tidy builder

Author: alex-courtis

lua/nvim-tree/renderer/builder.lua

@@ -1,5 +1,4 @@
 local utils = require "nvim-tree.utils"
-local core = require "nvim-tree.core"
 local notify = require "nvim-tree.notify"
 
 local pad = require "nvim-tree.renderer.components.padding"
@@ -138,7 +137,7 @@ function Builder:_build_folder(node)
   local foldername_hl = "NvimTreeFolderName"
   if node.link_to and self.symlink_destination then
     local arrow = icons.i.symlink_arrow
-    local link_to = utils.path_relative(node.link_to, core.get_cwd())
+    local link_to = utils.path_relative(node.link_to, self.root_cwd)
     foldername = foldername .. arrow .. link_to
     foldername_hl = "NvimTreeSymlinkFolderName"
   elseif vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
@@ -160,7 +159,7 @@ function Builder:_build_symlink(node)
   local arrow = icons.i.symlink_arrow
   local symlink_formatted = node.name
   if self.symlink_destination then
-    local link_to = utils.path_relative(node.link_to, core.get_cwd())
+    local link_to = utils.path_relative(node.link_to, self.root_cwd)
     symlink_formatted = symlink_formatted .. arrow .. link_to
   end
 

lua/nvim-tree/renderer/init.lua

@@ -20,7 +20,6 @@ local DecoratorOpened = require "nvim-tree.renderer.decorator.opened"
 local M = {
   last_highlights = {},
   decorators = {},
-  deco = {},
 }
 
 local SIGN_GROUP = "NvimTreeRendererSigns"
@@ -72,7 +71,7 @@ function M.draw()
   local cursor = vim.api.nvim_win_get_cursor(view.get_winnr())
   icon_component.reset_config()
 
-  local lines, hl, sign_names = Builder.new(core.get_cwd(), M.deco)
+  local lines, hl, sign_names = Builder.new(core.get_cwd(), M.decorators)
     :configure_root_label(M.config.root_folder_label)
     :configure_trailing_slash(M.config.add_trailing)
     :configure_special_files(M.config.special_files)
@@ -108,7 +107,7 @@ function M.setup(opts)
   icon_component.setup(opts)
 
   -- priority order
-  M.deco = {
+  M.decorators = {
     DecoratorCut:new(opts),
     DecoratorCopied:new(opts),
     DecoratorDiagnostics:new(opts),