]> git.madduck.net Git - etc/vim.git/blobdiff - autoload/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:

Ensure b:showing_message is always defined.
[etc/vim.git] / autoload / flake8.vim
index 06a1b6b4873a78bd3a70540376593359a53730c7..15d061efee31d9eac5e11e68be273a594debcf16 100644 (file)
@@ -20,6 +20,10 @@ function! flake8#Flake8UnplaceMarkers()
     call s:Warnings()
 endfunction
 
     call s:Warnings()
 endfunction
 
+function! flake8#Flake8ShowError()
+    call s:ShowErrorMessage()
+endfunction
+
 "" }}}
 
 "" ** internal ** {{{
 "" }}}
 
 "" ** internal ** {{{
@@ -101,6 +105,7 @@ function! s:Setup()  " {{{
     let s:markerdata['F'].marker = s:flake8_pyflake_marker
     let s:markerdata['C'].marker = s:flake8_complexity_marker
     let s:markerdata['N'].marker = s:flake8_naming_marker
     let s:markerdata['F'].marker = s:flake8_pyflake_marker
     let s:markerdata['C'].marker = s:flake8_complexity_marker
     let s:markerdata['N'].marker = s:flake8_naming_marker
+
 endfunction  " }}}
 
 "" do flake8
 endfunction  " }}}
 
 "" do flake8
@@ -109,8 +114,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 +130,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,25 +139,40 @@ 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
+    " store mapping of line number to error string
 
     " process results
 
     " process results
+    let s:resultDict = {} 
+
     let l:results=getqflist()
     let l:has_results=results != []
     if l:has_results
     let l:results=getqflist()
     let l:has_results=results != []
     if l:has_results
+       " save line number of each error message        
+        for result in l:results
+           let linenum = result.lnum
+            let s:resultDict[linenum] = result.text
+       endfor
+
         " markers
         if !s:flake8_show_in_gutter == 0 || !s:flake8_show_in_file == 0
             call s:PlaceMarkers(l:results)
         " markers
         if !s:flake8_show_in_gutter == 0 || !s:flake8_show_in_file == 0
             call s:PlaceMarkers(l:results)
@@ -174,8 +198,9 @@ function! s:Flake8()  " {{{
     endif
 endfunction  " }}}
 
     endif
 endfunction  " }}}
 
-"" markers
 
 
+
+"" markers
 function! s:PlaceMarkers(results)  " {{{
     " in gutter?
     if !s:flake8_show_in_gutter == 0
 function! s:PlaceMarkers(results)  " {{{
     " in gutter?
     if !s:flake8_show_in_gutter == 0
@@ -243,8 +268,34 @@ function! s:UnplaceMarkers()  " {{{
     endfor
 endfunction  " }}}
 
     endfor
 endfunction  " }}}
 
+function! s:ShowErrorMessage()  " {{{
+    let l:cursorPos = getpos(".")
+    if !exists('s:resultDict')
+       return
+    endif
+    if !exists('b:showing_message')
+       " ensure showing msg is always defined
+       let b:showing_message = ' '
+    endif
+
+    " if there is a message on the current line,
+    " then echo it 
+    if has_key(s:resultDict, l:cursorPos[1])
+       let l:errorText = get(s:resultDict, l:cursorPos[1]) 
+       echo strpart(l:errorText, 0, &columns-1)
+       let b:showing_message = 1
+    endif
+
+    " if a message is already being shown,
+    " then clear it
+    if !b:showing_message == 0
+       echo
+       let b:showing_message = 0
+    endif
+
+endfunction  " }}}
+
 "" }}}
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 "" }}}
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-