Merge pull request #583 from lcd047/checkbashisms

Set subchecker in checkbashisms
2013-03-27 02:19:52 -07:00 · 2013-03-27 02:19:52 -07:00 · 0cf85d52c1
commit 0cf85d52c1
parent a3299364ca 1247394786
30 changed files with 73 additions and 35 deletions
--- a/syntax_checkers/applescript/osacompile.vim
+++ b/syntax_checkers/applescript/osacompile.vim
@ -37,7 +37,8 @@ endfunction
 function! SyntaxCheckers_applescript_osacompile_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'osacompile',
-                \ 'args': '-o ' . tempname() . '.scpt ' })
+                \ 'args': '-o ' . tempname() . '.scpt ',
+                \ 'subchecker': 'osacompile' })
    let errorformat = '%f:%l:%m'

    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/co/coco.vim
+++ b/syntax_checkers/co/coco.vim
@ -26,7 +26,8 @@ endfunction
 function! SyntaxCheckers_co_coco_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'coco',
-                \ 'args': '-c -o /tmp' })
+                \ 'args': '-c -o /tmp',
+                \ 'subchecker': 'coco' })
    let errorformat = '%EFailed at: %f,%ZSyntax%trror: %m on line %l,%EFailed at: %f,%Z%trror: Parse error on line %l: %m'

    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/coffee/coffee.vim
+++ b/syntax_checkers/coffee/coffee.vim
@ -21,7 +21,8 @@ endfunction
 function! SyntaxCheckers_coffee_coffee_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'coffee',
-                \ 'args': '-c -l -o /tmp' })
+                \ 'args': '-c -l -o /tmp',
+                \ 'subchecker': 'coffee' })
    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%.%#'

    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/cs/mcs.vim
+++ b/syntax_checkers/cs/mcs.vim
@ -22,7 +22,8 @@ endfunction
 function! SyntaxCheckers_cs_mcs_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'mcs',
-                \ 'args': '--parse' })
+                \ 'args': '--parse',
+                \ 'subchecker': 'mcs' })
    let errorformat = '%f(%l\,%c): %trror %m'
    return SyntasticMake({ 'makeprg': makeprg,
                         \ 'errorformat': errorformat,
--- a/syntax_checkers/css/csslint.vim
+++ b/syntax_checkers/css/csslint.vim
@ -30,7 +30,8 @@ endfunction
 function! SyntaxCheckers_css_csslint_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'csslint',
-                \ 'args': '--format=compact ' . g:syntastic_csslint_options })
+                \ 'args': '--format=compact ' . g:syntastic_csslint_options,
+                \ 'subchecker': 'csslint' })

    " Print CSS Lint's error/warning messages from compact format. Ignores blank lines.
    let errorformat = '%-G,%-G%f: lint free!,%f: line %l\, col %c\, %trror - %m,%f: line %l\, col %c\, %tarning - %m,%f: line %l\, col %c\, %m,'
--- a/syntax_checkers/cucumber/cucumber.vim
+++ b/syntax_checkers/cucumber/cucumber.vim
@ -22,7 +22,8 @@ endfunction
 function! SyntaxCheckers_cucumber_cucumber_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'cucumber',
-                \ 'args': '--dry-run --quiet --strict --format pretty' })
+                \ 'args': '--dry-run --quiet --strict --format pretty',
+                \ 'subchecker': 'cucumber' })
    let errorformat =  '%f:%l:%c:%m,%W      %.%# (%m),%-Z%f:%l:%.%#,%-G%.%#'

    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/elixir/elixir.vim
+++ b/syntax_checkers/elixir/elixir.vim
@ -29,7 +29,9 @@ function! SyntaxCheckers_elixir_elixir_IsAvailable()
 endfunction

 function! SyntaxCheckers_elixir_elixir_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': s:syntastic_elixir_compile_command })
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': s:syntastic_elixir_compile_command,
+        \ 'subchecker': 'elixir' })
    let errorformat = '** %*[^\ ] %f:%l: %m'

    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/fortran/gfortran.vim
+++ b/syntax_checkers/fortran/gfortran.vim
@ -34,7 +34,8 @@ endfunction
 function! SyntaxCheckers_fortran_gfortran_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'gfortran',
-                \ 'args': s:args() })
+                \ 'args': s:args(),
+                \ 'subchecker': 'gfortran' })
    let errorformat = '%-C %#,%-C  %#%.%#,%A%f:%l.%c:,%Z%m,%G%.%#'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/haml/haml.vim
