diff options
| author | glepnir <glephunter@gmail.com> | 2024-06-13 17:21:24 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-06-13 17:21:24 +0200 |
| commit | 1c296026627d7ac8195e803b4c2393c21ae659b4 (patch) | |
| tree | e9090c610ec4ed97ceea59213949a7aa25e81e10 | |
| parent | 2f95ca9fcef8495d60e298ac2cd6d702b90bfb18 (diff) | |
patch 9.1.0480: fuzzy string matching executed when not neededv9.1.0480
Problem: fuzzy string matching executed when not needed
Solution: when no leader is available, can skip fuzzy logic, so return
early (glepnir)
closes: #14986
Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/popupmenu.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/popupmenu.c b/src/popupmenu.c index dd1a6ec99a..09ed57427f 100644 --- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -434,21 +434,22 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, int attr) char_u *leader = ins_compl_leader(); int in_fuzzy = (get_cot_flags() & COT_FUZZY) != 0; - if ((highlight_attr[HLF_PMSI] == highlight_attr[HLF_PSI] && - highlight_attr[HLF_PMNI] == highlight_attr[HLF_PNI])) + if (leader == NULL || *leader == NUL || + (highlight_attr[HLF_PMSI] == highlight_attr[HLF_PSI] && + highlight_attr[HLF_PMNI] == highlight_attr[HLF_PNI])) { screen_puts_len(text, textlen, row, col, attr); return; } #ifdef FEAT_RIGHTLEFT - if (leader != NULL && curwin->w_p_rl) + if (curwin->w_p_rl) rt_leader = reverse_text(leader); #endif match_leader = rt_leader != NULL ? rt_leader : leader; - leader_len = match_leader ? (int)STRLEN(match_leader) : 0; + leader_len = (int)STRLEN(match_leader); - if (match_leader != NULL && leader_len > 0 && in_fuzzy) + if (in_fuzzy) ga = fuzzy_match_str_with_pos(text, match_leader); // Render text with proper attributes diff --git a/src/version.c b/src/version.c index 5addf1a8d7..89ba9fc392 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 480, +/**/ 479, /**/ 478, |