From: Vincent Driessen Date: Mon, 24 Sep 2012 12:43:54 +0000 (+0200) Subject: Reread configuration upon every invocation of Flake8(). X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/66174e2d85c3aa21c8c12825f9389fdaefbf277e?ds=inline;hp=-c Reread configuration upon every invocation of Flake8(). This fixes #23. --- 66174e2d85c3aa21c8c12825f9389fdaefbf277e diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim index 0b386c7..2fc7ed4 100644 --- a/ftplugin/python_flake8.vim +++ b/ftplugin/python_flake8.vim @@ -11,29 +11,14 @@ if exists("b:loaded_flake8_ftplugin") endif let b:loaded_flake8_ftplugin=1 -if exists("g:flake8_cmd") - let s:flake8_cmd=g:flake8_cmd -else - let s:flake8_cmd="flake8" -endif - -let s:flake8_ignores="" -if exists("g:flake8_ignore") - let s:flake8_ignores=" --ignore=".g:flake8_ignore -endif - -let s:flake8_max_line_length="" -if exists("g:flake8_max_line_length") - let s:flake8_max_line_length=" --max-line-length=".g:flake8_max_line_length -endif - -let s:flake8_max_complexity="" -if exists("g:flake8_max_complexity") - let s:flake8_max_complexity=" --max-complexity=".g:flake8_max_complexity -endif - if !exists("*Flake8()") function Flake8() + if exists("g:flake8_cmd") + let s:flake8_cmd=g:flake8_cmd + else + let s:flake8_cmd="flake8" + endif + if !executable(s:flake8_cmd) echoerr "File " . s:flake8_cmd . " not found. Please install it first." return @@ -51,6 +36,25 @@ if !exists("*Flake8()") update endif + " read config + if exists("g:flake8_ignore") + let s:flake8_ignores=" --ignore=".g:flake8_ignore + else + let s:flake8_ignores="" + endif + + if exists("g:flake8_max_line_length") + let s:flake8_max_line_length=" --max-line-length=".g:flake8_max_line_length + else + let s:flake8_max_line_length="" + endif + + if exists("g:flake8_max_complexity") + let s:flake8_max_complexity=" --max-complexity=".g:flake8_max_complexity + else + let s:flake8_max_complexity="" + endif + " perform the grep itself let &grepformat="%f:%l:%c: %m\,%f:%l: %m" let &grepprg=s:flake8_cmd.s:flake8_ignores.s:flake8_max_line_length.s:flake8_max_complexity