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

Merge pull request #158 from technosophos/master

Browse Source 
Support for subtypes
This commit is contained in:
Martin Grenfell 2012-02-07 08:31:54 -08:00
commit 2b514d84bd
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/syntastic.vim
View File

@ -267,6 +267,8 @@ if g:syntastic_enable_signs
"use >> to display syntax errors in the sign column "use >> to display syntax errors in the sign column
sign define SyntasticError text=>> texthl=error sign define SyntasticError text=>> texthl=error
sign define SyntasticWarning text=>> texthl=todo sign define SyntasticWarning text=>> texthl=todo
sign define SyntasticStyleError text=S> texthl=error
sign define SyntasticStyleWarning text=S> texthl=todo
endif endif
"start counting sign ids at 5000, start here to hopefully avoid conflicting "start counting sign ids at 5000, start here to hopefully avoid conflicting
@ -281,10 +283,15 @@ function! s:SignErrors()
let errors = s:FilterLocList({'bufnr': bufnr('')}) let errors = s:FilterLocList({'bufnr': bufnr('')})
for i in errors for i in errors
let sign_type = 'SyntasticError' let sign_severity = 'Error'
if i['type'] ==? 'W' let sign_subtype = ''
let sign_type = 'SyntasticWarning' if has_key(i,'subtype')
let sign_subtype = i['subtype']
endif endif
if i['type'] ==? 'w'
let sign_severity = 'Warning'
endif
let sign_type = 'Syntastic' . sign_subtype . sign_severity
if !s:WarningMasksError(i, errors) if !s:WarningMasksError(i, errors)
exec "sign place ". s:next_sign_id ." line=". i['lnum'] ." name=". sign_type ." file=". expand("%:p") exec "sign place ". s:next_sign_id ." line=". i['lnum'] ." name=". sign_type ." file=". expand("%:p")
@ -507,6 +514,14 @@ function! SyntasticMake(options)
redraw! redraw!
endif endif
" Add subtype info if present.
if has_key(a:options, 'subtype')
if !has_key(a:options, 'defaults')
let a:options['defaults'] = {}
endif
let a:options['defaults']['subtype'] = a:options['subtype']
endif
if has_key(a:options, 'defaults') if has_key(a:options, 'defaults')
call SyntasticAddToErrors(errors, a:options['defaults']) call SyntasticAddToErrors(errors, a:options['defaults'])
endif endif
@ -557,7 +572,7 @@ endfunction
function! SyntasticAddToErrors(errors, options) function! SyntasticAddToErrors(errors, options)
for i in range(0, len(a:errors)-1) for i in range(0, len(a:errors)-1)
for key in keys(a:options) for key in keys(a:options)
if empty(a:errors[i][key]) if !has_key(a:errors[i], key) || empty(a:errors[i][key])
let a:errors[i][key] = a:options[key] let a:errors[i][key] = a:options[key]
endif endif
endfor endfor

2
syntax_checkers/php.vim
View File

@ -54,5 +54,5 @@ endfunction
function! s:GetPHPCSErrors() function! s:GetPHPCSErrors()
let makeprg = "phpcs " . g:syntastic_phpcs_conf . " --report=csv ".shellescape(expand('%')) let makeprg = "phpcs " . g:syntastic_phpcs_conf . " --report=csv ".shellescape(expand('%'))
let errorformat = '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity,"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]' let errorformat = '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity,"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]'
return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat, 'subtype': 'Style' })
endfunction endfunction