From c1948cbce0bc828d5e1b40b73ddb47a4eb19dead Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sun, 20 Jul 2025 21:07:49 +0200 Subject: [PATCH 01/11] feat: Allow to expand nodes until certain condition is met --- .../actions/tree/modifiers/expand.lua | 52 +++++++--- lua/nvim-tree/api.lua | 95 +++++++++++-------- 2 files changed, 97 insertions(+), 50 deletions(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index 385ff72b6c5..f8ba12ae604 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -30,17 +30,30 @@ end ---@param expansion_count integer ---@param node Node ---@return boolean -local function should_expand(expansion_count, node) +local function descend_until_max_or_empty(expansion_count, node) local dir = node:as(DirectoryNode) if not dir then return false end + local should_halt = expansion_count >= M.MAX_FOLDER_DISCOVERY local should_exclude = M.EXCLUDE[dir.name] - return not should_halt and not dir.open and not should_exclude + + return not should_halt and not should_exclude +end + +---@param expansion_count integer +---@param node Node +---@param should_descend fun(expansion_count: integer, node: Node): boolean +---@return boolean +local function should_expand(expansion_count, node, should_descend) + local dir = node:as(DirectoryNode) + return dir and not dir.open and should_descend(expansion_count, node) end -local function gen_iterator() + +---@param should_descend fun(expansion_count: integer, node: Node): boolean +local function gen_iterator(should_descend) local expansion_count = 0 return function(parent) @@ -52,7 +65,7 @@ local function gen_iterator() Iterator.builder(parent.nodes) :hidden() :applier(function(node) - if should_expand(expansion_count, node) then + if should_expand(expansion_count, node, should_descend) then expansion_count = expansion_count + 1 node = node:as(DirectoryNode) if node then @@ -61,7 +74,19 @@ local function gen_iterator() end end) :recursor(function(node) - return expansion_count < M.MAX_FOLDER_DISCOVERY and (node.group_next and { node.group_next } or (node.open and node.nodes)) + if not should_descend(expansion_count, node) then + return nil + end + + if node.group_next then + return { node.group_next } + end + + if node.open and node.nodes then + return node.nodes + end + + return nil end) :iterate() @@ -72,12 +97,13 @@ local function gen_iterator() end ---@param node Node? -local function expand_node(node) +---@param expand_opts ApiTreeExpandAllOpts? +local function expand_node(node, expand_opts) if not node then return end - - if gen_iterator()(node) then + local descend_until = (expand_opts and expand_opts.descend_until) or descend_until_max_or_empty + if gen_iterator(descend_until)(node) then notify.warn("expansion iteration was halted after " .. M.MAX_FOLDER_DISCOVERY .. " discovered folders") end @@ -89,18 +115,20 @@ end ---Expand the directory node or the root ---@param node Node -function M.all(node) - expand_node(node and node:as(DirectoryNode) or core.get_explorer()) +---@param expand_opts ApiTreeExpandAllOpts? +function M.all(node, expand_opts) + expand_node(node and node:as(DirectoryNode) or core.get_explorer(), expand_opts) end ---Expand the directory node or parent node ---@param node Node -function M.node(node) +---@param expand_opts ApiTreeExpandAllOpts? +function M.node(node, expand_opts) if not node then return end - expand_node(node:is(FileNode) and node.parent or node:as(DirectoryNode)) + expand_node(node:is(FileNode) and node.parent or node:as(DirectoryNode), expand_opts) end function M.setup(opts) diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index c75115c6c62..f379f6ce965 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -121,6 +121,45 @@ local function wrap_explorer_member(explorer_member, member_method) end) end +--- +---@class NodeEditOpts +---@field quit_on_open boolean|nil default false +---@field focus boolean|nil default true + +---@param mode string +---@param node Node +---@param edit_opts NodeEditOpts? +local function edit(mode, node, edit_opts) + local file_link = node:as(FileLinkNode) + local path = file_link and file_link.link_to or node.absolute_path + local cur_tabpage = vim.api.nvim_get_current_tabpage() + + local explorer = core.get_explorer() + + actions.node.open_file.fn(mode, path) + + edit_opts = edit_opts or {} + + local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" + if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then + if explorer then + explorer.view:close(cur_tabpage, "api.edit " .. mode) + end + end + + local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" + local focus = edit_opts.focus == nil or edit_opts.focus == true + if not mode_unsupported_focus and not focus then + -- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab + if mode == "tabnew" then + vim.cmd(":tabprev") + end + if explorer then + explorer.view:focus() + end + end +end + ---@class ApiTreeOpenOpts ---@field path string|nil path ---@field current_window boolean|nil default false @@ -186,7 +225,25 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn) ---@field keep_buffers boolean|nil default false Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) + +---@class ApiTreeExpandAllOpts +---@field descend_until (fun(expansion_count: integer, node: Node): boolean)|nil + Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) + +Api.tree.toggle_descend_until = wrap_node(function(node, descend_until) + if node.open then + local dir = node:as(DirectoryNode) + dir:expand_or_collapse("edit") + else + if node.nodes then + actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) + else + edit("edit", node) + end + end +end) + Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle") Api.tree.toggle_gitignore_filter = wrap_explorer_member_args("filters", "toggle", "git_ignored") Api.tree.toggle_git_clean_filter = wrap_explorer_member_args("filters", "toggle", "git_clean") @@ -225,44 +282,6 @@ Api.fs.copy.absolute_path = wrap_node(wrap_explorer_member("clipboard", "copy_ab Api.fs.copy.filename = wrap_node(wrap_explorer_member("clipboard", "copy_filename")) Api.fs.copy.basename = wrap_node(wrap_explorer_member("clipboard", "copy_basename")) Api.fs.copy.relative_path = wrap_node(wrap_explorer_member("clipboard", "copy_path")) ---- ----@class NodeEditOpts ----@field quit_on_open boolean|nil default false ----@field focus boolean|nil default true - ----@param mode string ----@param node Node ----@param edit_opts NodeEditOpts? -local function edit(mode, node, edit_opts) - local file_link = node:as(FileLinkNode) - local path = file_link and file_link.link_to or node.absolute_path - local cur_tabpage = vim.api.nvim_get_current_tabpage() - - local explorer = core.get_explorer() - - actions.node.open_file.fn(mode, path) - - edit_opts = edit_opts or {} - - local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" - if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then - if explorer then - explorer.view:close(cur_tabpage, "api.edit " .. mode) - end - end - - local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" - local focus = edit_opts.focus == nil or edit_opts.focus == true - if not mode_unsupported_focus and not focus then - -- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab - if mode == "tabnew" then - vim.cmd(":tabprev") - end - if explorer then - explorer.view:focus() - end - end -end ---@param mode string ---@param toggle_group boolean? From 641f125f6bd7185816478d83bd2e4df3ad42937c Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sun, 20 Jul 2025 21:24:29 +0200 Subject: [PATCH 02/11] Fix warnings --- lua/nvim-tree/actions/tree/modifiers/expand.lua | 7 ++++++- lua/nvim-tree/api.lua | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index f8ba12ae604..06d071c6ecc 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -48,11 +48,16 @@ end ---@return boolean local function should_expand(expansion_count, node, should_descend) local dir = node:as(DirectoryNode) - return dir and not dir.open and should_descend(expansion_count, node) + if not dir then + return false + end + + return not dir.open and should_descend(expansion_count, node) end ---@param should_descend fun(expansion_count: integer, node: Node): boolean +---@return fun(node): any local function gen_iterator(should_descend) local expansion_count = 0 diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index f379f6ce965..190722d0b46 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -232,15 +232,15 @@ Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) Api.tree.toggle_descend_until = wrap_node(function(node, descend_until) - if node.open then - local dir = node:as(DirectoryNode) - dir:expand_or_collapse("edit") - else - if node.nodes then - actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) + local dir = node:as(DirectoryNode) + if dir then + if node.open then + dir:expand_or_collapse(nil) else - edit("edit", node) + actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) end + else + edit("edit", node) end end) From 72404b9f52ac12c0b6e1266ce128e41b809d9741 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:40:39 +0200 Subject: [PATCH 03/11] Restore original position of edit function --- lua/nvim-tree/api.lua | 105 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 53 deletions(-) diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 190722d0b46..04f2fc71af8 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -121,45 +121,6 @@ local function wrap_explorer_member(explorer_member, member_method) end) end ---- ----@class NodeEditOpts ----@field quit_on_open boolean|nil default false ----@field focus boolean|nil default true - ----@param mode string ----@param node Node ----@param edit_opts NodeEditOpts? -local function edit(mode, node, edit_opts) - local file_link = node:as(FileLinkNode) - local path = file_link and file_link.link_to or node.absolute_path - local cur_tabpage = vim.api.nvim_get_current_tabpage() - - local explorer = core.get_explorer() - - actions.node.open_file.fn(mode, path) - - edit_opts = edit_opts or {} - - local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" - if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then - if explorer then - explorer.view:close(cur_tabpage, "api.edit " .. mode) - end - end - - local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" - local focus = edit_opts.focus == nil or edit_opts.focus == true - if not mode_unsupported_focus and not focus then - -- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab - if mode == "tabnew" then - vim.cmd(":tabprev") - end - if explorer then - explorer.view:focus() - end - end -end - ---@class ApiTreeOpenOpts ---@field path string|nil path ---@field current_window boolean|nil default false @@ -230,20 +191,6 @@ Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) ---@field descend_until (fun(expansion_count: integer, node: Node): boolean)|nil Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) - -Api.tree.toggle_descend_until = wrap_node(function(node, descend_until) - local dir = node:as(DirectoryNode) - if dir then - if node.open then - dir:expand_or_collapse(nil) - else - actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) - end - else - edit("edit", node) - end -end) - Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle") Api.tree.toggle_gitignore_filter = wrap_explorer_member_args("filters", "toggle", "git_ignored") Api.tree.toggle_git_clean_filter = wrap_explorer_member_args("filters", "toggle", "git_clean") @@ -283,6 +230,58 @@ Api.fs.copy.filename = wrap_node(wrap_explorer_member("clipboard", "copy_filenam Api.fs.copy.basename = wrap_node(wrap_explorer_member("clipboard", "copy_basename")) Api.fs.copy.relative_path = wrap_node(wrap_explorer_member("clipboard", "copy_path")) +--- +---@class NodeEditOpts +---@field quit_on_open boolean|nil default false +---@field focus boolean|nil default true + +---@param mode string +---@param node Node +---@param edit_opts NodeEditOpts? +local function edit(mode, node, edit_opts) + local file_link = node:as(FileLinkNode) + local path = file_link and file_link.link_to or node.absolute_path + local cur_tabpage = vim.api.nvim_get_current_tabpage() + + local explorer = core.get_explorer() + + actions.node.open_file.fn(mode, path) + + edit_opts = edit_opts or {} + + local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" + if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then + if explorer then + explorer.view:close(cur_tabpage, "api.edit " .. mode) + end + end + + local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place" + local focus = edit_opts.focus == nil or edit_opts.focus == true + if not mode_unsupported_focus and not focus then + -- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab + if mode == "tabnew" then + vim.cmd(":tabprev") + end + if explorer then + explorer.view:focus() + end + end +end + +Api.tree.toggle_descend_until = wrap_node(function(node, descend_until) + local dir = node:as(DirectoryNode) + if dir then + if node.open then + dir:expand_or_collapse(nil) + else + actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) + end + else + edit("edit", node) + end +end) + ---@param mode string ---@param toggle_group boolean? ---@return fun(node: Node, edit_opts: NodeEditOpts?) From 06575bce2b0c17a61729e77393bee17936996075 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:42:16 +0200 Subject: [PATCH 04/11] Rename field to match the api method name --- lua/nvim-tree/api.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 04f2fc71af8..f1745587656 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -188,7 +188,7 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn) Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) ---@class ApiTreeExpandAllOpts ----@field descend_until (fun(expansion_count: integer, node: Node): boolean)|nil +---@field expand_until (fun(expansion_count: integer, node: Node): boolean)|nil Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle") From 89364601a6adb98b12ea9301c10299ac5e6ed2c9 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:43:44 +0200 Subject: [PATCH 05/11] Rename ApiTreeExpandAllOpts to ApiTreeExpandOpts --- lua/nvim-tree/actions/tree/modifiers/expand.lua | 6 +++--- lua/nvim-tree/api.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index 06d071c6ecc..1da0d234b87 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -102,7 +102,7 @@ local function gen_iterator(should_descend) end ---@param node Node? ----@param expand_opts ApiTreeExpandAllOpts? +---@param expand_opts ApiTreeExpandOpts? local function expand_node(node, expand_opts) if not node then return @@ -120,14 +120,14 @@ end ---Expand the directory node or the root ---@param node Node ----@param expand_opts ApiTreeExpandAllOpts? +---@param expand_opts ApiTreeExpandOpts? function M.all(node, expand_opts) expand_node(node and node:as(DirectoryNode) or core.get_explorer(), expand_opts) end ---Expand the directory node or parent node ---@param node Node ----@param expand_opts ApiTreeExpandAllOpts? +---@param expand_opts ApiTreeExpandOpts? function M.node(node, expand_opts) if not node then return diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index f1745587656..e17336f7821 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -187,7 +187,7 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn) Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) ----@class ApiTreeExpandAllOpts +---@class ApiTreeExpandOpts ---@field expand_until (fun(expansion_count: integer, node: Node): boolean)|nil Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) From 71271e3149f5163c7cd989e04e40ea3141245052 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:46:19 +0200 Subject: [PATCH 06/11] Remove toggle_descend_until --- lua/nvim-tree/api.lua | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 9896776d261..dac6ab2b19b 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -269,19 +269,6 @@ local function edit(mode, node, edit_opts) end end -Api.tree.toggle_descend_until = wrap_node(function(node, descend_until) - local dir = node:as(DirectoryNode) - if dir then - if node.open then - dir:expand_or_collapse(nil) - else - actions.tree.modifiers.expand.all(node, { descend_until = descend_until }) - end - else - edit("edit", node) - end -end) - ---@param mode string ---@param toggle_group boolean? ---@return fun(node: Node, edit_opts: NodeEditOpts?) From 03e3a155628d46b8e37417bc718b4b3f0944a367 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:49:47 +0200 Subject: [PATCH 07/11] Remove redundant empty line --- lua/nvim-tree/api.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index dac6ab2b19b..27f819ffe03 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -229,7 +229,6 @@ Api.fs.copy.absolute_path = wrap_node(wrap_explorer_member("clipboard", "copy_ab Api.fs.copy.filename = wrap_node(wrap_explorer_member("clipboard", "copy_filename")) Api.fs.copy.basename = wrap_node(wrap_explorer_member("clipboard", "copy_basename")) Api.fs.copy.relative_path = wrap_node(wrap_explorer_member("clipboard", "copy_path")) - --- ---@class NodeEditOpts ---@field quit_on_open boolean|nil default false From 4ab16dd3a756d68bed1e4f64c5c96b7d50303a81 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 14:53:33 +0200 Subject: [PATCH 08/11] Update :help for changed methods --- doc/nvim-tree-lua.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/nvim-tree-lua.txt b/doc/nvim-tree-lua.txt index adf54f1c2b3..6761cb691c3 100644 --- a/doc/nvim-tree-lua.txt +++ b/doc/nvim-tree-lua.txt @@ -1846,6 +1846,7 @@ tree.expand_all({node}) *nvim-tree-api.tree.expand_all()* Parameters: ~ • {node} (Node|nil) folder + • {expand_opts} (ApiTreeExpandOpts|nil) optional parameters *nvim-tree-api.tree.toggle_enable_filters()* tree.toggle_enable_filters() @@ -2285,6 +2286,7 @@ node.expand({node}) *nvim-tree-api.node.expand()* Parameters: ~ • {node} (Node|nil) file or folder + • {expand_opts} (ApiTreeExpandOpts|nil) optional parameters node.collapse({node}, {opts}) *nvim-tree-api.node.collapse()* Collapse the tree under a directory or a file's parent directory. From 3dac0be704d3edb1bc931251854a31674cf385e2 Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 16:09:58 +0200 Subject: [PATCH 09/11] Fix partial expansion of grouped nodes --- lua/nvim-tree/actions/tree/modifiers/expand.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index 1da0d234b87..8b897251cf7 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -52,7 +52,15 @@ local function should_expand(expansion_count, node, should_descend) return false end - return not dir.open and should_descend(expansion_count, node) + if not dir.open and should_descend(expansion_count, node) then + core.get_explorer():expand(node) + if node.group_next then + return should_expand(expansion_count, node.group_next, should_descend) + else + return true + end + end + return false end From 160ae4fce6e91ac7b8d12417145478c19e3f042e Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 16:13:07 +0200 Subject: [PATCH 10/11] Fix lint error --- lua/nvim-tree/actions/tree/modifiers/expand.lua | 12 ++++++------ lua/nvim-tree/api.lua | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index 8b897251cf7..fcd1a4abcea 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -44,7 +44,7 @@ end ---@param expansion_count integer ---@param node Node ----@param should_descend fun(expansion_count: integer, node: Node): boolean +---@param should_descend fun(expansion_count: integer, node: DirectoryNode): boolean ---@return boolean local function should_expand(expansion_count, node, should_descend) local dir = node:as(DirectoryNode) @@ -52,10 +52,10 @@ local function should_expand(expansion_count, node, should_descend) return false end - if not dir.open and should_descend(expansion_count, node) then - core.get_explorer():expand(node) - if node.group_next then - return should_expand(expansion_count, node.group_next, should_descend) + if not dir.open and should_descend(expansion_count, dir) then + core.get_explorer():expand(dir) -- populate node.group_next + if dir.group_next then + return should_expand(expansion_count, dir.group_next, should_descend) else return true end @@ -64,7 +64,7 @@ local function should_expand(expansion_count, node, should_descend) end ----@param should_descend fun(expansion_count: integer, node: Node): boolean +---@param should_descend fun(expansion_count: integer, node: DirectoryNode): boolean ---@return fun(node): any local function gen_iterator(should_descend) local expansion_count = 0 diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 27f819ffe03..059101dfa6b 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -188,7 +188,7 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn) Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) ---@class ApiTreeExpandOpts ----@field expand_until (fun(expansion_count: integer, node: Node): boolean)|nil +---@field expand_until (fun(expansion_count: integer, node: DirectoryNode): boolean)|nil Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle") From 37b351691cd37ec8a79391de25d42c4ba1ffa63a Mon Sep 17 00:00:00 2001 From: ghostbuster91 Date: Sat, 2 Aug 2025 16:18:41 +0200 Subject: [PATCH 11/11] Fix linting error --- lua/nvim-tree/actions/tree/modifiers/expand.lua | 6 +++--- lua/nvim-tree/api.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/nvim-tree/actions/tree/modifiers/expand.lua b/lua/nvim-tree/actions/tree/modifiers/expand.lua index fcd1a4abcea..16c9b9f8128 100644 --- a/lua/nvim-tree/actions/tree/modifiers/expand.lua +++ b/lua/nvim-tree/actions/tree/modifiers/expand.lua @@ -44,7 +44,7 @@ end ---@param expansion_count integer ---@param node Node ----@param should_descend fun(expansion_count: integer, node: DirectoryNode): boolean +---@param should_descend fun(expansion_count: integer, node: Node): boolean ---@return boolean local function should_expand(expansion_count, node, should_descend) local dir = node:as(DirectoryNode) @@ -52,7 +52,7 @@ local function should_expand(expansion_count, node, should_descend) return false end - if not dir.open and should_descend(expansion_count, dir) then + if not dir.open and should_descend(expansion_count, node) then core.get_explorer():expand(dir) -- populate node.group_next if dir.group_next then return should_expand(expansion_count, dir.group_next, should_descend) @@ -64,7 +64,7 @@ local function should_expand(expansion_count, node, should_descend) end ----@param should_descend fun(expansion_count: integer, node: DirectoryNode): boolean +---@param should_descend fun(expansion_count: integer, node: Node): boolean ---@return fun(node): any local function gen_iterator(should_descend) local expansion_count = 0 diff --git a/lua/nvim-tree/api.lua b/lua/nvim-tree/api.lua index 059101dfa6b..27f819ffe03 100644 --- a/lua/nvim-tree/api.lua +++ b/lua/nvim-tree/api.lua @@ -188,7 +188,7 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn) Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all) ---@class ApiTreeExpandOpts ----@field expand_until (fun(expansion_count: integer, node: DirectoryNode): boolean)|nil +---@field expand_until (fun(expansion_count: integer, node: Node): boolean)|nil Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all) Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle")