fix(snippet): early return for final tabstop #35115

The cursor movement autocommand can not detect when the final tabstop $0
is directly adjacent to another tabstop, which prevents ending the
snippet session. The fix is an early return when jumping.
This commit is contained in:
TheBlob42
2025-08-03 21:52:09 +02:00
committed by GitHub
parent 7ed8cbd095
commit ecded994c1
3 changed files with 21 additions and 1 deletions

View File

@@ -585,6 +585,12 @@ function M.jump(direction)
M._session.current_tabstop = dest
select_tabstop(dest)
-- The cursor is not on a tabstop so exit the session.
if dest.index == 0 then
M.stop()
return
end
-- Activate expansion of the destination tabstop.
M._session:set_group_gravity(dest.index, false)

View File

@@ -214,6 +214,20 @@ describe('vim.snippet', function()
eq(false, exec_lua('return vim.snippet.active()'))
end)
it('stop session when jumping to $0', function()
test_expand_success({ 'local ${1:name} = ${2:value}$0' }, { 'local name = value' })
-- Jump to $2
feed('<Tab>')
poke_eventloop()
-- Jump to $0 (stop snippet)
feed('<Tab>')
poke_eventloop()
-- Insert literal \t
feed('<Tab>')
poke_eventloop()
eq({ 'local name = value\t' }, buf_lines(0))
end)
it('inserts choice', function()
test_expand_success({ 'console.${1|assert,log,error|}()' }, { 'console.()' })
wait_for_pum()

View File

@@ -1309,7 +1309,7 @@ describe('vim.lsp.completion: integration', function()
end)
feed('<C-n><C-y>')
eq(
{ true, { 'if true then', '\t', 'end' } },
{ false, { 'if true then', '\t', 'end' } },
exec_lua(function()
return {
vim.snippet.active({ direction = 1 }),