+++ b/syntax_checkers/haml/haml.vim
@ -22,7 +22,8 @@ endfunction
 function! SyntaxCheckers_haml_haml_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'haml',
-                \ 'args': '-c' })
+                \ 'args': '-c',
+                \ 'subchecker': 'haml' })
    let errorformat = 'Haml error on line %l: %m,Syntax error on line %l: %m,%-G%.%#'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/less/lessc.vim
+++ b/syntax_checkers/less/lessc.vim
@ -44,7 +44,8 @@ function! SyntaxCheckers_less_lessc_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': s:check_file,
                \ 'args': g:syntastic_less_options,
-                \ 'tail': syntastic#util#DevNull() })
+                \ 'tail': syntastic#util#DevNull(),
+                \ 'subchecker': 'lessc' })
    let errorformat = '%m in %f:%l:%c'

    return SyntasticMake({ 'makeprg': makeprg,
--- a/syntax_checkers/lisp/clisp.vim
+++ b/syntax_checkers/lisp/clisp.vim
@ -22,7 +22,8 @@ function! SyntaxCheckers_lisp_clisp_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'clisp',
                \ 'args': '-c',
-                \ 'tail': '-o /tmp/clisp-vim-compiled-file' })
+                \ 'tail': '-o /tmp/clisp-vim-compiled-file',
+                \ 'subchecker': 'clisp' })
    let efm  = '%-G;%.%#,'
    let efm .= '%W%>WARNING:%.%#line %l : %m,%C  %#%m,'
    let efm .= '%E%>The following functions were %m,%Z %m,'
--- a/syntax_checkers/lua/luac.vim
+++ b/syntax_checkers/lua/luac.vim
@ -44,7 +44,10 @@ endfunction


 function! SyntaxCheckers_lua_luac_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'luac', 'args': '-p' })
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'luac',
+        \ 'args': '-p',
+        \ 'subchecker': 'luac' })
    let errorformat =  'luac: %#%f:%l: %m'

    return SyntasticMake({ 'makeprg': makeprg,
--- a/syntax_checkers/matlab/mlint.vim
+++ b/syntax_checkers/matlab/mlint.vim
@ -20,7 +20,10 @@ function! SyntaxCheckers_matlab_mlint_IsAvailable()
 endfunction

 function! SyntaxCheckers_matlab_mlint_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'mlint', 'args': '-id $*' })
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'mlint',
+        \ 'args': '-id $*',
+        \ 'subchecker': 'mlint' })
    let errorformat = 'L %l (C %c): %*[a-zA-Z0-9]: %m,L %l (C %c-%*[0-9]): %*[a-zA-Z0-9]: %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat, 'defaults': {'bufnr': bufnr("")} })
 endfunction
--- a/syntax_checkers/nasm/nasm.vim
+++ b/syntax_checkers/nasm/nasm.vim
@ -27,7 +27,8 @@ function! SyntaxCheckers_nasm_nasm_GetLocList()
    let wd = shellescape(expand("%:p:h") . "/")
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'nasm',
-                \ 'args': '-X gnu -f elf -I ' . wd . ' -o ' . outfile })
+                \ 'args': '-X gnu -f elf -I ' . wd . ' -o ' . outfile,
+                \ 'subchecker': 'nasm' })
    let errorformat = '%f:%l: %t%*[^:]: %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/rst/rst2pseudoxml.vim
+++ b/syntax_checkers/rst/rst2pseudoxml.vim
@ -26,7 +26,8 @@ function! SyntaxCheckers_rst_rst2pseudoxml_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': s:exe(),
                \ 'args': '--report=2 --exit-status=1',
-                \ 'tail': syntastic#util#DevNull() })
+                \ 'tail': syntastic#util#DevNull(),
+                \ 'subchecker': 'rst2pseudoxml' })

    let errorformat = '%f:%l:\ (%tNFO/1)\ %m,
      \%f:%l:\ (%tARNING/2)\ %m,
--- a/syntax_checkers/rust/rustc.vim
+++ b/syntax_checkers/rust/rustc.vim
@ -22,7 +22,8 @@ endfunction
 function! SyntaxCheckers_rust_rustc_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'rustc',
-                \ 'args': '--parse-only' })
+                \ 'args': '--parse-only',
+                \ 'subchecker': 'rustc' })

    let errorformat  = '%E%f:%l:%c: \\d%#:\\d%# %.%\{-}error:%.%\{-} %m,'   .
                     \ '%W%f:%l:%c: \\d%#:\\d%# %.%\{-}warning:%.%\{-} %m,' .
