Merge remote-tracking branch 'brendanjerwin/master'
This commit is contained in:
commit
18364490b0
@ -25,17 +25,23 @@ function! SyntaxCheckers_coffee_GetLocList()
|
|||||||
let errorformat = 'Syntax%trror: In %f\, %m on line %l,%EError: In %f\, Parse error on line %l: %m,%EError: In %f\, %m on line %l,%W%f(%l): lint warning: %m,%-Z%p^,%W%f(%l): warning: %m,%-Z%p^,%E%f(%l): SyntaxError: %m,%-Z%p^,%-G%.%#'
|
let errorformat = 'Syntax%trror: In %f\, %m on line %l,%EError: In %f\, Parse error on line %l: %m,%EError: In %f\, %m on line %l,%W%f(%l): lint warning: %m,%-Z%p^,%W%f(%l): warning: %m,%-Z%p^,%E%f(%l): SyntaxError: %m,%-Z%p^,%-G%.%#'
|
||||||
|
|
||||||
let coffee_results = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
|
let coffee_results = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
|
||||||
|
|
||||||
|
if !empty(coffee_results)
|
||||||
|
return coffee_results
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
let lint_results = []
|
|
||||||
if executable("coffeelint")
|
if executable("coffeelint")
|
||||||
let lint_options = ''
|
let lint_options = ''
|
||||||
if(exists('g:coffee_lint_options'))
|
if(exists('g:coffee_lint_options'))
|
||||||
let lint_options = g:coffee_lint_options
|
let lint_options = g:coffee_lint_options
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let coffeelint = 'coffeelint --csv '.lint_options.' '.shellescape(expand('%'))
|
let coffeelint = 'coffeelint --csv '.lint_options.' '.shellescape(expand('%'))
|
||||||
echo coffeelint
|
let lint_results = SyntasticMake({ 'makeprg': coffeelint, 'errorformat': '%f\,%l\,%trror\,%m', 'subtype': 'Style' })
|
||||||
let lint_results = SyntasticMake({ 'makeprg': coffeelint, 'errorformat': '%f\,%l\,error\,%m' })
|
|
||||||
|
return lint_results
|
||||||
endif
|
endif
|
||||||
|
|
||||||
return coffee_results + lint_results
|
return []
|
||||||
endfunction
|
endfunction
|
||||||
|
Loading…
Reference in New Issue
Block a user