1 files changed, 47 insertions, 4 deletions

diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index d4c65eae5b..1b2c21783e 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -401,8 +401,8 @@ describe('lua: nvim_buf_attach on_bytes', function()
         }
         feed '<cr>'
         check_events {
-          { "test1", "bytes", 1, 4, 8, 0, 115, 0, 4, 4, 0, 0, 0 };
-          { "test1", "bytes", 1, 5, 7, 4, 118, 0, 0, 0, 1, 4, 5 };
+          { "test1", "bytes", 1, 4, 7, 0, 114, 0, 4, 4, 0, 0, 0 };
+          { "test1", "bytes", 1, 5, 7, 0, 114, 0, 0, 0, 1, 4, 5 };
         }
     end)
 
@@ -447,8 +447,8 @@ describe('lua: nvim_buf_attach on_bytes', function()
 
       feed '<CR>'
       check_events {
-        { "test1", "bytes", 1, 6, 2, 2, 16, 0, 1, 1, 0, 0, 0 };
-        { "test1", "bytes", 1, 7, 1, 3, 14, 0, 0, 0, 1, 3, 4 };
+        { "test1", "bytes", 1, 6, 1, 2, 13, 0, 1, 1, 0, 0, 0 };
+        { "test1", "bytes", 1, 7, 1, 2, 13, 0, 0, 0, 1, 3, 4 };
       }
     end)
 
@@ -936,6 +936,26 @@ describe('lua: nvim_buf_attach on_bytes', function()
       }
     end)
 
+    it("virtual edit", function ()
+      local check_events = setup_eventcheck(verify, { "", "	" })
+
+      meths.set_option("virtualedit", "all")
+
+      feed [[<Right><Right>iab<ESC>]]
+
+      check_events {
+        { "test1", "bytes", 1, 3, 0, 0, 0, 0, 0, 0, 0, 2, 2 };
+        { "test1", "bytes", 1, 4, 0, 2, 2, 0, 0, 0, 0, 2, 2 };
+      }
+
+      feed [[j<Right><Right>iab<ESC>]]
+
+      check_events {
+        { "test1", "bytes", 1, 5, 1, 0, 5, 0, 1, 1, 0, 8, 8 };
+        { "test1", "bytes", 1, 6, 1, 5, 10, 0, 0, 0, 0, 2, 2 };
+      }
+    end)
+
     it("block visual paste", function()
       local check_events = setup_eventcheck(verify, {"AAA",
                                                      "BBB",
@@ -958,6 +978,29 @@ describe('lua: nvim_buf_attach on_bytes', function()
       }
     end)
 
+    it("nvim_buf_set_lines", function()
+      local check_events = setup_eventcheck(verify, {"AAA", "BBB"})
+
+      -- delete
+      meths.buf_set_lines(0, 0, 1, true, {})
+
+      check_events {
+        { "test1", "bytes", 1, 3, 0, 0, 0, 1, 0, 4, 0, 0, 0 };
+      }
+
+      -- add
+      meths.buf_set_lines(0, 0, 0, true, {'asdf'})
+      check_events {
+        { "test1", "bytes", 1, 4, 0, 0, 0, 0, 0, 0, 1, 0, 5 };
+      }
+
+      -- replace
+      meths.buf_set_lines(0, 0, 1, true, {'asdf', 'fdsa'})
+      check_events {
+        { "test1", "bytes", 1, 5, 0, 0, 0, 1, 0, 5, 2, 0, 10 };
+      }
+    end)
+
     teardown(function()
       os.remove "Xtest-reload"
       os.remove "Xtest-undofile"