aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-12 22:44:34 -05:00
Code Activity

patch 9.0.1397: highlight for popupmenu kind and extra cannot be set

Browse Source 
Problem:    Highlight for popupmenu kind and extra cannot be set.
Solution:   Add PmenuKind, PmenuKindSel, PmenuExtra and PmenuExtraSel
            highlight groups and use them. (Gianmaria Bajo, closes #12114)
This commit is contained in:
Gianmaria Bajo
2023-03-10 16:35:53 +00:00
committed by Bram Moolenaar
parent be19d78c3d
commit 6a7c774920
10 changed files with 152 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/popupmenu.c
View File

@@ -420,11 +420,10 @@ pum_redraw(void)
{
int row = pum_row;
int col;
int attr_norm = highlight_attr[HLF_PNI];
int attr_select = highlight_attr[HLF_PSI];
int attr_scroll = highlight_attr[HLF_PSB];
int attr_thumb = highlight_attr[HLF_PST];
int attr;
int *attrs; // array used for highlights
int i;
int idx;
char_u *s;
@@ -435,6 +434,11 @@ pum_redraw(void)
int round;
int n;
int *ha = highlight_attr;
// "word" "kind" "extra text"
int attrsNorm[3] = { ha[HLF_PNI], ha[HLF_PNK], ha[HLF_PNX] };
int attrsSel[3] = { ha[HLF_PSI], ha[HLF_PSK], ha[HLF_PSX] };
if (call_update_screen)
{
call_update_screen = FALSE;
@@ -468,7 +472,8 @@ pum_redraw(void)
for (i = 0; i < pum_height; ++i)
{
idx = i + pum_first;
attr = (idx == pum_selected) ? attr_select : attr_norm;
attrs = (idx == pum_selected) ? attrsSel : attrsNorm;
attr = attrs[0]; // start with "word" highlight
// prepend a space if there is room
#ifdef FEAT_RIGHTLEFT
@@ -483,18 +488,22 @@ pum_redraw(void)
screen_putchar(' ', row, pum_col - 1, attr);
// Display each entry, use two spaces for a Tab.
// Do this 3 times: For the main text, kind and extra info
// Do this 3 times:
// 0 - main text
// 1 - kind
// 2 - extra info
col = pum_col;
totwidth = 0;
for (round = 1; round <= 3; ++round)
for (round = 0; round < 3; ++round)
{
attr = attrs[round];
width = 0;
s = NULL;
switch (round)
{
case 1: p = pum_array[idx].pum_text; break;
case 2: p = pum_array[idx].pum_kind; break;
case 3: p = pum_array[idx].pum_extra; break;
case 0: p = pum_array[idx].pum_text; break;
case 1: p = pum_array[idx].pum_kind; break;
case 2: p = pum_array[idx].pum_extra; break;
}
if (p != NULL)
for ( ; ; MB_PTR_ADV(p))
@@ -607,15 +616,15 @@ pum_redraw(void)
width += w;
}
if (round > 1)
if (round > 0)
n = pum_kind_width + 1;
else
n = 1;
// Stop when there is nothing more to display.
if (round == 3
|| (round == 2 && pum_array[idx].pum_extra == NULL)
|| (round == 1 && pum_array[idx].pum_kind == NULL
if (round == 2
|| (round == 1 && pum_array[idx].pum_extra == NULL)
|| (round == 0 && pum_array[idx].pum_kind == NULL
&& pum_array[idx].pum_extra == NULL)
|| pum_base_width + n >= pum_width)
break;