forked from aniani/vim
patch 7.4.1961
Problem: When 'insertmode' is reset while doing completion the popup menu remains even though Vim is in Normal mode. Solution: Ignore stop_insert_mode when the popup menu is visible. Don't set stop_insert_mode when 'insertmode' was already off. (Christian Brabandt)
This commit is contained in:
parent
04e2b4b0c4
commit
00672e1d3f
@ -2045,6 +2045,7 @@ test_arglist \
|
||||
test_packadd \
|
||||
test_partial \
|
||||
test_perl \
|
||||
test_popup \
|
||||
test_quickfix \
|
||||
test_regexp_latin \
|
||||
test_regexp_utf8 \
|
||||
|
@ -649,7 +649,11 @@ edit(
|
||||
if (update_Insstart_orig)
|
||||
Insstart_orig = Insstart;
|
||||
|
||||
if (stop_insert_mode)
|
||||
if (stop_insert_mode
|
||||
#ifdef FEAT_INS_EXPAND
|
||||
&& !pum_visible()
|
||||
#endif
|
||||
)
|
||||
{
|
||||
/* ":stopinsert" used or 'insertmode' reset */
|
||||
count = 0;
|
||||
|
@ -8001,7 +8001,8 @@ set_bool_option(
|
||||
need_start_insertmode = TRUE;
|
||||
stop_insert_mode = FALSE;
|
||||
}
|
||||
else
|
||||
/* only reset if it was set previously */
|
||||
else if (old_value)
|
||||
{
|
||||
need_start_insertmode = FALSE;
|
||||
stop_insert_mode = TRUE;
|
||||
|
@ -21,6 +21,7 @@ source test_matchstrpos.vim
|
||||
source test_menu.vim
|
||||
source test_messages.vim
|
||||
source test_partial.vim
|
||||
source test_popup.vim
|
||||
source test_reltime.vim
|
||||
source test_searchpos.vim
|
||||
source test_set.vim
|
||||
|
35
src/testdir/test_popup.vim
Normal file
35
src/testdir/test_popup.vim
Normal file
@ -0,0 +1,35 @@
|
||||
" Test for completion menu
|
||||
|
||||
inoremap <F5> <C-R>=ListMonths()<CR>
|
||||
let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
|
||||
let g:setting = ''
|
||||
|
||||
func ListMonths()
|
||||
if g:setting != ''
|
||||
exe ":set" g:setting
|
||||
endif
|
||||
call complete(col('.'), g:months)
|
||||
return ''
|
||||
endfunc
|
||||
|
||||
func! Test_popup_completion_insertmode()
|
||||
new
|
||||
call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
|
||||
call assert_equal('February', getline(1))
|
||||
%d
|
||||
let g:setting = 'noinsertmode'
|
||||
call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
|
||||
call assert_equal('February', getline(1))
|
||||
call assert_false(pumvisible())
|
||||
%d
|
||||
let g:setting = ''
|
||||
call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx')
|
||||
call assert_equal('', getline(1))
|
||||
%d
|
||||
call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx')
|
||||
call assert_equal('', getline(1))
|
||||
%d
|
||||
call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
|
||||
call assert_equal('December', getline(1))
|
||||
bwipe!
|
||||
endfunc
|
@ -753,6 +753,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1961,
|
||||
/**/
|
||||
1960,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user