diff options
| -rw-r--r-- | autoload/ale/completion.vim | 10 | ||||
| -rw-r--r-- | test/completion/test_completion_events.vader | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/autoload/ale/completion.vim b/autoload/ale/completion.vim index 0423e395..c79ac634 100644 --- a/autoload/ale/completion.vim +++ b/autoload/ale/completion.vim @@ -1,10 +1,17 @@ " Author: w0rp <devw0rp@gmail.com> " Description: Completion support for LSP linters +function! ale#completion#TriggerOmnicompleteMenu() abort + " Replace completion options shortly before opening the menu. + call s:ReplaceCompletionOptions() + + return "\<C-x>\<C-o>" +endfunction + " The omnicompletion menu is shown through a special Plug mapping which is " only valid in Insert mode. This way, feedkeys() won't send these keys if you " quit Insert mode quickly enough. -inoremap <silent> <Plug>(ale_show_completion_menu) <C-x><C-o> +inoremap <silent> <Plug>(ale_show_completion_menu) <C-R>=ale#completion#TriggerOmnicompleteMenu()<CR> " If we hit the key sequence in normal mode, then we won't show the menu, so " we should restore the old settings right away. nnoremap <silent> <Plug>(ale_show_completion_menu) :call ale#completion#RestoreCompletionOptions()<CR> @@ -214,7 +221,6 @@ function! ale#completion#Show(response, completion_parser) abort " function, and then start omni-completion. let b:ale_completion_response = a:response let b:ale_completion_parser = a:completion_parser - call s:ReplaceCompletionOptions() call ale#util#FeedKeys("\<Plug>(ale_show_completion_menu)") endfunction diff --git a/test/completion/test_completion_events.vader b/test/completion/test_completion_events.vader index f3e05950..dfffab61 100644 --- a/test/completion/test_completion_events.vader +++ b/test/completion/test_completion_events.vader @@ -125,6 +125,8 @@ Execute(ale#completion#Show() should remember the omnifunc setting and replace i let &l:omnifunc = 'FooBar' call ale#completion#Show('Response', 'Parser') + AssertEqual [["\<Plug>(ale_show_completion_menu)"]], g:feedkeys_calls + call ale#completion#TriggerOmnicompleteMenu() AssertEqual 'FooBar', b:ale_old_omnifunc AssertEqual 'ale#completion#OmniFunc', &l:omnifunc @@ -133,6 +135,8 @@ Execute(ale#completion#Show() should remember the completeopt setting and replac let &l:completeopt = 'menu' call ale#completion#Show('Response', 'Parser') + AssertEqual [["\<Plug>(ale_show_completion_menu)"]], g:feedkeys_calls + call ale#completion#TriggerOmnicompleteMenu() AssertEqual 'menu', b:ale_old_completopt AssertEqual 'menu,menuone,noselect,noinsert', &l:completeopt @@ -141,6 +145,8 @@ Execute(ale#completion#Show() should set the preview option if it's set): let &l:completeopt = 'menu,preview' call ale#completion#Show('Response', 'Parser') + AssertEqual [["\<Plug>(ale_show_completion_menu)"]], g:feedkeys_calls + call ale#completion#TriggerOmnicompleteMenu() AssertEqual 'menu,preview', b:ale_old_completopt AssertEqual 'menu,menuone,preview,noselect,noinsert', &l:completeopt |