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>

diff --git a/src/popupmenu.c b/src/popupmenu.c
index dd1a6ec99af67f0c586616718bed84a82edd6646..09ed57427f6378a6ff1634195543034a5765fc6b 100644 (file)
--- 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 5addf1a8d76cea2bca457b434940bc52ce527ec9..89ba9fc3922b3af9a6f2c91043436a37b0642db3 100644 (file)
--- 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 */
+/**/
+    480,
 /**/
     479,
 /**/