X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/015a511d0b4d697885525b0b3f37168b55cc6a48..c6b43f88e4cbce052843e8cbd9593cc7753208fe:/autoload/flake8.vim?ds=sidebyside diff --git a/autoload/flake8.vim b/autoload/flake8.vim index 59b4dbf..cf592cf 100644 --- a/autoload/flake8.vim +++ b/autoload/flake8.vim @@ -31,7 +31,7 @@ function s:Warnings() if !s:displayed_warnings let l:show_website_url = 0 - let l:msg = "has been depreciated in favour of flake8 config files" + 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 @@ -109,8 +109,10 @@ function! s:Flake8() " {{{ " read config call s:Setup() - if !executable(s:flake8_cmd) - echoerr "File " . s:flake8_cmd . " not found. Please install it first." + let l:executable = split(s:flake8_cmd)[0] + + if !executable(l:executable) + echoerr "File " . l:executable . " not found. Please install it first." return endif @@ -123,6 +125,8 @@ function! s:Flake8() " {{{ let l:old_gfm=&grepformat let l:old_gp=&grepprg let l:old_shellpipe=&shellpipe + let l:old_t_ti=&t_ti + let l:old_t_te=&t_te " write any changes before continuing if &readonly == 0 @@ -130,20 +134,26 @@ function! s:Flake8() " {{{ endif set lazyredraw " delay redrawing - cclose " close any existing cwindows - " set shellpipe to > instead of tee (suppressing output) + " prevent terminal from blinking set shellpipe=> + set t_ti= + set t_te= " perform the grep itself let &grepformat="%f:%l:%c: %m\,%f:%l: %m" let &grepprg=s:flake8_cmd silent! grep! "%" + " close any existing cwindows, + " placed after 'grep' in case quickfix is open on autocmd QuickFixCmdPost + cclose " restore grep settings let &grepformat=l:old_gfm let &grepprg=l:old_gp let &shellpipe=l:old_shellpipe + let &t_ti=l:old_t_ti + let &t_te=l:old_t_te " process results let l:results=getqflist()