tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(renderer): indent markers with arrows

Browse Source 
breaking: glyphs for indent markers should only be one block large
This commit is contained in:
kiyan
2022-07-15 09:32:14 +02:00
parent 19425c5896
commit 9a02dedd92
3 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/nvim-tree-lua.txt
View File

@@ -201,10 +201,10 @@ Subsequent calls to setup will replace the previous configuration.
indent_markers = { indent_markers = {
enable = false, enable = false,
icons = { icons = {
corner = "└ ", corner = "└",
edge = "│ ", edge = "│",
item = "│ ", item = "│",
none = " ", none = " ",
}, },
}, },
icons = { icons = {
@@ -644,7 +644,7 @@ UI rendering setup
*nvim-tree.renderer.indent_markers.icons* *nvim-tree.renderer.indent_markers.icons*
Icons shown before the file/directory. Icons shown before the file/directory.
Type: `table`, Default: `{ corner = "└ ", edge = "│ ", item = "│ ", none = " ", }` Type: `table`, Default: `{ corner = "└", edge = "│", item = "│", none = " ", }`
*nvim-tree.renderer.icons* *nvim-tree.renderer.icons*
Configuration options for icons. Configuration options for icons.

8
lua/nvim-tree.lua
View File

@@ -449,10 +449,10 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
indent_markers = { indent_markers = {
enable = false, enable = false,
icons = { icons = {
corner = "└ ", corner = "└",
edge = "│ ", edge = "│",
item = "│ ", item = "│",
none = " ", none = " ",
}, },
}, },
icons = { icons = {

35
lua/nvim-tree/renderer/components/padding.lua
View File

@@ -1,21 +1,44 @@
local M = {} local M = {}
local function check_siblings_for_folder(node, with_arrows)
if with_arrows then
for _, n in pairs(node.parent.nodes) do
if n.nodes then
return true
end
end
end
return false
end
local function get_padding_indent_markers(depth, idx, nodes_number, markers, with_arrows, node) local function get_padding_indent_markers(depth, idx, nodes_number, markers, with_arrows, node)
local default_padding = with_arrows and (not node.nodes or depth > 0) and " " or "" local base_padding = with_arrows and (not node.nodes or depth > 0) and " " or ""
local padding = depth == 0 and default_padding or "" local padding = base_padding
if depth > 0 then if depth > 0 then
local has_folder_sibling = check_siblings_for_folder(node, with_arrows)
local rdepth = depth / 2 local rdepth = depth / 2
markers[rdepth] = idx ~= nodes_number markers[rdepth] = idx ~= nodes_number
for i = 1, rdepth do for i = 1, rdepth do
local glyph
if idx == nodes_number and i == rdepth then if idx == nodes_number and i == rdepth then
padding = padding .. default_padding .. M.config.indent_markers.icons.corner glyph = M.config.indent_markers.icons.corner
elseif markers[i] and i == rdepth then elseif markers[i] and i == rdepth then
padding = padding .. default_padding .. M.config.indent_markers.icons.item glyph = M.config.indent_markers.icons.item
elseif markers[i] then elseif markers[i] then
padding = padding .. default_padding .. M.config.indent_markers.icons.edge glyph = M.config.indent_markers.icons.edge
else else
padding = padding .. default_padding .. M.config.indent_markers.icons.none glyph = M.config.indent_markers.icons.none
end
if not with_arrows or i == 1 then
padding = padding .. glyph .. " "
elseif idx == nodes_number and i == rdepth and has_folder_sibling then
padding = padding .. base_padding .. glyph .. "── "
elseif rdepth == i and not node.nodes and has_folder_sibling then
padding = padding .. base_padding .. glyph .. " " .. base_padding
else
padding = padding .. base_padding .. glyph .. " "
end end
end end
end end