#653 - Automatically accept annoying loclist and quickfix errors from Vim

This commit is contained in:
w0rp 2017-08-20 13:27:18 +01:00
parent e5d0a17694
commit 753cf5da95
7 changed files with 96 additions and 17 deletions

View File

@ -1,10 +1,6 @@
" Author: w0rp <devw0rp@gmail.com> " Author: w0rp <devw0rp@gmail.com>
" Description: Completion support for LSP linters " Description: Completion support for LSP linters
" A do-nothing function so we can load this autoload file in tests.
function! ale#completion#Nop() abort
endfunction
let s:timer_id = -1 let s:timer_id = -1
function! s:GetRegex(map, filetype) abort function! s:GetRegex(map, filetype) abort
@ -110,11 +106,6 @@ function! ale#completion#OmniFunc(findstart, base) abort
endif endif
endfunction endfunction
" A wrapper function for feedkeys so we can test calls for it.
function! ale#completion#FeedKeys(string, mode) abort
call feedkeys(a:string, a:mode)
endfunction
function! ale#completion#Show(response, completion_parser) abort function! ale#completion#Show(response, completion_parser) abort
" Remember the old omnifunc value, if there is one. " Remember the old omnifunc value, if there is one.
" If we don't store an old one, we'll just never reset the option. " If we don't store an old one, we'll just never reset the option.
@ -129,7 +120,7 @@ function! ale#completion#Show(response, completion_parser) abort
let b:ale_completion_parser = a:completion_parser let b:ale_completion_parser = a:completion_parser
let &l:omnifunc = 'ale#completion#OmniFunc' let &l:omnifunc = 'ale#completion#OmniFunc'
call s:ReplaceCompleteopt() call s:ReplaceCompleteopt()
call ale#completion#FeedKeys("\<C-x>\<C-o>", 'n') call ale#util#FeedKeys("\<C-x>\<C-o>", 'n')
endfunction endfunction
function! s:CompletionStillValid(request_id) abort function! s:CompletionStillValid(request_id) abort

View File

@ -45,3 +45,25 @@ function! ale#events#FileChangedEvent(buffer) abort
call s:LintOnEnter(a:buffer) call s:LintOnEnter(a:buffer)
endif endif
endfunction endfunction
" When changing quickfix or a loclist window while the window is open
" from autocmd events and while navigating from one buffer to another, Vim
" will complain saying that the window has closed or that the lists have
" changed.
"
" This timer callback just accepts those errors when they appear.
function! s:HitReturn(...) abort
if ale#util#Mode() is# 'r'
redir => l:output
silent mess
redir end
if get(split(l:output, "\n"), -1, '') =~# '^E92[456]'
call ale#util#FeedKeys("\<CR>", 'n')
endif
endif
endfunction
function! ale#events#BufWinLeave() abort
call timer_start(0, function('s:HitReturn'))
endfunction

View File

@ -1,11 +1,23 @@
" Author: w0rp <devw0rp@gmail.com> " Author: w0rp <devw0rp@gmail.com>
" Description: Contains miscellaneous functions " Description: Contains miscellaneous functions
" A null file for sending output to nothing. " A wrapper function for mode() so we can test calls for it.
let g:ale#util#nul_file = '/dev/null' function! ale#util#Mode(...) abort
return call('mode', a:000)
endfunction
if has('win32') " A wrapper function for feedkeys so we can test calls for it.
let g:ale#util#nul_file = 'nul' function! ale#util#FeedKeys(...) abort
return call('feedkeys', a:000)
endfunction
if !exists('g:ale#util#nul_file')
" A null file for sending output to nothing.
let g:ale#util#nul_file = '/dev/null'
if has('win32')
let g:ale#util#nul_file = 'nul'
endif
endif endif
" Return the number of lines for a given buffer. " Return the number of lines for a given buffer.

View File

@ -226,6 +226,7 @@ function! ALEInitAuGroups() abort
autocmd BufWinEnter,BufRead * call ale#Queue(0, 'lint_file', str2nr(expand('<abuf>'))) autocmd BufWinEnter,BufRead * call ale#Queue(0, 'lint_file', str2nr(expand('<abuf>')))
" Track when the file is changed outside of Vim. " Track when the file is changed outside of Vim.
autocmd FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand('<abuf>'))) autocmd FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand('<abuf>')))
autocmd BufWinLeave * call ale#events#BufWinLeave()
endif endif
augroup END augroup END

View File

@ -128,6 +128,7 @@ Execute (g:ale_lint_on_enter = 1 should bind the required events):
\ 'BufEnter * call ale#events#EnterEvent(str2nr(expand(''<abuf>'')))', \ 'BufEnter * call ale#events#EnterEvent(str2nr(expand(''<abuf>'')))',
\ 'BufReadPost * call ale#Queue(0, ''lint_file'', str2nr(expand(''<abuf>'')))', \ 'BufReadPost * call ale#Queue(0, ''lint_file'', str2nr(expand(''<abuf>'')))',
\ 'BufWinEnter * call ale#Queue(0, ''lint_file'', str2nr(expand(''<abuf>'')))', \ 'BufWinEnter * call ale#Queue(0, ''lint_file'', str2nr(expand(''<abuf>'')))',
\ 'BufWinLeave * call ale#events#BufWinLeave()',
\ 'FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand(''<abuf>'')))', \ 'FileChangedShellPost * call ale#events#FileChangedEvent(str2nr(expand(''<abuf>'')))',
\], CheckAutocmd('ALERunOnEnterGroup') \], CheckAutocmd('ALERunOnEnterGroup')

View File

@ -9,9 +9,7 @@ Before:
\ 'feedkeys_calls': [], \ 'feedkeys_calls': [],
\} \}
call ale#completion#Nop() function! ale#util#FeedKeys(string, mode) abort
function! ale#completion#FeedKeys(string, mode) abort
call add(g:test_vars.feedkeys_calls, [a:string, a:mode]) call add(g:test_vars.feedkeys_calls, [a:string, a:mode])
endfunction endfunction

View File

@ -0,0 +1,54 @@
Before:
let b:fake_mode = 'r'
let b:feedkeys_calls = []
" Mock mode() and feedkeys() for the check
function! ale#util#Mode(...) abort
return b:fake_mode
endfunction
function! ale#util#FeedKeys(...) abort
call add(b:feedkeys_calls, a:000)
endfunction
function! CheckError(mode, message, expected_list) abort
let b:fake_mode = a:mode
echom a:message
call ale#events#BufWinLeave()
AssertEqual [], b:feedkeys_calls
sleep 1ms
AssertEqual a:expected_list, b:feedkeys_calls
endfunction
After:
unlet! b:fake_mode
unlet! b:feedkeys_calls
delfunction CheckError
runtime autoload/ale/util.vim
Execute(The BufWinLeave event function should hide E924 errors):
" For some reason, this test fails the first time when running in NeoVim
" in Docker, so just execute this twice.
echom 'E924'
call ale#events#BufWinLeave()
sleep 1ms
let b:feedkeys_calls = []
call CheckError('r', 'E924', [["\<CR>", 'n']])
Execute(The BufWinLeave event function should hide E925 errors):
call CheckError('r', 'E925', [["\<CR>", 'n']])
Execute(The BufWinLeave event function should hide E926 errors):
call CheckError('r', 'E926', [["\<CR>", 'n']])
Execute(The BufWinLeave event function should ignore other errors):
call CheckError('r', 'E999', [])
Execute(The BufWinLeave event function not send keys for other modes):
call CheckError('n', 'E924', [])