diff --git a/syntax_checkers/c/oclint.vim b/syntax_checkers/c/oclint.vim index efd84f2e..32cdd57a 100644 --- a/syntax_checkers/c/oclint.vim +++ b/syntax_checkers/c/oclint.vim @@ -16,10 +16,10 @@ " " let g:syntastic_oclint_config_file = '.config' -if exists("loaded_oclint_syntax_checker") +if exists("g:loaded_syntastic_c_oclint_checker") finish endif -let loaded_oclint_syntax_checker = 1 +let g:loaded_syntastic_c_oclint_checker = 1 function! SyntaxCheckers_c_oclint_IsAvailable() return executable("oclint") @@ -37,15 +37,23 @@ function! SyntaxCheckers_c_oclint_GetLocList() \ 'subchecker': 'oclint' }) let errorformat = - \ '%f:%l:%c:\ %m,' . + \ '%W%f:%l:%c: %m,' . + \ '%E%f:%l:%c: error: %m,' . \ '%-G%.%#' - return SyntasticMake({ + let loclist = SyntasticMake({ \ 'makeprg': makeprg, \ 'errorformat': errorformat, \ 'subtype': 'Style', - \ 'postprocess': ['compressWhitespace'], - \ 'defaults': {'type': 'W'} }) + \ 'postprocess': ['compressWhitespace', 'sort'] }) + + for n in range(len(loclist)) + if loclist[n]['text'] =~# ' P[12] \=$' + let loclist[n]['type'] = 'E' + endif + endfor + + return loclist endfunction call g:SyntasticRegistry.CreateAndRegisterChecker({ diff --git a/syntax_checkers/cpp/oclint.vim b/syntax_checkers/cpp/oclint.vim index d6e43dde..b3edbfbc 100644 --- a/syntax_checkers/cpp/oclint.vim +++ b/syntax_checkers/cpp/oclint.vim @@ -16,10 +16,10 @@ " " let g:syntastic_oclint_config_file = '.config' -if exists("loaded_oclint_syntax_checker") +if exists("g:loaded_syntastic_cpp_oclint_checker") finish endif -let loaded_oclint_syntax_checker = 1 +let g:loaded_syntastic_cpp_oclint_checker = 1 function! SyntaxCheckers_cpp_oclint_IsAvailable() return executable("oclint") @@ -37,15 +37,23 @@ function! SyntaxCheckers_cpp_oclint_GetLocList() \ 'subchecker': 'oclint' }) let errorformat = - \ '%f:%l:%c:\ %m,' . + \ '%W%f:%l:%c: %m,' . + \ '%E%f:%l:%c: error: %m,' . \ '%-G%.%#' - return SyntasticMake({ + let loclist = SyntasticMake({ \ 'makeprg': makeprg, \ 'errorformat': errorformat, \ 'subtype': 'Style', - \ 'postprocess': ['compressWhitespace'], - \ 'defaults': {'type': 'W'} }) + \ 'postprocess': ['compressWhitespace', 'sort'] }) + + for n in range(len(loclist)) + if loclist[n]['text'] =~# ' P[12] \=$' + let loclist[n]['type'] = 'E' + endif + endfor + + return loclist endfunction call g:SyntasticRegistry.CreateAndRegisterChecker({ diff --git a/syntax_checkers/objc/oclint.vim b/syntax_checkers/objc/oclint.vim new file mode 100644 index 00000000..4441b2a5 --- /dev/null +++ b/syntax_checkers/objc/oclint.vim @@ -0,0 +1,61 @@ +"============================================================================ +"File: oclint.vim +"Description: Syntax checking plugin for syntastic.vim +"Maintainer: "UnCO" Lin +"License: This program is free software. It comes without any warranty, +" to the extent permitted by applicable law. You can redistribute +" it and/or modify it under the terms of the Do What The Fuck You +" Want To Public License, Version 2, as published by Sam Hocevar. +" See http://sam.zoy.org/wtfpl/COPYING for more details. +"============================================================================ +" +" The setting 'g:syntastic_oclint_config_file' allows you to define a file +" that contains additional compiler arguments like include directories or +" CFLAGS. The file is expected to contain one option per line. If none is +" given the filename defaults to '.syntastic_oclint_config': +" +" let g:syntastic_oclint_config_file = '.config' + +if exists("g:loaded_syntastic_objc_oclint_checker") + finish +endif +let g:loaded_syntastic_objc_oclint_checker = 1 + +function! SyntaxCheckers_objc_oclint_IsAvailable() + return executable("oclint") +endfunction + +if !exists('g:syntastic_oclint_config_file') + let g:syntastic_oclint_config_file = '.syntastic_oclint_config' +endif + +function! SyntaxCheckers_objc_oclint_GetLocList() + let makeprg = syntastic#makeprg#build({ + \ 'exe': 'oclint', + \ 'args': '-text', + \ 'post_args': '-- -c' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file), + \ 'subchecker': 'oclint' }) + + let errorformat = + \ '%W%f:%l:%c: %m,' . + \ '%E%f:%l:%c: error: %m,' . + \ '%-G%.%#' + + let loclist = SyntasticMake({ + \ 'makeprg': makeprg, + \ 'errorformat': errorformat, + \ 'subtype': 'Style', + \ 'postprocess': ['compressWhitespace', 'sort'] }) + + for n in range(len(loclist)) + if loclist[n]['text'] =~# ' P[12] \=$' + let loclist[n]['type'] = 'E' + endif + endfor + + return loclist +endfunction + +call g:SyntasticRegistry.CreateAndRegisterChecker({ + \ 'filetype': 'objc', + \ 'name': 'oclint'})