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

refactor(decorations): merge the two different code paths for virt_text

Browse Source 
test(bufhl): CHANGE of tested behaviour (inb4 a proper priority mechanism)
test(decoration): change of test; previous behavior was buggy (ghost
buffer text)
This commit is contained in:
Björn Linse
2021-07-25 14:33:28 +02:00
parent 1495d36d63
commit a4d81a8002
7 changed files with 78 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/api/private/helpers.c
View File

@@ -1592,9 +1592,10 @@ bool extmark_get_index_from_obj(buf_T *buf, Integer ns_id, Object obj, int
}
}
VirtText parse_virt_text(Array chunks, Error *err)
VirtText parse_virt_text(Array chunks, Error *err, int *width)
{
VirtText virt_text = KV_INITIAL_VALUE;
int w = 0;
for (size_t i = 0; i < chunks.size; i++) {
if (chunks.items[i].type != kObjectTypeArray) {
api_set_error(err, kErrorTypeValidation, "Chunk is not an array");
@@ -1635,9 +1636,12 @@ VirtText parse_virt_text(Array chunks, Error *err)
}
char *text = transstr(str.size > 0 ? str.data : ""); // allocates
w += (int)mb_string2cells((char_u *)text);
kv_push(virt_text, ((VirtTextChunk){ .text = text, .hl_id = hl_id }));
}
*width = w;
return virt_text;
free_exit: