mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(highlight): avoid ORing underline flags (#22372)

Browse Source 
When combining attributes use the one that takes priority.
For :highlight command use the last one specified.
For API use a hard-coded order same as the order in docs.
This commit is contained in:
zeertzjq
2023-02-23 16:15:04 +08:00
committed by GitHub
parent d422fc8274
commit 524e1a0643
5 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/highlight.c
View File

@@ -507,6 +507,16 @@ void hl_invalidate_blends(void)
update_window_hl(curwin, true);
}
/// Combine HlAttrFlags.
/// The underline attribute in "prim_ae" overrules the one in "char_ae" if both are present.
static int16_t hl_combine_ae(int16_t char_ae, int16_t prim_ae)
{
int16_t char_ul = char_ae & HL_UNDERLINE_MASK;
int16_t prim_ul = prim_ae & HL_UNDERLINE_MASK;
int16_t new_ul = prim_ul ? prim_ul : char_ul;
return (char_ae & ~HL_UNDERLINE_MASK) | (prim_ae & ~HL_UNDERLINE_MASK) | new_ul;
}
// Combine special attributes (e.g., for spelling) with other attributes
// (e.g., for syntax highlighting).
// "prim_attr" overrules "char_attr".
@@ -537,12 +547,12 @@ int hl_combine_attr(int char_attr, int prim_attr)
if (prim_aep.cterm_ae_attr & HL_NOCOMBINE) {
new_en.cterm_ae_attr = prim_aep.cterm_ae_attr;
} else {
new_en.cterm_ae_attr |= prim_aep.cterm_ae_attr;
new_en.cterm_ae_attr = hl_combine_ae(new_en.cterm_ae_attr, prim_aep.cterm_ae_attr);
}
if (prim_aep.rgb_ae_attr & HL_NOCOMBINE) {
new_en.rgb_ae_attr = prim_aep.rgb_ae_attr;
} else {
new_en.rgb_ae_attr |= prim_aep.rgb_ae_attr;
new_en.rgb_ae_attr = hl_combine_ae(new_en.rgb_ae_attr, prim_aep.rgb_ae_attr);
}
if (prim_aep.cterm_fg_color > 0) {
@@ -664,7 +674,7 @@ int hl_blend_attrs(int back_attr, int front_attr, bool *through)
} else {
cattrs = fattrs;
if (ratio >= 50) {
cattrs.rgb_ae_attr |= battrs.rgb_ae_attr;
cattrs.rgb_ae_attr = hl_combine_ae(battrs.rgb_ae_attr, cattrs.rgb_ae_attr);
}
cattrs.rgb_fg_color = rgb_blend(ratio/2, battrs.rgb_fg_color,
fattrs.rgb_fg_color);
@@ -924,7 +934,10 @@ HlAttrs dict2hlattrs(Dict(highlight) *dict, bool use_rgb, int *link_id, Error *e
#define CHECK_FLAG(d, m, name, extra, flag) \
if (api_object_to_bool(d->name##extra, #name, false, err)) { \
m = m | flag; \
if (flag & HL_UNDERLINE_MASK) { \
m &= ~HL_UNDERLINE_MASK; \
} \
m |= flag; \
}
CHECK_FLAG(dict, mask, reverse, , HL_INVERSE);

3
src/nvim/highlight_group.c
View File

@@ -1124,6 +1124,9 @@ void do_highlight(const char *line, const bool forceit, const bool init)
for (i = ARRAY_SIZE(hl_attr_table); --i >= 0;) {
int len = (int)strlen(hl_name_table[i]);
if (STRNICMP(arg + off, hl_name_table[i], len) == 0) {
if (hl_attr_table[i] & HL_UNDERLINE_MASK) {
attr &= ~HL_UNDERLINE_MASK;
}
attr |= hl_attr_table[i];
off += len;
break;