extract methods from lib

Author: alex-courtis

lua/nvim-tree/actions/fs/clipboard.lua

@@ -217,7 +217,7 @@ end
 ---@param action ACTION
 ---@param action_fn fun(source: string, dest: string)
 function Clipboard:do_paste(node, action, action_fn)
-  node = lib.get_last_group_node(node)
+  node = node:last_group_node()
   local explorer = core.get_explorer()
   if node.name == ".." and explorer then
     node = explorer

lua/nvim-tree/actions/fs/create-file.lua

@@ -1,6 +1,5 @@
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
-local lib = require "nvim-tree.lib"
 local core = require "nvim-tree.core"
 local notify = require "nvim-tree.notify"
 
@@ -49,7 +48,7 @@ function M.fn(node)
     return
   end
 
-  node = node and lib.get_last_group_node(node)
+  node = node and node:last_group_node()
 
   local containing_folder
   if not node or node.name == ".." then

lua/nvim-tree/actions/fs/rename-file.lua

@@ -120,7 +120,7 @@ function M.fn(default_modifier)
       return
     end
 
-    node = lib.get_last_group_node(node)
+    node = node:last_group_node()
     if node.name == ".." then
       return
     end

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

@@ -1,7 +1,6 @@
 local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
-local lib = require "nvim-tree.lib"
 
 local M = {}
 
@@ -13,7 +12,7 @@ function M.fn(should_close)
   local explorer = core.get_explorer()
 
   return function(node)
-    node = lib.get_last_group_node(node)
+    node = node:last_group_node()
     if should_close and node.open then
       node.open = false
       if explorer then

lua/nvim-tree/actions/tree/modifiers/expand-all.lua

@@ -1,7 +1,6 @@
 local core = require "nvim-tree.core"
 local Iterator = require "nvim-tree.iterators.node-iterator"
 local notify = require "nvim-tree.notify"
-local lib = require "nvim-tree.lib"
 
 local M = {}
 
@@ -18,7 +17,7 @@ end
 
 ---@param node Node
 local function expand(node)
-  node = lib.get_last_group_node(node)
+  node = node:last_group_node()
   node.open = true
   if #node.nodes == 0 then
     core.get_explorer():expand(node)

lua/nvim-tree/api.lua

@@ -138,7 +138,7 @@ Api.tree.change_root_to_node = wrap_node(function(node)
   if node.name == ".." then
     actions.root.change_dir.fn ".."
   elseif node.nodes ~= nil then
-    actions.root.change_dir.fn(lib.get_last_group_node(node).absolute_path)
+    actions.root.change_dir.fn(node:last_group_node().absolute_path)
   end
 end)
 

lua/nvim-tree/lib.lua

@@ -83,17 +83,6 @@ function M.get_nodes()
   return clone_node(core.get_explorer())
 end
 
--- If node is grouped, return the last node in the group. Otherwise, return the given node.
----@param node Node
----@return Node
-function M.get_last_group_node(node)
-  while node and node.group_next do
-    node = node.group_next
-  end
-
-  return node ---@diagnostic disable-line: return-type-mismatch -- it can't be nil
-end
-
 ---Group empty folders
 -- Recursively group nodes
 ---@param node Node
@@ -164,7 +153,7 @@ function M.expand_or_collapse(node, toggle_group)
     toggle_group_folders(head_node)
   end
 
-  local open = M.get_last_group_node(node).open
+  local open = node:last_group_node().open
   local next_open
   if toggle_group then
     next_open = open

lua/nvim-tree/node/init.lua

@@ -78,7 +78,7 @@ function BaseNode:get_git_status()
   end
 
   local status = {}
-  if not require("nvim-tree.lib").get_last_group_node(self).open or self.explorer.opts.git.show_on_open_dirs then
+  if not self:last_group_node().open or self.explorer.opts.git.show_on_open_dirs then
     -- dir is closed or we should show on open_dirs
     if self.git_status.file ~= nil then
       table.insert(status, self.git_status.file)
@@ -151,4 +151,16 @@ function BaseNode:is_dotfile()
   return false
 end
 
+-- If node is grouped, return the last node in the group. Otherwise, return the given node.
+---@return Node
+function BaseNode:last_group_node()
+  local node = self
+
+  while node.group_next do
+    node = node.group_next
+  end
+
+  return node
+end
+
 return BaseNode

lua/nvim-tree/renderer/builder.lua

@@ -137,7 +137,7 @@ function Builder:unwrap_highlighted_strings(highlighted_strings)
 end
 
 ---@private
----@param node table
+---@param node Node
 ---@return HighlightedString icon
 ---@return HighlightedString name
 function Builder:build_folder(node)
@@ -369,7 +369,7 @@ function Builder:build_line(node, idx, num_children)
 
   self.index = self.index + 1
 
-  node = require("nvim-tree.lib").get_last_group_node(node)
+  node = node:last_group_node()
   if node.open then
     self.depth = self.depth + 1
     self:build_lines(node)