neovim

commit 5fe4ce6678c0b531487e4d9836774464b5ec56ed
parent 118ae7e5ed6cfab6a49ec70c21da2b850161289c
Author: Maria José Solano <majosolano99@gmail.com>
Date:   Tue, 16 Jul 2024 10:30:22 -0700

fix(snippet): modify base indentation when there's actually whitespace (#29670)


Diffstat:
M
runtime/lua/vim/snippet.lua
 | 
2
+-
M
test/functional/lua/snippet_spec.lua
 | 
6
++++++

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
@@ -514,7 +514,7 @@ function M.expand(input)
     local snippet_lines = text_to_lines(snippet_text)
     -- Get the base indentation based on the current line and the last line of the snippet.
     if #snippet_lines > 0 then
-      base_indent = base_indent .. (snippet_lines[#snippet_lines]:match('(^%s*)%S') or '') --- @type string
+      base_indent = base_indent .. (snippet_lines[#snippet_lines]:match('(^%s+)%S') or '') --- @type string
     end
 
     local shiftwidth = vim.fn.shiftwidth()
diff --git a/test/functional/lua/snippet_spec.lua b/test/functional/lua/snippet_spec.lua
@@ -58,7 +58,13 @@ describe('vim.snippet', function()
   end)
 
   it('adds indentation based on the start of snippet lines', function()
+    local curbuf = api.nvim_get_current_buf()
+
     test_expand_success({ 'if $1 then', '  $0', 'end' }, { 'if  then', '  ', 'end' })
+
+    -- Regression test: #29658
+    api.nvim_buf_set_lines(curbuf, 0, -1, false, {})
+    test_expand_success({ '${1:foo^bar}\n' }, { 'foo^bar', '' })
   end)
 
   it('replaces tabs with spaces when expandtab is set', function()