From 7e8b7bba21cfb0a35e442c27aec0ced1b32ce14d Mon Sep 17 00:00:00 2001 From: luukvbaal Date: Tue, 1 Apr 2025 07:56:36 +0200 Subject: fix(display): wrong cursor column with 'concealcursor' = "n" and virt_text (#33218) Problem: Inline virtual text placed in a decor provider callback invalidates `w_virtcol`, which must be valid for `win_line()`. Solution: Call `validate_virtcol()` after "line" decor provider callbacks. --- test/functional/ui/decorations_spec.lua | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'test/functional') diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua index 06bb5a14c9..307f750175 100644 --- a/test/functional/ui/decorations_spec.lua +++ b/test/functional/ui/decorations_spec.lua @@ -811,6 +811,33 @@ describe('decorations providers', function() | ]]) end) + + it('inline virt_text does not result in wrong cursor column #33153', function() + insert("line1 with a lot of text\nline2 with a lot of text") + setup_provider([[ + _G.do_win = false + vim.keymap.set('n', 'f', function() + _G.do_win = true + vim.cmd('redraw!') + end) + vim.o.concealcursor = 'n' + function on_do(event) + if event == 'win' and _G.do_win then + vim.api.nvim_buf_set_extmark(0, ns1, 1, 0, { + virt_text = { { 'virt_text ' } }, + virt_text_pos = 'inline' + }) + end + end + ]]) + feed('f') + screen:expect([[ + line1 with a lot of text | + virt_text line2 with a lot of tex^t | + {1:~ }|*5 + | + ]]) + end) end) describe('decoration_providers', function() -- cgit