--- a/syntax_checkers/sass/sass.vim
+++ b/syntax_checkers/sass/sass.vim
@ -40,7 +40,8 @@ function! SyntaxCheckers_sass_sass_GetLocList()
    end
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'sass',
-                \ 'args': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check' })
+                \ 'args': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check',
+                \ 'subchecker': 'sass' })
    let errorformat = '%ESyntax %trror:%m,%C        on line %l of %f,%Z%.%#'
    let errorformat .= ',%Wwarning on line %l:,%Z%m,Syntax %trror on line %l: %m'
    let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
--- a/syntax_checkers/scala/scalac.vim
+++ b/syntax_checkers/scala/scalac.vim
@ -27,7 +27,8 @@ endif
 function! SyntaxCheckers_scala_scalac_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'scalac',
-                \ 'args': '-Ystop-after:parser '. g:syntastic_scala_options })
+                \ 'args': '-Ystop-after:parser '. g:syntastic_scala_options,
+                \ 'subchecker': 'scalac' })

    let errorformat = '%f\:%l: %trror: %m'

--- a/syntax_checkers/sh/checkbashisms.vim
+++ b/syntax_checkers/sh/checkbashisms.vim
@ -13,12 +13,15 @@ let g:loaded_syntastic_sh_checkbashisms_checker=1


 function! SyntaxCheckers_sh_checkbashisms_IsAvailable()
-    return executable('checkbashisms.pl')
+    return executable('checkbashisms')
 endfunction


 function! SyntaxCheckers_sh_checkbashisms_GetLocList()
-    let makeprg = syntastic#makeprg#build({'exe': 'checkbashisms.pl', 'args': '-fpx'})
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'checkbashisms',
+        \ 'args': '-fpx',
+        \ 'subchecker': 'checkbashisms'})

    let errorformat =
        \ '%Eerror: %f: %m,' .
@ -26,7 +29,7 @@ function! SyntaxCheckers_sh_checkbashisms_GetLocList()
        \ '%Wscript %f %m,%C%.# lines,' .
        \ '%Wpossible bashism in %f line %l (%m):,%C%.%#,%Z.%#'

-    return SyntasticMake({'makeprg': makeprg, 'errorformat': errorformat})
+    return SyntasticMake({'makeprg': makeprg, 'errorformat': errorformat, 'subtype': 'Style'})
 endfunction


--- a/syntax_checkers/sh/sh.vim
+++ b/syntax_checkers/sh/sh.vim
@ -63,7 +63,8 @@ function! SyntaxCheckers_sh_sh_GetLocList()

    let makeprg = syntastic#makeprg#build({
                \ 'exe': s:GetShell(),
-                \ 'args': '-n' })
+                \ 'args': '-n',
+                \ 'subchecker': 'sh'})

    let errorformat = '%f: line %l: %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat})
--- a/syntax_checkers/slim/slimrb.vim
+++ b/syntax_checkers/slim/slimrb.vim
@ -32,7 +32,8 @@ endfunction
 function! SyntaxCheckers_slim_slimrb_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'slimrb',
-                \ 'args': '-c' })
+                \ 'args': '-c',
+                \ 'subchecker': 'slimrb' })
    if syntastic#util#versionIsAtLeast(s:SlimrbVersion(), [1,3,1])
        let errorformat = '%C\ %#%f\, Line %l\, Column %c,%-G\ %.%#,%ESlim::Parser::SyntaxError: %m,%+C%.%#'
    else
--- a/syntax_checkers/tex/lacheck.vim
+++ b/syntax_checkers/tex/lacheck.vim
@ -20,7 +20,7 @@ function! SyntaxCheckers_tex_lacheck_IsAvailable()
 endfunction

 function! SyntaxCheckers_tex_lacheck_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'lacheck' })
+    let makeprg = syntastic#makeprg#build({ 'exe': 'lacheck', 'subchecker': 'lacheck' })
    let errorformat =  '%-G** %f:,%E"%f"\, line %l: %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/typescript/tsc.vim
+++ b/syntax_checkers/typescript/tsc.vim
@ -17,7 +17,8 @@ endfunction
 function! SyntaxCheckers_typescript_tsc_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'tsc',
