Skip to content

Commit 8632ac2

Browse files
committed
fix(renderer): indent markers + folder arrows should offset
fixes #1421
1 parent 80dc86e commit 8632ac2

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

lua/nvim-tree/renderer/components/padding.lua

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
local M = {}
22

3-
local function get_padding_indent_markers(depth, idx, nodes_number, markers)
4-
local padding = ""
3+
local function get_padding_indent_markers(depth, idx, nodes_number, markers, with_arrows, node)
4+
local default_padding = with_arrows and (not node.nodes or depth > 0) and " " or ""
5+
local padding = depth == 0 and default_padding or ""
56

6-
if depth ~= 0 then
7+
if depth > 0 then
78
local rdepth = depth / 2
89
markers[rdepth] = idx ~= nodes_number
910
for i = 1, rdepth do
1011
if idx == nodes_number and i == rdepth then
11-
padding = padding .. M.config.indent_markers.icons.corner
12+
padding = padding .. default_padding .. M.config.indent_markers.icons.corner
1213
elseif markers[i] and i == rdepth then
13-
padding = padding .. M.config.indent_markers.icons.item
14+
padding = padding .. default_padding .. M.config.indent_markers.icons.item
1415
elseif markers[i] then
15-
padding = padding .. M.config.indent_markers.icons.edge
16+
padding = padding .. default_padding .. M.config.indent_markers.icons.edge
1617
else
17-
padding = padding .. M.config.indent_markers.icons.none
18+
padding = padding .. default_padding .. M.config.indent_markers.icons.none
1819
end
1920
end
2021
end
@@ -35,7 +36,8 @@ function M.get_padding(depth, idx, nodes_number, node, markers)
3536
local padding = ""
3637

3738
if M.config.indent_markers.enable then
38-
padding = padding .. get_padding_indent_markers(depth, idx, nodes_number, markers)
39+
padding = padding
40+
.. get_padding_indent_markers(depth, idx, nodes_number, markers, M.config.icons.show.folder_arrow, node)
3941
else
4042
padding = padding .. string.rep(" ", depth)
4143
end

0 commit comments

Comments
 (0)