neovim

Neovim text editor
git clone https://git.dasho.dev/neovim.git
Log | Files | Refs | README

commit 8d7eb03040c26e8e3bdbf51b25fe03a735b85b5b
parent db2c3d1143fb5888602a2cee84578bd8a9c88bd7
Author: Mathias Fussenegger <f.mathias@zignar.net>
Date:   Fri, 21 Feb 2025 18:37:05 +0100

fix(lsp): unify get_completion_word for textEdits/insertText

Problem:

After https://github.com/neovim/neovim/pull/32377 selecting snippets
provided by luals inserted the multi-line text before accepting the
candidates. That's inconsistent with servers who provide `textEdit`
instead of `insertText` and having lines shift up/down while cycling
through the completion candidates is a bit irritating.

Solution:

Use the logic used for `textEdit` snippets also for `insertText`

Diffstat:
Mruntime/lua/vim/lsp/completion.lua | 4+---
Mtest/functional/plugin/lsp/completion_spec.lua | 11+++++++++++
2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/runtime/lua/vim/lsp/completion.lua b/runtime/lua/vim/lsp/completion.lua @@ -132,7 +132,7 @@ end --- @return string local function get_completion_word(item, prefix, match) if item.insertTextFormat == protocol.InsertTextFormat.Snippet then - if item.textEdit then + if item.textEdit or (item.insertText and item.insertText ~= '') then -- Use label instead of text if text has different starting characters. -- label is used as abbr (=displayed), but word is used for filtering -- This is required for things like postfix completion. @@ -154,8 +154,6 @@ local function get_completion_word(item, prefix, match) else return word end - elseif item.insertText and item.insertText ~= '' then - return parse_snippet(item.insertText) else return item.label end diff --git a/test/functional/plugin/lsp/completion_spec.lua b/test/functional/plugin/lsp/completion_spec.lua @@ -562,6 +562,13 @@ describe('vim.lsp.completion: item conversion', function() range = range0, }, }, + -- luals for snippet + { + insertText = 'for ${1:index}, ${2:value} in ipairs(${3:t}) do\n\t$0\nend', + insertTextFormat = 2, + kind = 15, + label = 'for .. ipairs', + }, } local expected = { { @@ -569,6 +576,10 @@ describe('vim.lsp.completion: item conversion', function() word = 'copyOf', }, { + abbr = 'for .. ipairs', + word = 'for .. ipairs', + }, + { abbr = 'insert', word = 'insert', },