patch 9.1.0447: completion may be wrong when deleting all chars

Problem:  completion may be wrong when deleting all chars
Solution: reset compl_shown_match

closes: #14854

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/insexpand.c b/src/insexpand.c
index c420c0ed9364ea74893ffe2b7bbf843b6666d75f..c1374d3e9ccf89d5214c79faac5c25e6ea1440c9 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -1255,6 +1255,12 @@ ins_compl_build_pum(void)
     if (match_at_original_text(compl_shown_match))
        shown_match_ok = TRUE;
 
+    if (compl_leader != NULL
+           && STRCMP(compl_leader, compl_orig_text) == 0
+           && shown_match_ok == FALSE)
+       compl_shown_match = compl_no_select ? compl_first_match
+                                           : compl_first_match->cp_next;
+
     i = 0;
     compl = compl_first_match;
     do

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index eb89a15c53e0e44bab435d140d2c9203a4a99569..d1b96099b1f87cb9503b5da470dc0ac054495d50 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -630,14 +630,14 @@ func Test_pum_with_preview_win()
   CheckScreendump
 
   let lines =<< trim END
-      funct Omni_test(findstart, base)
-       if a:findstart
-         return col(".") - 1
-       endif
-       return [#{word: "one", info: "1info"}, #{word: "two", info: "2info"}, #{word: "three", info: "3info"}]
-      endfunc
-      set omnifunc=Omni_test
-      set completeopt+=longest
+    func Omni_test(findstart, base)
+      if a:findstart
+        return col(".") - 1
+      endif
+      return [#{word: "one", info: "1info"}, #{word: "two", info: "2info"}, #{word: "three", info: "3info"}]
+    endfunc
+    set omnifunc=Omni_test
+    set completeopt+=longest
   END
 
   call writefile(lines, 'Xpreviewscript', 'D')

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index f5cb8b2a19e79fed4f20447fabdcfdfc8c72f6a5..1142efc7b79180f493880ca6e0965334c9b6ddd3 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1175,6 +1175,8 @@ func Test_CompleteChanged()
   set completeopt=menu,menuone
   call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f", 'tx')
   call assert_equal('five', g:word)
+  call feedkeys("i\<C-X>\<C-O>\<BS>\<BS>\<BS>f\<BS>", 'tx')
+  call assert_equal('one', g:word)
 
   autocmd! AAAAA_Group
   set complete& completeopt&

diff --git a/src/version.c b/src/version.c
index ac0bda070a1b6bd80dfc0059141b9109ce867883..92088fc95f5e7a9022f8acaebf486f9c4069778b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    447,
 /**/
     446,
 /**/