tidy hl icon name

Author: alex-courtis

lua/nvim-tree.lua

@@ -736,9 +736,6 @@ function M.setup(conf)
   require("nvim-tree.buffers").setup(opts)
   require("nvim-tree.help").setup(opts)
   require("nvim-tree.watcher").setup(opts)
-  if M.config.renderer.icons.show.file and pcall(require, "nvim-web-devicons") then
-    require("nvim-web-devicons").setup()
-  end
 
   setup_autocommands(opts)
 

lua/nvim-tree/node/directory-link.lua

@@ -1,9 +1,7 @@
 local git_utils = require("nvim-tree.git.utils")
-local icons = require("nvim-tree.renderer.components.icons")
 local utils = require("nvim-tree.utils")
 
 local DirectoryNode = require("nvim-tree.node.directory")
-local Node = require("nvim-tree.node")
 
 ---@class (exact) DirectoryLinkNode: DirectoryNode
 ---@field link_to string absolute path
@@ -49,7 +47,7 @@ end
 ---@return HighlightedString name
 function DirectoryLinkNode:highlighted_icon()
   if not self.explorer.opts.renderer.icons.show.folder then
-    return Node.highlighted_icon(self)
+    return self:highlighted_icon_empty()
   end
 
   local str, hl
@@ -72,7 +70,7 @@ function DirectoryLinkNode:highlighted_name()
 
   if self.explorer.opts.renderer.symlink_destination then
     local link_to = utils.path_relative(self.link_to, self.explorer.absolute_path)
-    name.str = string.format("%s%s%s", name.str, icons.i.symlink_arrow, link_to)
+    name.str = string.format("%s%s%s", name.str, self.explorer.opts.renderer.icons.symlink_arrow, link_to)
     name.hl = { "NvimTreeSymlinkFolderName" }
   end
 

lua/nvim-tree/node/directory.lua

@@ -211,7 +211,7 @@ end
 ---@return HighlightedString icon
 function DirectoryNode:highlighted_icon()
   if not self.explorer.opts.renderer.icons.show.folder then
-    return Node.highlighted_icon(self)
+    return self:highlighted_icon_empty()
   end
 
   local str, hl

lua/nvim-tree/node/file-link.lua

@@ -1,9 +1,7 @@
 local git_utils = require("nvim-tree.git.utils")
-local icons = require("nvim-tree.renderer.components.icons")
 local utils = require("nvim-tree.utils")
 
 local FileNode = require("nvim-tree.node.file")
-local Node = require("nvim-tree.node")
 
 ---@class (exact) FileLinkNode: FileNode
 ---@field link_to string absolute path
@@ -44,8 +42,8 @@ end
 
 ---@return HighlightedString icon
 function FileLinkNode:highlighted_icon()
-  if not self.explorer.opts.renderer.icons.show.folder then
-    return Node.highlighted_icon(self)
+  if not self.explorer.opts.renderer.icons.show.file then
+    return self:highlighted_icon_empty()
   end
 
   local str, hl
@@ -68,21 +66,6 @@ function FileLinkNode:highlighted_name()
   return { str = str, hl = { "NvimTreeSymlink" } }
 end
 
----Icon and name for the file link
----@return HighlightedString icon
----@return HighlightedString name
-function FileLinkNode:icon_name()
-  local icon_str = icons.i.symlink
-
-  local name_str = self.name
-  if self.explorer.opts.renderer.symlink_destination then
-    local link_to = utils.path_relative(self.link_to, self.explorer.absolute_path)
-    name_str = string.format("%s%s%s", name_str, icons.i.symlink_arrow, link_to)
-  end
-
-  return { str = icon_str, hl = { "NvimTreeSymlinkIcon" } }, { str = name_str, hl = { "NvimTreeSymlink" } }
-end
-
 ---Create a sanitized partial copy of a node
 ---@return FileLinkNode cloned
 function FileLinkNode:clone()

lua/nvim-tree/node/file.lua

@@ -69,14 +69,21 @@ end
 ---@return HighlightedString icon
 function FileNode:highlighted_icon()
   if not self.explorer.opts.renderer.icons.show.file then
-    return Node.highlighted_icon(self)
+    return self:highlighted_icon_empty()
   end
 
   local str, hl
 
   -- devicon if enabled and available
   if self.explorer.opts.renderer.icons.web_devicons.file.enable then
     str, hl = icons.get_icon(self.name)
+    if not str then
+      local default_icon = icons.get_default_icon()
+      if default_icon then
+        str = default_icon.icon
+        hl = "DevIcon" .. default_icon.name
+      end
+    end
     if not self.explorer.opts.renderer.icons.web_devicons.file.color then
       hl = nil
     end

lua/nvim-tree/node/init.lua

@@ -68,18 +68,32 @@ function Node:get_parent_of_group()
   end
 end
 
+---Empty highlighted icon
+---@protected
+---@return HighlightedString icon
+function Node:highlighted_icon_empty()
+  return { str = "", hl = {} }
+end
+
 ---Highlighted icon for the node
 ---Empty for base Node
 ---@return HighlightedString icon
 function Node:highlighted_icon()
+  return self:highlighted_icon_empty()
+end
+
+---Empty highlighted name
+---@protected
+---@return HighlightedString name
+function Node:highlighted_name_empty()
   return { str = "", hl = {} }
 end
 
 ---Highlighted name for the node
 ---Empty for base Node
 ---@return HighlightedString icon
 function Node:highlighted_name()
-  return { str = "", hl = {} }
+  return self:highlighted_name_empty()
 end
 
 ---Create a sanitized partial copy of a node, populating children recursively.

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

@@ -13,7 +13,7 @@ local M = {
   devicons = nil,
 }
 
----Wrapper around nvim-web-devicons, nils if not present
+---Wrapper around nvim-web-devicons, nils if devicons not available
 ---@param name string
 ---@return string? icon
 ---@return string? hl_group
@@ -25,10 +25,27 @@ function M.get_icon(name)
   end
 end
 
-function M.setup()
-  local devicons_ok, devicons = pcall(require, "nvim-web-devicons")
-  if devicons_ok then
-    M.devicons = devicons
+---Wrapper around nvim-web-devicons, nil if devicons not available
+---@return DevIcon?
+function M.get_default_icon()
+  if M.devicons then
+    return M.devicons.get_default_icon()
+  else
+    return nil
+  end
+end
+
+---Attempt to use nvim-web-devicons if present and enabled for file or folder
+---@param opts table
+function M.setup(opts)
+  if opts.renderer.icons.show.file or opts.renderer.icons.show.folder then
+    local devicons_ok, devicons = pcall(require, "nvim-web-devicons")
+    if devicons_ok then
+      M.devicons = devicons
+
+      -- does nothing if already called i.e. don't clobber previous user setup
+      M.devicons.setup()
+    end
   end
 end
 

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

@@ -8,7 +8,7 @@ M.padding = require("nvim-tree.renderer.components.padding")
 function M.setup(opts)
   M.diagnostics.setup(opts)
   M.full_name.setup(opts)
-  M.icons.setup()
+  M.icons.setup(opts)
   M.padding.setup(opts)
 end