g:flake8_builtins to pass --builtins to flake8.py

[etc/vim.git] / ftplugin / python_flake8.vim

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index 0b386c7689692974ab5e58c9fd53ef7e664eef6b..710abf7d97acf3d29a3a1ad750aeaf5c66a3248c 100644 (file)
--- 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,9 +36,34 @@ if !exists("*Flake8()")
             update
         endif
 
+        " read config
+        if exists("g:flake8_builtins")
+            let s:flake8_builtins_opt=" --builtins=".g:flake8_builtins
+        else
+            let s:flake8_builtins_opt=""
+        endif
+
+        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
+        let &grepprg=s:flake8_cmd.s:flake8_builtins_opt.s:flake8_ignores.s:flake8_max_line_length.s:flake8_max_complexity
         silent! grep! %
 
         " restore grep settings