changeset 23374:1371e21fdc3d v8.2.2230

patch 8.2.2230: Vim9: insert completion runs into error Commit: https://github.com/vim/vim/commit/179eb567b15a2ed5cf25b45d95d06c7a729d50bc Author: Bram Moolenaar <Bram@vim.org> Date: Sun Dec 27 18:03:22 2020 +0100 patch 8.2.2230: Vim9: insert completion runs into error Problem: Vim9: insert completion runs into error. Solution: Insert colon before range. (closes https://github.com/vim/vim/issues/7556)
author Bram Moolenaar <Bram@vim.org>
date Sun, 27 Dec 2020 18:15:03 +0100
parents e870e15300ee
children d1e50afeccb8
files src/insexpand.c src/testdir/test_vim9_cmd.vim src/version.c
diffstat 3 files changed, 22 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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\<c-x>\<c-u>\<Esc>", 'ntx')
+  assert_equal('aaa', getline(1))
+
+  set completefunc=
+  bwipe!
+enddef
+
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2230,
+/**/
     2229,
 /**/
     2228,