move file specifics from icons to File

Author: alex-courtis

lua/nvim-tree/node/directory.lua

@@ -218,13 +218,13 @@ function DirectoryNode:highlighted_icon()
 
   -- devicon if enabled and available
   if self.explorer.opts.renderer.icons.web_devicons.folder.enable then
-    str, hl = icons.get_icon(self.name, nil)
+    str, hl = icons.get_icon(self.name)
     if not self.explorer.opts.renderer.icons.web_devicons.folder.color then
       hl = nil
     end
   end
 
-  -- icon from opts
+  -- default icon from opts
   if not str then
     if #self.nodes ~= 0 or self.has_children then
       if self.open then
@@ -241,8 +241,8 @@ function DirectoryNode:highlighted_icon()
     end
   end
 
-  -- hl
-  if #str > 0 and hl == nil then
+  -- default hl
+  if not hl then
     if self.open then
       hl = "NvimTreeOpenedFolderIcon"
     else

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

@@ -3,6 +3,7 @@ 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
@@ -43,15 +44,25 @@ end
 
 ---@return HighlightedString icon
 function FileLinkNode:highlighted_icon()
-  return { str = icons.i.symlink, hl = { "NvimTreeSymlinkIcon" } }
+  if not self.explorer.opts.renderer.icons.show.folder then
+    return Node.highlighted_icon(self)
+  end
+
+  local str, hl
+
+  -- default icon from opts
+  str = self.explorer.opts.renderer.icons.glyphs.symlink
+  hl = "NvimTreeSymlinkIcon"
+
+  return { str = str, hl = { hl } }
 end
 
 ---@return HighlightedString name
 function FileLinkNode:highlighted_name()
   local str = self.name
   if self.explorer.opts.renderer.symlink_destination then
     local link_to = utils.path_relative(self.link_to, self.explorer.absolute_path)
-    str = string.format("%s%s%s", str, icons.i.symlink_arrow, link_to)
+    str = string.format("%s%s%s", str, self.explorer.opts.renderer.icons.symlink_arrow, link_to)
   end
 
   return { str = str, hl = { "NvimTreeSymlink" } }

lua/nvim-tree/node/file.lua

@@ -68,9 +68,31 @@ end
 
 ---@return HighlightedString icon
 function FileNode:highlighted_icon()
-  local icon_str, icon_hl = icons.get_file_icon(self.name, self.extension)
+  if not self.explorer.opts.renderer.icons.show.file then
+    return Node.highlighted_icon(self)
+  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 self.explorer.opts.renderer.icons.web_devicons.file.color then
+      hl = nil
+    end
+  end
+
+  -- default icon from opts
+  if not str then
+    str = self.explorer.opts.renderer.icons.glyphs.default
+  end
+
+  -- default hl
+  if not hl then
+    hl = "NvimTreeFileIcon"
+  end
 
-  return { str = icon_str, hl = { icon_hl } }
+  return { str = str, hl = { hl } }
 end
 
 ---@return HighlightedString name

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

@@ -9,90 +9,27 @@
 ---@field get_default_icon fun(): DevIcon
 
 local M = {
-  i = {},
   ---@type DevIcons?
   devicons = nil,
 }
 
-local function config_symlinks()
-  M.i.symlink = #M.config.glyphs.symlink > 0 and M.config.glyphs.symlink or ""
-  M.i.symlink_arrow = M.config.symlink_arrow
-end
-
----@return string icon
----@return string? hl_group
-local function empty()
-  return "", nil
-end
-
----@return string icon
----@return string? hl_group
-local function get_file_icon_default()
-  local hl_group = "NvimTreeFileIcon"
-  local icon = M.config.glyphs.default
-  if #icon > 0 then
-    return icon, hl_group
-  else
-    return "", nil
-  end
-end
-
----@param name string
----@param ext string
----@return string icon
----@return string? hl_group
-local function get_file_icon_webdev(name, ext)
-  local icon, hl_group = M.devicons.get_icon(name, ext)
-  if not M.config.web_devicons.file.color then
-    hl_group = "NvimTreeFileIcon"
-  end
-  if icon and hl_group ~= "DevIconDefault" then
-    return icon, hl_group
-  elseif string.match(ext, "%.(.*)") then
-    -- If there are more extensions to the file, try to grab the icon for them recursively
-    return get_file_icon_webdev(name, string.match(ext, "%.(.*)"))
-  else
-    local devicons_default = M.devicons.get_default_icon()
-    if devicons_default and type(devicons_default.icon) == "string" and type(devicons_default.name) == "string" then
-      return devicons_default.icon, "DevIcon" .. devicons_default.name
-    else
-      return get_file_icon_default()
-    end
-  end
-end
-
-local function config_file_icon()
-  if M.config.show.file then
-    if M.devicons and M.config.web_devicons.file.enable then
-      M.get_file_icon = get_file_icon_webdev
-    else
-      M.get_file_icon = get_file_icon_default
-    end
-  else
-    M.get_file_icon = empty
-  end
-end
-
----Wrapper around nvim-web-devicons, nil if not present
+---Wrapper around nvim-web-devicons, nils if not present
 ---@param name string
----@param ext string?
 ---@return string? icon
 ---@return string? hl_group
-function M.get_icon(name, ext)
+function M.get_icon(name)
   if M.devicons then
-    return M.devicons.get_icon(name, ext)
+    return M.devicons.get_icon(name, nil)
+  else
+    return nil, nil
   end
 end
 
-function M.reset_config()
-  config_symlinks()
-  config_file_icon()
-end
-
-function M.setup(opts)
-  M.config = opts.renderer.icons
-
-  M.devicons = pcall(require, "nvim-web-devicons") and require("nvim-web-devicons") or nil
+function M.setup()
+  local devicons_ok, devicons = pcall(require, "nvim-web-devicons")
+  if devicons_ok then
+    M.devicons = devicons
+  end
 end
 
 return M

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(opts)
+  M.icons.setup()
   M.padding.setup(opts)
 end
 

lua/nvim-tree/renderer/init.lua

@@ -2,8 +2,6 @@ local log = require("nvim-tree.log")
 local view = require("nvim-tree.view")
 local events = require("nvim-tree.events")
 
-local icon_component = require("nvim-tree.renderer.components.icons")
-
 local Builder = require("nvim-tree.renderer.builder")
 
 local SIGN_GROUP = "NvimTreeRendererSigns"
@@ -107,7 +105,6 @@ function Renderer:draw()
   local profile = log.profile_start("draw")
 
   local cursor = vim.api.nvim_win_get_cursor(view.get_winnr() or 0)
-  icon_component.reset_config()
 
   local builder = Builder:new(self.opts, self.explorer):build()