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

Author: alex-courtis

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

@@ -215,32 +215,77 @@ end
 ---@field recurse boolean?
 
 ---@param opts NavigationItemOpts
----@return fun()
-function M.fn(opts)
-  return function()
-    local explorer = core.get_explorer()
-    if not explorer then
-      return
-    end
+local function item(opts)
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
 
-    local recurse = false
+  local recurse = false
 
-    -- recurse only valid for git and diag moves.
-    if (opts.what == "git" or opts.what == "diag") and opts.recurse ~= nil then
-      recurse = opts.recurse
-    end
+  -- recurse only valid for git and diag moves.
+  if (opts.what == "git" or opts.what == "diag") and opts.recurse ~= nil then
+    recurse = opts.recurse
+  end
 
-    if not recurse then
-      move(explorer, opts.where, opts.what, opts.skip_gitignored)
-      return
-    end
+  if not recurse then
+    move(explorer, opts.where, opts.what, opts.skip_gitignored)
+    return
+  end
 
-    if opts.where == "next" then
-      move_next_recursive(explorer, opts.what, opts.skip_gitignored)
-    elseif opts.where == "prev" then
-      move_prev_recursive(explorer, opts.what, opts.skip_gitignored)
-    end
+  if opts.where == "next" then
+    move_next_recursive(explorer, opts.what, opts.skip_gitignored)
+  elseif opts.where == "prev" then
+    move_prev_recursive(explorer, opts.what, opts.skip_gitignored)
   end
 end
 
+function M.git_next()
+  item({ where = "next", what = "git" })
+end
+
+function M.git_next_skip_gitignored()
+  item({ where = "next", what = "git", skip_gitignored = true })
+end
+
+function M.git_next_recursive()
+  item({ where = "next", what = "git", recurse = true })
+end
+
+function M.git_prev()
+  item({ where = "prev", what = "git" })
+end
+
+function M.git_prev_skip_gitignored()
+  item({ where = "prev", what = "git", skip_gitignored = true })
+end
+
+function M.git_prev_recursive()
+  item({ where = "prev", what = "git", recurse = true })
+end
+
+function M.diagnostics_next()
+  item({ where = "next", what = "diag" })
+end
+
+function M.diagnostics_next_recursive()
+  item({ where = "next", what = "diag", recurse = true })
+end
+
+function M.diagnostics_prev()
+  item({ where = "prev", what = "diag" })
+end
+
+function M.diagnostics_prev_recursive()
+  item({ where = "prev", what = "diag", recurse = true })
+end
+
+function M.opened_next()
+  item({ where = "next", what = "opened" })
+end
+
+function M.opened_prev()
+  item({ where = "prev", what = "opened" })
+end
+
 return M

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

@@ -231,20 +231,24 @@ function M.hydrate(api)
   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.move)
   api.node.navigate.parent_close = wrap_node(actions.moves.parent.move_close)
-  api.node.navigate.git.next = wrap_node(actions.moves.item.fn({ where = "next", what = "git" }))
-  api.node.navigate.git.next_skip_gitignored = wrap_node(actions.moves.item.fn({ where = "next", what = "git", skip_gitignored = true }))
-  api.node.navigate.git.next_recursive = wrap_node(actions.moves.item.fn({ where = "next", what = "git", recurse = true }))
-  api.node.navigate.git.prev = wrap_node(actions.moves.item.fn({ where = "prev", what = "git" }))
-  api.node.navigate.git.prev_skip_gitignored = wrap_node(actions.moves.item.fn({ where = "prev", what = "git", skip_gitignored = true }))
-  api.node.navigate.git.prev_recursive = wrap_node(actions.moves.item.fn({ where = "prev", what = "git", recurse = true }))
-  api.node.navigate.diagnostics.next = wrap_node(actions.moves.item.fn({ where = "next", what = "diag" }))
-  api.node.navigate.diagnostics.next_recursive = wrap_node(actions.moves.item.fn({ where = "next", what = "diag", recurse = true }))
-  api.node.navigate.diagnostics.prev = wrap_node(actions.moves.item.fn({ where = "prev", what = "diag" }))
-  api.node.navigate.diagnostics.prev_recursive = wrap_node(actions.moves.item.fn({ where = "prev", what = "diag", recurse = true }))
-  api.node.navigate.opened.next = wrap_node(actions.moves.item.fn({ where = "next", what = "opened" }))
-  api.node.navigate.opened.prev = wrap_node(actions.moves.item.fn({ where = "prev", what = "opened" }))
+
+  api.node.navigate.git.next = actions.moves.item.git_next
+  api.node.navigate.git.next_skip_gitignored = actions.moves.item.git_next_skip_gitignored
+  api.node.navigate.git.next_recursive = actions.moves.item.git_next_recursive
+  api.node.navigate.git.prev = actions.moves.item.git_prev
+  api.node.navigate.git.prev_skip_gitignored = actions.moves.item.git_prev_skip_gitignored
+  api.node.navigate.git.prev_recursive = actions.moves.item.git_prev_recursive
+
+  api.node.navigate.diagnostics.next = actions.moves.item.diagnostics_next
+  api.node.navigate.diagnostics.next_recursive = actions.moves.item.diagnostics_next_recursive
+  api.node.navigate.diagnostics.prev = actions.moves.item.diagnostics_prev
+  api.node.navigate.diagnostics.prev_recursive = actions.moves.item.diagnostics_prev_recursive
+
+  api.node.navigate.opened.next = actions.moves.item.opened_next
+  api.node.navigate.opened.prev = actions.moves.item.opened_prev
 
   api.node.expand = wrap_node(wrap_explorer("expand_node"))
   api.node.collapse = wrap_node(actions.tree.collapse.node)