diff --git a/doc/syntastic-checkers.txt b/doc/syntastic-checkers.txt index ef536a2d..e4d7b15e 100644 --- a/doc/syntastic-checkers.txt +++ b/doc/syntastic-checkers.txt @@ -1614,8 +1614,8 @@ SYNTAX CHECKERS FOR COFFEESCRIPT *syntastic-checkers-coffee* The following checkers are available for CoffeeScript (filetype "coffee"): 1. Coffee...................|syntastic-coffee-coffee| - 2. CoffeeLint...............|syntastic-coffee-coffeelint| - 3. coffee_jshint............|syntastic-coffee-coffee-jshint| + 2. Coffee->JSHint...........|syntastic-coffee-coffee_jshint| + 3. CoffeeLint...............|syntastic-coffee-coffeelint| ------------------------------------------------------------------------------ 1. Coffee *syntastic-coffee-coffee* @@ -1635,7 +1635,28 @@ This checker is initialised using the "makeprgBuild()" function and thus it accepts the standard options described at |syntastic-config-makeprg|. ------------------------------------------------------------------------------ -2. CoffeeLint *syntastic-coffee-coffeelint* +2. Coffee->JSHint *syntastic-coffee-coffee_jshint* + +Name: coffee_jshint +Maintainer: John Krauss + +"Coffee->JSHint" is a JSHint validator for CoffeeScript. See the project's +page at GitHub for details: + + https://github.com/marviq/coffee-jshint + +Installation~ + +Install it with "npm": > + npm install -g coffee-jshint +< +Checker options~ + +This checker is initialised using the "makeprgBuild()" function and thus it +Accepts the standard options described at |syntastic-config-makeprg|. + +------------------------------------------------------------------------------ +3. CoffeeLint *syntastic-coffee-coffeelint* Name: coffeelint Maintainer: Lincoln Stoll @@ -1650,22 +1671,6 @@ Checker options~ This checker is initialised using the "makeprgBuild()" function and thus it accepts the standard options described at |syntastic-config-makeprg|. ------------------------------------------------------------------------------- -2. coffee-jshint *syntastic-coffee-coffee-jshint* - -Name: coffee-jshint -Maintainer: John Krauss - -"coffee-jshint" is a JSHint validator for CoffeeScript. See the project's page -for details: - - https://github.com/marviq/coffee-jshint - -Checker options~ - -This checker is initialised using the "makeprgBuild()" function and thus it -Accepts the standard options described at |syntastic-config-makeprg|. - ============================================================================== SYNTAX CHECKERS FOR COQ *syntastic-checkers-coq* diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim index d7d0705f..93141900 100644 --- a/plugin/syntastic.vim +++ b/plugin/syntastic.vim @@ -19,7 +19,7 @@ if has('reltime') lockvar! g:_SYNTASTIC_START endif -let g:_SYNTASTIC_VERSION = '3.8.0-56' +let g:_SYNTASTIC_VERSION = '3.8.0-58' lockvar g:_SYNTASTIC_VERSION " Sanity checks {{{1 diff --git a/plugin/syntastic/registry.vim b/plugin/syntastic/registry.vim index 1a65f639..4efd5098 100644 --- a/plugin/syntastic/registry.vim +++ b/plugin/syntastic/registry.vim @@ -22,7 +22,7 @@ let s:_DEFAULT_CHECKERS = { \ 'cmake': ['cmakelint'], \ 'co': ['coco'], \ 'cobol': ['cobc'], - \ 'coffee': ['coffee', 'coffeelint', 'coffee_jshint'], + \ 'coffee': ['coffee', 'coffeelint'], \ 'coq': ['coqtop'], \ 'cpp': ['gcc'], \ 'cs': ['mcs'], diff --git a/syntax_checkers/coffee/coffee-jshint.vim b/syntax_checkers/coffee/coffee_jshint.vim similarity index 82% rename from syntax_checkers/coffee/coffee-jshint.vim rename to syntax_checkers/coffee/coffee_jshint.vim index 568fc09b..95f82141 100644 --- a/syntax_checkers/coffee/coffee-jshint.vim +++ b/syntax_checkers/coffee/coffee_jshint.vim @@ -1,6 +1,6 @@ "============================================================================ -"File: coffee-jshint.vim -"Description: Syntax checking plugin for syntastic.vim +"File: coffee_jshint.vim +"Description: Syntax checking plugin for syntastic "Maintainer: John Krauss "License: This program is free software. It comes without any warranty, " to the extent permitted by applicable law. You can redistribute @@ -22,21 +22,20 @@ function! SyntaxCheckers_coffee_coffee_jshint_GetLocList() dict let makeprg = self.makeprgBuild({}) let errorformat = - \ '--------------------------------,' . - \ '%+P%f,' . - \ '%l:%c: %m,' . - \ '%-Q' + \ '%Q-%\{32\,},' . + \ '%E%l:%c: %m,' . + \ '%P%f' return SyntasticMake({ \ 'makeprg': makeprg, \ 'errorformat': errorformat, - \ 'returns': [0, 1]}) + \ 'returns': [0, 1] }) endfunction call g:SyntasticRegistry.CreateAndRegisterChecker({ \ 'filetype': 'coffee', \ 'exec': 'coffee-jshint', - \ 'name': 'coffee_jshint'}) + \ 'name': 'coffee_jshint' }) let &cpo = s:save_cpo unlet s:save_cpo