1 files changed, 27 insertions, 5 deletions

diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
index a6e50ac82c..8b5e7d56ac 100644
--- a/test/functional/plugin/lsp_spec.lua
+++ b/test/functional/plugin/lsp_spec.lua
@@ -1714,6 +1714,9 @@ describe('LSP', function()
       end)
 
       it('fix the cursor col', function()
+        -- append empty last line. See #22636
+        exec_lua('vim.api.nvim_buf_set_lines(...)', 1, -1, -1, true, {''})
+
         funcs.nvim_win_set_cursor(0, { 2, 11 })
         local edits = {
           make_edit(1, 7, 1, 11, '')
@@ -1725,6 +1728,7 @@ describe('LSP', function()
           'Third line of text';
           'Fourth line of text';
           'å å ɧ 汉语 ↥ 🤦 🦄';
+          '';
         }, buf_lines(1))
         eq({ 2, 7 }, funcs.nvim_win_get_cursor(0))
       end)
@@ -2196,7 +2200,22 @@ describe('LSP', function()
       eq(true, exists)
       os.remove(new)
     end)
-    it('Can rename a direcory', function()
+    it("Kills old buffer after renaming an existing file", function()
+      local old = helpers.tmpname()
+      write_file(old, 'Test content')
+      local new = helpers.tmpname()
+      os.remove(new)  -- only reserve the name, file must not exist for the test scenario
+      local lines = exec_lua([[
+        local old = select(1, ...)
+	local oldbufnr = vim.fn.bufadd(old)
+        local new = select(2, ...)
+        vim.lsp.util.rename(old, new)
+	return vim.fn.bufloaded(oldbufnr)
+      ]], old, new)
+      eq(0, lines)
+      os.remove(new)
+    end)
+    it('Can rename a directory', function()
       -- only reserve the name, file must not exist for the test scenario
       local old_dir = helpers.tmpname()
       local new_dir = helpers.tmpname()
@@ -2205,16 +2224,19 @@ describe('LSP', function()
 
       helpers.mkdir_p(old_dir)
 
-      local file = "file"
+      local file = 'file.txt'
       write_file(old_dir .. pathsep .. file, 'Test content')
 
-      exec_lua([[
+      local lines = exec_lua([[
         local old_dir = select(1, ...)
         local new_dir = select(2, ...)
+	local pathsep = select(3, ...)
+	local oldbufnr = vim.fn.bufadd(old_dir .. pathsep .. 'file')
 
         vim.lsp.util.rename(old_dir, new_dir)
-      ]], old_dir, new_dir)
-
+	return vim.fn.bufloaded(oldbufnr)
+      ]], old_dir, new_dir, pathsep)
+      eq(0, lines)
       eq(false, exec_lua('return vim.loop.fs_stat(...) ~= nil', old_dir))
       eq(true, exec_lua('return vim.loop.fs_stat(...) ~= nil', new_dir))
       eq(true, exec_lua('return vim.loop.fs_stat(...) ~= nil', new_dir .. pathsep .. file))