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

fix(decoration): redraw correctly when re-using ids

Browse Source 
00cfc1d (from #20249) reduced the amount of unnecessary redraws. This
surfaced an issue where if and extmark with a specific ID is
repositioned to a different row, the decorations from the old row were
not redrawn and removed. This change fixes that by redrawing the
old row.
This commit is contained in:
Lewis Russell
2022-10-14 11:49:57 +01:00
parent 9931db2e3f
commit 546b294e74
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/extmark.c
View File

@@ -112,6 +112,7 @@ void extmark_set(buf_T *buf, uint32_t ns_id, uint32_t *idp, int row, colnr_T col
marktree_revise(buf->b_marktree, itr, decor_level, old_mark); marktree_revise(buf->b_marktree, itr, decor_level, old_mark);
goto revised; goto revised;
} }
decor_remove(buf, old_mark.pos.row, old_mark.pos.row, old_mark.decor_full);
marktree_del_itr(buf->b_marktree, itr, false); marktree_del_itr(buf->b_marktree, itr, false);
} }
} else { } else {

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

@@ -2085,4 +2085,39 @@ describe('decorations: virt_text', function()
]]} ]]}
end) end)
it('redraws correctly when re-using extmark ids', function()
command 'normal 5ohello'
screen:expect{grid=[[
|
hello |
hello |
hello |
hello |
hell^o |
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
local ns = meths.create_namespace('ns')
for row = 1, 5 do
meths.buf_set_extmark(0, ns, row, 0, { id = 1, virt_text = {{'world', 'Normal'}} })
end
screen:expect{grid=[[
|
hello |
hello |
hello |
hello |
hell^o world |
{3:~ }|
{3:~ }|
{3:~ }|
|
]]}
end)
end) end)