patch 9.1.1127: preinsert text is not cleaned up correctly

Problem:  when 'completeopt' is set to preinsert the preinserted text is
          not cleared when adding new leader (Yee Cheng Chin)
Solution: add a condition to delete preinsert text in edit function
          (glepnir)

closes: #16672

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

diff --git a/src/edit.c b/src/edit.c
index 72a82f8fc62eceb41dee72c52a02e096b943f252..8ad5a66e244b228eab4adb62db62fa69637fea23 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -146,6 +146,7 @@ edit(
 #ifdef FEAT_CONCEAL
     int                cursor_line_was_concealed;
 #endif
+    int                ins_completion = FALSE;
 
     // Remember whether editing was restarted after CTRL-O.
     did_restart_edit = restart_edit;
@@ -636,10 +637,11 @@ edit(
         * and the cursor is still in the completed word.  Only when there is
         * a match, skip this when no matches were found.
         */
-       if (ins_compl_active()
-               && pum_wanted()
-               && curwin->w_cursor.col >= ins_compl_col()
-               && ins_compl_has_shown_match())
+       ins_completion = ins_compl_active()
+           && curwin->w_cursor.col >= ins_compl_col()
+           && ins_compl_has_shown_match();
+
+       if (ins_completion && pum_wanted())
        {
            // BS: Delete one character from "compl_leader".
            if ((c == K_BS || c == Ctrl_H)
@@ -697,6 +699,8 @@ edit(
                    ins_compl_delete();
            }
        }
+       else if (ins_completion && !pum_wanted() && ins_compl_preinsert_effect())
+           ins_compl_delete();
 
        // Prepare for or stop CTRL-X mode.  This doesn't do completion, but
        // it does fix up the text when finishing completion.

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 4ecf2893dab477e011e832095947cdc28d144bfb..0b943712bb20d41a85097cc750c900eea87b6643 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -3171,6 +3171,11 @@ function Test_completeopt_preinsert()
   call assert_equal("fobar", getline('.'))
   call assert_equal(5, col('.'))
 
+  set cot=preinsert
+  call feedkeys("Sfoo1 foo2\<CR>f\<C-X>\<C-N>bar", 'tx')
+  call assert_equal("fbar", getline('.'))
+  call assert_equal(4, col('.'))
+
   bw!
   set cot&
   set omnifunc&

diff --git a/src/version.c b/src/version.c
index 61e2d6b0a567b3a0f0d6e7468e06c473d4ae5890..fad08acae41c70eee88019f8c1e9093bca84a907 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 */
+/**/
+    1127,
 /**/
     1126,
 /**/