tidy group methods

Author: alex-courtis

lua/nvim-tree.lua

@@ -125,7 +125,7 @@ function M.place_cursor_on_node()
   if not node or node.name == ".." then
     return
   end
-  node = node:group_parent_or_node()
+  node = node:get_parent_of_group() or node
 
   local line = vim.api.nvim_get_current_line()
   local cursor = vim.api.nvim_win_get_cursor(0)

lua/nvim-tree/actions/moves/parent.lua

@@ -24,7 +24,7 @@ function M.fn(should_close)
       return
     end
 
-    local parent = node:group_parent_or_node().parent
+    local parent = (node:get_parent_of_group() or node).parent
 
     if not parent or not parent.parent then
       return view.set_cursor({ 1, 0 })

lua/nvim-tree/node/directory.lua

@@ -118,7 +118,7 @@ end
 
 ---Refresh contents and git status for a single node
 function DirectoryNode:refresh()
-  local node = self:group_parent_or_node()
+  local node = self:get_parent_of_group() or self
   local toplevel = git.get_toplevel(self.absolute_path)
 
   git.reload_project(toplevel, self.absolute_path, function()
@@ -195,7 +195,7 @@ function DirectoryNode:expand_or_collapse(toggle_group)
     self.explorer:expand(self)
   end
 
-  local head_node = self:group_parent_or_node()
+  local head_node = self:get_parent_of_group() or self
   if toggle_group then
     head_node:toggle_group_folders()
   end

lua/nvim-tree/node/init.lua

@@ -116,13 +116,20 @@ function BaseNode:update_parent_statuses(project, root)
   end
 end
 
----Get the highest parent of grouped nodes or the node itself
----@return Node
-function BaseNode:group_parent_or_node()
-  if self.parent and self.parent.group_next then
-    return self.parent:group_parent_or_node()
-  else
-    return self
+---Get the highest parent of grouped nodes, nil when not grouped
+---@return DirectoryNode?
+function BaseNode:get_parent_of_group()
+  if not self.parent or not self.parent.group_next then
+    return nil
+  end
+
+  local node = self.parent
+  while node do
+    if node.parent and node.parent.group_next then
+      node = node.parent
+    else
+      return node
+    end
   end
 end