extract methods from explorer

Author: alex-courtis

lua/nvim-tree/explorer/init.lua

@@ -186,26 +186,6 @@ function Explorer:reload(node, git_status)
   return node.nodes
 end
 
----TODO #2837 #2871 #2886 move this and similar to node
----Refresh contents and git status for a single node
----@param node Node
----@param callback function
-function Explorer:refresh_node(node, callback)
-  if type(node) ~= "table" then
-    callback()
-  end
-
-  local parent_node = utils.get_parent_of_group(node)
-
-  self:reload_and_get_git_project(node.absolute_path, function(toplevel, project)
-    self:reload(parent_node, project)
-
-    self:update_parent_statuses(parent_node, project, toplevel)
-
-    callback()
-  end)
-end
-
 ---Refresh contents of all nodes to a path: actual directory and links.
 ---Groups will be expanded if needed.
 ---@param path string absolute path
@@ -233,7 +213,7 @@ function Explorer:refresh_parent_nodes_for_path(path)
     local project = git.get_project(toplevel) or {}
 
     self:reload(node, project)
-    self:update_parent_statuses(node, project, toplevel)
+    node:update_parent_statuses(project, toplevel)
   end
 
   log.profile_end(profile)
@@ -261,52 +241,6 @@ function Explorer:update_status(nodes_by_path, node_ignored, status)
   end
 end
 
----TODO #2837 #2871 #2886 move this and similar to node
----@private
----@param path string
----@param callback fun(toplevel: string|nil, project: table|nil)
-function Explorer:reload_and_get_git_project(path, callback)
-  local toplevel = git.get_toplevel(path)
-
-  git.reload_project(toplevel, path, function()
-    callback(toplevel, git.get_project(toplevel) or {})
-  end)
-end
-
----TODO #2837 #2871 #2886 move this and similar to node
----@private
----@param node Node
----@param project table|nil
----@param root string|nil
-function Explorer:update_parent_statuses(node, project, root)
-  while project and node do
-    -- step up to the containing project
-    if node.absolute_path == root then
-      -- stop at the top of the tree
-      if not node.parent then
-        break
-      end
-
-      root = git.get_toplevel(node.parent.absolute_path)
-
-      -- stop when no more projects
-      if not root then
-        break
-      end
-
-      -- update the containing project
-      project = git.get_project(root)
-      git.reload_project(root, node.absolute_path, nil)
-    end
-
-    -- update status
-    node:update_git_status(node.parent and node.parent:is_git_ignored() or false, project)
-
-    -- maybe parent
-    node = node.parent
-  end
-end
-
 ---@private
 ---@param handle uv.uv_fs_t
 ---@param cwd string

lua/nvim-tree/explorer/watch.lua

@@ -76,9 +76,7 @@ function M.create_watcher(node)
       else
         log.line("watcher", "node event executing refresh '%s'", node.absolute_path)
       end
-      node.explorer:refresh_node(node, function()
-        node.explorer.renderer:draw()
-      end)
+      node:refresh()
     end)
   end
 

lua/nvim-tree/marks/init.lua

@@ -8,7 +8,7 @@ local rename_file = require("nvim-tree.actions.fs.rename-file")
 local trash = require("nvim-tree.actions.fs.trash")
 local utils = require("nvim-tree.utils")
 
-local DirectoryNode = require "nvim-tree.node.directory"
+local DirectoryNode = require("nvim-tree.node.directory")
 
 ---@class Marks
 ---@field config table hydrated user opts.filters

lua/nvim-tree/node/init.lua

@@ -1,4 +1,5 @@
 local git = require("nvim-tree.git")
+local utils = require("nvim-tree.utils")
 
 ---Abstract Node class.
 ---Uses the abstract factory pattern to instantiate child instances.
@@ -182,4 +183,59 @@ function BaseNode:last_group_node()
   return node
 end
 
+---@param path string
+---@param callback fun(toplevel: string|nil, project: table|nil)
+function BaseNode:reload_and_get_git_project(path, callback)
+  local toplevel = git.get_toplevel(path)
+
+  git.reload_project(toplevel, path, function()
+    callback(toplevel, git.get_project(toplevel) or {})
+  end)
+end
+
+---@param project table|nil
+---@param root string|nil
+function BaseNode:update_parent_statuses(project, root)
+  local node = self
+  while project and node do
+    -- step up to the containing project
+    if node.absolute_path == root then
+      -- stop at the top of the tree
+      if not node.parent then
+        break
+      end
+
+      root = git.get_toplevel(node.parent.absolute_path)
+
+      -- stop when no more projects
+      if not root then
+        break
+      end
+
+      -- update the containing project
+      project = git.get_project(root)
+      git.reload_project(root, node.absolute_path, nil)
+    end
+
+    -- update status
+    node:update_git_status(node.parent and node.parent:is_git_ignored() or false, project)
+
+    -- maybe parent
+    node = node.parent
+  end
+end
+
+---Refresh contents and git status for a single node
+function BaseNode:refresh()
+  local parent_node = utils.get_parent_of_group(self)
+
+  self:reload_and_get_git_project(self.absolute_path, function(toplevel, project)
+    self.explorer:reload(parent_node, project)
+
+    parent_node:update_parent_statuses(project, toplevel)
+
+    self.explorer.renderer:draw()
+  end)
+end
+
 return BaseNode