-                \ 'post_args': '--out ' . syntastic#util#DevNull() })
+                \ 'post_args': '--out ' . syntastic#util#DevNull(),
+                \ 'subchecker': 'tsc' })
    let errorformat = '%f %#(%l\,%c): %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/vala/valac.vim
+++ b/syntax_checkers/vala/valac.vim
@ -51,7 +51,8 @@ function! SyntaxCheckers_vala_valac_GetLocList()
    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'valac',
-                \ 'args': '-C ' . vala_pkg_args })
+                \ 'args': '-C ' . vala_pkg_args,
+                \ 'subchecker': 'valac' })
    let errorformat = '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,%C%m,%Z%m'

    return SyntasticMake({ 'makeprg': makeprg,
--- a/syntax_checkers/xhtml/tidy.vim
+++ b/syntax_checkers/xhtml/tidy.vim
@ -42,7 +42,8 @@ function! SyntaxCheckers_xhtml_tidy_GetLocList()
    let encopt = s:TidyEncOptByFenc()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'tidy',
-                \ 'args': encopt . ' -xml -e' })
+                \ 'args': encopt . ' -xml -e',
+                \ 'subchecker': 'tidy' })
    let errorformat='%Wline %l column %c - Warning: %m,%Eline %l column %c - Error: %m,%-G%.%#,%-G%.%#'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat, 'defaults': {'bufnr': bufnr("")} })
 endfunction
--- a/syntax_checkers/xml/xmllint.vim
+++ b/syntax_checkers/xml/xmllint.vim
@ -26,7 +26,8 @@ endfunction
 function! SyntaxCheckers_xml_xmllint_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'xmllint',
-                \ 'args': '--xinclude --noout --postvalid' })
+                \ 'args': '--xinclude --noout --postvalid',
+                \ 'subchecker': 'xmllint' })
    let errorformat='%E%f:%l: error : %m,' .
                \ '%-G%f:%l: validity error : Validation failed: no DTD found %m,' .
                \ '%W%f:%l: warning : %m,' .
--- a/syntax_checkers/yaml/jsyaml.vim
+++ b/syntax_checkers/yaml/jsyaml.vim
@ -25,7 +25,8 @@ endfunction
 function! SyntaxCheckers_yaml_jsyaml_GetLocList()
    let makeprg = syntastic#makeprg#build({
                \ 'exe': 'js-yaml',
-                \ 'args': '--compact' })
+                \ 'args': '--compact',
+                \ 'subchecker': 'jsyaml' })
    let errorformat='Error on line %l\, col %c:%m,%-G%.%#'
    return SyntasticMake({ 'makeprg': makeprg,
                         \ 'errorformat': errorformat,
--- a/syntax_checkers/z80/z80syntaxchecker.vim
+++ b/syntax_checkers/z80/z80syntaxchecker.vim
@ -24,7 +24,9 @@ function! SyntaxCheckers_z80_z80syntaxchecker_IsAvailable()
 endfunction

 function! SyntaxCheckers_z80_z80syntaxchecker_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'z80_syntax_checker.py' })
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'z80_syntax_checker.py',
+        \ 'subchecker': 'z80syntaxchecker' })
    let errorformat =  '%f:%l %m'
    let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
    return loclist
--- a/syntax_checkers/zpt/zptlint.vim
+++ b/syntax_checkers/zpt/zptlint.vim
@ -29,7 +29,7 @@ function! SyntaxCheckers_zpt_zptlint_IsAvailable()
 endfunction

 function! SyntaxCheckers_zpt_zptlint_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'zptlint' })
+    let makeprg = syntastic#makeprg#build({ 'exe': 'zptlint', 'subchecker': 'zptlint' })
    let errorformat='%-P*** Error in: %f,%Z%*\s\, at line %l\, column %c,%E%*\s%m,%-Q'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endfunction
--- a/syntax_checkers/zsh/zsh.vim
+++ b/syntax_checkers/zsh/zsh.vim
@ -20,7 +20,10 @@ function! SyntaxCheckers_zsh_zsh_IsAvailable()
 endfunction

 function! SyntaxCheckers_zsh_zsh_GetLocList()
-    let makeprg = syntastic#makeprg#build({ 'exe': 'zsh', 'args': '-n' })
+    let makeprg = syntastic#makeprg#build({
+        \ 'exe': 'zsh',
+        \ 'args': '-n',
+        \ 'subchecker': 'zsh' })
    let errorformat = '%f:%l: %m'
    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat})
 endfunction