mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-08-04 18:58:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(indent): allow rendering over blank lines. Fixes #313

Browse source
This commit is contained in:
Folke Lemaitre 2024-12-16 08:42:39 +01:00
parent 7ac92249e6
commit 766e671452
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lua/snacks/indent.lua
View file

@ -213,6 +213,7 @@ local function get_state(win, buf, top, bottom)
end
---@class snacks.indent.State
---@field indents table<number, number>
---@field blanks table<number, boolean>
local state = {
win = win,
buf = buf,
@ -223,6 +224,7 @@ local function get_state(win, buf, top, bottom)
leftcol = vim.api.nvim_buf_call(buf, vim.fn.winsaveview).leftcol --[[@as number]],
shiftwidth = vim.bo[buf].shiftwidth,
indents = prev and prev.indents or { [0] = 0 },
blanks = prev and prev.blanks or {},
indent_offset = 0, -- the start column of the indent guides
listchars = get_listchars(win),
}
@ -269,6 +271,7 @@ function M.on_win(win, buf, top, bottom)
-- Indent for a blank line is the minimum of the previous and next non-blank line.
-- If the previous and next non-blank lines have different indents, add shiftwidth.
if next ~= l then
state.blanks[l] = true
local prev = vim.fn.prevnonblank(l)
indents[prev] = indents[prev] or vim.fn.indent(prev)
indents[next] = indents[next] or vim.fn.indent(next)
@ -345,7 +348,7 @@ function M.render_scope(scope, state)
for l = from, to do
local i = state.indents[l]
if (i and i > indent) or vim.g.snacks_indent_overlap then
if (i and i > indent) or vim.g.snacks_indent_overlap or state.blanks[l] then
vim.api.nvim_buf_set_extmark(scope.buf, ns, l - 1, 0, {
virt_text = { { config.scope.char, hl } },
virt_text_pos = "overlay",