let s:save_cpo = &cpo
set cpo&vim
-"" external {{{
+"" ** external ** {{{
function! flake8#Flake8()
call s:Flake8()
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 " }}}
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 != ''
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
let s:signids = []
" place
- let index = 100
+ let l:index0 = 100
+ let l:index = l:index0
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
- let s:matchids += [matchadd(s:markerdata[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
- 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")
- let s:signids += [index]
- let index += 1
+ let s:signids += [l:index]
endif
+ let l:index += 1
endif
endfor
+
+ " in file?
+ if !s:flake8_show_in_file == 0
+ 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 " }}}
function! s:UnplaceMarkers() " {{{
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 " }}}
"" }}}