Commit: patch 9.1.1005: completion text is highlighted even with no pattern found

[Christian Brabandt]

patch 9.1.1005: completion text is highlighted even with no pattern found

Commit: 
https://github.com/vim/vim/commit/9fddb8ae770be3e16545dd4c2f4cfaad8f62cb40
Author: glepnir <glephun...@gmail.com>
Date:   Sat Jan 11 16:42:50 2025 +0100

    patch 9.1.1005: completion text is highlighted even with no pattern found
    
    Problem:  completion text is highlighted even with no pattern found
    Solution: use ins_compl_leader_len() instead of checking
              compl_leader.length (glepnir)
    
    closes: #16422
    
    Signed-off-by: glepnir <glephun...@gmail.com>
    Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/insexpand.c b/src/insexpand.c
index 22f021de7..4a02f0ec8 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -927,7 +927,7 @@ ins_compl_col_range_attr(int col)
     if ((get_cot_flags() & COT_FUZZY))
        return -1;
 
-    if (col >= (compl_col + (int)compl_leader.length) && col < 
compl_ins_end_col)
+    if (col >= (compl_col + (int)ins_compl_leader_len()) && col < 
compl_ins_end_col)
        return syn_name2attr((char_u *)"ComplMatchIns");
 
     return -1;
diff --git a/src/testdir/dumps/Test_pum_matchins_combine_09.dump 
b/src/testdir/dumps/Test_pum_matchins_combine_09.dump
new file mode 100644
index 000000000..d7904b29e
--- /dev/null
+++ b/src/testdir/dumps/Test_pum_matchins_combine_09.dump
@@ -0,0 +1,20 @@
+|f+8&#40ff4011> @73
+|~+0#4040ff13#4040ff13| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |K|e|y|w|o|r|d| |c|o|m|p|l|e|t|i|o|n| |(|^|N|^|P|)| 
|P+0#ffffff16#e000002|a|t@1|e|r|n| |n|o|t| |f|o|u|n|d| +0#0000000#4040ff13@28
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 3f4836fa8..0303c42bd 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1829,6 +1829,13 @@ func Test_pum_matchins_highlight_combine()
   call term_sendkeys(buf, "S\<C-X>\<C-O>f\<C-N>")
   call VerifyScreenDump(buf, 'Test_pum_matchins_combine_08', {})
   call term_sendkeys(buf, "\<C-E>\<Esc>")
+  call TermWait(buf)
+
+  call term_sendkeys(buf, ":set cot-=fuzzy\<CR>")
+  call TermWait(buf)
+  call term_sendkeys(buf, "Sf\<C-N>")
+  call VerifyScreenDump(buf, 'Test_pum_matchins_combine_09', {})
+  call term_sendkeys(buf, "\<C-E>\<Esc>")
 
   call StopVimInTerminal(buf)
 endfunc
diff --git a/src/version.c b/src/version.c
index 6179cb3f9..1927d9e82 100644
--- 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 */
+/**/
+    1005,
 /**/
     1004,
 /**/

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit 
https://groups.google.com/d/msgid/vim_dev/E1tWdfb-0053Bc-7m%40256bit.org.