mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(snippet): correct indent with newline

Browse Source 
Problem: snippet newline use before line indent after expand.

Solution: it should level + 1.
This commit is contained in:
glepnir
2024-02-29 18:50:40 +08:00
parent 0eaae1bc05
commit a5ade3c63d
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,14 +446,18 @@ function M.expand(input)
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
local lines = vim.iter.map(function(i, line)
-- Replace tabs by spaces.
if vim.o.expandtab then
line = line:gsub('\t', (' '):rep(vim.fn.shiftwidth())) --- @type string
if expandtab then
line = line:gsub('\t', (' '):rep(shiftwidth)) --- @type string
end
-- Add the base indentation.
if i > 1 then
line = base_indent .. line
line = #line ~= 0 and base_indent .. line
or (expandtab and (' '):rep(shiftwidth) or '\t'):rep(vim.fn.indent('.') / shiftwidth + 1)
end
return line
end, ipairs(text_to_lines(text)))