fix: according to code review

Author: raaymax

lua/nvim-tree/explorer/explore.lua

@@ -2,7 +2,6 @@ local utils = require "nvim-tree.utils"
 local builders = require "nvim-tree.explorer.node-builders"
 local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
-local Sorters = require "nvim-tree.explorer.sorters"
 local filters = require "nvim-tree.explorer.filters"
 local live_filter = require "nvim-tree.live-filter"
 local log = require "nvim-tree.log"
@@ -57,7 +56,7 @@ end
 ---@param node Node
 ---@param status table
 ---@return Node[]|nil
-function M.explore(node, status)
+function M.explore(node, status, explorer)
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if not handle then
@@ -74,22 +73,21 @@ function M.explore(node, status)
     local child_cwd = child_folder_only.link_to or child_folder_only.absolute_path
     local child_status = git.load_project_status(child_cwd)
     node.group_next = child_folder_only
-    local ns = M.explore(child_folder_only, child_status)
+    local ns = M.explore(child_folder_only, child_status, explorer)
     node.nodes = ns or {}
 
     log.profile_end(profile)
     return ns
   end
 
-  M.sorters:sort(node.nodes)
+  explorer.sorters:sort(node.nodes)
   live_filter.apply_filter(node)
 
   log.profile_end(profile)
   return node.nodes
 end
 
 function M.setup(opts)
-  M.sorters = Sorters:new(opts)
   M.config = opts.renderer
 end
 

lua/nvim-tree/explorer/init.lua

@@ -2,6 +2,7 @@ local git = require "nvim-tree.git"
 local notify = require "nvim-tree.notify"
 local watch = require "nvim-tree.explorer.watch"
 local explorer_node = require "nvim-tree.explorer.node"
+local Sorters = require "nvim-tree.explorer.sorters"
 
 local M = {}
 
@@ -36,6 +37,7 @@ function Explorer.new(path)
     absolute_path = path,
     nodes = {},
     open = true,
+    sorters = Sorters:new(M.config)
   }, Explorer)
   explorer.watcher = watch.create_watcher(explorer)
   explorer:_load(explorer)
@@ -47,7 +49,7 @@ end
 function Explorer:_load(node)
   local cwd = node.link_to or node.absolute_path
   local git_status = git.load_project_status(cwd)
-  M.explore(node, git_status)
+  M.explore(node, git_status, self)
 end
 
 ---@param node Node
@@ -68,6 +70,7 @@ function Explorer:destroy()
 end
 
 function M.setup(opts)
+  M.config = opts
   require("nvim-tree.explorer.node").setup(opts)
   require("nvim-tree.explorer.explore").setup(opts)
   require("nvim-tree.explorer.filters").setup(opts)

lua/nvim-tree/explorer/reload.lua

@@ -2,7 +2,6 @@ local utils = require "nvim-tree.utils"
 local builders = require "nvim-tree.explorer.node-builders"
 local explorer_node = require "nvim-tree.explorer.node"
 local filters = require "nvim-tree.explorer.filters"
-local Sorters = require "nvim-tree.explorer.sorters"
 local live_filter = require "nvim-tree.live-filter"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"
@@ -162,7 +161,10 @@ function M.reload(node, git_status)
     return ns
   end
 
-  M.sorters:sort(node.nodes)
+  local explorer = require("nvim-tree.core").get_explorer()
+  if explorer then
+    explorer.sorters:sort(node.nodes)
+  end
   live_filter.apply_filter(node)
   log.profile_end(profile)
   return node.nodes
@@ -226,7 +228,6 @@ function M.refresh_parent_nodes_for_path(path)
 end
 
 function M.setup(opts)
-  M.sorters = Sorters:new(opts)
   M.config = opts.renderer
 end
 

lua/nvim-tree/explorer/sorters.lua

@@ -1,5 +1,29 @@
 local C = {}
 
+---@class Sorter
+local Sorter = {}
+
+function Sorter:new(opts)
+  local o = {} -- create object if user does not provide one
+  setmetatable(o, self)
+  self.__index = self
+  o.config = vim.deepcopy(opts.sort)
+
+  if type(o.config.sorter) == "function" then
+    o.user = o.config.sorter
+  end
+  return o
+end
+
+--- Predefined comparator, defaulting to name
+---@param sorter string as per options
+---@return function
+function Sorter:get_comparator(sorter)
+  return function(a, b)
+    return (C[sorter] or C.name)(a, b, self.config)
+  end
+end
+
 ---Create a shallow copy of a portion of a list.
 ---@param t table
 ---@param first integer First index, inclusive
