Skip to content

Commit 217370b

Browse files
committed
chore: resolve undefined-field
1 parent 4303f25 commit 217370b

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

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

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
local DirectoryLinkNode = require("nvim-tree.node.directory-link")
2+
13
local M = { i = {} }
24

35
local function config_symlinks()
@@ -11,39 +13,40 @@ local function empty()
1113
return "", nil
1214
end
1315

14-
---@param node Node
16+
---@param dir DirectoryNode
1517
---@param has_children boolean
1618
---@return string icon
1719
---@return string? name
18-
local function get_folder_icon_default(node, has_children)
19-
local is_symlink = node.links_to ~= nil
20-
local n
21-
if is_symlink and node.open then
22-
n = M.config.glyphs.folder.symlink_open
23-
elseif is_symlink then
24-
n = M.config.glyphs.folder.symlink
25-
elseif node.open then
20+
local function get_folder_icon_default(dir, has_children)
21+
local icon
22+
if dir:is(DirectoryLinkNode) then
23+
if dir.open then
24+
icon = M.config.glyphs.folder.symlink_open
25+
else
26+
icon = M.config.glyphs.folder.symlink
27+
end
28+
elseif dir.open then
2629
if has_children then
27-
n = M.config.glyphs.folder.open
30+
icon = M.config.glyphs.folder.open
2831
else
29-
n = M.config.glyphs.folder.empty_open
32+
icon = M.config.glyphs.folder.empty_open
3033
end
3134
else
3235
if has_children then
33-
n = M.config.glyphs.folder.default
36+
icon = M.config.glyphs.folder.default
3437
else
35-
n = M.config.glyphs.folder.empty
38+
icon = M.config.glyphs.folder.empty
3639
end
3740
end
38-
return n, nil
41+
return icon, nil
3942
end
4043

41-
---@param node Node
44+
---@param node DirectoryNode
4245
---@param has_children boolean
4346
---@return string icon
4447
---@return string? name
4548
local function get_folder_icon_webdev(node, has_children)
46-
local icon, hl_group = M.devicons.get_icon(node.name, node.extension)
49+
local icon, hl_group = M.devicons.get_icon(node.name, nil)
4750
if not M.config.web_devicons.folder.color then
4851
hl_group = nil
4952
end

0 commit comments

Comments
 (0)