diff options
author | Lewis Russell <lewis6991@gmail.com> | 2022-02-15 23:40:06 +0000 |
---|---|---|
committer | Lewis Russell <lewis6991@gmail.com> | 2022-02-16 20:22:09 +0000 |
commit | 876aaf2003d1a6eb8f0701cf11e1834751b28980 (patch) | |
tree | 7a5fb69585707ef94bf0c9eedcafbcad65cc980b /src/nvim/syntax.c | |
parent | 238b944e58d12a28245be996e69bf36a2a452a90 (diff) | |
download | rneovim-876aaf2003d1a6eb8f0701cf11e1834751b28980.tar.gz rneovim-876aaf2003d1a6eb8f0701cf11e1834751b28980.tar.bz2 rneovim-876aaf2003d1a6eb8f0701cf11e1834751b28980.zip |
fix(highlight): allow globals to be cleared
- and reduce heap allocations
Fixes #17420
Diffstat (limited to 'src/nvim/syntax.c')
-rw-r--r-- | src/nvim/syntax.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index 119f6e811f..962a48822f 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -6758,16 +6758,26 @@ void set_hl_group(int id, HlAttrs attrs, Dict(highlight) *dict, int link_id) { NULL, -1, NIL }, }; + char hex_name[8]; + char *name; + for (int j = 0; cattrs[j].dest; j++) { - if (cattrs[j].val != -1) { + if (cattrs[j].val < 0) { + XFREE_CLEAR(*cattrs[j].dest); + continue; + } + + if (cattrs[j].name.type == kObjectTypeString && cattrs[j].name.data.string.size) { + name = cattrs[j].name.data.string.data; + } else { + snprintf(hex_name, sizeof(hex_name), "#%06x", cattrs[j].val); + name = hex_name; + } + + if (!*cattrs[j].dest + || STRCMP(*cattrs[j].dest, name) != 0) { xfree(*cattrs[j].dest); - if (cattrs[j].name.type == kObjectTypeString && cattrs[j].name.data.string.size) { - *cattrs[j].dest = xstrdup(cattrs[j].name.data.string.data); - } else { - char hex_name[8]; - snprintf(hex_name, sizeof(hex_name), "#%06x", cattrs[j].val); - *cattrs[j].dest = xstrdup(hex_name); - } + *cattrs[j].dest = xstrdup(name); } } |