function! flake8#Flake8()
call s:Flake8()
+ call s:Warnings()
endfunction
function! flake8#Flake8UnplaceMarkers()
call s:UnplaceMarkers()
+ call s:Warnings()
endfunction
"" }}}
"" ** internal ** {{{
+"" warnings
+
+let s:displayed_warnings = 0
+function s:Warnings()
+ if !s:displayed_warnings
+ let l:show_website_url = 0
+
+ let l:msg = "has been deprecated in favour of flake8 config files"
+ for setting_name in ['g:flake8_ignore', 'g:flake8_builtins', 'g:flake8_max_line_length', 'g:flake8_max_complexity']
+ if exists(setting_name)
+ echohl WarningMsg | echom setting_name l:msg | echohl None
+ let l:show_website_url = 1
+ endif
+ endfor
+
+ if l:show_website_url
+ let l:url = "http://flake8.readthedocs.org/en/latest/config.html"
+ echohl WarningMsg | echom l:url | echohl None
+ endif
+ let s:displayed_warnings = 1
+ endif
+endfunction
+
"" config
function! s:DeclareOption(name, globalPrefix, default) " {{{
endif
endfunction " }}}
-function! s:SetupConfig() " {{{
+function! s:Setup() " {{{
"" read options
" flake8 command
call s:DeclareOption('flake8_cmd', '', '"flake8"')
- " flake8 stuff
- call s:DeclareOption('flake8_builtins', ' --builtins=', '')
- call s:DeclareOption('flake8_ignore', ' --ignore=', '')
- call s:DeclareOption('flake8_max_line_length', ' --max-line-length=', '')
- call s:DeclareOption('flake8_max_complexity', ' --max-complexity=', '')
" quickfix
call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')
- call s:DeclareOption('flake8_show_quickfix', '', 1)
+ call s:DeclareOption('flake8_quickfix_height', '', 5)
+ call s:DeclareOption('flake8_show_quickfix', '', 1)
" markers to show
call s:DeclareOption('flake8_show_in_gutter', '', 0)
- call s:DeclareOption('flake8_show_in_file', '', 0)
- call s:DeclareOption('flake8_max_markers', '', 500)
+ call s:DeclareOption('flake8_show_in_file', '', 0)
+ call s:DeclareOption('flake8_max_markers', '', 500)
" marker signs
- call s:DeclareOption('flake8_error_marker', '', '"E>"')
- call s:DeclareOption('flake8_warning_marker', '', '"W>"')
- call s:DeclareOption('flake8_pyflake_marker', '', '"F>"')
+ call s:DeclareOption('flake8_error_marker', '', '"E>"')
+ call s:DeclareOption('flake8_warning_marker', '', '"W>"')
+ call s:DeclareOption('flake8_pyflake_marker', '', '"F>"')
call s:DeclareOption('flake8_complexity_marker', '', '"C>"')
- call s:DeclareOption('flake8_naming_marker', '', '"N>"')
+ call s:DeclareOption('flake8_naming_marker', '', '"N>"')
"" setup markerdata
- let s:markerdata = {}
- if s:flake8_error_marker != ''
- let s:markerdata['E'] = {
- \ 'color': 'Flake8_Error',
- \ 'marker': s:flake8_error_marker,
- \ 'sign': 'Flake8_E',
- \ }
- endif
- if s:flake8_warning_marker != ''
- let s:markerdata['W'] = {
- \ 'color': 'Flake8_Warning',
- \ 'marker': s:flake8_warning_marker,
- \ 'sign': 'Flake8_W',
- \ }
- endif
- if s:flake8_pyflake_marker != ''
- let s:markerdata['F'] = {
- \ 'color': 'Flake8_PyFlake',
- \ 'marker': s:flake8_pyflake_marker,
- \ 'sign': 'Flake8_F',
- \ }
- endif
- if s:flake8_complexity_marker != ''
- let s:markerdata['C'] = {
- \ 'color': 'Flake8_Complexity',
- \ 'marker': s:flake8_complexity_marker,
- \ 'sign': 'Flake8_C',
- \ }
- endif
- if s:flake8_naming_marker != ''
- let s:markerdata['N'] = {
- \ 'color': 'Flake8_Nameing',
- \ 'marker': s:flake8_naming_marker,
- \ 'sign': 'Flake8_N',
- \ }
+ if !exists('s:markerdata')
+ let s:markerdata = {}
+ let s:markerdata['E'] = {'name': 'Flake8_Error'}
+ let s:markerdata['W'] = {'name': 'Flake8_Warning'}
+ let s:markerdata['F'] = {'name': 'Flake8_PyFlake'}
+ let s:markerdata['C'] = {'name': 'Flake8_Complexity'}
+ let s:markerdata['N'] = {'name': 'Flake8_Nameing'}
endif
+ let s:markerdata['E'].marker = s:flake8_error_marker
+ let s:markerdata['W'].marker = s:flake8_warning_marker
+ let s:markerdata['F'].marker = s:flake8_pyflake_marker
+ let s:markerdata['C'].marker = s:flake8_complexity_marker
+ let s:markerdata['N'].marker = s:flake8_naming_marker
endfunction " }}}
"" do flake8
function! s:Flake8() " {{{
" read config
- call s:SetupConfig()
+ call s:Setup()
if !executable(s:flake8_cmd)
echoerr "File " . s:flake8_cmd . " not found. Please install it first."
return
endif
+ " clear old
+ call s:UnplaceMarkers()
+ let s:matchids = []
+ let s:signids = []
+
" store old grep settings (to restore later)
let l:old_gfm=&grepformat
let l:old_gp=&grepprg
" perform the grep itself
let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
- let &grepprg=s:flake8_cmd.s:flake8_builtins.s:flake8_ignore.s:flake8_max_line_length.s:flake8_max_complexity
+ let &grepprg=s:flake8_cmd
silent! grep! "%"
" restore grep settings
" quickfix
if !s:flake8_show_quickfix == 0
" open cwindow
- execute s:flake8_quickfix_location." copen"
+ execute s:flake8_quickfix_location." copen".s:flake8_quickfix_height
setlocal wrap
nnoremap <buffer> <silent> c :cclose<CR>
nnoremap <buffer> <silent> q :cclose<CR>
if !s:flake8_show_in_gutter == 0
" define signs
for val in values(s:markerdata)
- execute "sign define ".val['sign']." text=".val['marker']." texthl=".val['color']
+ if val.marker != ''
+ execute "sign define ".val.name." text=".val.marker." texthl=".val.name
+ endif
endfor
endif
- " clear old
- call s:UnplaceMarkers()
- let s:matchids = []
- let s:signids = []
-
" place
let l:index0 = 100
let l:index = l:index0
break
endif
let l:type = strpart(result.text, 0, 1)
- if has_key(s:markerdata, l:type)
+ if has_key(s:markerdata, l:type) && s:markerdata[l:type].marker != ''
" file markers
if !s:flake8_show_in_file == 0
- if !has_key(s:markerdata, 'matchstr')
- let s:markerdata[l:type]['matchstr'] = '\%('
+ if !has_key(s:markerdata[l:type], 'matchstr')
+ let s:markerdata[l:type].matchstr = '\%('
else
- let s:markerdata[l:type]['matchstr'] .= '\|'
+ let s:markerdata[l:type].matchstr .= '\|'
endif
- let s:markerdata[l:type]['matchstr'] .= '\%'.result.lnum.'l\%'.result.col.'c'
+ 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[l:type]['sign']
+ execute ":sign place ".index." name=".s:markerdata[l:type].name
\ . " line=".result.lnum." file=".expand("%:p")
let s:signids += [l:index]
endif
" 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'].'\)')
+ if l:val.marker != '' && has_key(l:val, 'matchstr')
+ let l:val.matchid = matchadd(l:val.name, l:val.matchstr.'\)')
endif
endfor
endif
" file markers
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']
+ call matchdelete(l:val.matchid)
+ unlet l:val.matchid
+ unlet l:val.matchstr
endif
endfor
endfunction " }}}
projects / etc / vim.git / blobdiff