Merge branch 'master' into 3088-gen_vimdoc-api-3231-remove-api-requires

Author: alex-courtis

lua/nvim-tree.lua

@@ -12,6 +12,17 @@ local M = {
   init_root = "",
 }
 
+--- Helper function to execute some explorer method safely
+---@param fn string # key of explorer
+---@param ... any|nil
+---@return function|nil
+local function explorer_fn(fn, ...)
+  local explorer = core.get_explorer()
+  if explorer then
+    return explorer[fn](explorer, ...)
+  end
+end
+
 --- Update the tree root to a directory or the directory containing
 ---@param path string relative or absolute
 ---@param bufnr number|nil
@@ -48,7 +59,7 @@ function M.change_root(path, bufnr)
   -- test if in vim_cwd
   if utils.path_relative(path, vim_cwd) ~= path then
     if vim_cwd ~= cwd then
-      actions.root.change_dir.fn(vim_cwd)
+      explorer_fn("change_dir", vim_cwd)
     end
     return
   end
@@ -59,19 +70,19 @@ function M.change_root(path, bufnr)
 
   -- otherwise test M.init_root
   if _config.prefer_startup_root and utils.path_relative(path, M.init_root) ~= path then
-    actions.root.change_dir.fn(M.init_root)
+    explorer_fn("change_dir", M.init_root)
     return
   end
   -- otherwise root_dirs
   for _, dir in pairs(_config.root_dirs) do
     dir = vim.fn.fnamemodify(dir, ":p")
     if utils.path_relative(path, dir) ~= path then
-      actions.root.change_dir.fn(dir)
+      explorer_fn("change_dir", dir)
       return
     end
   end
   -- finally fall back to the folder containing the file
-  actions.root.change_dir.fn(vim.fn.fnamemodify(path, ":p:h"))
+  explorer_fn("change_dir", vim.fn.fnamemodify(path, ":p:h"))
 end
 
 function M.tab_enter()
@@ -111,7 +122,13 @@ function M.open_on_directory()
     return
   end
 
-  actions.root.change_dir.force_dirchange(bufname, true)
+
+  local explorer = core.get_explorer()
+  if not explorer then
+    core.init(bufname)
+  end
+
+  explorer_fn("force_dirchange", bufname, true, false)
 end
 
 ---@return table
@@ -135,7 +152,7 @@ end
 ---@param name string|nil
 function M.change_dir(name)
   if name then
-    actions.root.change_dir.fn(name)
+    explorer_fn("change_dir", name)
   end
 
   if _config.update_focused_file.update_root.enable then

lua/nvim-tree/actions/finders/find-file.lua

@@ -66,7 +66,7 @@ function M.fn(path)
             dir.open = true
           end
           if #dir.nodes == 0 then
-            core.get_explorer():expand(dir)
+            core.get_explorer():expand_dir_node(dir)
             if dir.group_next and incremented_line then
               line = line - 1
             end

lua/nvim-tree/actions/init.lua

@@ -4,13 +4,11 @@ M.finders = require("nvim-tree.actions.finders")
 M.fs = require("nvim-tree.actions.fs")
 M.moves = require("nvim-tree.actions.moves")
 M.node = require("nvim-tree.actions.node")
-M.root = require("nvim-tree.actions.root")
 M.tree = require("nvim-tree.actions.tree")
 
 function M.setup(opts)
   M.fs.setup(opts)
   M.node.setup(opts)
-  M.root.setup(opts)
   M.tree.setup(opts)
 end
 

lua/nvim-tree/actions/root/change-dir.lua

@@ -23,7 +23,7 @@ local function expand(node)
   node = node:last_group_node()
   node.open = true
   if #node.nodes == 0 then
-    core.get_explorer():expand(node)
+    core.get_explorer():expand_dir_node(node)
   end
 end
 
@@ -66,7 +66,7 @@ local function should_expand(expansion_count, node, should_descend)
 
   if not dir.open and should_descend(expansion_count, node) then
     if #node.nodes == 0 then
-      core.get_explorer():expand(dir) -- populate node.group_next
+      core.get_explorer():expand_dir_node(dir) -- populate node.group_next
     end
 
     if dir.group_next then

lua/nvim-tree/actions/root/init.lua

@@ -2,7 +2,6 @@ local view = require("nvim-tree.view")
 local actions = require("nvim-tree.actions")
 
 local DirectoryNode = require("nvim-tree.node.directory")
-local FileNode = require("nvim-tree.node.file")
 local FileLinkNode = require("nvim-tree.node.file-link")
 local RootNode = require("nvim-tree.node.root")
 
@@ -139,23 +138,7 @@ local function hydrate_post(api)
 
   api.tree.change_root = require("nvim-tree").change_dir
 
-  api.tree.change_root_to_node = wrap_node(function(node)
-    if node.name == ".." or node:is(RootNode) then
-      actions.root.change_dir.fn("..")
-      return
-    end
-
-    if node:is(FileNode) and node.parent ~= nil then
-      actions.root.change_dir.fn(node.parent:last_group_node().absolute_path)
-      return
-    end
-
-    if node:is(DirectoryNode) then
-      actions.root.change_dir.fn(node:last_group_node().absolute_path)
-      return
-    end
-  end)
-
+  api.tree.change_root_to_node = wrap_node(wrap_explorer("change_dir_to_node"))
   api.tree.change_root_to_parent = wrap_node(wrap_explorer("dir_up"))
   api.tree.get_node_under_cursor = wrap_explorer("get_node_at_cursor")
   api.tree.get_nodes = wrap_explorer("get_nodes")

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

@@ -134,6 +134,9 @@ function Filters:bookmark(path, path_type, bookmarks)
 
   local mark_parent = utils.path_add_trailing(path)
   for mark, mark_type in pairs(bookmarks) do
+    if type(mark_type) == "table" and mark_type.type then
+      mark_type = mark_type.type
+    end
     if path == mark then
       return false
     end