neovim

commit 389f5ca39d278173dc0446dc339f7ac1ff573329
parent 0e1f3b5acf74e82ea778f3c0871a804a9ae89d4e
Author: Ibby <33922797+SleepySwords@users.noreply.github.com>
Date:   Sun, 19 Mar 2023 18:50:45 +1100

fix(ui): adjust the cursor when inserting virtual text

Credit to: Jesse Bakker

https://github.com/neovim/neovim/pull/20130#issuecomment-1369652743

Co-authored-by: Jesse Bakker <github@jessebakker.com>

Diffstat:
M
src/nvim/decoration.c
 | 
3
+++
M
test/functional/ui/decorations_spec.lua
 | 
26
++++++++++++++++++++++++++

2 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/nvim/decoration.c b/src/nvim/decoration.c
@@ -83,6 +83,9 @@ void decor_redraw(buf_T *buf, int row1, int row2, Decoration *decor)
 
   if (decor && decor_virt_pos(*decor)) {
     redraw_buf_line_later(buf, row1 + 1, false);
+    if (decor->virt_text_pos == kVTInline) {
+      changed_line_display_buf(buf);
+    }
   }
 
   if (decor && kv_size(decor->virt_lines)) {
diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
@@ -1272,6 +1272,32 @@ end]]
                                                         |
       ]]}
   end)
+
+  it('adjusts cursor location correctly when inserting around inline virtual text', function()
+        insert('12345678')
+        feed '$'
+        meths.buf_set_extmark(0, ns, 0, 4,
+            { virt_text = { { ' virtual text ', 'Special' } }, virt_text_pos = 'inline' })
+
+        screen:expect { grid = [[
+      1234{28: virtual text }567^8                            |
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+      {1:~                                                 }|
+                                                        |
+      ]]
+        }
+  end)
 end)
 
 describe('decorations: virtual lines', function()