mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
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>
This commit is contained in:
committed by
Christian Brabandt
parent
2f95ca9fce
commit
1c29602662
@@ -434,7 +434,8 @@ 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] &&
|
||||
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);
|
||||
@@ -442,13 +443,13 @@ pum_screen_put_with_attr(int row, int col, char_u *text, int textlen, int attr)
|
||||
}
|
||||
|
||||
#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
|
||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
480,
|
||||
/**/
|
||||
479,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user