feat: move should_expand to Node for better OO

Author: Uanela

lua/nvim-tree/node/directory.lua

@@ -327,35 +327,6 @@ function DirectoryNode:descend_until_empty()
   return not should_exclude
 end
 
----@private
----@param expansion_count integer
----@param node Node
----@param should_descend fun(expansion_count: integer, node: Node): boolean
----@return boolean
-function DirectoryNode:should_expand(expansion_count, node, should_descend)
-  local dir = node:as(DirectoryNode)
-  if not dir then
-    return false
-  end
-
-  if not dir.open and should_descend(expansion_count, node) then
-    if #node.nodes == 0 then
-      node.explorer:expand_dir_node(dir) -- populate node.group_next
-    end
-
-    if dir.group_next then
-      local expand_next = self:should_expand(expansion_count, dir.group_next, should_descend)
-      if expand_next then
-        dir.open = true
-      end
-      return expand_next
-    else
-      return true
-    end
-  end
-  return false
-end
-
 ---@param expand_opts ApiTreeExpandOpts?
 function DirectoryNode:expand(expand_opts)
   local expansion_count = 0
@@ -375,12 +346,9 @@ function DirectoryNode:expand(expand_opts)
   Iterator.builder(self.nodes)
     :hidden()
     :applier(function(node)
-      if DirectoryNode:should_expand(expansion_count, node, should_descend) then
+      if node:should_expand(expansion_count, should_descend) then
         expansion_count = expansion_count + 1
-        node = node:as(DirectoryNode)
-        if node then
-          node:expand_dir_node()
-        end
+        node:expand_dir_node()
       end
     end)
     :recursor(function(node)

lua/nvim-tree/node/init.lua

@@ -144,6 +144,35 @@ function Node:clone(api_nodes)
   return clone
 end
 
+---@param expansion_count integer
+---@param should_descend fun(expansion_count: integer, node: Node): boolean
+---@return boolean
+function Node:should_expand(expansion_count, should_descend)
+  local DirectoryNode = require("nvim-tree.node.directory")
+
+  local dir = self:as(DirectoryNode)
+  if not dir then
+    return false
+  end
+
+  if not dir.open and should_descend(expansion_count, self) then
+    if #self.nodes == 0 then
+      self.explorer:expand_dir_node(dir) -- populate node.group_next
+    end
+
+    if dir.group_next then
+      local expand_next = dir.group_next:should_expand(expansion_count, should_descend)
+      if expand_next then
+        dir.open = true
+      end
+      return expand_next
+    else
+      return true
+    end
+  end
+  return false
+end
+
 ---@param expand_opts ApiTreeExpandOpts?
 function Node:expand(expand_opts)
   if self.parent then