kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): fix virtual text not displaying when two overlapping inlines (nowrap)

Browse Source
This commit is contained in:
Ibby 2023-04-19 19:02:33 +10:00 committed by bfredl
parent 5547b16c40
commit 34d862942c
2 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/nvim/drawline.c
View File

@ -1756,70 +1756,76 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
extmark_attr = decor_redraw_col(wp, (colnr_T)v, wlv.off, extmark_attr = decor_redraw_col(wp, (colnr_T)v, wlv.off,
selected, &decor_state); selected, &decor_state);
// we could already be inside an existing virt_line with multiple chunks while (true) {
if (!(virt_inline_i < kv_size(virt_inline))) { // we could already be inside an existing virt_line with multiple chunks
DecorState *state = &decor_state; if (!(virt_inline_i < kv_size(virt_inline))) {
for (size_t i = 0; i < kv_size(state->active); i++) { DecorState *state = &decor_state;
DecorRange *item = &kv_A(state->active, i); for (size_t i = 0; i < kv_size(state->active); i++) {
if (item->start_row != state->row DecorRange *item = &kv_A(state->active, i);
|| !kv_size(item->decor.virt_text) if (item->start_row != state->row
|| item->decor.virt_text_pos != kVTInline) { || !kv_size(item->decor.virt_text)
continue; || item->decor.virt_text_pos != kVTInline) {
} continue;
if (item->win_col >= -1 && item->start_col == v) { }
virt_inline = item->decor.virt_text; if (item->win_col >= -1 && item->start_col == v) {
virt_inline_i = 0; virt_inline = item->decor.virt_text;
item->win_col = -2; virt_inline_i = 0;
break; item->win_col = -2;
break;
}
} }
} }
}
if (wlv.n_extra == 0 || !wlv.extra_for_extmark) { if (wlv.n_extra == 0 || !wlv.extra_for_extmark) {
reset_extra_attr = false; reset_extra_attr = false;
} }
if (wlv.n_extra <= 0 && virt_inline_i < kv_size(virt_inline)) { if (wlv.n_extra <= 0 && virt_inline_i < kv_size(virt_inline)) {
VirtTextChunk vtc = kv_A(virt_inline, virt_inline_i); VirtTextChunk vtc = kv_A(virt_inline, virt_inline_i);
wlv.p_extra = vtc.text; wlv.p_extra = vtc.text;
wlv.n_extra = (int)strlen(wlv.p_extra); wlv.n_extra = (int)strlen(wlv.p_extra);
wlv.extra_for_extmark = true; wlv.extra_for_extmark = true;
wlv.c_extra = NUL; wlv.c_extra = NUL;
wlv.c_final = NUL; wlv.c_final = NUL;
wlv.extra_attr = vtc.hl_id ? syn_id2attr(vtc.hl_id) : 0; wlv.extra_attr = vtc.hl_id ? syn_id2attr(vtc.hl_id) : 0;
n_attr = mb_charlen(vtc.text); n_attr = mb_charlen(vtc.text);
// restore search_attr and area_attr when n_extra // restore search_attr and area_attr when n_extra
// is down to zero // is down to zero
saved_search_attr = search_attr; saved_search_attr = search_attr;
saved_area_attr = area_attr; saved_area_attr = area_attr;
saved_search_attr_from_match = search_attr_from_match; saved_search_attr_from_match = search_attr_from_match;
search_attr_from_match = false; search_attr_from_match = false;
search_attr = 0; search_attr = 0;
area_attr = 0; area_attr = 0;
extmark_attr = 0; extmark_attr = 0;
virt_inline_i++; virt_inline_i++;
// If the text didn't reach until the first window // If the text didn't reach until the first window
// column we need to skip cells. // column we need to skip cells.
if (skip_cells > 0) { if (skip_cells > 0) {
int virt_text_len = n_attr; int virt_text_len = n_attr;
if (virt_text_len > skip_cells) { if (virt_text_len > skip_cells) {
int len = mb_charlen2bytelen(wlv.p_extra, skip_cells); int len = mb_charlen2bytelen(wlv.p_extra, skip_cells);
wlv.n_extra -= len; wlv.n_extra -= len;
wlv.p_extra += len; wlv.p_extra += len;
n_attr -= skip_cells; n_attr -= skip_cells;
// Skipped cells needed to be accounted for in vcol. // Skipped cells needed to be accounted for in vcol.
skipped_cells += skip_cells; skipped_cells += skip_cells;
skip_cells = 0; skip_cells = 0;
} else { } else {
// the whole text is left of the window, drop // the whole text is left of the window, drop
// it and advance to the next one // it and advance to the next one
skip_cells -= virt_text_len; skip_cells -= virt_text_len;
// Skipped cells needed to be accounted for in vcol. // Skipped cells needed to be accounted for in vcol.
skipped_cells += virt_text_len; skipped_cells += virt_text_len;
n_attr = 0; n_attr = 0;
wlv.n_extra = 0; wlv.n_extra = 0;
// go to the start so the next virtual text chunk can be selected.
continue;
}
} }
} }
break;
} }
} }
@ -3013,8 +3019,7 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool nochange,
} }
// The skipped cells need to be accounted for in vcol. // The skipped cells need to be accounted for in vcol.
if (wlv.draw_state > WL_STC if (wlv.draw_state > WL_STC && skipped_cells > 0) {
&& skipped_cells > 0) {
wlv.vcol += skipped_cells; wlv.vcol += skipped_cells;
skipped_cells = 0; skipped_cells = 0;
} }

27
test/functional/ui/decorations_spec.lua
View File

@ -1956,6 +1956,33 @@ bbbbbbb]])
| |
]]} ]]}
end) end)
it('correctly draws when there are multiple overlapping virtual texts on the same line with nowrap', function()
command('set nowrap')
insert('a')
meths.buf_set_extmark(0, ns, 0, 0,
{ virt_text = { { string.rep('a', 55), 'Special' } }, virt_text_pos = 'inline' })
meths.buf_set_extmark(0, ns, 0, 0,
{ virt_text = { { string.rep('b', 55), 'Special' } }, virt_text_pos = 'inline' })
feed('$')
screen:expect { grid = [[
{28:bbbbbbbbbbbbbbbbbbbbbbbbb}^a |
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
|
]]}
end)
end) end)
describe('decorations: virtual lines', function() describe('decorations: virtual lines', function()