refactor(#3255): wire node.navigate.sibling API impl directly to functions

Author: alex-courtis

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

@@ -3,55 +3,73 @@ local Iterator = require("nvim-tree.iterators.node-iterator")
 
 local M = {}
 
----@param direction string
----@return fun(node: Node): nil
-function M.fn(direction)
-  return function(node)
-    if node.name == ".." or not direction then
-      return
-    end
-
-    local explorer = core.get_explorer()
-    if not explorer then
-      return
-    end
-
-    local first, last, next, prev = nil, nil, nil, nil
-    local found = false
-    local parent = node.parent or explorer
-    Iterator.builder(parent and parent.nodes or {})
-      :recursor(function()
-        return nil
-      end)
-      :applier(function(n)
-        first = first or n
-        last = n
-        if n.absolute_path == node.absolute_path then
-          found = true
-          return
-        end
-        prev = not found and n or prev
-        if found and not next then
-          next = n
-        end
-      end)
-      :iterate()
-
-    local target_node
-    if direction == "first" then
-      target_node = first
-    elseif direction == "last" then
-      target_node = last
-    elseif direction == "next" then
-      target_node = next or first
-    else
-      target_node = prev or last
-    end
-
-    if target_node then
-      explorer:focus_node_or_parent(target_node)
-    end
+---@param node Node
+---@param direction "next"|"prev"|"first"|"last"
+local function move(node, direction)
+  if node.name == ".." or not direction then
+    return
   end
+
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
+
+  local first, last, next, prev = nil, nil, nil, nil
+  local found = false
+  local parent = node.parent or explorer
+  Iterator.builder(parent and parent.nodes or {})
+    :recursor(function()
+      return nil
+    end)
+    :applier(function(n)
+      first = first or n
+      last = n
+      if n.absolute_path == node.absolute_path then
+        found = true
+        return
+      end
+      prev = not found and n or prev
+      if found and not next then
+        next = n
+      end
+    end)
+    :iterate()
+
+  local target_node
+  if direction == "first" then
+    target_node = first
+  elseif direction == "last" then
+    target_node = last
+  elseif direction == "next" then
+    target_node = next or first
+  else
+    target_node = prev or last
+  end
+
+  if target_node then
+    explorer:focus_node_or_parent(target_node)
+  end
+end
+
+---@param node Node
+function M.next(node)
+  move(node, "next")
+end
+
+---@param node Node
+function M.prev(node)
+  move(node, "prev")
+end
+
+---@param node Node
+function M.first(node)
+  move(node, "first")
+end
+
+---@param node Node
+function M.last(node)
+  move(node, "last")
 end
 
 return M

lua/nvim-tree/api/impl/post.lua

@@ -207,10 +207,10 @@ function M.hydrate(api)
   api.node.run.cmd = wrap_node(actions.node.run_command.run_file_command)
   api.node.run.system = wrap_node(actions.node.system_open.fn)
 
-  api.node.navigate.sibling.next = wrap_node(actions.moves.sibling.fn("next"))
-  api.node.navigate.sibling.prev = wrap_node(actions.moves.sibling.fn("prev"))
-  api.node.navigate.sibling.first = wrap_node(actions.moves.sibling.fn("first"))
-  api.node.navigate.sibling.last = wrap_node(actions.moves.sibling.fn("last"))
+  api.node.navigate.sibling.next = wrap_node(actions.moves.sibling.next)
+  api.node.navigate.sibling.prev = wrap_node(actions.moves.sibling.prev)
+  api.node.navigate.sibling.first = wrap_node(actions.moves.sibling.first)
+  api.node.navigate.sibling.last = wrap_node(actions.moves.sibling.last)
   api.node.navigate.parent = wrap_node(actions.moves.parent.fn(false))
   api.node.navigate.parent_close = wrap_node(actions.moves.parent.fn(true))
   api.node.navigate.git.next = wrap_node(actions.moves.item.fn({ where = "next", what = "git" }))