From db53dcffece5b7c69b5d747bcd3f4458d0e13d91 Mon Sep 17 00:00:00 2001 From: Prabir Shrestha Date: Wed, 5 Jan 2022 17:56:14 -0800 Subject: [PATCH] Update quickpick to 663aeacc6bd50f4612ffdb9fd1d438eab09f02b0 (fixes filckering) (#1259) Refer to https://github.com/prabirshrestha/quickpick.vim/pull/25 for more information --- autoload/lsp/internal/ui/quickpick.vim | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/autoload/lsp/internal/ui/quickpick.vim b/autoload/lsp/internal/ui/quickpick.vim index 761f3ecb..84837fbd 100644 --- a/autoload/lsp/internal/ui/quickpick.vim +++ b/autoload/lsp/internal/ui/quickpick.vim @@ -1,4 +1,4 @@ -" https://github.com/prabirshrestha/quickpick.vim#e0e38f40e4fa9b32c5ff1a3f7de449e930b6513c +" https://github.com/prabirshrestha/quickpick.vim#663aeacc6bd50f4612ffdb9fd1d438eab09f02b0 " :QuickpickEmbed path=autoload/lsp/internal/ui/quickpick.vim namespace=lsp#internal#ui#quickpick prefix=lsp-quickpick let s:has_timer = exists('*timer_start') && exists('*timer_stop') @@ -67,11 +67,11 @@ function! lsp#internal#ui#quickpick#open(opt) abort inoremap (lsp-quickpick-cancel) :call on_cancel() nnoremap (lsp-quickpick-cancel) :call on_cancel() - inoremap (lsp-quickpick-move-next) :call on_move_next(1) - nnoremap (lsp-quickpick-move-next) :call on_move_next(0) + inoremap (lsp-quickpick-move-next) :call on_move_next() + nnoremap (lsp-quickpick-move-next) :call on_move_next() - inoremap (lsp-quickpick-move-previous) :call on_move_previous(1) - nnoremap (lsp-quickpick-move-previous) :call on_move_previous(0) + inoremap (lsp-quickpick-move-previous) :call on_move_previous() + nnoremap (lsp-quickpick-move-previous) :call on_move_previous() exec printf('setlocal filetype=' . s:state['promptfiletype']) @@ -323,21 +323,15 @@ function! s:on_cancel() abort call lsp#internal#ui#quickpick#close() endfunction -function! s:on_move_next(insertmode) abort +function! s:on_move_next() abort let l:col = col('.') call s:win_execute(s:state['resultswinid'], 'normal! j') - if a:insertmode - call s:win_execute(s:state['promptwinid'], 'startinsert | call setpos(".", [0, 1, ' . (l:col + 1) .', 1])') - endif call s:notify_selection() endfunction -function! s:on_move_previous(insertmode) abort +function! s:on_move_previous() abort let l:col = col('.') call s:win_execute(s:state['resultswinid'], 'normal! k') - if a:insertmode - call s:win_execute(s:state['promptwinid'], 'startinsert | call setpos(".", [0, 1, ' . (l:col + 1) .', 1])') - endif call s:notify_selection() endfunction @@ -362,9 +356,9 @@ function! s:notify_selection() abort \ 'resultswinid': s:state['resultswinid'], \ 'items': l:items, \ } - call win_gotoid(s:state['winid']) + noautocmd call win_gotoid(s:state['winid']) call s:notify('selection', l:data) - call win_gotoid(l:original_winid) + noautocmd call win_gotoid(l:original_winid) endfunction function! s:on_inputchanged() abort