hasufell/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #539 - Just set our highlights again when buffers are shown after being hidden

Browse Source
This commit is contained in:
w0rp 2017-05-07 19:30:19 +01:00
parent f6723784e6
commit ca120088c7
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
autoload/ale/highlight.vim
View File

@ -65,11 +65,6 @@ endfunction
function! ale#highlight#UpdateHighlights() abort function! ale#highlight#UpdateHighlights() abort
let l:buffer = bufnr('%') let l:buffer = bufnr('%')
if has_key(s:buffer_restore_map, l:buffer)
call setmatches(s:buffer_restore_map[l:buffer])
endif
let l:has_new_items = has_key(s:buffer_highlights, l:buffer) let l:has_new_items = has_key(s:buffer_highlights, l:buffer)
let l:loclist = l:has_new_items ? remove(s:buffer_highlights, l:buffer) : [] let l:loclist = l:has_new_items ? remove(s:buffer_highlights, l:buffer) : []
@ -80,7 +75,13 @@ function! ale#highlight#UpdateHighlights() abort
" Remove anything with a current match_id " Remove anything with a current match_id
call filter(l:loclist, '!has_key(v:val, ''match_id'')') call filter(l:loclist, '!has_key(v:val, ''match_id'')')
if l:has_new_items " Restore items from the map of hidden items,
" if we don't have some new items to set already.
if empty(l:loclist) && has_key(s:buffer_restore_map, l:buffer)
let l:loclist = s:buffer_restore_map[l:buffer]
endif
if g:ale_enabled
for l:item in l:loclist for l:item in l:loclist
let l:col = l:item.col let l:col = l:item.col
let l:group = l:item.type ==# 'E' ? 'ALEError' : 'ALEWarning' let l:group = l:item.type ==# 'E' ? 'ALEError' : 'ALEWarning'
@ -96,12 +97,22 @@ function! ale#highlight#UpdateHighlights() abort
endfunction endfunction
function! ale#highlight#BufferHidden(buffer) abort function! ale#highlight#BufferHidden(buffer) abort
" Remember all matches, so they can be restored later. let l:info = get(g:ale_buffer_info, a:buffer, {'loclist': []})
let s:buffer_restore_map[a:buffer] = filter( let l:loclist = deepcopy(l:info.loclist)
\ getmatches(),
\ 'get(v:val, ''group'', '''')[:2] ==# ''ALE''' " Remember loclist items, so they can be restored later.
\) if !empty(l:loclist)
" Remove match_ids, as they must be re-calculated when buffers are
" shown again.
for l:item in l:loclist
if has_key(l:item, 'match_id')
call remove(l:item, 'match_id')
endif
endfor
let s:buffer_restore_map[a:buffer] = l:loclist
call clearmatches() call clearmatches()
endif
endfunction endfunction
augroup ALEHighlightBufferGroup augroup ALEHighlightBufferGroup

16
test/test_highlight_placement.vader
View File

@ -96,9 +96,13 @@ Execute(Highlights set by ALE should be removed when buffer cleanup is done):
Execute(Highlights should be cleared when buffers are hidden): Execute(Highlights should be cleared when buffers are hidden):
call ale#engine#InitBufferInfo(bufnr('%')) call ale#engine#InitBufferInfo(bufnr('%'))
call ale#highlight#SetHighlights(bufnr('%'), [ let g:ale_buffer_info[bufnr('%')].loclist = [
\ {'bufnr': bufnr('%'), 'type': 'E', 'lnum': 3, 'col': 2}, \ {'bufnr': bufnr('%'), 'type': 'E', 'lnum': 3, 'col': 2},
\]) \]
call ale#highlight#SetHighlights(
\ bufnr('%'),
\ g:ale_buffer_info[bufnr('%')].loclist
\)
AssertEqual 1, len(getmatches()), 'The highlights weren''t initially set!' AssertEqual 1, len(getmatches()), 'The highlights weren''t initially set!'
@ -112,9 +116,13 @@ Execute(Highlights should be cleared when buffers are hidden):
Execute(Only ALE highlights should be restored when buffers are restored): Execute(Only ALE highlights should be restored when buffers are restored):
call ale#engine#InitBufferInfo(bufnr('%')) call ale#engine#InitBufferInfo(bufnr('%'))
call ale#highlight#SetHighlights(bufnr('%'), [ let g:ale_buffer_info[bufnr('%')].loclist = [
\ {'bufnr': bufnr('%'), 'type': 'E', 'lnum': 3, 'col': 2}, \ {'bufnr': bufnr('%'), 'type': 'E', 'lnum': 3, 'col': 2},
\]) \]
call ale#highlight#SetHighlights(
\ bufnr('%'),
\ g:ale_buffer_info[bufnr('%')].loclist
\)
call matchaddpos('SomeOtherGroup', [[1, 1, 1]]) call matchaddpos('SomeOtherGroup', [[1, 1, 1]])