#904 Do not run linters on :wq or :x

This commit is contained in:
w0rp 2017-10-14 23:22:13 +01:00
parent 010ebc2459
commit ef495ba32d
6 changed files with 113 additions and 2 deletions

View File

@ -1,8 +1,15 @@
" Author: w0rp <devw0rp@gmail.com> " Author: w0rp <devw0rp@gmail.com>
function! ale#events#QuitEvent(buffer) abort
" Remember when ALE is quitting for BufWrite, etc.
call setbufvar(a:buffer, 'ale_quitting', 1)
endfunction
function! ale#events#SaveEvent(buffer) abort function! ale#events#SaveEvent(buffer) abort
call setbufvar(a:buffer, 'ale_save_event_fired', 1) call setbufvar(a:buffer, 'ale_save_event_fired', 1)
let l:should_lint = ale#Var(a:buffer, 'enabled') && g:ale_lint_on_save let l:should_lint = ale#Var(a:buffer, 'enabled')
\ && g:ale_lint_on_save
\ && !getbufvar(a:buffer, 'ale_quitting')
if g:ale_fix_on_save if g:ale_fix_on_save
let l:will_fix = ale#fix#Fix('save_file') let l:will_fix = ale#fix#Fix('save_file')
@ -24,6 +31,8 @@ function! s:LintOnEnter(buffer) abort
endfunction endfunction
function! ale#events#EnterEvent(buffer) abort function! ale#events#EnterEvent(buffer) abort
" When entering a buffer, we are no longer quitting it.
call setbufvar(a:buffer, 'ale_quitting', 0)
let l:filetype = getbufvar(a:buffer, '&filetype') let l:filetype = getbufvar(a:buffer, '&filetype')
call setbufvar(a:buffer, 'ale_original_filetype', l:filetype) call setbufvar(a:buffer, 'ale_original_filetype', l:filetype)

View File

@ -56,7 +56,9 @@ function! ale#fix#ApplyQueuedFixes() abort
" If ALE linting is enabled, check for problems with the file again after " If ALE linting is enabled, check for problems with the file again after
" fixing problems. " fixing problems.
if g:ale_enabled && l:should_lint if g:ale_enabled
\&& l:should_lint
\&& !getbufvar(l:buffer, 'ale_quitting')
call ale#Queue(0, l:data.should_save ? 'lint_file' : '') call ale#Queue(0, l:data.should_save ? 'lint_file' : '')
endif endif
endfunction endfunction

View File

@ -383,6 +383,7 @@ augroup ALECleanupGroup
autocmd! autocmd!
" Clean up buffers automatically when they are unloaded. " Clean up buffers automatically when they are unloaded.
autocmd BufUnload * call ale#engine#Cleanup(str2nr(expand('<abuf>'))) autocmd BufUnload * call ale#engine#Cleanup(str2nr(expand('<abuf>')))
autocmd QuitPre * call ale#events#QuitEvent(str2nr(expand('<abuf>')))
augroup END augroup END
" Backwards Compatibility " Backwards Compatibility

View File

@ -199,6 +199,12 @@ Execute (g:ale_echo_cursor = 1 should bind cursor events):
\ 'InsertLeave * call ale#cursor#EchoCursorWarning()', \ 'InsertLeave * call ale#cursor#EchoCursorWarning()',
\], CheckAutocmd('ALECursorGroup') \], CheckAutocmd('ALECursorGroup')
Execute (ALECleanupGroup should include the right commands):
AssertEqual [
\ 'BufUnload * call ale#engine#Cleanup(str2nr(expand(''<abuf>'')))',
\ 'QuitPre * call ale#events#QuitEvent(str2nr(expand(''<abuf>'')))',
\], CheckAutocmd('ALECleanupGroup')
Execute(Enabling completion should set up autocmd events correctly): Execute(Enabling completion should set up autocmd events correctly):
let g:ale_completion_enabled = 0 let g:ale_completion_enabled = 0
call ale#completion#Enable() call ale#completion#Enable()

View File

@ -0,0 +1,71 @@
Before:
Save g:ale_echo_cursor
Save g:ale_fix_on_save
Save g:ale_fixers
Save g:ale_lint_on_save
let g:ale_echo_cursor = 0
let g:ale_run_synchronously = 1
function! TestCallback(buffer, output)
return [{'lnum': 1, 'col': 1, 'text': 'xxx'}]
endfunction
function AddLine(buffer, lines) abort
return a:lines + ['x']
endfunction
let g:ale_fixers = {
\ 'testft': ['AddLine'],
\}
call ale#linter#Define('testft', {
\ 'name': 'testlinter',
\ 'callback': 'TestCallback',
\ 'executable': 'true',
\ 'command': 'true',
\})
Given testft (An empty file):
After:
Restore
unlet! g:ale_run_synchronously
unlet! b:ale_quitting
delfunction TestCallback
delfunction AddLine
call ale#linter#Reset()
call setloclist(0, [])
Execute(No linting should be done on :wq or :x):
let g:ale_lint_on_save = 1
let g:ale_fix_on_save = 0
" First try just the SaveEvent, to be sure that we set errors in the test.
call ale#events#SaveEvent(bufnr(''))
AssertEqual 1, len(getloclist(0))
" Now try doing it again, but where we run the quit event first.
call setloclist(0, [])
call ale#events#QuitEvent(bufnr(''))
call ale#events#SaveEvent(bufnr(''))
AssertEqual [], getloclist(0)
Execute(No linting should be done on :wq or :x after fixing files):
let g:ale_lint_on_save = 0
let g:ale_fix_on_save = 1
call ale#events#SaveEvent(bufnr(''))
AssertEqual 1, len(getloclist(0))
" Now try doing it again, but where we run the quit event first.
call setloclist(0, [])
call ale#events#QuitEvent(bufnr(''))
call ale#events#SaveEvent(bufnr(''))
AssertEqual [], getloclist(0)

View File

@ -0,0 +1,22 @@
Before:
Save g:ale_enabled
unlet! b:ale_quitting
let g:ale_enabled = 0
After:
Restore
unlet! b:ale_quitting
Execute(QuitEvent should set b:ale_quitting to 1):
call ale#events#QuitEvent(bufnr(''))
AssertEqual 1, b:ale_quitting
Execute(EnterEvent should set b:ale_quitting to 0):
let b:ale_quitting = 1
call ale#events#EnterEvent(bufnr(''))
AssertEqual 0, b:ale_quitting