kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Maria José Solano 2024-07-16 10:30:22 -07:00 committed by GitHub
parent 118ae7e5ed
commit 5fe4ce6678
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/lua/vim/snippet.lua
View File

@ -514,7 +514,7 @@ function M.expand(input)
local snippet_lines = text_to_lines(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. -- Get the base indentation based on the current line and the last line of the snippet.
if #snippet_lines > 0 then 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 end
local shiftwidth = vim.fn.shiftwidth() local shiftwidth = vim.fn.shiftwidth()

6
test/functional/lua/snippet_spec.lua
View File

@ -58,7 +58,13 @@ describe('vim.snippet', function()
end) end)
it('adds indentation based on the start of snippet lines', function() 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' }) 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) end)
it('replaces tabs with spaces when expandtab is set', function() it('replaces tabs with spaces when expandtab is set', function()