Merge pull request #74 from UbiCastTeam/master

[etc/vim.git] / autoload / flake8.vim

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 0ca4afff8b459352ab287bf4c2c9c6b964f67055..cf592cf7247764fcbe504101123ec695b048b53d 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -31,7 +31,7 @@ function s:Warnings()
   if !s:displayed_warnings
     let l:show_website_url = 0
 
   if !s:displayed_warnings
     let l:show_website_url = 0
 

-    let l:msg = "has been depreciated in favour of flake8 config files"
+    let l:msg = "has been deprecated in favour of flake8 config files"

     for setting_name in ['g:flake8_ignore', 'g:flake8_builtins', 'g:flake8_max_line_length', 'g:flake8_max_complexity']
       if exists(setting_name)
         echohl WarningMsg | echom setting_name l:msg | echohl None
     for setting_name in ['g:flake8_ignore', 'g:flake8_builtins', 'g:flake8_max_line_length', 'g:flake8_max_complexity']
       if exists(setting_name)
         echohl WarningMsg | echom setting_name l:msg | echohl None


@@ -73,28 +73,28 @@ function! s:Setup()  " {{{
     call s:DeclareOption('flake8_cmd', '', '"flake8"')
     " quickfix
     call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')
     call s:DeclareOption('flake8_cmd', '', '"flake8"')
     " quickfix
     call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')

-    call s:DeclareOption('flake8_quickfix_height',     '', 5)
-    call s:DeclareOption('flake8_show_quickfix',     '', 1)
+    call s:DeclareOption('flake8_quickfix_height', '', 5)
+    call s:DeclareOption('flake8_show_quickfix', '', 1)

     " markers to show
     call s:DeclareOption('flake8_show_in_gutter', '',   0)
     " markers to show
     call s:DeclareOption('flake8_show_in_gutter', '',   0)

-    call s:DeclareOption('flake8_show_in_file',   '',   0)
-    call s:DeclareOption('flake8_max_markers',    '', 500)
+    call s:DeclareOption('flake8_show_in_file', '',   0)
+    call s:DeclareOption('flake8_max_markers', '', 500)

     " marker signs
     " marker signs

-    call s:DeclareOption('flake8_error_marker',      '', '"E>"')
-    call s:DeclareOption('flake8_warning_marker',    '', '"W>"')
-    call s:DeclareOption('flake8_pyflake_marker',    '', '"F>"')
+    call s:DeclareOption('flake8_error_marker', '', '"E>"')
+    call s:DeclareOption('flake8_warning_marker', '', '"W>"')
+    call s:DeclareOption('flake8_pyflake_marker', '', '"F>"')

     call s:DeclareOption('flake8_complexity_marker', '', '"C>"')
     call s:DeclareOption('flake8_complexity_marker', '', '"C>"')

-    call s:DeclareOption('flake8_naming_marker',     '', '"N>"')
+    call s:DeclareOption('flake8_naming_marker', '', '"N>"')

 
     "" setup markerdata
 
     if !exists('s:markerdata')
         let s:markerdata = {}
 
     "" setup markerdata
 
     if !exists('s:markerdata')
         let s:markerdata = {}

-        let s:markerdata['E'] = { 'name': 'Flake8_Error'      }
-        let s:markerdata['W'] = { 'name': 'Flake8_Warning'    }
-        let s:markerdata['F'] = { 'name': 'Flake8_PyFlake'    }
-        let s:markerdata['C'] = { 'name': 'Flake8_Complexity' }
-        let s:markerdata['N'] = { 'name': 'Flake8_Nameing'    }
+        let s:markerdata['E'] = {'name': 'Flake8_Error'}
+        let s:markerdata['W'] = {'name': 'Flake8_Warning'}
+        let s:markerdata['F'] = {'name': 'Flake8_PyFlake'}
+        let s:markerdata['C'] = {'name': 'Flake8_Complexity'}
+        let s:markerdata['N'] = {'name': 'Flake8_Nameing'}

     endif
     let s:markerdata['E'].marker = s:flake8_error_marker
     let s:markerdata['W'].marker = s:flake8_warning_marker
     endif
     let s:markerdata['E'].marker = s:flake8_error_marker
     let s:markerdata['W'].marker = s:flake8_warning_marker


@@ -109,8 +109,10 @@ function! s:Flake8()  " {{{
     " read config
     call s:Setup()
 
     " read config
     call s:Setup()
 

-    if !executable(s:flake8_cmd)
-        echoerr "File " . s:flake8_cmd . " not found. Please install it first."
+    let l:executable = split(s:flake8_cmd)[0]
+
+    if !executable(l:executable)
+        echoerr "File " . l:executable . " not found. Please install it first."

         return
     endif
 
         return
     endif
 


@@ -123,6 +125,8 @@ function! s:Flake8()  " {{{
     let l:old_gfm=&grepformat
     let l:old_gp=&grepprg
     let l:old_shellpipe=&shellpipe
     let l:old_gfm=&grepformat
     let l:old_gp=&grepprg
     let l:old_shellpipe=&shellpipe

+    let l:old_t_ti=&t_ti
+    let l:old_t_te=&t_te

 
     " write any changes before continuing
     if &readonly == 0
 
     " write any changes before continuing
     if &readonly == 0


@@ -130,20 +134,26 @@ function! s:Flake8()  " {{{
     endif
 
     set lazyredraw   " delay redrawing
     endif
 
     set lazyredraw   " delay redrawing

-    cclose           " close any existing cwindows

 
 

-    " set shellpipe to > instead of tee (suppressing output)
+    " prevent terminal from blinking

     set shellpipe=>
     set shellpipe=>

+    set t_ti=
+    set t_te=

 
     " perform the grep itself
     let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
     let &grepprg=s:flake8_cmd
     silent! grep! "%"
 
     " perform the grep itself
     let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
     let &grepprg=s:flake8_cmd
     silent! grep! "%"

+    " close any existing cwindows,
+    " placed after 'grep' in case quickfix is open on autocmd QuickFixCmdPost
+    cclose

 
     " restore grep settings
     let &grepformat=l:old_gfm
     let &grepprg=l:old_gp
     let &shellpipe=l:old_shellpipe
 
     " restore grep settings
     let &grepformat=l:old_gfm
     let &grepprg=l:old_gp
     let &shellpipe=l:old_shellpipe

+    let &t_ti=l:old_t_ti
+    let &t_te=l:old_t_te

 
     " process results
     let l:results=getqflist()
 
     " process results
     let l:results=getqflist()