]> git.madduck.net Git - etc/vim.git/blobdiff - ftplugin/python_flake8.vim

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge pull request #15 from ecmendenhall/docfix
[etc/vim.git] / ftplugin / python_flake8.vim
index d1ece6162e3d964bcdeba7f2c2fda0ff1dba86ec..0b386c7689692974ab5e58c9fd53ef7e664eef6b 100644 (file)
@@ -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,13 +11,27 @@ 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"
+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_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 !executable(s:flake8_cmd)
 if !exists("*Flake8()")
     function Flake8()
         if !executable(s:flake8_cmd)
@@ -39,7 +53,7 @@ if !exists("*Flake8()")
 
         " 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
+        let &grepprg=s:flake8_cmd.s:flake8_ignores.s:flake8_max_line_length.s:flake8_max_complexity
         silent! grep! %
 
         " restore grep settings
         silent! grep! %
 
         " restore grep settings