Mercurial > vim
changeset 35389:c4a1e9fa9e4c v9.1.0480
patch 9.1.0480: fuzzy string matching executed when not needed
Commit: https://github.com/vim/vim/commit/1c296026627d7ac8195e803b4c2393c21ae659b4
Author: glepnir <glephunter@gmail.com>
Date: Thu Jun 13 17:21:24 2024 +0200
patch 9.1.0480: fuzzy string matching executed when not needed
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 13 Jun 2024 17:30:05 +0200 |
| parents | cd810ee90476 |
| children | 30b0097a8956 |
| files | src/popupmenu.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -434,21 +434,22 @@ pum_screen_put_with_attr(int row, int co 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