From d454a006153c461a67cc4a9a0b26726da5f0da16 Mon Sep 17 00:00:00 2001 From: Martin Grenfell Date: Mon, 20 Feb 2012 10:20:48 +0000 Subject: [PATCH] split python checker out into 3 files previously there were 3 checkers in the one file --- syntax_checkers/python.vim | 59 ++--------------------------- syntax_checkers/python/flake8.vim | 36 ++++++++++++++++++ syntax_checkers/python/pyflakes.vim | 37 ++++++++++++++++++ syntax_checkers/python/pylint.vim | 14 +++++++ 4 files changed, 90 insertions(+), 56 deletions(-) create mode 100644 syntax_checkers/python/flake8.vim create mode 100644 syntax_checkers/python/pyflakes.vim create mode 100644 syntax_checkers/python/pylint.vim diff --git a/syntax_checkers/python.vim b/syntax_checkers/python.vim index a20539b8..93a0b529 100644 --- a/syntax_checkers/python.vim +++ b/syntax_checkers/python.vim @@ -6,75 +6,22 @@ " kstep " Parantapa Bhattacharya " -"============================================================================ " " For forcing the use of flake8, pyflakes, or pylint set " " let g:syntastic_python_checker = 'pyflakes' " " in your .vimrc. Default is flake8. +"============================================================================ if exists("loaded_python_syntax_checker") finish endif let loaded_python_syntax_checker = 1 -"bail if the user doesnt have his favorite checker or flake8 or pyflakes installed -if !exists('g:syntastic_python_checker') || !executable(g:syntastic_python_checker) - if executable("flake8") - let g:syntastic_python_checker = 'flake8' - elseif executable("pyflakes") - let g:syntastic_python_checker = 'pyflakes' - elseif executable("pylint") - let g:syntastic_python_checker = 'pylint' - else - finish - endif -endif if !exists('g:syntastic_python_checker_args') let g:syntastic_python_checker_args = '' endif -function! SyntaxCheckers_python_Term(i) - if a:i['type'] ==# 'E' - let a:i['text'] = "Syntax error" - endif - if match(a:i['text'], 'is assigned to but never used') > -1 - \ || match(a:i['text'], 'imported but unused') > -1 - \ || match(a:i['text'], 'undefined name') > -1 - \ || match(a:i['text'], 'redefinition of') > -1 - \ || match(a:i['text'], 'referenced before assignment') > -1 - \ || match(a:i['text'], 'duplicate argument') > -1 - \ || match(a:i['text'], 'after other statements') > -1 - \ || match(a:i['text'], 'shadowed by loop variable') > -1 - - let term = split(a:i['text'], "'", 1)[1] - return '\V\<'.term.'\>' - endif - return '' -endfunction - -if g:syntastic_python_checker == 'pylint' - function! SyntaxCheckers_python_GetLocList() - let makeprg = 'pylint -f parseable -r n -i y ' . - \ shellescape(expand('%')) . - \ ' \| sed ''s_: \[[RC]_: \[W_''' . - \ ' \| sed ''s_: \[[F]_:\ \[E_''' - let errorformat = '%f:%l: [%t%n] %m,%-GNo config%m' - let errors = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) - - return errors - endfunction -else - function! SyntaxCheckers_python_GetLocList() - let makeprg = g:syntastic_python_checker.' '.g:syntastic_python_checker_args.' '.shellescape(expand('%')) - let errorformat = - \ '%E%f:%l: could not compile,%-Z%p^,%W%f:%l:%c: %m,%W%f:%l: %m,%-G%.%#' - - let errors = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) - - call SyntasticHighlightErrors(errors, function('SyntaxCheckers_python_Term')) - - return errors - endfunction -endif +let s:supported_checkers = ["flake8", "pyflakes", "pylint"] +call SyntasticLoadChecker(s:supported_checkers) diff --git a/syntax_checkers/python/flake8.vim b/syntax_checkers/python/flake8.vim new file mode 100644 index 00000000..0315733f --- /dev/null +++ b/syntax_checkers/python/flake8.vim @@ -0,0 +1,36 @@ +"============================================================================ +"File: flake8.vim +"Description: Syntax checking plugin for syntastic.vim +"Authors: Sylvain Soliman +" kstep +" +"============================================================================ +function! SyntaxCheckers_python_Term(i) + if a:i['type'] ==# 'E' + let a:i['text'] = "Syntax error" + endif + if match(a:i['text'], 'is assigned to but never used') > -1 + \ || match(a:i['text'], 'imported but unused') > -1 + \ || match(a:i['text'], 'undefined name') > -1 + \ || match(a:i['text'], 'redefinition of') > -1 + \ || match(a:i['text'], 'referenced before assignment') > -1 + \ || match(a:i['text'], 'duplicate argument') > -1 + \ || match(a:i['text'], 'after other statements') > -1 + \ || match(a:i['text'], 'shadowed by loop variable') > -1 + + let term = split(a:i['text'], "'", 1)[1] + return '\V\<'.term.'\>' + endif + return '' +endfunction + +function! SyntaxCheckers_python_GetLocList() + let makeprg = 'flake8 '.g:syntastic_python_checker_args.' '.shellescape(expand('%')) + let errorformat = '%E%f:%l: could not compile,%-Z%p^,%W%f:%l:%c: %m,%W%f:%l: %m,%-G%.%#' + + let errors = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) + + call SyntasticHighlightErrors(errors, function('SyntaxCheckers_python_Term')) + + return errors +endfunction diff --git a/syntax_checkers/python/pyflakes.vim b/syntax_checkers/python/pyflakes.vim new file mode 100644 index 00000000..eed03fcd --- /dev/null +++ b/syntax_checkers/python/pyflakes.vim @@ -0,0 +1,37 @@ +"============================================================================ +"File: pyflakes.vim +"Description: Syntax checking plugin for syntastic.vim +"Authors: Martin Grenfell +" kstep +" Parantapa Bhattacharya +" +"============================================================================ +function! SyntaxCheckers_python_Term(i) + if a:i['type'] ==# 'E' + let a:i['text'] = "Syntax error" + endif + if match(a:i['text'], 'is assigned to but never used') > -1 + \ || match(a:i['text'], 'imported but unused') > -1 + \ || match(a:i['text'], 'undefined name') > -1 + \ || match(a:i['text'], 'redefinition of') > -1 + \ || match(a:i['text'], 'referenced before assignment') > -1 + \ || match(a:i['text'], 'duplicate argument') > -1 + \ || match(a:i['text'], 'after other statements') > -1 + \ || match(a:i['text'], 'shadowed by loop variable') > -1 + + let term = split(a:i['text'], "'", 1)[1] + return '\V\<'.term.'\>' + endif + return '' +endfunction + +function! SyntaxCheckers_python_GetLocList() + let makeprg = g:syntastic_python_checker.' '.g:syntastic_python_checker_args.' '.shellescape(expand('%')) + let errorformat = '%E%f:%l: could not compile,%-Z%p^,%W%f:%l:%c: %m,%W%f:%l: %m,%-G%.%#' + + let errors = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) + + call SyntasticHighlightErrors(errors, function('SyntaxCheckers_python_Term')) + + return errors +endfunction diff --git a/syntax_checkers/python/pylint.vim b/syntax_checkers/python/pylint.vim new file mode 100644 index 00000000..1fc880cb --- /dev/null +++ b/syntax_checkers/python/pylint.vim @@ -0,0 +1,14 @@ +"============================================================================ +"File: pylint.vim +"Description: Syntax checking plugin for syntastic.vim +"Author: Parantapa Bhattacharya +" +"============================================================================ +function! SyntaxCheckers_python_GetLocList() + let makeprg = 'pylint -f parseable -r n -i y ' . + \ shellescape(expand('%')) . + \ ' \| sed ''s_: \[[RC]_: \[W_''' . + \ ' \| sed ''s_: \[[F]_:\ \[E_''' + let errorformat = '%f:%l: [%t%n] %m,%-GNo config%m' + return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) +endfunction