diff options
author | Avinash Thakur <19588421+80avin@users.noreply.github.com> | 2025-03-19 20:17:59 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-03-19 14:47:59 +0000 |
commit | 424f4cc0389ed883f220bd5cbab9c07b4955acde (patch) | |
tree | 10ed59629f0cfc533fc18e7f16cb5d49be6f6296 /runtime/lua/vim/snippet.lua | |
parent | 42db8b17594e2a911396e8f8eea8cbfa8ddf0de2 (diff) | |
download | rneovim-424f4cc0389ed883f220bd5cbab9c07b4955acde.tar.gz rneovim-424f4cc0389ed883f220bd5cbab9c07b4955acde.tar.bz2 rneovim-424f4cc0389ed883f220bd5cbab9c07b4955acde.zip |
fix(snippet): wrong indentation when snippet contains "^" #32970
## Problem
The pattern used to match indentation is wrong as can be seen in
```lua
-- current pattern doesn't match starting space
print(vim.inspect((" xyz"):match("(^%s+)%S")))
-- nil
-- instead, it matches characters `^ ` in text
print(vim.inspect(("x^ yz"):match("(^%s+)%S")))
-- "^ "
-- indentation could've been matched by, however not required
print(vim.inspect((" xyz"):match("^(%s+)%S")))
-- " "
```
## Solution
We don't even need to modify `base_indent` at every line. If every line's indentation is calculated by the previous line's indentation (which already has starting indentation) added to the starting indentation, we see that indentation is multiplied on every line.
Hence, we only add the starting line indentation to every line.
Diffstat (limited to 'runtime/lua/vim/snippet.lua')
-rw-r--r-- | runtime/lua/vim/snippet.lua | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/runtime/lua/vim/snippet.lua b/runtime/lua/vim/snippet.lua index 2edea6d5ad..6d572fed34 100644 --- a/runtime/lua/vim/snippet.lua +++ b/runtime/lua/vim/snippet.lua @@ -420,6 +420,7 @@ end function M.expand(input) local snippet = G.parse(input) local snippet_text = {} + ---@type string local base_indent = vim.api.nvim_get_current_line():match('^%s*') or '' -- Get the placeholders we should use for each tabstop index. @@ -454,12 +455,6 @@ 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. - if #snippet_lines > 0 then - base_indent = base_indent .. (snippet_lines[#snippet_lines]:match('(^%s+)%S') or '') --- @type string - end - local shiftwidth = vim.fn.shiftwidth() local curbuf = vim.api.nvim_get_current_buf() local expandtab = vim.bo[curbuf].expandtab |