Fixed options parseing when given empty strings.

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

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 67d696584dd30fc8760d1ffae3036a896be2f42b..a8dc7d623215adacfa81fd567afdaf90507cb140 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -8,7 +8,7 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
 let s:save_cpo = &cpo
 set cpo&vim
 

-"" external {{{
+"" ** external ** {{{

 
 function! flake8#Flake8()
     call s:Flake8()
 
 function! flake8#Flake8()
     call s:Flake8()


@@ -26,9 +26,18 @@ endfunction
 
 function! s:DeclareOption(name, globalPrefix, default)  " {{{
     if !exists('g:'.a:name)
 
 function! s:DeclareOption(name, globalPrefix, default)  " {{{
     if !exists('g:'.a:name)

-        execute 'let s:'.a:name.'='.a:default
+        if a:default != ''
+            execute 'let s:'.a:name.'='.a:default
+        else
+            execute 'let s:'.a:name.'=""'
+        endif

     else
     else

-        execute 'let s:'.a:name.'="'.a:globalPrefix.'".g:'.a:name
+        execute 'let l:global="g:".a:name'
+        if l:global != ''
+            execute 'let s:'.a:name.'="'.a:globalPrefix.'".g:'.a:name
+        else
+            execute 'let s:'.a:name.'=""'
+        endif

     endif
 endfunction  " }}}
 
     endif
 endfunction  " }}}
 


@@ -175,30 +184,45 @@ function! s:PlaceMarkers(results)  " {{{
         endfor
     endif
 
         endfor
     endif
 

+    " in file?
+    let l:matchstr = ""
+    if !s:flake8_show_in_file == 0
+        let l:matchstr = '\%('
+    endif
+

     " clear old
     call s:UnplaceMarkers()
     let s:matchids = []
     let s:signids  = []
 
     " place
     " clear old
     call s:UnplaceMarkers()
     let s:matchids = []
     let s:signids  = []
 
     " place

-    let index = 100
+    let l:index0 = 100
+    let l:index  = l:index0

     for result in a:results
     for result in a:results

-        let type = strpart(result.text, 0, 1)
-        if has_key(s:markerdata, type)
+        if l:index >= (s:flake8_max_markers+l:index0)
+            break
+        endif
+        let l:type = strpart(result.text, 0, 1)
+        if has_key(s:markerdata, l:type)

             " file markers
             if !s:flake8_show_in_file == 0
             " file markers
             if !s:flake8_show_in_file == 0

-                let s:matchids += [matchadd(s:markerdata[type]['color'],
-                            \ "\\%".result.lnum."l\\%".result.col."c")]
+                "let s:matchstr .= '\|\%'.result.lnum.'l\%'.result.col.'c'
+                let s:matchids += [matchadd(s:markerdata[l:type]['color'], "\\%".result.lnum."l\\%".result.col."c")]

             endif
             " gutter markers
             if !s:flake8_show_in_gutter == 0
             endif
             " gutter markers
             if !s:flake8_show_in_gutter == 0

-                execute ":sign place ".index." name=".s:markerdata[type]['sign']
+                execute ":sign place ".index." name=".s:markerdata[l:type]['sign']

                             \ . " line=".result.lnum." file=".expand("%:p")
                             \ . " line=".result.lnum." file=".expand("%:p")

-                let s:signids += [index]
-                let index += 1
+                let s:signids += [l:index]

             endif
             endif

+            let l:index += 1

         endif
     endfor
         endif
     endfor

+
+    " in file?
+    if !s:flake8_show_in_file == 0
+        call matchadd(Error, s:matchstr.'\)')
+    endif

 endfunction  " }}}
 
 function! s:UnplaceMarkers()  " {{{
 endfunction  " }}}
 
 function! s:UnplaceMarkers()  " {{{