From 179eb567b15a2ed5cf25b45d95d06c7a729d50bc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 27 Dec 2020 18:03:22 +0100 Subject: [PATCH] patch 8.2.2230: Vim9: insert completion runs into error Problem: Vim9: insert completion runs into error. Solution: Insert colon before range. (closes #7556) --- src/insexpand.c | 2 +- src/testdir/test_vim9_cmd.vim | 19 +++++++++++++++++++ src/version.c | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/insexpand.c b/src/insexpand.c index 73b2218e1..02f593d7c 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -1020,7 +1020,7 @@ ins_compl_show_pum(void) #if defined(FEAT_EVAL) // Dirty hard-coded hack: remove any matchparen highlighting. - do_cmdline_cmd((char_u *)"if exists('g:loaded_matchparen')|3match none|endif"); + do_cmdline_cmd((char_u *)"if exists('g:loaded_matchparen')|:3match none|endif"); #endif // Update the screen later, before drawing the popup menu over it. diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim index b6644e394..96311a5c6 100644 --- a/src/testdir/test_vim9_cmd.vim +++ b/src/testdir/test_vim9_cmd.vim @@ -816,4 +816,23 @@ def Test_gdefault_not_used() bwipe! enddef +def g:SomeComplFunc(findstart: number, base: string): any + if findstart + return 0 + else + return ['aaa', 'bbb'] + endif +enddef + +def Test_insert_complete() + # this was running into an error with the matchparen hack + new + set completefunc=SomeComplFunc + feedkeys("i\\\", 'ntx') + assert_equal('aaa', getline(1)) + + set completefunc= + bwipe! +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index adfaf50eb..51a9e4299 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2230, /**/ 2229, /**/ -- 2.50.1