neovim

commit 94127cb5df0a513e66777d18a2c7fa6219404280
parent 370232dbefb91b7ee773ee9a61a9b1ad77d7f1af
Author: Maria José Solano <majosolano99@gmail.com>
Date:   Sun, 22 Oct 2023 22:38:11 -0700

fix(lsp): do not add extra indentation

Diffstat:
M
runtime/lua/vim/snippet.lua
 | 
7
++++---
M
test/functional/lua/snippet_spec.lua
 | 
4
++++

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua
@@ -346,6 +346,7 @@ end
 function M.expand(input)
   local snippet = G.parse(input)
   local snippet_text = {}
+  local base_indent = vim.api.nvim_get_current_line():match('^%s*') or ''
 
   -- Get the placeholders we should use for each tabstop index.
   --- @type table<integer, string>
@@ -377,10 +378,10 @@ function M.expand(input)
   ---
   --- @param text string|string[]
   local function append_to_snippet(text)
+    local snippet_lines = text_to_lines(snippet_text)
     -- Get the base indentation based on the current line and the last line of the snippet.
-    local base_indent = vim.api.nvim_get_current_line():match('^%s*') or ''
-    if #snippet_text > 0 then
-      base_indent = base_indent .. (snippet_text[#snippet_text]:match('^%s*') or '') --- @type string
+    if #snippet_lines > 0 then
+      base_indent = base_indent .. (snippet_lines[#snippet_lines]:match('(^%s*)%S') or '') --- @type string
     end
 
     local lines = vim.iter.map(function(i, line)
diff --git a/test/functional/lua/snippet_spec.lua b/test/functional/lua/snippet_spec.lua
@@ -48,6 +48,10 @@ describe('vim.snippet', function()
     )
   end)
 
+  it('adds indentation based on the start of snippet lines', function()
+    test_success({ 'if $1 then', '  $0', 'end' }, { 'if  then', '  ', 'end' })
+  end)
+
   it('replaces tabs with spaces when expandtab is set', function()
     test_success(
       { 'function $1($2)', '\t$0', 'end' },