]> 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:

Speedup on placing file markers.
authoreistaa <eiv.s.aa@gmail.com>
Sat, 20 Sep 2014 14:22:32 +0000 (16:22 +0200)
committereistaa <eiv.s.aa@gmail.com>
Sun, 21 Sep 2014 01:15:13 +0000 (03:15 +0200)
autoload/flake8.vim

index a8dc7d623215adacfa81fd567afdaf90507cb140..70a2538c57a41fa734a9888eb2fdebeb885b84e3 100644 (file)
@@ -70,9 +70,9 @@ function! s:SetupConfig()  " {{{
     let s:markerdata = {}
     if s:flake8_error_marker != ''
     let s:markerdata['E'] = {
     let s:markerdata = {}
     if s:flake8_error_marker != ''
     let s:markerdata['E'] = {
-                    \   'color':  'Flake8_Error',
-                    \   'marker': s:flake8_error_marker,
-                    \   'sign':   'Flake8_E',
+                    \   'color':    'Flake8_Error',
+                    \   'marker':   s:flake8_error_marker,
+                    \   'sign':     'Flake8_E',
                     \ }
     endif
     if s:flake8_warning_marker != ''
                     \ }
     endif
     if s:flake8_warning_marker != ''
@@ -137,8 +137,6 @@ function! s:Flake8()  " {{{
     let &grepprg=s:flake8_cmd.s:flake8_builtins.s:flake8_ignore.s:flake8_max_line_length.s:flake8_max_complexity
     silent! grep! "%"
 
     let &grepprg=s:flake8_cmd.s:flake8_builtins.s:flake8_ignore.s:flake8_max_line_length.s:flake8_max_complexity
     silent! grep! "%"
 
-    echo s:flake8_cmd.s:flake8_builtins.s:flake8_ignore.s:flake8_max_line_length.s:flake8_max_complexity
-
     " restore grep settings
     let &grepformat=l:old_gfm
     let &grepprg=l:old_gp
     " restore grep settings
     let &grepformat=l:old_gfm
     let &grepprg=l:old_gp
@@ -184,12 +182,6 @@ 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 = []
     " clear old
     call s:UnplaceMarkers()
     let s:matchids = []
@@ -206,8 +198,12 @@ function! s:PlaceMarkers(results)  " {{{
         if has_key(s:markerdata, l:type)
             " file markers
             if !s:flake8_show_in_file == 0
         if has_key(s:markerdata, l:type)
             " file markers
             if !s:flake8_show_in_file == 0
-                "let s:matchstr .= '\|\%'.result.lnum.'l\%'.result.col.'c'
-                let s:matchids += [matchadd(s:markerdata[l:type]['color'], "\\%".result.lnum."l\\%".result.col."c")]
+                if !has_key(s:markerdata, 'matchstr')
+                    let s:markerdata[l:type]['matchstr'] = '\%('
+                else
+                    let s:markerdata[l:type]['matchstr'] .= '\|'
+                endif
+                let s:markerdata[l:type]['matchstr'] .= '\%'.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
@@ -221,7 +217,11 @@ function! s:PlaceMarkers(results)  " {{{
 
     " in file?
     if !s:flake8_show_in_file == 0
 
     " in file?
     if !s:flake8_show_in_file == 0
-        call matchadd(Error, s:matchstr.'\)')
+        for l:val in values(s:markerdata)
+            if l:val['matchstr'] != ''
+                let l:val['matchid'] = matchadd(l:val['color'], l:val['matchstr'].'\)')
+            endif
+        endfor
     endif
 endfunction  " }}}
 
     endif
 endfunction  " }}}
 
@@ -234,12 +234,13 @@ function! s:UnplaceMarkers()  " {{{
         unlet s:signids
     endif
     " file markers
         unlet s:signids
     endif
     " file markers
-    if exists('s:matchids')
-        for i in s:matchids
-            call matchdelete(i)
-        endfor
-        unlet s:matchids
-    endif
+    for l:val in values(s:markerdata)
+        if has_key(l:val, 'matchid')
+            call matchdelete(l:val['matchid'])
+            unlet l:val['matchid']
+            unlet l:val['matchstr']
+        endif
+    endfor
 endfunction  " }}}
 
 "" }}}
 endfunction  " }}}
 
 "" }}}