2 files changed, 86 insertions, 0 deletions
diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index 439cc12192..fa31880782 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -245,6 +245,31 @@ describe('lua buffer event callbacks: on_lines', function()
     helpers.assert_alive()
   end)
 
+  it('#12718 lnume', function()
+    meths.buf_set_lines(0, 0, -1, true, {'1', '2', '3'})
+    exec_lua([[
+      vim.api.nvim_buf_attach(0, false, {
+        on_lines = function(...)
+          vim.api.nvim_set_var('linesev', { ... })
+        end,
+      })
+    ]])
+    feed('1G0')
+    feed('y<C-v>2j')
+    feed('G0')
+    feed('p')
+    -- Is the last arg old_byte_size correct? Doesn't matter for this PR
+    eq(meths.get_var('linesev'), { "lines", 1, 4, 2, 3, 5, 4 })
+
+    feed('2G0')
+    feed('p')
+    eq(meths.get_var('linesev'), { "lines", 1, 5, 1, 4, 4, 8 })
+
+    feed('1G0')
+    feed('P')
+    eq(meths.get_var('linesev'), { "lines", 1, 6, 0, 3, 3, 9 })
+
+  end)
 end)
 
 describe('lua: nvim_buf_attach on_bytes', function()
@@ -452,6 +477,36 @@ describe('lua: nvim_buf_attach on_bytes', function()
         { "test1", "bytes", 1, 5, 0, 0, 0, 0, 0, 0, 0, 3, 3 };
       }
     end)
+
+    it('blockwise paste', function()
+      local check_events = setup_eventcheck(verify, {'1', '2', '3'})
+      feed('1G0')
+      feed('y<C-v>2j')
+      feed('G0')
+      feed('p')
+      check_events {
+        { "test1", "bytes", 1, 3, 2, 1, 5, 0, 0, 0, 0, 1, 1 };
+        { "test1", "bytes", 1, 3, 3, 0, 7, 0, 0, 0, 0, 3, 3 };
+        { "test1", "bytes", 1, 3, 4, 0, 10, 0, 0, 0, 0, 3, 3 };
+      }
+
+      feed('2G0')
+      feed('p')
+      check_events {
+        { "test1", "bytes", 1, 4, 1, 1, 3, 0, 0, 0, 0, 1, 1 };
+        { "test1", "bytes", 1, 4, 2, 1, 6, 0, 0, 0, 0, 1, 1 };
+        { "test1", "bytes", 1, 4, 3, 1, 10, 0, 0, 0, 0, 1, 1 };
+      }
+
+      feed('1G0')
+      feed('P')
+      check_events {
+        { "test1", "bytes", 1, 5, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
+        { "test1", "bytes", 1, 5, 1, 0, 3, 0, 0, 0, 0, 1, 1 };
+        { "test1", "bytes", 1, 5, 2, 0, 7, 0, 0, 0, 0, 1, 1 };
+      }
+
+    end)
   end
 
   describe('(with verify) handles', function()
diff --git a/test/functional/lua/treesitter_spec.lua b/test/functional/lua/treesitter_spec.lua
index 128545b472..74ae6cde2b 100644
--- a/test/functional/lua/treesitter_spec.lua
+++ b/test/functional/lua/treesitter_spec.lua
@@ -660,4 +660,35 @@ static int nlua_schedule(lua_State *const lstate)
       { 10, 5, 10, 20 },
       { 14, 9, 14, 27 } }, res)
   end)
+
+  it("allows to create string parsers", function()
+    local ret = exec_lua [[
+      local parser = vim.treesitter.get_string_parser("int foo = 42;", "c")
+      return { parser:parse():root():range() }
+    ]]
+
+    eq({ 0, 0, 0, 13 }, ret)
+  end)
+
+  it("allows to run queries with string parsers", function()
+    local txt = [[
+      int foo = 42;
+      int bar = 13;
+    ]]
+
+    local ret = exec_lua([[
+    local str = ...
+    local parser = vim.treesitter.get_string_parser(str, "c")
+
+    local nodes = {}
+    local query = vim.treesitter.parse_query("c", '((identifier) @id (eq? @id "foo"))')
+
+    for _, node in query:iter_captures(parser:parse():root(), str, 0, 2) do
+      table.insert(nodes, { node:range() })
+    end
+
+    return nodes]], txt)
+
+    eq({ {0, 10, 0, 13} }, ret)
+  end)
 end)