#653 Skip filetype keys in g:ale_buffer_info during cleanup
This commit is contained in:
parent
2d02de33d4
commit
79701f6f20
@ -296,12 +296,17 @@ function! s:ALEToggle() abort
|
||||
call ale#balloon#Enable()
|
||||
endif
|
||||
else
|
||||
" Make sure the buffer number is a number, not a string,
|
||||
" otherwise things can go wrong.
|
||||
for l:buffer in map(keys(g:ale_buffer_info), 'str2nr(v:val)')
|
||||
for l:key in keys(g:ale_buffer_info)
|
||||
" The key could be a filename or a buffer number, so try and
|
||||
" convert it to a number. We need a number for the other
|
||||
" functions.
|
||||
let l:buffer = str2nr(l:key)
|
||||
|
||||
if l:buffer > 0
|
||||
" Stop all jobs and clear the results for everything, and delete
|
||||
" all of the data we stored for the buffer.
|
||||
call ale#engine#Cleanup(l:buffer)
|
||||
endif
|
||||
endfor
|
||||
|
||||
" Remove highlights for the current buffer now.
|
||||
|
@ -1,4 +1,8 @@
|
||||
Before:
|
||||
Save g:ale_buffer_info
|
||||
|
||||
let g:ale_buffer_info = {}
|
||||
|
||||
let g:expected_loclist = [{
|
||||
\ 'bufnr': bufnr('%'),
|
||||
\ 'lnum': 2,
|
||||
@ -38,6 +42,8 @@ Before:
|
||||
\})
|
||||
|
||||
After:
|
||||
Restore
|
||||
|
||||
unlet! g:expected_loclist
|
||||
unlet! g:expected_groups
|
||||
|
||||
|
@ -1,4 +1,7 @@
|
||||
Before:
|
||||
Save g:ale_buffer_info
|
||||
|
||||
let g:ale_buffer_info = {}
|
||||
let g:expected_loclist = [{
|
||||
\ 'bufnr': bufnr('%'),
|
||||
\ 'lnum': 2,
|
||||
@ -42,10 +45,11 @@ Before:
|
||||
for l:line in split(l:output, "\n")
|
||||
let l:match = matchlist(l:line, '^ALE[a-zA-Z]\+Group')
|
||||
|
||||
" We don't care about checking for the completion or fixing groups here.
|
||||
" We don't care about some groups here.
|
||||
if !empty(l:match)
|
||||
\&& l:match[0] !=# 'ALECompletionGroup'
|
||||
\&& l:match[0] !=# 'ALEBufferFixGroup'
|
||||
\&& l:match[0] !=# 'ALEPatternOptionsGroup'
|
||||
call add(l:results, l:match[0])
|
||||
endif
|
||||
endfor
|
||||
@ -64,10 +68,11 @@ Before:
|
||||
\})
|
||||
|
||||
After:
|
||||
Restore
|
||||
|
||||
unlet! g:expected_loclist
|
||||
unlet! g:expected_groups
|
||||
|
||||
let g:ale_buffer_info = {}
|
||||
call ale#linter#Reset()
|
||||
|
||||
" Toggle ALE back on if we fail when it's disabled.
|
||||
@ -119,3 +124,47 @@ Execute(ALEToggle should reset everything and then run again):
|
||||
\ map(getmatches(), '{''group'': v:val.group, ''pos1'': v:val.pos1}')
|
||||
AssertEqual g:expected_groups, ParseAuGroups()
|
||||
AssertEqual [{'lnum': 2, 'bufnr': bufnr(''), 'col': 3, 'linter_name': 'testlinter', 'vcol': 0, 'nr': -1, 'type': 'E', 'text': 'foo bar', 'sign_id': 1000001}], g:ale_buffer_info[bufnr('')].loclist
|
||||
|
||||
Execute(ALEToggle should skip filename keys and preserve them):
|
||||
AssertEqual 'foobar', &filetype
|
||||
|
||||
let g:ale_buffer_info['/foo/bar/baz.txt'] = {
|
||||
\ 'job_list': [],
|
||||
\ 'active_linter_list': [],
|
||||
\ 'loclist': [],
|
||||
\ 'temporary_file_list': [],
|
||||
\ 'temporary_directory_list': [],
|
||||
\ 'history': [],
|
||||
\}
|
||||
|
||||
call ale#Lint()
|
||||
call ale#engine#WaitForJobs(2000)
|
||||
|
||||
" Now Toggle ALE off.
|
||||
ALEToggle
|
||||
|
||||
AssertEqual
|
||||
\ {
|
||||
\ 'job_list': [],
|
||||
\ 'active_linter_list': [],
|
||||
\ 'loclist': [],
|
||||
\ 'temporary_file_list': [],
|
||||
\ 'temporary_directory_list': [],
|
||||
\ 'history': [],
|
||||
\ },
|
||||
\ get(g:ale_buffer_info, '/foo/bar/baz.txt', {})
|
||||
|
||||
" Toggle ALE on again.
|
||||
ALEToggle
|
||||
call ale#engine#WaitForJobs(2000)
|
||||
|
||||
AssertEqual
|
||||
\ {
|
||||
\ 'job_list': [],
|
||||
\ 'active_linter_list': [],
|
||||
\ 'loclist': [],
|
||||
\ 'temporary_file_list': [],
|
||||
\ 'temporary_directory_list': [],
|
||||
\ 'history': [],
|
||||
\ },
|
||||
\ get(g:ale_buffer_info, '/foo/bar/baz.txt', {})
|
||||
|
Loading…
Reference in New Issue
Block a user