mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(highlight): make hlattrs2dict always use pre-allocated dict

Browse Source 
hlattrs2dict used to work with both allocated and unallocated
dicts which was quite messy. Now always delegate allocation to caller.
This commit is contained in:
bfredl
2022-08-31 14:49:15 +02:00
parent f078a3453a
commit ba8be7446d
5 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/highlight_group.c
View File

@@ -1466,19 +1466,21 @@ static void highlight_list_one(const int id)
}
}
Dictionary get_global_hl_defs(void)
Dictionary get_global_hl_defs(Arena *arena)
{
Dictionary rv = ARRAY_DICT_INIT;
for (int i = 1; i <= highlight_ga.ga_len && !got_int; i++) {
Dictionary rv = arena_dict(arena, (size_t)highlight_ga.ga_len);
for (int i = 1; i <= highlight_ga.ga_len; i++) {
Dictionary attrs = ARRAY_DICT_INIT;
HlGroup *h = &hl_table[i - 1];
if (h->sg_attr > 0) {
attrs = hlattrs2dict(NULL, syn_attr2entry(h->sg_attr), true);
attrs = arena_dict(arena, HLATTRS_DICT_SIZE);
hlattrs2dict(&attrs, syn_attr2entry(h->sg_attr), true);
} else if (h->sg_link > 0) {
const char *link = (const char *)hl_table[h->sg_link - 1].sg_name;
PUT(attrs, "link", STRING_OBJ(cstr_to_string(link)));
attrs = arena_dict(arena, 1);
char *link = (char *)hl_table[h->sg_link - 1].sg_name;
PUT_C(attrs, "link", STRING_OBJ(cstr_as_string(link)));
}
PUT(rv, (const char *)h->sg_name, DICTIONARY_OBJ(attrs));
PUT_C(rv, (char *)h->sg_name, DICTIONARY_OBJ(attrs));
}
return rv;