patch 9.1.1011: popupmenu internal error with some abbr in completion item

Problem:  Popup menu internal error with some abbr in completion item.
Solution: Don't compute attributes when there is no corresponding text.
          Reduce indent in pum_redraw() while at it (zeertzjq).

fixes: #16427
closes: #16435

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

src/popupmenu.c

@@ -414,7 +414,7 @@ pum_compute_text_attrs(char_u *text, hlf_T hlf, int user_hlattr)
     int_u	char_pos = 0;
     int		is_select = FALSE;
 
-    if ((hlf != HLF_PSI && hlf != HLF_PNI)
+    if (*text == NUL || (hlf != HLF_PSI && hlf != HLF_PNI)
 	    || (highlight_attr[HLF_PMSI] == highlight_attr[HLF_PSI]
 		&& highlight_attr[HLF_PMNI] == highlight_attr[HLF_PNI]))
 	return NULL;
@@ -662,8 +662,12 @@ pum_redraw(void)
 		    if (s == NULL)
 			s = p;
 		    w = ptr2cells(p);
-		    if (*p == NUL || *p == TAB || totwidth + w > pum_width)
+		    if (*p != NUL && *p != TAB && totwidth + w <= pum_width)
 		    {
+			width += w;
+			continue;
+		    }
+
 		    // Display the text that fits or comes before a Tab.
 		    // First convert it to printable characters.
 		    char_u	*st;
@@ -703,19 +707,18 @@ pum_redraw(void)
 
 				    if (cells < pum_width)
 				    {
-					    // Most left character requires
+					// Most left character requires 2-cells
-					    // 2-cells but only 1 cell is
+					// but only 1 cell is available on
-					    // available on screen.  Put a
+					// screen.  Put a '<' on the left of
-					    // '<' on the left of the pum
+					// the pum item.
-					    // item
 					*(--rt) = '<';
 					cells++;
 				    }
 				}
 
 				if (attrs == NULL)
-					screen_puts_len(rt, (int)STRLEN(rt),
+				    screen_puts_len(rt, (int)STRLEN(rt), row,
-						   row, col - cells + 1, attr);
+							col - cells + 1, attr);
 				else
 				    pum_screen_puts_with_attrs(row,
 						    col - cells + 1, cells, rt,
@@ -770,24 +773,19 @@ pum_redraw(void)
 #ifdef FEAT_RIGHTLEFT
 		    if (pum_rl)
 		    {
-			    screen_puts_len((char_u *)"  ", 2, row, col - 1,
+			screen_puts_len((char_u *)"  ", 2, row, col - 1, attr);
-								    attr);
 			col -= 2;
 		    }
 		    else
 #endif
 		    {
-			    screen_puts_len((char_u *)"  ", 2, row, col,
+			screen_puts_len((char_u *)"  ", 2, row, col, attr);
-								    attr);
 			col += 2;
 		    }
 		    totwidth += 2;
 		    s = NULL;  // start text at next char
 		    width = 0;
 		}
-		    else
-			width += w;
-		}
 
 	    if (j > 0)
 		n = items_width_array[order[1]] + (last_isabbr ? 0 : 1);

src/testdir/dumps/Test_pum_highlights_19.dump

@@ -0,0 +1,20 @@
+|f+0&#ffffff0|o@1> @71
+|f+0#00e0e07#e0e0e08|o@1|b+0#0000001&|a|r| @3|!| @3| +0#4040ff13#ffffff0@59
+|f+0#0000e05#ffd7ff255|o@1|b+0#0000001&|a|z| @3|!| @3| +0#4040ff13#ffffff0@59
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |O|m|n|i| |c|o|m|p|l|e|t|i|o|n| |(|^|O|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |2| +0#0000000&@34

src/testdir/test_popup.vim

@@ -1528,6 +1528,39 @@ func Test_pum_highlights_match()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_pum_highlights_match_with_abbr()
+  CheckScreendump
+  let lines =<< trim END
+    func Omni_test(findstart, base)
+      if a:findstart
+        return col(".")
+      endif
+      return {
+            \ 'words': [
+            \ { 'word': 'foobar', 'abbr': "foobar\t\t!" },
+            \ { 'word': 'foobaz', 'abbr': "foobaz\t\t!" },
+            \]}
+    endfunc
+
+    set omnifunc=Omni_test
+    set completeopt=menuone,noinsert
+    hi PmenuMatchSel  ctermfg=6 ctermbg=7
+    hi PmenuMatch     ctermfg=4 ctermbg=225
+  END
+  call writefile(lines, 'Xscript', 'D')
+  let  buf = RunVimInTerminal('-S Xscript', {})
+  call TermWait(buf)
+  call term_sendkeys(buf, "i\<C-X>\<C-O>")
+  call TermWait(buf, 50)
+  call term_sendkeys(buf, "foo")
+  call VerifyScreenDump(buf, 'Test_pum_highlights_19', {})
+
+  call term_sendkeys(buf, "\<C-E>\<Esc>")
+  call TermWait(buf)
+
+  call StopVimInTerminal(buf)
+endfunc
+
 func Test_pum_user_abbr_hlgroup()
   CheckScreendump
   let lines =<< trim END

src/version.c

@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1011,
 /**/
     1010,
 /**/