fix(lsp): fix cursor row after textEdits (#16038)

hrsh7th · web-flow · commit bd2f61c6c423 · 2021-10-18T11:49:33.000-07:00
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua
@@ -335,10 +335,12 @@ function M.apply_text_edits(text_edits, bufnr)
   end
 
   if is_cursor_fixed then
-    vim.api.nvim_win_set_cursor(0, {
-      cursor.row + 1,
-      math.min(cursor.col, #(vim.api.nvim_buf_get_lines(bufnr, cursor.row, cursor.row + 1, false)[1] or ''))
-    })
+    local is_valid_cursor = true
+    is_valid_cursor = is_valid_cursor and cursor.row < vim.api.nvim_buf_line_count(bufnr)
+    is_valid_cursor = is_valid_cursor and cursor.col <= #(vim.api.nvim_buf_get_lines(bufnr, cursor.row, cursor.row + 1, false)[1] or '')
+    if is_valid_cursor then
+      vim.api.nvim_win_set_cursor(0, { cursor.row + 1, cursor.col })
+    end
   end
 
   -- Remove final line if needed
diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua
@@ -1164,10 +1164,11 @@ describe('LSP', function()
         eq({ 2, 6 }, funcs.nvim_win_get_cursor(0))
       end)
 
-      it('fix the cursor to the valid column if the content was removed', function()
+      it('fix the cursor to the valid col if the content was removed', function()
         funcs.nvim_win_set_cursor(0, { 2, 6 })
         local edits = {
-          make_edit(1, 0, 1, 19, '')
+          make_edit(1, 0, 1, 6, ''),
+          make_edit(1, 6, 1, 19, '')
         }
         exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1)
         eq({
@@ -1180,6 +1181,19 @@ describe('LSP', function()
         eq({ 2, 0 }, funcs.nvim_win_get_cursor(0))
       end)
 
+      it('fix the cursor to the valid row if the content was removed', function()
+        funcs.nvim_win_set_cursor(0, { 2, 6 })
+        local edits = {
+          make_edit(1, 0, 1, 6, ''),
+          make_edit(0, 18, 5, 0, '')
+        }
+        exec_lua('vim.lsp.util.apply_text_edits(...)', edits, 1)
+        eq({
+          'First line of text';
+        }, buf_lines(1))
+        eq({ 1, 6 }, funcs.nvim_win_get_cursor(0))
+      end)
+
       it('fix the cursor row', function()
         funcs.nvim_win_set_cursor(0, { 3, 0 })
         local edits = {
