]> git.madduck.net Git - etc/vim.git/commitdiff

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:

Fixed options parseing when given empty strings.
authoreistaa <eiv.s.aa@gmail.com>
Fri, 19 Sep 2014 14:32:50 +0000 (16:32 +0200)
committereistaa <eiv.s.aa@gmail.com>
Sun, 21 Sep 2014 01:02:51 +0000 (03:02 +0200)
autoload/flake8.vim

index 6aee19c27dc496b4a9f533fee9782a0ff098b0fd..a8dc7d623215adacfa81fd567afdaf90507cb140 100644 (file)
@@ -26,9 +26,18 @@ endfunction
 
 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
-        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  " }}}
 
@@ -175,6 +184,12 @@ function! s:PlaceMarkers(results)  " {{{
         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 = []
@@ -191,8 +206,8 @@ function! s:PlaceMarkers(results)  " {{{
         if has_key(s:markerdata, l:type)
             " file markers
             if !s:flake8_show_in_file == 0
-                let s:matchids += [matchadd(s:markerdata[l: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
@@ -203,6 +218,11 @@ function! s:PlaceMarkers(results)  " {{{
             let l:index += 1
         endif
     endfor
+
+    " in file?
+    if !s:flake8_show_in_file == 0
+        call matchadd(Error, s:matchstr.'\)')
+    endif
 endfunction  " }}}
 
 function! s:UnplaceMarkers()  " {{{