extract methods from explore_node

Author: alex-courtis

lua/nvim-tree/explorer/explore.lua

@@ -1,5 +1,4 @@
 local utils = require "nvim-tree.utils"
-local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"
 
@@ -65,7 +64,7 @@ local function populate_children(handle, cwd, node, git_status, parent)
           if child then
             table.insert(node.nodes, child)
             nodes_by_path[child.absolute_path] = true
-            explorer_node.update_git_status(child, node_ignored, git_status)
+            child:update_git_status(node_ignored, git_status)
           end
         end
       else

lua/nvim-tree/explorer/init.lua

@@ -279,7 +279,7 @@ end
 function Explorer:update_status(nodes_by_path, node_ignored, status)
   return function(node)
     if nodes_by_path[node.absolute_path] then
-      explorer_node.update_git_status(node, node_ignored, status)
+      node:update_git_status(node_ignored, status)
     end
     return node
   end
@@ -324,7 +324,7 @@ function Explorer:update_parent_statuses(node, project, root)
     end
 
     -- update status
-    explorer_node.update_git_status(node, node.parent and node.parent:is_git_ignored() or false, project)
+    node:update_git_status(node.parent and node.parent:is_git_ignored() or false, project)
 
     -- maybe parent
     node = node.parent
@@ -380,7 +380,7 @@ function Explorer:populate_children(handle, cwd, node, git_status, parent)
         if child then
           table.insert(node.nodes, child)
           nodes_by_path[child.absolute_path] = true
-          explorer_node.update_git_status(child, node_ignored, git_status)
+          child:update_git_status(node_ignored, git_status)
         end
       else
         for reason, value in pairs(FILTER_REASON) do

lua/nvim-tree/explorer/node.lua

@@ -2,59 +2,6 @@ local git = {} -- circular dependencies
 
 local M = {}
 
----@class GitStatus
----@field file string|nil
----@field dir table|nil
-
----@param parent_ignored boolean
----@param status table|nil
----@param absolute_path string
----@return GitStatus|nil
-local function get_dir_git_status(parent_ignored, status, absolute_path)
-  if parent_ignored then
-    return { file = "!!" }
-  end
-
-  if status then
-    return {
-      file = status.files and status.files[absolute_path],
-      dir = status.dirs and {
-        direct = status.dirs.direct[absolute_path],
-        indirect = status.dirs.indirect[absolute_path],
-      },
-    }
-  end
-end
-
----@param parent_ignored boolean
----@param status table
----@param absolute_path string
----@return GitStatus
-local function get_git_status(parent_ignored, status, absolute_path)
-  local file_status = parent_ignored and "!!" or (status and status.files and status.files[absolute_path])
-  return { file = file_status }
-end
-
----@param node Node
----@param parent_ignored boolean
----@param status table|nil
-function M.update_git_status(node, parent_ignored, status)
-  local get_status
-  if node.nodes then
-    get_status = get_dir_git_status
-  else
-    get_status = get_git_status
-  end
-
-  -- status of the node's absolute path
-  node.git_status = get_status(parent_ignored, status, node.absolute_path)
-
-  -- status of the link target, if the link itself is not dirty
-  if node.link_to and not node.git_status then
-    node.git_status = get_status(parent_ignored, status, node.link_to)
-  end
-end
-
 ---@param node Node
 ---@return GitStatus|nil
 function M.get_git_status(node)
@@ -128,7 +75,7 @@ function M.reload_node_status(parent_node, projects)
   local toplevel = git.get_toplevel(parent_node.absolute_path)
   local status = projects[toplevel] or {}
   for _, node in ipairs(parent_node.nodes) do
-    M.update_git_status(node, M.is_git_ignored(parent_node), status)
+    node:update_git_status(M.is_git_ignored(parent_node), status)
     if node.nodes and #node.nodes > 0 then
       M.reload_node_status(node, projects)
     end

lua/nvim-tree/git/init.lua

@@ -4,7 +4,10 @@ local git_utils = require "nvim-tree.git.utils"
 local Runner = require "nvim-tree.git.runner"
 local Watcher = require("nvim-tree.watcher").Watcher
 local Iterator = require "nvim-tree.iterators.node-iterator"
-local explorer_node = require "nvim-tree.explorer.node"
+
+---@class GitStatus
+---@field file string|nil
+---@field dir table|nil
 
 local M = {
   config = {},
@@ -209,7 +212,7 @@ local function reload_tree_at(toplevel)
       :hidden()
       :applier(function(node)
         local parent_ignored = node.parent and node.parent:is_git_ignored() or false
-        explorer_node.update_git_status(node, parent_ignored, git_status)
+        node:update_git_status(parent_ignored, git_status)
       end)
       :recursor(function(node)
         return node.nodes and #node.nodes > 0 and node.nodes
@@ -283,6 +286,35 @@ function M.load_project_status(path)
   end
 end
 
+---@param parent_ignored boolean
+---@param status table|nil
+---@param absolute_path string
+---@return GitStatus|nil
+function M.get_dir_git_status(parent_ignored, status, absolute_path)
+  if parent_ignored then
+    return { file = "!!" }
+  end
+
+  if status then
+    return {
+      file = status.files and status.files[absolute_path],
+      dir = status.dirs and {
+        direct = status.dirs.direct[absolute_path],
+        indirect = status.dirs.indirect[absolute_path],
+      },
+    }
+  end
+end
+
+---@param parent_ignored boolean
+---@param status table
+---@param absolute_path string
+---@return GitStatus
+function M.get_git_status(parent_ignored, status, absolute_path)
+  local file_status = parent_ignored and "!!" or (status and status.files and status.files[absolute_path])
+  return { file = file_status }
+end
+
 function M.purge_state()
   log.line("git", "purge_state")
 

lua/nvim-tree/node/init.lua

@@ -1,3 +1,5 @@
+local git = require "nvim-tree.git"
+
 ---@class (exact) BaseNode
 ---@field private __index? table
 ---@field type NODE_TYPE
@@ -39,6 +41,25 @@ function BaseNode:has_one_child_folder()
   return #self.nodes == 1 and self.nodes[1].nodes and vim.loop.fs_access(self.nodes[1].absolute_path, "R") or false
 end
 
+---@param parent_ignored boolean
+---@param status table|nil
+function BaseNode:update_git_status(parent_ignored, status)
+  local get_status
+  if self.nodes then
+    get_status = git.get_dir_git_status
+  else
+    get_status = git.get_git_status
+  end
+
+  -- status of the node's absolute path
+  self.git_status = get_status(parent_ignored, status, self.absolute_path)
+
+  -- status of the link target, if the link itself is not dirty
+  if self.link_to and not self.git_status then
+    self.git_status = get_status(parent_ignored, status, self.link_to)
+  end
+end
+
 ---@return boolean
 function BaseNode:is_git_ignored()
   return self.git_status ~= nil and self.git_status.file == "!!"