From 65407ce1d2963e7a758af8fecdcbd67b9a90bdb9 Mon Sep 17 00:00:00 2001 From: glepnir Date: Sat, 6 Jul 2024 16:09:19 +0200 Subject: patch 9.1.0534: completion wrong with fuzzy when cycling back to original Problem: completion wrong with fuzzy when cycling back to original (Quan Nguyen) Solution: reset show_match_ok when cp_score is zero (glepnir) fixes: #15095 closes: #15105 Signed-off-by: glepnir Signed-off-by: Christian Brabandt --- src/insexpand.c | 11 ++++++++--- src/testdir/dumps/Test_pum_highlights_10.dump | 20 ++++++++++++++++++++ src/testdir/dumps/Test_pum_highlights_11.dump | 20 ++++++++++++++++++++ src/testdir/test_popup.vim | 11 +++++++++++ src/version.c | 2 ++ 5 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/testdir/dumps/Test_pum_highlights_10.dump create mode 100644 src/testdir/dumps/Test_pum_highlights_11.dump diff --git a/src/insexpand.c b/src/insexpand.c index 01fa6de83d..36228e9b13 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -1307,6 +1307,11 @@ ins_compl_build_pum(void) did_find_shown_match = TRUE; max_fuzzy_score = compl->cp_score; compl_shown_match = compl; + } + + if (!shown_match_ok && compl == compl_shown_match && !compl_no_select) + { + cur = i; shown_match_ok = TRUE; } @@ -1318,8 +1323,6 @@ ins_compl_build_pum(void) && (max_fuzzy_score > 0 || (compl_leader == NULL || lead_len == 0))) { - shown_match_ok = TRUE; - cur = 0; if (match_at_original_text(compl_shown_match)) compl_shown_match = shown_compl; } @@ -1367,6 +1370,7 @@ ins_compl_build_pum(void) // sort by the largest score of fuzzy match qsort(compl_match_array, (size_t)compl_match_arraysize, sizeof(pumitem_T), ins_compl_fuzzy_cmp); + shown_match_ok = TRUE; } if (!shown_match_ok) // no displayed match at all @@ -4102,7 +4106,8 @@ find_comp_when_fuzzy(void) if ((is_forward && compl_selected_item == compl_match_arraysize - 1) || (is_backward && compl_selected_item == 0)) - return compl_first_match; + return compl_first_match != compl_shown_match ? compl_first_match : + (compl_first_match->cp_prev ? compl_first_match->cp_prev : NULL); if (is_forward) target_idx = compl_selected_item + 1; diff --git a/src/testdir/dumps/Test_pum_highlights_10.dump b/src/testdir/dumps/Test_pum_highlights_10.dump new file mode 100644 index 0000000000..5db4e59e4d --- /dev/null +++ b/src/testdir/dumps/Test_pum_highlights_10.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0|h|e|l@1|o| |h|e|l|i|o| |h|e|r|o| |h|e|r|o> @52 +|~+0#4040ff13&| @15| +0#0000001#ffd7ff255|h+0#0000e05&|e+0#0000001&|l@1|o| @9| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#ffd7ff255|h+0#0000e05&|e+0#0000001&|l|i|o| @9| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#e0e0e08|h+0#00e0e07&|e+0#0000001&|r|o| @10| +0#4040ff13#ffffff0@41 +|~| @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| |L|o|c|a|l| |c|o|m|p|l|e|t|i|o|n| |(|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |3| +0#0000000&@27 diff --git a/src/testdir/dumps/Test_pum_highlights_11.dump b/src/testdir/dumps/Test_pum_highlights_11.dump new file mode 100644 index 0000000000..720d839fae --- /dev/null +++ b/src/testdir/dumps/Test_pum_highlights_11.dump @@ -0,0 +1,20 @@ +| +0&#ffffff0|h|e|l@1|o| |h|e|l|i|o| |h|e|r|o| |h|e|l|i|o> @51 +|~+0#4040ff13&| @15| +0#0000001#ffd7ff255|h+0#0000e05&|e+0#0000001&|l@1|o| @9| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#e0e0e08|h+0#00e0e07&|e+0#0000001&|l|i|o| @9| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#ffd7ff255|h+0#0000e05&|e+0#0000001&|r|o| @10| +0#4040ff13#ffffff0@41 +|~| @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| |L|o|c|a|l| |c|o|m|p|l|e|t|i|o|n| |(|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |2| |o|f| |3| +0#0000000&@27 diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index dd01a57da8..d930133348 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -1482,6 +1482,17 @@ func Test_pum_highlights_match() call term_sendkeys(buf, "o\\=Comp()\") call VerifyScreenDump(buf, 'Test_pum_highlights_09', {}) + " issue #15095 wrong select + call term_sendkeys(buf, "\:set completeopt=fuzzy,menu\") + call TermWait(buf) + call term_sendkeys(buf, "S hello helio hero h\\") + call TermWait(buf, 50) + call VerifyScreenDump(buf, 'Test_pum_highlights_10', {}) + + call term_sendkeys(buf, "\S hello helio hero h\\\") + call TermWait(buf, 50) + call VerifyScreenDump(buf, 'Test_pum_highlights_11', {}) + call term_sendkeys(buf, "\\") call TermWait(buf) diff --git a/src/version.c b/src/version.c index 4867fe8d76..2371355580 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 */ +/**/ + 534, /**/ 533, /**/ -- cgit v1.2.3