@@ -86,6 +110,57 @@ local function split_merge(t, first, last, comparator)
   merge(t, first, mid, last, comparator)
 end
 
+---Perform a merge sort using sorter option.
+---@param t table nodes
+function Sorter:sort(t)
+  if self.user then
+    local t_user = {}
+    local origin_index = {}
+
+    for _, n in ipairs(t) do
+      table.insert(t_user, {
+        absolute_path = n.absolute_path,
+        executable = n.executable,
+        extension = n.extension,
+        filetype = vim.filetype.match { filename = n.name },
+        link_to = n.link_to,
+        name = n.name,
+        type = n.type,
+      })
+      table.insert(origin_index, n)
+    end
+
+    local predefined = self.user(t_user)
+    if predefined then
+      split_merge(t, 1, #t, self:get_comparator(predefined))
+      return
+    end
+
+    -- do merge sort for prevent memory exceed
+    local user_index = {}
+    for i, v in ipairs(t_user) do
+      if type(v.absolute_path) == "string" and user_index[v.absolute_path] == nil then
+        user_index[v.absolute_path] = i
+      end
+    end
+
+    -- if missing value found, then using origin_index
+    local mini_comparator = function(a, b)
+      local a_index = user_index[a.absolute_path] or origin_index[a.absolute_path]
+      local b_index = user_index[b.absolute_path] or origin_index[b.absolute_path]
+
+      if type(a_index) == "number" and type(b_index) == "number" then
+        return a_index <= b_index
+      end
+      return (a_index or 0) <= (b_index or 0)
+    end
+
+    split_merge(t, 1, #t, mini_comparator) -- sort by user order
+  else
+    split_merge(t, 1, #t, self:get_comparator(self.config.sorter))
+  end
+end
+
 ---@param a Node
 ---@param b Node
 ---@param ignorecase boolean|nil
@@ -238,79 +313,4 @@ function C.filetype(a, b, cfg)
   return a_ft < b_ft
 end
 
----@class Sorter
-local Sorter = {}
-
-function Sorter:new(opts)
-  local o = {} -- create object if user does not provide one
-  setmetatable(o, self)
-  self.__index = self
-  o.config = opts.sort
-
-  if type(o.config.sorter) == "function" then
-    o.user = o.config.sorter
-  end
-  return o
-end
-
---- Predefined comparator, defaulting to name
----@param sorter string as per options
----@return function
-function Sorter:get_comparator(sorter)
-  return function(a, b)
-    return (C[sorter] or C.name)(a, b, self.config)
-  end
-end
-
----Perform a merge sort using sorter option.
----@param t table nodes
-function Sorter:sort(t)
-  if self.user then
-    local t_user = {}
-    local origin_index = {}
-
-    for _, n in ipairs(t) do
-      table.insert(t_user, {
-        absolute_path = n.absolute_path,
-        executable = n.executable,
-        extension = n.extension,
-        filetype = vim.filetype.match { filename = n.name },
-        link_to = n.link_to,
-        name = n.name,
-        type = n.type,
-      })
-      table.insert(origin_index, n)
-    end
-
-    local predefined = self.user(t_user)
-    if predefined then
-      split_merge(t, 1, #t, self:get_comparator(predefined))
-      return
-    end
-
-    -- do merge sort for prevent memory exceed
-    local user_index = {}
-    for i, v in ipairs(t_user) do
-      if type(v.absolute_path) == "string" and user_index[v.absolute_path] == nil then
-        user_index[v.absolute_path] = i
-      end
-    end
-
-    -- if missing value found, then using origin_index
-    local mini_comparator = function(a, b)
-      local a_index = user_index[a.absolute_path] or origin_index[a.absolute_path]
-      local b_index = user_index[b.absolute_path] or origin_index[b.absolute_path]
-
-      if type(a_index) == "number" and type(b_index) == "number" then
-        return a_index <= b_index
-      end
-      return (a_index or 0) <= (b_index or 0)
-    end
-
-    split_merge(t, 1, #t, mini_comparator) -- sort by user order
-  else
-    split_merge(t, 1, #t, self:get_comparator(self.config.sorter))
-  end
-end
-
 return Sorter