Merge pull request #26 from mmedvede/add-quickfix-location

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

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index bfc97c7f9952974c4bd9add558714081eb92a8e5..b26d9a1a75e05bc5d86efa9b479cf3138af526f2 100644 (file)
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -1,7 +1,7 @@
 "
 " Python filetype plugin for running flake8
 " Language:     Python (ft=python)
 "
 " Python filetype plugin for running flake8
 " Language:     Python (ft=python)

-" Maintainer:   Vincent Driessen <vincent@datafox.nl>
+" Maintainer:   Vincent Driessen <vincent@3rdcloud.com>

 " Version:      Vim 7 (may work with lower Vim versions, but not tested)
 " URL:          http://github.com/nvie/vim-flake8
 "
 " Version:      Vim 7 (may work with lower Vim versions, but not tested)
 " URL:          http://github.com/nvie/vim-flake8
 "


@@ -11,15 +11,14 @@ if exists("b:loaded_flake8_ftplugin")
 endif
 let b:loaded_flake8_ftplugin=1
 
 endif
 let b:loaded_flake8_ftplugin=1
 

-let s:flake8_cmd="flake8"
-
-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("*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
         if !executable(s:flake8_cmd)
             echoerr "File " . s:flake8_cmd . " not found. Please install it first."
             return


@@ -37,10 +36,41 @@ if !exists("*Flake8()")
             update
         endif
 
             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
+

         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
         " 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
 
         " restore grep settings
         let &grepformat=l:old_gfm


@@ -49,7 +79,7 @@ if !exists("*Flake8()")
         " open cwindow
         let has_results=getqflist() != []
         if has_results
         " 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>
             setlocal wrap
             nnoremap <buffer> <silent> c :cclose<CR>
             nnoremap <buffer> <silent> q :cclose<CR>


@@ -74,6 +104,5 @@ endif
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")
     if !hasmapto('Flake8(')
         noremap <buffer> <F7> :call Flake8()<CR>
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")
     if !hasmapto('Flake8(')
         noremap <buffer> <F7> :call Flake8()<CR>

-        noremap! <buffer> <F7> :call Flake8()<CR>

     endif
 endif
     endif
 endif