vim/syntastic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix "puppet parser validate" for Puppet 3.0.0

Browse Source 
The error message in 'puppet parser validate' changed between Puppet 2.x
and Puppet 3.0.0, preventing syntax errors from being caught.

In addition, the logic to apply --ignoreimport was falsely triggering on
3.0.0, because it was written assuming a major version of "2".  The
--ignoreimport flag has been broken since 2.6.1, so I removed all of that
logic.  In theory, it could be re-added for 2.6.0 and 0.2x.x, but the
version number checking didn't handle 0.2x.x, so I didn't reach back that
far.
This commit is contained in:
pforman 2012-10-03 22:42:11 -06:00
parent 2e7d73305b
commit e9e9172d29
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
syntax_checkers/puppet.vim
View File

@ -72,14 +72,8 @@ function! s:getPuppetMakeprg()
let makeprg = 'puppet parser validate ' . let makeprg = 'puppet parser validate ' .
\ shellescape(expand('%')) . \ shellescape(expand('%')) .
\ ' --color=false' \ ' --color=false'
"add --ignoreimport for versions < 2.7.10
if s:PuppetVersion()[2] < '10'
let makeprg .= ' --ignoreimport'
endif
else else
let makeprg = 'puppet --color=false --parseonly --ignoreimport '.shellescape(expand('%')) let makeprg = 'puppet --color=false --parseonly '.shellescape(expand('%'))
endif endif
return makeprg return makeprg
endfunction endfunction
@ -95,6 +89,13 @@ function! SyntaxCheckers_puppet_GetLocList()
let errorformat = '%-Gerr: Try ''puppet help parser validate'' for usage,' let errorformat = '%-Gerr: Try ''puppet help parser validate'' for usage,'
let errorformat .= 'err: Could not parse for environment %*[a-z]: %m at %f:%l' let errorformat .= 'err: Could not parse for environment %*[a-z]: %m at %f:%l'
"Puppet 3.0.0 changes this from "err:" to "Error:"
"reset errorformat in that case
if SyntasticIsVersionAtLeast(s:PuppetVersion(), [3,0,0])
let errorformat = '%-GError: Try ''puppet help parser validate'' for usage,'
let errorformat .= 'Error: Could not parse for environment %*[a-z]: %m at %f:%l'
endif
let errors = errors + SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) let errors = errors + SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
endif endif