Merge pull request #92 from bot-boi/master

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

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 157a717c8c2ef3b4f8f3c0ff83f1c0c7d8bda9d1..15d061efee31d9eac5e11e68be273a594debcf16 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -20,7 +20,7 @@ function! flake8#Flake8UnplaceMarkers()
     call s:Warnings()
 endfunction
 
     call s:Warnings()
 endfunction
 

-function! flake8#ShowErrorMessage()
+function! flake8#Flake8ShowError()

     call s:ShowErrorMessage()
 endfunction
 
     call s:ShowErrorMessage()
 endfunction
 


@@ -31,7 +31,7 @@ endfunction
 "" warnings 
 
 let s:displayed_warnings = 0
 "" warnings 
 
 let s:displayed_warnings = 0

-function! s:Warnings()
+function s:Warnings()

   if !s:displayed_warnings
     let l:show_website_url = 0
 
   if !s:displayed_warnings
     let l:show_website_url = 0
 


@@ -106,8 +106,6 @@ function! s:Setup()  " {{{
     let s:markerdata['C'].marker = s:flake8_complexity_marker
     let s:markerdata['N'].marker = s:flake8_naming_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


@@ -170,8 +168,10 @@ function! s:Flake8()  " {{{
     let l:has_results=results != []
     if l:has_results
        " save line number of each error message        
     let l:has_results=results != []
     if l:has_results
        " save line number of each error message        

-        for result in a:results:
-            s:resultDict[result.lnum] = result.text
+        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
 
         " markers
         if !s:flake8_show_in_gutter == 0 || !s:flake8_show_in_file == 0


@@ -198,6 +198,8 @@ function! s:Flake8()  " {{{
     endif
 endfunction  " }}}
 
     endif
 endfunction  " }}}
 

+
+

 "" markers
 function! s:PlaceMarkers(results)  " {{{
     " in gutter?
 "" markers
 function! s:PlaceMarkers(results)  " {{{
     " in gutter?


@@ -271,11 +273,15 @@ function! s:ShowErrorMessage()  " {{{
     if !exists('s:resultDict')
        return
     endif
     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 there is a message on the current line,
     " then echo it 

-    if has_key(s:matchDict, s:cursorPos[1])
-       let l:errorText = get(s:matchDict, l:cursorPos[1]) 
+    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
        echo strpart(l:errorText, 0, &columns-1)
        let b:showing_message = 1
     endif


@@ -293,4 +299,3 @@ endfunction  " }}}
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
 let &cpo = s:save_cpo
 unlet s:save_cpo

-