Suppresses output to stdout.

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

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index 52d9fdfcfaa7718fa877be460dcd5a9fa7c5d849..5310e3bb86c2d17d0db4ed2e823ead48b9a412c5 100644 (file)
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -11,19 +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
-
 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
@@ -35,25 +30,61 @@ if !exists("*Flake8()")
         " store old grep settings (to restore later)
         let l:old_gfm=&grepformat
         let l:old_gp=&grepprg
+        let l:old_shellpipe=&shellpipe
 
         " write any changes before continuing
         if &readonly == 0
             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
+
+        if exists("g:flake8_quickfix_location")
+            let s:flake8_quickfix_location=g:flake8_quickfix_location
+        else
+            let s:flake8_quickfix_location="belowright"
+        endif
+
+        " set shellpipe to > instead of tee (suppressing output)
+        set shellpipe=>
+
         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
-        let &grepprg=s:flake8_cmd.s:flake8_ignores
-        silent! grep! %
+        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
         let &grepformat=l:old_gfm
         let &grepprg=l:old_gp
+        let &shellpipe=l:old_shellpipe
 
         " open cwindow
         let has_results=getqflist() != []
         if has_results
-            execute 'belowright copen'
+            execute s:flake8_quickfix_location." copen"
             setlocal wrap
             nnoremap <buffer> <silent> c :cclose<CR>
             nnoremap <buffer> <silent> q :cclose<CR>