#653 Treat temporary filenames as being for the current buffer

This commit is contained in:
w0rp 2017-08-19 21:18:27 +01:00
parent 9d6883561c
commit fb0adc602e
2 changed files with 45 additions and 0 deletions

View File

@ -336,6 +336,9 @@ function! s:RemapItemTypes(type_map, loclist) abort
endfor endfor
endfunction endfunction
" Save the temporary directory so we can figure out if files are in it.
let s:temp_dir = fnamemodify(tempname(), ':h')
function! ale#engine#FixLocList(buffer, linter_name, loclist) abort function! ale#engine#FixLocList(buffer, linter_name, loclist) abort
let l:bufnr_map = {} let l:bufnr_map = {}
let l:new_loclist = [] let l:new_loclist = []
@ -381,6 +384,10 @@ function! ale#engine#FixLocList(buffer, linter_name, loclist) abort
elseif has_key(l:bufnr_map, l:filename) elseif has_key(l:bufnr_map, l:filename)
" Get the buffer number from the map, which can be faster. " Get the buffer number from the map, which can be faster.
let l:item.bufnr = l:bufnr_map[l:filename] let l:item.bufnr = l:bufnr_map[l:filename]
elseif l:filename[:len(s:temp_dir) - 1] is# s:temp_dir
" Assume that any temporary files are for this buffer.
let l:item.bufnr = a:buffer
let l:bufnr_map[l:filename] = a:buffer
else else
" Look up the buffer number. " Look up the buffer number.
let l:item.bufnr = bufnr(l:filename) let l:item.bufnr = bufnr(l:filename)

View File

@ -1,4 +1,5 @@
After: After:
unlet! b:temp_name
unlet! b:other_bufnr unlet! b:other_bufnr
Given foo (Some file with lines to count): Given foo (Some file with lines to count):
@ -291,3 +292,40 @@ Execute(FixLocList should accept filenames):
\ {'text': 'a', 'lnum': 5, 'filename': '/foo/bar/baz'}, \ {'text': 'a', 'lnum': 5, 'filename': '/foo/bar/baz'},
\ ], \ ],
\ ) \ )
Execute(FixLocList should interpret temporary filenames as being the current buffer):
let b:temp_name = tempname()
AssertEqual
\ [
\ {
\ 'text': 'a',
\ 'lnum': 2,
\ 'col': 0,
\ 'bufnr': bufnr(''),
\ 'filename': b:temp_name,
\ 'vcol': 0,
\ 'type': 'E',
\ 'nr': -1,
\ 'linter_name': 'foobar',
\ },
\ {
\ 'text': 'a',
\ 'lnum': 3,
\ 'col': 0,
\ 'bufnr': bufnr(''),
\ 'filename': b:temp_name,
\ 'vcol': 0,
\ 'type': 'E',
\ 'nr': -1,
\ 'linter_name': 'foobar',
\ },
\],
\ ale#engine#FixLocList(
\ bufnr(''),
\ 'foobar',
\ [
\ {'text': 'a', 'lnum': 2, 'filename': b:temp_name},
\ {'text': 'a', 'lnum': 3, 'filename': b:temp_name},
\ ],
\ )