diff options
Diffstat (limited to 'autoload/ale.vim')
| -rw-r--r-- | autoload/ale.vim | 35 |
1 files changed, 30 insertions, 5 deletions
diff --git a/autoload/ale.vim b/autoload/ale.vim index ce2589bb..830a281d 100644 --- a/autoload/ale.vim +++ b/autoload/ale.vim @@ -3,7 +3,7 @@ " Manages execution of linters when requested by autocommands let s:lint_timer = -1 -let s:should_lint_file = 0 +let s:should_lint_file_for_buffer = {} " A function for checking various conditions whereby ALE just shouldn't " attempt to do anything, say if particular buffer types are open in Vim. @@ -20,8 +20,8 @@ function! ale#Queue(delay, ...) abort throw 'too many arguments!' endif - " Default run_file_linters to 0 - let l:linting_flag = len(a:0) > 1 ? a:1 : '' + " Default linting_flag to '' + let l:linting_flag = get(a:000, 0, '') if l:linting_flag !=# '' && l:linting_flag !=# 'lint_file' throw "linting_flag must be either '' or 'lint_file'" @@ -31,8 +31,11 @@ function! ale#Queue(delay, ...) abort return endif - " Remember the event used for linting. - let s:should_lint_file = l:linting_flag ==# 'lint_file' + " Remember that we want to check files for this buffer. + " We will remember this until we finally run the linters, via any event. + if l:linting_flag ==# 'lint_file' + let s:should_lint_file_for_buffer[bufnr('%')] = 1 + endif if s:lint_timer != -1 call timer_stop(s:lint_timer) @@ -59,6 +62,13 @@ function! ale#Lint(...) abort let l:buffer = bufnr('%') let l:linters = ale#linter#Get(&filetype) + let l:should_lint_file = 0 + + " Check if we previously requested checking the file. + if has_key(s:should_lint_file_for_buffer, l:buffer) + unlet s:should_lint_file_for_buffer[l:buffer] + let l:should_lint_file = 1 + endif " Initialise the buffer information if needed. call ale#engine#InitBufferInfo(l:buffer) @@ -66,7 +76,22 @@ function! ale#Lint(...) abort " Clear the new loclist again, so we will work with all new items. let g:ale_buffer_info[l:buffer].new_loclist = [] + if l:should_lint_file + " Clear loclist items for files if we are checking files again. + let g:ale_buffer_info[l:buffer].lint_file_loclist = [] + else + " Otherwise, don't run any `lint_file` linters + " We will continue running any linters which are currently checking + " the file, and the items will be mixed together with any new items. + call filter(l:linters, '!v:val.lint_file') + endif + for l:linter in l:linters call ale#engine#Invoke(l:buffer, l:linter) endfor endfunction + +" Reset flags indicating that files should be checked for all buffers. +function! ale#ResetLintFileMarkers() abort + let s:should_lint_file_for_buffer = {} +endfunction |