From 0fe0cf5adaab06b92250eb350306de63c4d4f36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maria=20Jos=C3=A9=20Solano?= Date: Mon, 30 Oct 2023 04:58:28 -0700 Subject: [PATCH] fix(lsp): do not cancel snippet when selecting placeholder (#25835) --- runtime/lua/vim/snippet.lua | 10 +++++----- test/functional/lua/snippet_spec.lua | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua index 14f73bff5c..94c69795a4 100644 --- a/runtime/lua/vim/snippet.lua +++ b/runtime/lua/vim/snippet.lua @@ -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 diff --git a/test/functional/lua/snippet_spec.lua b/test/functional/lua/snippet_spec.lua index 390f268925..70337d1572 100644 --- a/test/functional/lua/snippet_spec.lua +++ b/test/functional/lua/snippet_spec.lua @@ -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') test_success({ 'local function $1()', ' $0', 'end' }, { '', 'local function ()', ' ', 'end' }) - feed('k') + feed('O-- A comment') eq(false, exec_lua('return vim.snippet.active()')) end) end)