Automatically adjust the completion options when using completion while you type

This commit is contained in:
w0rp 2017-08-17 23:06:02 +01:00
parent 342e83db60
commit 0a282eb76a
2 changed files with 39 additions and 0 deletions

View File

@ -115,11 +115,16 @@ function! ale#completion#Show(response, completion_parser) abort
let b:ale_old_omnifunc = &l:omnifunc let b:ale_old_omnifunc = &l:omnifunc
endif endif
if !exists('b:ale_old_completopt')
let b:ale_old_completopt = &l:completeopt
endif
" Set the list in the buffer, temporarily replace omnifunc with our " Set the list in the buffer, temporarily replace omnifunc with our
" function, and then start omni-completion. " function, and then start omni-completion.
let b:ale_completion_response = a:response let b:ale_completion_response = a:response
let b:ale_completion_parser = a:completion_parser let b:ale_completion_parser = a:completion_parser
let &l:omnifunc = 'ale#completion#OmniFunc' let &l:omnifunc = 'ale#completion#OmniFunc'
let &l:completeopt = 'menu,menuone,preview,noselect,noinsert'
call ale#completion#FeedKeys("\<C-x>\<C-o>", 'n') call ale#completion#FeedKeys("\<C-x>\<C-o>", 'n')
endfunction endfunction
@ -303,6 +308,11 @@ function! ale#completion#Done() abort
let &l:omnifunc = b:ale_old_omnifunc let &l:omnifunc = b:ale_old_omnifunc
unlet b:ale_old_omnifunc unlet b:ale_old_omnifunc
endif endif
if exists('b:ale_old_completopt')
let &l:completeopt = b:ale_old_completopt
unlet b:ale_old_completopt
endif
endfunction endfunction
function! s:Setup(enabled) abort function! s:Setup(enabled) abort

View File

@ -2,6 +2,7 @@ Before:
Save g:ale_completion_enabled Save g:ale_completion_enabled
Save g:ale_completion_delay Save g:ale_completion_delay
Save &l:omnifunc Save &l:omnifunc
Save &l:completeopt
let g:test_vars = { let g:test_vars = {
\ 'feedkeys_calls': [], \ 'feedkeys_calls': [],
@ -17,6 +18,8 @@ After:
Restore Restore
unlet! g:test_vars unlet! g:test_vars
unlet! b:ale_old_omnifunc
unlet! b:ale_old_completopt
unlet! b:ale_completion_info unlet! b:ale_completion_info
unlet! b:ale_completion_response unlet! b:ale_completion_response
unlet! b:ale_completion_parser unlet! b:ale_completion_parser
@ -130,6 +133,14 @@ Execute(ale#completion#Show() should remember the omnifunc setting and replace i
AssertEqual 'FooBar', b:ale_old_omnifunc AssertEqual 'FooBar', b:ale_old_omnifunc
AssertEqual 'ale#completion#OmniFunc', &l:omnifunc AssertEqual 'ale#completion#OmniFunc', &l:omnifunc
Execute(ale#completion#Show() should remember the completeopt setting and replace it):
let &l:completeopt = 'menu'
call ale#completion#Show('Response', 'Parser')
AssertEqual 'menu', b:ale_old_completopt
AssertEqual 'menu,menuone,preview,noselect,noinsert', &l:completeopt
Execute(ale#completion#Show() should make the correct feedkeys() call): Execute(ale#completion#Show() should make the correct feedkeys() call):
call ale#completion#Show('Response', 'Parser') call ale#completion#Show('Response', 'Parser')
@ -150,6 +161,24 @@ Execute(ale#completion#Done() should restore old omnifunc values):
AssertEqual 'FooBar', &l:omnifunc AssertEqual 'FooBar', &l:omnifunc
Assert !has_key(b:, 'ale_old_omnifunc') Assert !has_key(b:, 'ale_old_omnifunc')
Execute(ale#completion#Done() should restore the old completeopt setting):
let b:ale_old_completopt = 'menu'
let &l:completeopt = 'menu,menuone,preview,noselect,noinsert'
call ale#completion#Done()
AssertEqual 'menu', &l:completeopt
Assert !has_key(b:, 'ale_old_completopt')
Execute(ale#completion#Done() should leave settings alone when none were remembered):
let &l:omnifunc = 'BazBoz'
let &l:completeopt = 'menu'
call ale#completion#Done()
AssertEqual 'BazBoz', &l:omnifunc
AssertEqual 'menu', &l:completeopt
Execute(The completion request_id should be reset when queuing again): Execute(The completion request_id should be reset when queuing again):
let b:ale_completion_info = {'request_id': 123} let b:ale_completion_info = {'request_id': 123}