wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): do not cancel snippet when selecting placeholder (#25835)

Browse Source
This commit is contained in:
Maria José Solano 2023-10-30 04:58:28 -07:00 committed by GitHub
parent 8405649f92
commit 0fe0cf5ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/lua/vim/snippet.lua
View File

@ -278,6 +278,11 @@ local function setup_autocmds(bufnr)
desc = 'Update snippet state when the cursor moves',
buffer = bufnr,
callback = function()
-- Just update the tabstop in insert and select modes.
if not vim.fn.mode():match('^[isS]') then
return
end
local cursor_row, cursor_col = cursor_pos()
-- The cursor left the snippet region.
@ -292,11 +297,6 @@ local function setup_autocmds(bufnr)
return true
end
-- Just update the tabstop in insert and select modes.
if not vim.fn.mode():match('^[isS]') then
return
end
-- Update the current tabstop to be the one containing the cursor.
for tabstop_index, tabstops in pairs(M._session.tabstops) do
for _, tabstop in ipairs(tabstops) do

4
test/functional/lua/snippet_spec.lua
View File

@ -165,10 +165,10 @@ describe('vim.snippet', function()
eq(false, exec_lua('return vim.snippet.active()'))
end)
it('cancels session when leaving snippet region', function()
it('cancels session when inserting outside snippet region', function()
feed('i<cr>')
test_success({ 'local function $1()', ' $0', 'end' }, { '', 'local function ()', ' ', 'end' })
feed('<esc>k')
feed('<esc>O-- A comment')
eq(false, exec_lua('return vim.snippet.active()'))
end)
end)