mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-21 23:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): fix cursor position after snippet expansion (#30659)

Browse Source 
Problem: on `CompleteDone` cursor can jump to the end of line instead of
the end of the completed word.

Solution: remove only inserted word for snippet expansion instead of everything
until eol.

Fixes #30656

Co-authored-by: Mathias Fussenegger <f.mathias@zignar.net>
Co-authored-by: Justin M. Keyes <justinkz@gmail.com>
This commit is contained in:
Tomasz N
2024-10-10 11:40:03 +02:00
committed by GitHub
parent 641c4b1a2a
commit b3109084c2
2 changed files with 100 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/lua/vim/lsp/completion.lua
View File

@@ -113,12 +113,11 @@ local function parse_snippet(input)
end
--- @param item lsp.CompletionItem
--- @param suffix? string
local function apply_snippet(item, suffix)
local function apply_snippet(item)
if item.textEdit then
vim.snippet.expand(item.textEdit.newText .. suffix)
vim.snippet.expand(item.textEdit.newText)
elseif item.insertText then
vim.snippet.expand(item.insertText .. suffix)
vim.snippet.expand(item.insertText)
end
end
@@ -539,15 +538,12 @@ local function on_complete_done()
-- Remove the already inserted word.
local start_char = cursor_col - #completed_item.word
local line = api.nvim_buf_get_lines(bufnr, cursor_row, cursor_row + 1, true)[1]
api.nvim_buf_set_text(bufnr, cursor_row, start_char, cursor_row, #line, { '' })
return line:sub(cursor_col + 1)
api.nvim_buf_set_text(bufnr, cursor_row, start_char, cursor_row, cursor_col, { '' })
end
--- @param suffix? string
local function apply_snippet_and_command(suffix)
local function apply_snippet_and_command()
if expand_snippet then
apply_snippet(completion_item, suffix)
apply_snippet(completion_item)
end
local command = completion_item.command
@@ -565,9 +561,9 @@ local function on_complete_done()
end
if completion_item.additionalTextEdits and next(completion_item.additionalTextEdits) then
local suffix = clear_word()
clear_word()
lsp.util.apply_text_edits(completion_item.additionalTextEdits, bufnr, offset_encoding)
apply_snippet_and_command(suffix)
apply_snippet_and_command()
elseif resolve_provider and type(completion_item) == 'table' then
local changedtick = vim.b[bufnr].changedtick
@@ -577,7 +573,7 @@ local function on_complete_done()
return
end
local suffix = clear_word()
clear_word()
if err then
vim.notify_once(err.message, vim.log.levels.WARN)
elseif result and result.additionalTextEdits then
@@ -587,11 +583,11 @@ local function on_complete_done()
end
end
apply_snippet_and_command(suffix)
apply_snippet_and_command()
end, bufnr)
else
local suffix = clear_word()
apply_snippet_and_command(suffix)
clear_word()
apply_snippet_and_command()
end
end