chore(master): release nvim-tree 1.6.1 (#2877 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix(#2794 ): sshfs compatibility (#2893 )
2024-09-09 10:41:48 +10:00 · 2024-09-09 10:31:55 +10:00 · 2024-09-08 15:11:02 +10:00 · 2024-09-08 14:40:17 +10:00 · 2024-09-01 15:50:03 +10:00 · 2024-09-01 14:52:25 +10:00
38 changed files with 1112 additions and 878 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
    strategy:
      matrix:
        nvim_version: [ stable, nightly ]
-        luals_version: [ 3.9.1 ]
+        luals_version: [ 3.10.5 ]

    steps:
      - uses: actions/checkout@v4
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.5.0"
+  ".": "1.6.1"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog

+## [1.6.1](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.6.0...nvim-tree-v1.6.1) (2024-09-09)
+
+
+### Bug Fixes
+
+* **#2794:** sshfs compatibility ([#2893](https://github.com/nvim-tree/nvim-tree.lua/issues/2893)) ([2d6e64d](https://github.com/nvim-tree/nvim-tree.lua/commit/2d6e64dd8c45a86f312552b7a47eef2c8623a25c))
+* **#2868:** windows: do not visit unenumerable directories such as Application Data ([#2874](https://github.com/nvim-tree/nvim-tree.lua/issues/2874)) ([2104786](https://github.com/nvim-tree/nvim-tree.lua/commit/210478677cb9d672c4265deb0e9b59d58b675bd4))
+* **#2878:** nowrapscan prevents move from root ([#2880](https://github.com/nvim-tree/nvim-tree.lua/issues/2880)) ([4234095](https://github.com/nvim-tree/nvim-tree.lua/commit/42340952af598a08ab80579d067b6da72a9e6d29))
+* **#2879:** remove unnecessary tree window width setting to prevent unnecessary :wincmd = ([#2881](https://github.com/nvim-tree/nvim-tree.lua/issues/2881)) ([d43ab67](https://github.com/nvim-tree/nvim-tree.lua/commit/d43ab67d0eb4317961c5e9d15fffe908519debe0))
+
+## [1.6.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.5.0...nvim-tree-v1.6.0) (2024-08-10)
+
+
+### Features
+
+* **#2225:** add renderer.hidden_display to show a summary of hidden files below the tree ([#2856](https://github.com/nvim-tree/nvim-tree.lua/issues/2856)) ([e25eb7f](https://github.com/nvim-tree/nvim-tree.lua/commit/e25eb7fa83f7614bb23d762e91d2de44fcd7103b))
+* **#2349:** add "right_align" option for renderer.icons.*_placement ([#2839](https://github.com/nvim-tree/nvim-tree.lua/issues/2839)) ([1d629a5](https://github.com/nvim-tree/nvim-tree.lua/commit/1d629a5d3f7d83d516494c221a2cfc079f43bc47))
+* **#2349:** add "right_align" option for renderer.icons.*_placement ([#2846](https://github.com/nvim-tree/nvim-tree.lua/issues/2846)) ([48d0e82](https://github.com/nvim-tree/nvim-tree.lua/commit/48d0e82f9434691cc50d970898142a8c084a49d6))
+* add renderer.highlight_hidden, renderer.icons.show.hidden and renderer.icons.hidden_placement for dotfile icons/highlights ([#2840](https://github.com/nvim-tree/nvim-tree.lua/issues/2840)) ([48a9290](https://github.com/nvim-tree/nvim-tree.lua/commit/48a92907575df1dbd7242975a04e98169cb3a115))
+
+
+### Bug Fixes
+
+* **#2859:** make sure window still exists when restoring options ([#2863](https://github.com/nvim-tree/nvim-tree.lua/issues/2863)) ([466fbed](https://github.com/nvim-tree/nvim-tree.lua/commit/466fbed3e4b61fcc23a48fe99de7bfa264a9fee8))
+
 ## [1.5.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.4.0...nvim-tree-v1.5.0) (2024-07-11)


--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -423,6 +423,7 @@ Following is the default configuration. See |nvim-tree-opts| for details.
        root_folder_label = ":~:s?$?/..?",
        indent_width = 2,
        special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
+        hidden_display = "none",
        symlink_destination = true,
        highlight_git = "none",
        highlight_diagnostics = "none",
@@ -878,6 +879,49 @@ Number of spaces for an each tree nesting level. Minimum 1.
 A list of filenames that gets highlighted with `NvimTreeSpecialFile`.
  Type: `table`, Default: `{ "Cargo.toml", "Makefile", "README.md", "readme.md", }`

+*nvim-tree.renderer.hidden_display*
+Show a summary of hidden files below the tree using `NvimTreeHiddenDisplay
+  Type: `function | string`, Default: `"none"`
+
+  Possible string values are:
+    - `"none"`:   Doesn't inform anything about hidden files.
+    - `"simple"`: Shows how many hidden files are in a folder.
+    - `"all"`:    Shows how many files are hidden and the number of hidden
+                files per reason why they're hidden.
+
+  Example `"all"`:
+    If a folder has 14 hidden items for various reasons, the display might
+    show: >
+    (14 total git: 5, dotfile: 9)
+<
+  If a function is provided, it receives a table `hidden_stats` where keys are
+  reasons and values are the count of hidden files for that reason.
+
+  The `hidden_stats` argument is structured as follows, where <num> is the
+  number of hidden files related to the field: >
+    hidden_stats = {
+      bookmark = <num>,
+      buf = <num>,
+      custom = <num>,
+      dotfile = <num>,
+      git = <num>,
+      live_filter = <num>,
+    }
+<
+  Example of function that can be passed: >
+    function(hidden_stats)
+      local total_count = 0
+      for reason, count in pairs(hidden_stats) do
+        total_count = total_count + count
+      end
+
+      if total_count > 0 then
+        return "(" .. tostring(total_count) .. " hidden)"
+      end
+      return nil
+    end
+<
+
 *nvim-tree.renderer.symlink_destination*
 Whether to show the destination of the symlink.
  Type: `boolean`, Default: `true`
@@ -911,7 +955,6 @@ Value can be `"none"`, `"icon"`, `"name"` or `"all"`
 *nvim-tree.renderer.highlight_hidden*
 Highlight icons and/or names for hidden files (dotfiles) using the
 `NvimTreeHiddenFileHL` highlight group.
-Requires |nvim-tree.hidden.enable|
 Value can be `"none"`, `"icon"`, `"name"` or `"all"`
  Type: `string`, Default `"none"`

@@ -1045,8 +1088,7 @@ Icon order and sign column precedence:

        *nvim-tree.renderer.icons.show.hidden*
        Show a hidden icon, see |renderer.icons.hidden_placement|
-        Requires |hidden.enable| `= true`
-          Type: `boolean`, Default: `true`
+          Type: `boolean`, Default: `false`

        *nvim-tree.renderer.icons.show.diagnostics*
        Show a diagnostics status icon, see |renderer.icons.diagnostics_placement|
@@ -1637,10 +1679,8 @@ to avoid breaking configurations due to internal breaking changes.
 The api is separated in multiple modules, which can be accessed with
 `api.<module>.<function>`

-Functions that needs a tree node parameter are exposed with an abstraction
-that injects the node from the cursor position in the tree when calling
-the function. It will use the node you pass as an argument in priority if it
-exists.
+Functions accepting {node} as their first argument will use the node under the
+cursor when that argument is not present or nil.

 ==============================================================================
 6.1 API TREE                                             *nvim-tree-api.tree*
@@ -1766,9 +1806,11 @@ tree.collapse_all({keep_buffers})          *nvim-tree-api.tree.collapse_all()*
    Parameters: ~
      • {keep_buffers} (boolean) do not collapse nodes with open buffers.

-tree.expand_all()                            *nvim-tree-api.tree.expand_all()*
-    Recursively expand all nodes in the tree.
-    Folder: only the nodes underneath that folder.
+tree.expand_all({node})                      *nvim-tree-api.tree.expand_all()*
+    Recursively expand all nodes under the tree root or specified folder.
+
+    Parameters: ~
+      • {node} (Node|nil) folder

                                  *nvim-tree-api.tree.toggle_enable_filters()*
 tree.toggle_enable_filters()
@@ -1843,86 +1885,86 @@ fs.create({node})                                  *nvim-tree-api.fs.create()*
    Multiple directories/files may be created e.g. `foo/bar/baz`

    Parameters: ~
-      • {node} (Node) parent, uses the parent of a file.
+      • {node} (Node|nil) parent, uses the parent of a file.

 fs.remove({node})                                  *nvim-tree-api.fs.remove()*
    Delete a file or folder from the file system.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.trash({node})                                    *nvim-tree-api.fs.trash()*
    Trash a file or folder as per |nvim-tree.trash|

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.rename_node({node})                        *nvim-tree-api.fs.rename_node()*
    Prompt to rename a file or folder.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.rename({node})                                  *nvim-tree-api.fs.rename()*
    Prompt to rename a file or folder by name.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.rename_basename({node})                *nvim-tree-api.fs.rename_basename()*
    Prompt to rename a file or folder by name with extension omitted.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.rename_sub({node})                          *nvim-tree-api.fs.rename_sub()*
    Prompt to rename a file or folder by absolute path with name omitted.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.rename_full({node})                        *nvim-tree-api.fs.rename_full()*
    Prompt to rename a file or folder by absolute path.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.cut({node})                                        *nvim-tree-api.fs.cut()*
    Cut a file or folder to the nvim-tree clipboard.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.paste({node})                                    *nvim-tree-api.fs.paste()*
    Paste a file or folder from the nvim-tree clipboard.

    Parameters: ~
-      • {node} (Node) destination folder, uses the parent of a file.
+      • {node} (Node|nil) destination folder, uses the parent of a file.

 fs.copy.node({node})                            *nvim-tree-api.fs.copy.node()*
    Copy a file or folder from the nvim-tree clipboard.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.copy.absolute_path({node})          *nvim-tree-api.fs.copy.absolute_path()*
    Copy the absolute path of a file or folder to the system clipboard.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.copy.filename({node})                    *nvim-tree-api.fs.copy.filename()*
    Copy the name of a file or folder to the system clipboard.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.copy.relative_path({node})          *nvim-tree-api.fs.copy.relative_path()*
    Copy the path of a file or folder relative to the tree root to the system
    clipboard.

    Parameters: ~
-      • {node} (Node) file or folder
+      • {node} (Node|nil) file or folder

 fs.clear_clipboard()                      *nvim-tree-api.fs.clear_clipboard()*
    Clear the nvim-tree clipboard.
@@ -1933,34 +1975,37 @@ fs.print_clipboard()                      *nvim-tree-api.fs.print_clipboard()*
 ==============================================================================
 6.3 API NODE                                             *nvim-tree-api.node*

-node.open.edit()                              *nvim-tree-api.node.open.edit()*
+Parameters: ~
+  • {node} (Node|nil) file or folder
+
+node.open.edit({node})                        *nvim-tree-api.node.open.edit()*
    File:   open as per |nvim-tree.actions.open_file|
    Folder: expand or collapse
    Root:   change directory up

                               *nvim-tree-api.node.open.replace_tree_buffer()*
-node.open.replace_tree_buffer()
+node.open.replace_tree_buffer({node})
    |nvim-tree-api.node.edit()|, file will be opened in place: in the
    nvim-tree window.

                                  *nvim-tree-api.node.open.no_window_picker()*
-node.open.no_window_picker()
+node.open.no_window_picker({node})
    |nvim-tree-api.node.edit()|, window picker will never be used as per
    |nvim-tree.actions.open_file.window_picker.enable| `false`

-node.open.vertical()                      *nvim-tree-api.node.open.vertical()*
+node.open.vertical({node})                *nvim-tree-api.node.open.vertical()*
    |nvim-tree-api.node.edit()|, file will be opened in a new vertical split.

-node.open.horizontal()                  *nvim-tree-api.node.open.horizontal()*
+node.open.horizontal({node})            *nvim-tree-api.node.open.horizontal()*
    |nvim-tree-api.node.edit()|, file will be opened in a new horizontal split.

                                *nvim-tree-api.node.open.toggle_group_empty()*
-node.open.toggle_group_empty()
+node.open.toggle_group_empty({node})
    Toggle |nvim-tree.renderer.group_empty| for a specific folder.
    Does nothing on files.
    Needs |nvim-tree.renderer.group_empty| set.

-node.open.drop()                              *nvim-tree-api.node.open.drop()*
+node.open.drop({node})                        *nvim-tree-api.node.open.drop()*
    Switch to window with selected file if it exists.
    Open file otherwise.
    See: `:h :drop`.
@@ -1969,11 +2014,11 @@ node.open.drop()                              *nvim-tree-api.node.open.drop()*
    Folder: expand or collapse
    Root:   change directory up

-node.open.tab()                                *nvim-tree-api.node.open.tab()*
+node.open.tab({node})                          *nvim-tree-api.node.open.tab()*
    |nvim-tree-api.node.edit()|, file will be opened in a new tab.

                                          *nvim-tree-api.node.open.tab_drop()*
-node.open.tab_drop()
+node.open.tab_drop({node})
    Switch to tab containing window with selected file if it exists.
    Open file in new tab otherwise.

@@ -1981,102 +2026,103 @@ node.open.tab_drop()
    Folder: expand or collapse
    Root:   change directory up

-node.open.preview()                        *nvim-tree-api.node.open.preview()*
+node.open.preview({node})                  *nvim-tree-api.node.open.preview()*
    |nvim-tree-api.node.edit()|, file buffer will have |bufhidden| set to `delete`.

-node.open.preview_no_picker()    *nvim-tree-api.node.open.preview_no_picker()*
+                                 *nvim-tree-api.node.open.preview_no_picker()*
+node.open.preview_no_picker({node})
    |nvim-tree-api.node.edit()|, file buffer will have |bufhidden| set to `delete`.
    window picker will never be used as per
    |nvim-tree.actions.open_file.window_picker.enable| `false`

-node.navigate.git.next()              *nvim-tree-api.node.navigate.git.next()*
+node.navigate.git.next({node})        *nvim-tree-api.node.navigate.git.next()*
    Navigate to the next item showing git status.

                            *nvim-tree-api.node.navigate.git.next_recursive()*
-node.navigate.git.next_recursive()
+node.navigate.git.next_recursive({node})
    Alternative to |nvim-tree-api.node.navigate.git.next()| that navigates to
    the next file showing git status, recursively.
    Needs |nvim-tree.git.show_on_dirs| set.

                      *nvim-tree-api.node.navigate.git.next_skip_gitignored()*
-node.navigate.git.next_skip_gitignored()
+node.navigate.git.next_skip_gitignored({node})
    Same as |node.navigate.git.next()|, but skips gitignored files.

-node.navigate.git.prev()              *nvim-tree-api.node.navigate.git.prev()*
+node.navigate.git.prev({node})        *nvim-tree-api.node.navigate.git.prev()*
    Navigate to the previous item showing git status.

                      *nvim-tree-api.node.navigate.git.prev_recursive()*
-node.navigate.git.prev_recursive()
+node.navigate.git.prev_recursive({node})
    Alternative to |nvim-tree-api.node.navigate.git.prev()| that navigates to
    the previous file showing git status, recursively.
    Needs |nvim-tree.git.show_on_dirs| set.

                      *nvim-tree-api.node.navigate.git.prev_skip_gitignored()*
-node.navigate.git.prev_skip_gitignored()
+node.navigate.git.prev_skip_gitignored({node})
    Same as |node.navigate.git.prev()|, but skips gitignored files.

                              *nvim-tree-api.node.navigate.diagnostics.next()*
-node.navigate.diagnostics.next()
+node.navigate.diagnostics.next({node})
    Navigate to the next item showing diagnostic status.

                    *nvim-tree-api.node.navigate.diagnostics.next_recursive()*
-node.navigate.diagnostics.next_recursive()
+node.navigate.diagnostics.next_recursive({node})
    Alternative to |nvim-tree-api.node.navigate.diagnostics.next()| that
    navigates to the next file showing diagnostic status, recursively.
    Needs |nvim-tree.diagnostics.show_on_dirs| set.

                              *nvim-tree-api.node.navigate.diagnostics.prev()*
-node.navigate.diagnostics.prev()
+node.navigate.diagnostics.prev({node})
    Navigate to the next item showing diagnostic status.

                    *nvim-tree-api.node.navigate.diagnostics.prev_recursive()*
-node.navigate.diagnostics.prev_recursive()
+node.navigate.diagnostics.prev_recursive({node})
    Alternative to |nvim-tree-api.node.navigate.diagnostics.prev()| that
    navigates to the previous file showing diagnostic status, recursively.
    Needs |nvim-tree.diagnostics.show_on_dirs| set.

                                   *nvim-tree-api.node.navigate.opened.next()*
-node.navigate.opened.next()
+node.navigate.opened.next({node})
    Navigate to the next |bufloaded()| item.
    See |nvim-tree.renderer.highlight_opened_files|

                                   *nvim-tree-api.node.navigate.opened.prev()*
-node.navigate.opened.prev()
+node.navigate.opened.prev({node})
    Navigate to the previous |bufloaded()| item.
    See |nvim-tree.renderer.highlight_opened_files|

                                  *nvim-tree-api.node.navigate.sibling.next()*
-node.navigate.sibling.next()
+node.navigate.sibling.next({node})
    Navigate to the next node in the current node's folder, wraps.

                                  *nvim-tree-api.node.navigate.sibling.prev()*
-node.navigate.sibling.prev()
+node.navigate.sibling.prev({node})
    Navigate to the previous node in the current node's folder, wraps.

                                 *nvim-tree-api.node.navigate.sibling.first()*
-node.navigate.sibling.first()
+node.navigate.sibling.first({node})
    Navigate to the first node in the current node's folder.

                                  *nvim-tree-api.node.navigate.sibling.last()*
-node.navigate.sibling.last()
+node.navigate.sibling.last({node})
    Navigate to the last node in the current node's folder.

                                        *nvim-tree-api.node.navigate.parent()*
-node.navigate.parent()
+node.navigate.parent({node})
    Navigate to the parent folder of the current node.

                                  *nvim-tree-api.node.navigate.parent_close()*
-node.navigate.parent_close()
+node.navigate.parent_close({node})
    |api.node.navigate.parent()|, closing that folder.

-node.show_info_popup()                  *nvim-tree-api.node.show_info_popup()*
+node.show_info_popup({node})            *nvim-tree-api.node.show_info_popup()*
    Open a popup window showing: fullpath, size, accessed, modified, created.

-node.run.cmd()                                  *nvim-tree-api.node.run.cmd()*
+node.run.cmd({node})                            *nvim-tree-api.node.run.cmd()*
    Enter |cmdline| with the full path of the node and the cursor at the start
    of the line.

-node.run.system()                            *nvim-tree-api.node.run.system()*
+node.run.system({node})                      *nvim-tree-api.node.run.system()*
    Execute |nvim-tree.system_open|

 ==============================================================================
@@ -2151,8 +2197,8 @@ marks.navigate.prev()                    *nvim-tree-api.marks.navigate.prev()*
    As per |nvim-tree-api.marks.navigate.next()|

 marks.navigate.select()                *nvim-tree-api.marks.navigate.select()*
-    Prompts for selection of a marked node as per
-    |nvim-tree-api.marks.navigate.next()|
+    Prompts for selection of a marked node, sorted by absolute paths.
+    A folder will be focused, a file will be opened.

 ==============================================================================
 6.8 API CONFIG                                         *nvim-tree-api.config*
@@ -2254,7 +2300,8 @@ Single left mouse mappings can be achieved via `<LeftRelease>`.

 Single right / middle mouse mappings will require changes to |mousemodel| or |mouse|.

-You may execute your own functions as well as |nvim-tree-api| functions e.g. >
+|vim.keymap.set()| {rhs} is a `(function|string)` thus it may be necessary to
+define your own function to map complex functionality e.g. >

  local function print_node_path()
    local api = require('nvim-tree.api')
@@ -2461,6 +2508,9 @@ Hidden: >
    NvimTreeModifiedFileHL      NvimTreeHiddenIcon
    NvimTreeModifiedFolderHL    NvimTreeHiddenFileHL
 <
+Hidden Display: >
+    NvimTreeHiddenDisplay       Conceal
+<
 Opened: >
    NvimTreeOpenedHL            Special
 <
@@ -2872,6 +2922,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.renderer.add_trailing|
 |nvim-tree.renderer.full_name|
 |nvim-tree.renderer.group_empty|
+|nvim-tree.renderer.hidden_display|
 |nvim-tree.renderer.highlight_bookmarks|
 |nvim-tree.renderer.highlight_clipboard|
 |nvim-tree.renderer.highlight_diagnostics|
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -398,6 +398,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
    root_folder_label = ":~:s?$?/..?",
    indent_width = 2,
    special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
+    hidden_display = "none",
    symlink_destination = true,
    highlight_git = "none",
    highlight_diagnostics = "none",
@@ -647,6 +648,7 @@ local ACCEPTED_TYPES = {
    },
  },
  renderer = {
+    hidden_display = { "function", "string" },
    group_empty = { "boolean", "function" },
    root_folder_label = { "function", "string", "boolean" },
  },
@@ -680,6 +682,7 @@ local ACCEPTED_STRINGS = {
    signcolumn = { "yes", "no", "auto" },
  },
  renderer = {
+    hidden_display = { "none", "simple", "all" },
    highlight_git = { "none", "icon", "name", "all" },
    highlight_opened_files = { "none", "icon", "name", "all" },
    highlight_modified = { "none", "icon", "name", "all" },
@@ -837,8 +840,6 @@ function M.setup(conf)
  require("nvim-tree.view").setup(opts)
  require("nvim-tree.lib").setup(opts)
  require("nvim-tree.renderer").setup(opts)
-  require("nvim-tree.live-filter").setup(opts)
-  require("nvim-tree.marks").setup(opts)
  require("nvim-tree.buffers").setup(opts)
  require("nvim-tree.help").setup(opts)
  require("nvim-tree.watcher").setup(opts)
--- a/lua/nvim-tree/actions/finders/find-file.lua
+++ b/lua/nvim-tree/actions/finders/find-file.lua
@@ -2,7 +2,6 @@ local log = require "nvim-tree.log"
 local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local renderer = require "nvim-tree.renderer"
-local reload = require "nvim-tree.explorer.reload"
 local core = require "nvim-tree.core"
 local Iterator = require "nvim-tree.iterators.node-iterator"

@@ -13,7 +12,8 @@ local running = {}
 ---Find a path in the tree, expand it and focus it
 ---@param path string relative or absolute
 function M.fn(path)
-  if not core.get_explorer() or not view.is_visible() then
+  local explorer = core.get_explorer()
+  if not explorer or not view.is_visible() then
    return
  end

@@ -32,7 +32,7 @@ function M.fn(path)

  -- refresh the contents of all parents, expanding groups as needed
  if utils.get_node_from_path(path_real) == nil then
-    reload.refresh_parent_nodes_for_path(vim.fn.fnamemodify(path_real, ":h"))
+    explorer:refresh_parent_nodes_for_path(vim.fn.fnamemodify(path_real, ":h"))
  end

  local line = core.get_nodes_starting_line()
--- a/lua/nvim-tree/actions/fs/copy-paste.lua
+++ b/lua/nvim-tree/actions/fs/copy-paste.lua
@@ -9,14 +9,38 @@ local reloaders = require "nvim-tree.actions.reloaders"

 local find_file = require("nvim-tree.actions.finders.find-file").fn

-local M = {
-  config = {},
+---@enum ACTION
+local ACTION = {
+  copy = "copy",
+  cut = "cut",
 }

-local clipboard = {
-  cut = {},
-  copy = {},
-}
+---@class Clipboard to handle all actions.fs clipboard API
+---@field config table hydrated user opts.filters
+---@field private explorer Explorer
+---@field private data table<ACTION, Node[]>
+local Clipboard = {}
+
+---@param opts table user options
+---@param explorer Explorer
+---@return Clipboard
+function Clipboard:new(opts, explorer)
+  local o = {
+    explorer = explorer,
+    data = {
+      [ACTION.copy] = {},
+      [ACTION.cut] = {},
+    },
+    config = {
+      filesystem_watchers = opts.filesystem_watchers,
+      actions = opts.actions,
+    },
+  }
+
+  setmetatable(o, self)
+  self.__index = self
+  return o
+end

 ---@param source string
 ---@param destination string
@@ -85,11 +109,11 @@ end

 ---@param source string
 ---@param dest string
---@param action_type string
+---@param action ACTION
 ---@param action_fn fun(source: string, dest: string)
 ---@return boolean|nil -- success
 ---@return string|nil -- error message
-local function do_single_paste(source, dest, action_type, action_fn)
+local function do_single_paste(source, dest, action, action_fn)
  local dest_stats
  local success, errmsg, errcode
  local notify_source = notify.render_path(source)
@@ -98,14 +122,14 @@ local function do_single_paste(source, dest, action_type, action_fn)

  dest_stats, errmsg, errcode = vim.loop.fs_stat(dest)
  if not dest_stats and errcode ~= "ENOENT" then
-    notify.error("Could not " .. action_type .. " " .. notify_source .. " - " .. (errmsg or "???"))
+    notify.error("Could not " .. action .. " " .. notify_source .. " - " .. (errmsg or "???"))
    return false, errmsg
  end

  local function on_process()
    success, errmsg = action_fn(source, dest)
    if not success then
-      notify.error("Could not " .. action_type .. " " .. notify_source .. " - " .. (errmsg or "???"))
+      notify.error("Could not " .. action .. " " .. notify_source .. " - " .. (errmsg or "???"))
      return false, errmsg
    end

@@ -123,7 +147,7 @@ local function do_single_paste(source, dest, action_type, action_fn)
      vim.ui.input(input_opts, function(new_dest)
        utils.clear_prompt()
        if new_dest then
-          do_single_paste(source, new_dest, action_type, action_fn)
+          do_single_paste(source, new_dest, action, action_fn)
        end
      end)
    else
@@ -137,7 +161,7 @@ local function do_single_paste(source, dest, action_type, action_fn)
          vim.ui.input(input_opts, function(new_dest)
            utils.clear_prompt()
            if new_dest then
-              do_single_paste(source, new_dest, action_type, action_fn)
+              do_single_paste(source, new_dest, action, action_fn)
            end
          end)
        end
@@ -165,37 +189,42 @@ local function toggle(node, clip)
  notify.info(notify_node .. " added to clipboard.")
 end

-function M.clear_clipboard()
-  clipboard.cut = {}
-  clipboard.copy = {}
+---Clear copied and cut
+function Clipboard:clear_clipboard()
+  self.data[ACTION.copy] = {}
+  self.data[ACTION.cut] = {}
  notify.info "Clipboard has been emptied."
  renderer.draw()
 end

+---Copy one node
 ---@param node Node
-function M.copy(node)
-  utils.array_remove(clipboard.cut, node)
-  toggle(node, clipboard.copy)
+function Clipboard:copy(node)
+  utils.array_remove(self.data[ACTION.cut], node)
+  toggle(node, self.data[ACTION.copy])
  renderer.draw()
 end

+---Cut one node
 ---@param node Node
-function M.cut(node)
-  utils.array_remove(clipboard.copy, node)
-  toggle(node, clipboard.cut)
+function Clipboard:cut(node)
+  utils.array_remove(self.data[ACTION.copy], node)
+  toggle(node, self.data[ACTION.cut])
  renderer.draw()
 end

+---Paste cut or cop
+---@private
 ---@param node Node
---@param action_type string
+---@param action ACTION
 ---@param action_fn fun(source: string, dest: string)
-local function do_paste(node, action_type, action_fn)
+function Clipboard:do_paste(node, action, action_fn)
  node = lib.get_last_group_node(node)
  local explorer = core.get_explorer()
  if node.name == ".." and explorer then
    node = explorer
  end
-  local clip = clipboard[action_type]
+  local clip = self.data[action]
  if #clip == 0 then
    return
  end
@@ -204,7 +233,7 @@ local function do_paste(node, action_type, action_fn)
  local stats, errmsg, errcode = vim.loop.fs_stat(destination)
  if not stats and errcode ~= "ENOENT" then
    log.line("copy_paste", "do_paste fs_stat '%s' failed '%s'", destination, errmsg)
-    notify.error("Could not " .. action_type .. " " .. notify.render_path(destination) .. " - " .. (errmsg or "???"))
+    notify.error("Could not " .. action .. " " .. notify.render_path(destination) .. " - " .. (errmsg or "???"))
    return
  end
  local is_dir = stats and stats.type == "directory"
@@ -214,11 +243,11 @@ local function do_paste(node, action_type, action_fn)

  for _, _node in ipairs(clip) do
    local dest = utils.path_join { destination, _node.name }
-    do_single_paste(_node.absolute_path, dest, action_type, action_fn)
+    do_single_paste(_node.absolute_path, dest, action, action_fn)
  end

-  clipboard[action_type] = {}
-  if not M.config.filesystem_watchers.enable then
+  self.data[action] = {}
+  if not self.config.filesystem_watchers.enable then
    reloaders.reload_explorer()
  end
 end
@@ -246,26 +275,27 @@ local function do_cut(source, destination)
  return true
 end

+---Paste cut (if present) or copy (if present)
 ---@param node Node
-function M.paste(node)
-  if clipboard.cut[1] ~= nil then
-    do_paste(node, "cut", do_cut)
-  else
-    do_paste(node, "copy", do_copy)
+function Clipboard:paste(node)
+  if self.data[ACTION.cut][1] ~= nil then
+    self:do_paste(node, ACTION.cut, do_cut)
+  elseif self.data[ACTION.copy][1] ~= nil then
+    self:do_paste(node, ACTION.copy, do_copy)
  end
 end

-function M.print_clipboard()
+function Clipboard:print_clipboard()
  local content = {}
-  if #clipboard.cut > 0 then
+  if #self.data[ACTION.cut] > 0 then
    table.insert(content, "Cut")
-    for _, node in pairs(clipboard.cut) do
+    for _, node in pairs(self.data[ACTION.cut]) do
      table.insert(content, " * " .. (notify.render_path(node.absolute_path)))
    end
  end
-  if #clipboard.copy > 0 then
+  if #self.data[ACTION.copy] > 0 then
    table.insert(content, "Copy")
-    for _, node in pairs(clipboard.copy) do
+    for _, node in pairs(self.data[ACTION.copy]) do
      table.insert(content, " * " .. (notify.render_path(node.absolute_path)))
    end
  end
@@ -274,10 +304,10 @@ function M.print_clipboard()
 end

 ---@param content string
-local function copy_to_clipboard(content)
+function Clipboard:copy_to_reg(content)
  local clipboard_name
  local reg
-  if M.config.actions.use_system_clipboard == true then
+  if self.config.actions.use_system_clipboard == true then
    clipboard_name = "system"
    reg = "+"
  else
@@ -298,18 +328,18 @@ local function copy_to_clipboard(content)
 end

 ---@param node Node
-function M.copy_filename(node)
-  copy_to_clipboard(node.name)
+function Clipboard:copy_filename(node)
+  self:copy_to_reg(node.name)
 end

 ---@param node Node
-function M.copy_basename(node)
+function Clipboard:copy_basename(node)
  local basename = vim.fn.fnamemodify(node.name, ":r")
-  copy_to_clipboard(basename)
+  self:copy_to_reg(basename)
 end

 ---@param node Node
-function M.copy_path(node)
+function Clipboard:copy_path(node)
  local absolute_path = node.absolute_path
  local cwd = core.get_cwd()
  if cwd == nil then
@@ -318,33 +348,28 @@ function M.copy_path(node)

  local relative_path = utils.path_relative(absolute_path, cwd)
  local content = node.nodes ~= nil and utils.path_add_trailing(relative_path) or relative_path
-  copy_to_clipboard(content)
+  self:copy_to_reg(content)
 end

 ---@param node Node
-function M.copy_absolute_path(node)
+function Clipboard:copy_absolute_path(node)
  local absolute_path = node.absolute_path
  local content = node.nodes ~= nil and utils.path_add_trailing(absolute_path) or absolute_path
-  copy_to_clipboard(content)
+  self:copy_to_reg(content)
 end

 ---Node is cut. Will not be copied.
 ---@param node Node
 ---@return boolean
-function M.is_cut(node)
-  return vim.tbl_contains(clipboard.cut, node)
+function Clipboard:is_cut(node)
+  return vim.tbl_contains(self.data[ACTION.cut], node)
 end

 ---Node is copied. Will not be cut.
 ---@param node Node
 ---@return boolean
-function M.is_copied(node)
-  return vim.tbl_contains(clipboard.copy, node)
+function Clipboard:is_copied(node)
+  return vim.tbl_contains(self.data[ACTION.copy], node)
 end

-function M.setup(opts)
-  M.config.filesystem_watchers = opts.filesystem_watchers
-  M.config.actions = opts.actions
-end
-
-return M
+return Clipboard
--- a/lua/nvim-tree/actions/fs/init.lua
+++ b/lua/nvim-tree/actions/fs/init.lua
@@ -1,13 +1,11 @@
 local M = {}

-M.copy_paste = require "nvim-tree.actions.fs.copy-paste"
 M.create_file = require "nvim-tree.actions.fs.create-file"
 M.remove_file = require "nvim-tree.actions.fs.remove-file"
 M.rename_file = require "nvim-tree.actions.fs.rename-file"
 M.trash = require "nvim-tree.actions.fs.trash"

 function M.setup(opts)
-  M.copy_paste.setup(opts)
  M.remove_file.setup(opts)
  M.rename_file.setup(opts)
  M.trash.setup(opts)
--- a/lua/nvim-tree/actions/fs/remove-file.lua
+++ b/lua/nvim-tree/actions/fs/remove-file.lua
@@ -56,13 +56,18 @@ local function remove_dir(cwd)
  end

  while true do
-    local name, t = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.loop.fs_scandir_next(handle)
    if not name then
      break
    end

    local new_cwd = utils.path_join { cwd, name }
-    if t == "directory" then
+
+    -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
+    local stat = vim.loop.fs_stat(new_cwd)
+    local type = stat and stat.type or nil
+
+    if type == "directory" then
      local success = remove_dir(new_cwd)
      if not success then
        return false
--- a/lua/nvim-tree/actions/moves/item.lua
+++ b/lua/nvim-tree/actions/moves/item.lua
@@ -33,11 +33,15 @@ end
 ---@param what string type of status
 ---@param skip_gitignored boolean default false
 local function move(where, what, skip_gitignored)
-  local node_cur = lib.get_node_at_cursor()
  local first_node_line = core.get_nodes_starting_line()
  local nodes_by_line = utils.get_nodes_by_line(core.get_explorer().nodes, first_node_line)
  local iter_start, iter_end, iter_step, cur, first, nex

+  local cursor = lib.get_cursor_position()
+  if cursor and cursor[1] < first_node_line then
+    cur = cursor[1]
+  end
+
  if where == "next" then
    iter_start, iter_end, iter_step = first_node_line, #nodes_by_line, 1
  elseif where == "prev" then
@@ -52,7 +56,7 @@ local function move(where, what, skip_gitignored)
      first = line
    end

-    if node == node_cur then
+    if cursor and line == cursor[1] then
      cur = line
    elseif valid and cur then
      nex = line
--- a/lua/nvim-tree/actions/node/open-file.lua
+++ b/lua/nvim-tree/actions/node/open-file.lua
@@ -167,6 +167,8 @@ local function pick_win_id()

  if laststatus == 3 then
    for _, id in ipairs(not_selectable) do
+      -- Ensure window still exists at this point
+      if vim.api.nvim_win_is_valid(id) then
        for opt, value in pairs(win_opts[id]) do
          if vim.fn.has "nvim-0.10" == 1 then
            vim.api.nvim_set_option_value(opt, value, { win = id })
@@ -176,6 +178,7 @@ local function pick_win_id()
        end
      end
    end
+  end

  vim.o.laststatus = laststatus

--- a/lua/nvim-tree/actions/reloaders.lua
+++ b/lua/nvim-tree/actions/reloaders.lua
@@ -1,21 +1,22 @@
 local git = require "nvim-tree.git"
 local view = require "nvim-tree.view"
 local renderer = require "nvim-tree.renderer"
-local explorer_module = require "nvim-tree.explorer"
 local core = require "nvim-tree.core"
 local explorer_node = require "nvim-tree.explorer.node"
 local Iterator = require "nvim-tree.iterators.node-iterator"

 local M = {}

---@param node Explorer|nil
+---@param explorer Explorer|nil
 ---@param projects table
-local function refresh_nodes(node, projects)
-  Iterator.builder({ node })
+local function refresh_nodes(explorer, projects)
+  Iterator.builder({ explorer })
    :applier(function(n)
      if n.nodes then
        local toplevel = git.get_toplevel(n.cwd or n.link_to or n.absolute_path)
-        explorer_module.reload(n, projects[toplevel] or {})
+        if explorer then
+          explorer:reload(n, projects[toplevel] or {})
+        end
      end
    end)
    :recursor(function(n)
--- a/lua/nvim-tree/api.lua
+++ b/lua/nvim-tree/api.lua
@@ -6,11 +6,6 @@ local actions = require "nvim-tree.actions"
 local appearance_diagnostics = require "nvim-tree.appearance.diagnostics"
 local events = require "nvim-tree.events"
 local help = require "nvim-tree.help"
-local live_filter = require "nvim-tree.live-filter"
-local marks_navigation = require "nvim-tree.marks.navigation"
-local marks_bulk_delete = require "nvim-tree.marks.bulk-delete"
-local marks_bulk_trash = require "nvim-tree.marks.bulk-trash"
-local marks_bulk_move = require "nvim-tree.marks.bulk-move"
 local keymap = require "nvim-tree.keymap"
 local notify = require "nvim-tree.notify"

@@ -77,18 +72,6 @@ local function wrap_node_or_nil(fn)
  end
 end

---Inject the explorer as the first argument if present otherwise do nothing.
---@param fn function function to invoke
---@return fun(...) : any
-local function wrap_explorer(fn)
-  return function(...)
-    local explorer = core.get_explorer()
-    if explorer then
-      return fn(explorer, ...)
-    end
-  end
-end
-
 ---Invoke a member's method on the singleton explorer.
 ---Print error when setup not called.
 ---@param explorer_member string explorer member name
@@ -191,15 +174,15 @@ Api.fs.rename = wrap_node(actions.fs.rename_file.fn ":t")
 Api.fs.rename_sub = wrap_node(actions.fs.rename_file.fn ":p:h")
 Api.fs.rename_basename = wrap_node(actions.fs.rename_file.fn ":t:r")
 Api.fs.rename_full = wrap_node(actions.fs.rename_file.fn ":p")
-Api.fs.cut = wrap_node(actions.fs.copy_paste.cut)
-Api.fs.paste = wrap_node(actions.fs.copy_paste.paste)
-Api.fs.clear_clipboard = wrap(actions.fs.copy_paste.clear_clipboard)
-Api.fs.print_clipboard = wrap(actions.fs.copy_paste.print_clipboard)
-Api.fs.copy.node = wrap_node(actions.fs.copy_paste.copy)
-Api.fs.copy.absolute_path = wrap_node(actions.fs.copy_paste.copy_absolute_path)
-Api.fs.copy.filename = wrap_node(actions.fs.copy_paste.copy_filename)
-Api.fs.copy.basename = wrap_node(actions.fs.copy_paste.copy_basename)
-Api.fs.copy.relative_path = wrap_node(actions.fs.copy_paste.copy_path)
+Api.fs.cut = wrap_node(wrap_explorer_member("clipboard", "cut"))
+Api.fs.paste = wrap_node(wrap_explorer_member("clipboard", "paste"))
+Api.fs.clear_clipboard = wrap_explorer_member("clipboard", "clear_clipboard")
+Api.fs.print_clipboard = wrap_explorer_member("clipboard", "print_clipboard")
+Api.fs.copy.node = wrap_node(wrap_explorer_member("clipboard", "copy"))
+Api.fs.copy.absolute_path = wrap_node(wrap_explorer_member("clipboard", "copy_absolute_path"))
+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"))

 ---@param mode string
 ---@param node table
@@ -265,19 +248,19 @@ Api.git.reload = wrap(actions.reloaders.reload_git)
 Api.events.subscribe = events.subscribe
 Api.events.Event = events.Event

-Api.live_filter.start = wrap(live_filter.start_filtering)
-Api.live_filter.clear = wrap(live_filter.clear_filter)
+Api.live_filter.start = wrap_explorer_member("live_filter", "start_filtering")
+Api.live_filter.clear = wrap_explorer_member("live_filter", "clear_filter")

-Api.marks.get = wrap_node(wrap_explorer_member("marks", "get_mark"))
-Api.marks.list = wrap_explorer_member("marks", "get_marks")
-Api.marks.toggle = wrap_node(wrap_explorer_member("marks", "toggle_mark"))
-Api.marks.clear = wrap_explorer_member("marks", "clear_marks")
-Api.marks.bulk.delete = wrap_explorer(marks_bulk_delete.bulk_delete)
-Api.marks.bulk.trash = wrap_explorer(marks_bulk_trash.bulk_trash)
-Api.marks.bulk.move = wrap_explorer(marks_bulk_move.bulk_move)
-Api.marks.navigate.next = wrap(marks_navigation.next)
-Api.marks.navigate.prev = wrap(marks_navigation.prev)
-Api.marks.navigate.select = wrap(marks_navigation.select)
+Api.marks.get = wrap_node(wrap_explorer_member("marks", "get"))
+Api.marks.list = wrap_explorer_member("marks", "list")
+Api.marks.toggle = wrap_node(wrap_explorer_member("marks", "toggle"))
+Api.marks.clear = wrap_explorer_member("marks", "clear")
+Api.marks.bulk.delete = wrap_explorer_member("marks", "bulk_delete")
+Api.marks.bulk.trash = wrap_explorer_member("marks", "bulk_trash")
+Api.marks.bulk.move = wrap_explorer_member("marks", "bulk_move")
+Api.marks.navigate.next = wrap_explorer_member("marks", "navigate_next")
+Api.marks.navigate.prev = wrap_explorer_member("marks", "navigate_prev")
+Api.marks.navigate.select = wrap_explorer_member("marks", "navigate_select")

 Api.config.mappings.get_keymap = wrap(keymap.get_keymap)
 Api.config.mappings.get_keymap_default = wrap(keymap.get_keymap_default)
--- a/lua/nvim-tree/appearance/init.lua
+++ b/lua/nvim-tree/appearance/init.lua
@@ -14,6 +14,7 @@ M.HIGHLIGHT_GROUPS = {
  -- Standard
  { group = "NvimTreeNormal", link = "Normal" },
  { group = "NvimTreeNormalFloat", link = "NormalFloat" },
+  { group = "NvimTreeNormalFloatBorder", link = "FloatBorder" },
  { group = "NvimTreeNormalNC", link = "NvimTreeNormal" },

  { group = "NvimTreeLineNr", link = "LineNr" },
@@ -81,6 +82,9 @@ M.HIGHLIGHT_GROUPS = {
  { group = "NvimTreeHiddenFileHL", link = "NvimTreeHiddenIcon" },
  { group = "NvimTreeHiddenFolderHL", link = "NvimTreeHiddenFileHL" },

+  -- Hidden Display
+  { group = "NvimTreeHiddenDisplay", link = "Conceal" },
+
  -- Opened
  { group = "NvimTreeOpenedHL", link = "Special" },

--- a/lua/nvim-tree/core.lua
+++ b/lua/nvim-tree/core.lua
@@ -1,6 +1,5 @@
 local events = require "nvim-tree.events"
 local explorer = require "nvim-tree.explorer"
-local live_filter = require "nvim-tree.live-filter"
 local view = require "nvim-tree.view"
 local log = require "nvim-tree.log"

@@ -17,7 +16,7 @@ function M.init(foldername)
  if TreeExplorer then
    TreeExplorer:destroy()
  end
-  TreeExplorer = explorer.Explorer.new(foldername)
+  TreeExplorer = explorer:new(foldername)
  if not first_init_done then
    events._dispatch_ready()
    first_init_done = true
@@ -45,7 +44,7 @@ function M.get_nodes_starting_line()
  if view.is_root_folder_visible(M.get_cwd()) then
    offset = offset + 1
  end
-  if live_filter.filter then
+  if TreeExplorer and TreeExplorer.live_filter.filter then
    return offset + 1
  end
  return offset
--- a/lua/nvim-tree/enum.lua
+++ b/lua/nvim-tree/enum.lua
@@ -19,4 +19,15 @@ M.ICON_PLACEMENT = {
  right_align = 4,
 }

+---Reason for filter in filter.lua
+---@enum FILTER_REASON
+M.FILTER_REASON = {
+  none = 0, -- It's not filtered
+  git = 1,
+  buf = 2,
+  dotfile = 4,
+  custom = 8,
+  bookmark = 16,
+}
+
 return M
--- a/lua/nvim-tree/explorer/explore.lua
+++ b/lua/nvim-tree/explorer/explore.lua
@@ -2,9 +2,9 @@ local utils = require "nvim-tree.utils"
 local builders = require "nvim-tree.explorer.node-builders"
 local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
-local live_filter = require "nvim-tree.live-filter"
 local log = require "nvim-tree.log"

+local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON
 local Watcher = require "nvim-tree.watcher"

 local M = {}
@@ -17,26 +17,42 @@ local M = {}
 local function populate_children(handle, cwd, node, git_status, parent)
  local node_ignored = explorer_node.is_git_ignored(node)
  local nodes_by_path = utils.bool_record(node.nodes, "absolute_path")
+
  local filter_status = parent.filters:prepare(git_status)
+
+  node.hidden_stats = vim.tbl_deep_extend("force", node.hidden_stats or {}, {
+    git = 0,
+    buf = 0,
+    dotfile = 0,
+    custom = 0,
+    bookmark = 0,
+  })
+
  while true do
-    local name, t = vim.loop.fs_scandir_next(handle)
+    local name, _ = vim.loop.fs_scandir_next(handle)
    if not name then
      break
    end

    local abs = utils.path_join { cwd, name }
+
+    if Watcher.is_fs_event_capable(abs) then
      local profile = log.profile_start("explore populate_children %s", abs)

      ---@type uv.fs_stat.result|nil
      local stat = vim.loop.fs_stat(abs)

-    if not parent.filters:should_filter(abs, stat, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
+      -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
+      local type = stat and stat.type or nil
+
+      local filter_reason = parent.filters:should_filter_as_reason(abs, stat, filter_status)
+      if filter_reason == FILTER_REASON.none and not nodes_by_path[abs] then
        local child = nil
-      if t == "directory" and vim.loop.fs_access(abs, "R") then
+        if type == "directory" and vim.loop.fs_access(abs, "R") then
          child = builders.folder(node, abs, name, stat)
-      elseif t == "file" then
+        elseif type == "file" then
          child = builders.file(node, abs, name, stat)
-      elseif t == "link" then
+        elseif type == "link" then
          local link = builders.link(node, abs, name, stat)
          if link.link_to ~= nil then
            child = link
@@ -47,10 +63,17 @@ local function populate_children(handle, cwd, node, git_status, parent)
          nodes_by_path[child.absolute_path] = true
          explorer_node.update_git_status(child, node_ignored, git_status)
        end
+      else
+        for reason, value in pairs(FILTER_REASON) do
+          if filter_reason == value then
+            node.hidden_stats[reason] = node.hidden_stats[reason] + 1
+          end
+        end
      end

      log.profile_end(profile)
    end
+  end
 end

 ---@param node Node
@@ -82,7 +105,7 @@ function M.explore(node, status, parent)
  end

  parent.sorters:sort(node.nodes)
-  live_filter.apply_filter(node)
+  parent.live_filter:apply_filter(node)

  log.profile_end(profile)
  return node.nodes
--- a/lua/nvim-tree/explorer/filters.lua
+++ b/lua/nvim-tree/explorer/filters.lua
@@ -1,4 +1,5 @@
 local utils = require "nvim-tree.utils"
+local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON

 ---@class Filters to handle all opts.filters and related API
 ---@field config table hydrated user opts.filters
@@ -193,7 +194,7 @@ function Filters:prepare(git_status)

  local explorer = require("nvim-tree.core").get_explorer()
  if explorer then
-    for _, node in pairs(explorer.marks:get_marks()) do
+    for _, node in pairs(explorer.marks:list()) do
      status.bookmarks[node.absolute_path] = node.type
    end
  end
@@ -223,4 +224,33 @@ function Filters:should_filter(path, fs_stat, status)
    or bookmark(self, path, fs_stat and fs_stat.type, status.bookmarks)
 end

+--- Check if the given path should be filtered, and provide the reason why it was
+---@param path string Absolute path
+---@param fs_stat uv.fs_stat.result|nil fs_stat of file
+---@param status table from prepare
+---@return FILTER_REASON
+function Filters:should_filter_as_reason(path, fs_stat, status)
+  if not self.config.enable then
+    return FILTER_REASON.none
+  end
+
+  if is_excluded(self, path) then
+    return FILTER_REASON.none
+  end
+
+  if git(self, path, status.git_status) then
+    return FILTER_REASON.git
+  elseif buf(self, path, status.bufinfo) then
+    return FILTER_REASON.buf
+  elseif dotfile(self, path) then
+    return FILTER_REASON.dotfile
+  elseif custom(self, path) then
+    return FILTER_REASON.custom
+  elseif bookmark(self, path, fs_stat and fs_stat.type, status.bookmarks) then
+    return FILTER_REASON.bookmark
+  else
+    return FILTER_REASON.none
+  end
+end
+
 return Filters
--- a/lua/nvim-tree/explorer/init.lua
+++ b/lua/nvim-tree/explorer/init.lua
@@ -1,28 +1,40 @@
+local builders = require "nvim-tree.explorer.node-builders"
 local git = require "nvim-tree.git"
+local log = require "nvim-tree.log"
 local notify = require "nvim-tree.notify"
+local utils = require "nvim-tree.utils"
 local watch = require "nvim-tree.explorer.watch"
 local explorer_node = require "nvim-tree.explorer.node"
+
+local NodeIterator = require "nvim-tree.iterators.node-iterator"
+local Watcher = require "nvim-tree.watcher"
+
 local Filters = require "nvim-tree.explorer.filters"
-local Marks = require "nvim-tree.marks"
+local Marks = {} -- circular dependencies
+local LiveFilter = require "nvim-tree.explorer.live-filter"
 local Sorters = require "nvim-tree.explorer.sorters"
+local Clipboard = {} -- circular dependencies

-local M = {}
+local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON

-M.explore = require("nvim-tree.explorer.explore").explore
-M.reload = require("nvim-tree.explorer.reload").reload
+local config

 ---@class Explorer
 ---@field absolute_path string
 ---@field nodes Node[]
 ---@field open boolean
+---@field filters Filters
+---@field live_filter LiveFilter
+---@field sorters Sorter
 ---@field marks Marks
-
+---@field clipboard Clipboard
 local Explorer = {}
-Explorer.__index = Explorer
+
+Explorer.explore = require("nvim-tree.explorer.explore").explore

 ---@param path string|nil
 ---@return Explorer|nil
-function Explorer.new(path)
+function Explorer:new(path)
  local err

  if path then
@@ -36,25 +48,24 @@ function Explorer.new(path)
  end

  ---@class Explorer
-  local explorer = setmetatable({
+  local o = setmetatable({
    absolute_path = path,
    nodes = {},
    open = true,
-    marks = Marks:new(),
-    sorters = Sorters:new(M.config),
+    sorters = Sorters:new(config),
  }, Explorer)
-  explorer.watcher = watch.create_watcher(explorer)
-  explorer.filters = Filters:new(M.config, explorer)
-  explorer:_load(explorer)
-  return explorer
-end
+  setmetatable(o, self)
+  self.__index = self

---@private
---@param node Node
-function Explorer:_load(node)
-  local cwd = node.link_to or node.absolute_path
-  local git_status = git.load_project_status(cwd)
-  M.explore(node, git_status, self)
+  o.watcher = watch.create_watcher(o)
+  o.filters = Filters:new(config, o)
+  o.live_filter = LiveFilter:new(config, o)
+  o.marks = Marks:new(config, o)
+  o.clipboard = Clipboard:new(config, o)
+
+  o:_load(o)
+
+  return o
 end

 ---@param node Node
@@ -74,14 +85,256 @@ function Explorer:destroy()
  iterate(self)
 end

-function M.setup(opts)
-  M.config = opts
-  require("nvim-tree.explorer.node").setup(opts)
-  require("nvim-tree.explorer.explore").setup(opts)
-  require("nvim-tree.explorer.reload").setup(opts)
-  require("nvim-tree.explorer.watch").setup(opts)
+---@param node Node
+---@param git_status table|nil
+function Explorer:reload(node, git_status)
+  local cwd = node.link_to or node.absolute_path
+  local handle = vim.loop.fs_scandir(cwd)
+  if not handle then
+    return
+  end
+
+  local profile = log.profile_start("reload %s", node.absolute_path)
+
+  local filter_status = self.filters:prepare(git_status)
+
+  if node.group_next then
+    node.nodes = { node.group_next }
+    node.group_next = nil
+  end
+
+  local remain_childs = {}
+
+  local node_ignored = explorer_node.is_git_ignored(node)
+  ---@type table<string, Node>
+  local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
+
+  -- To reset we must 'zero' everything that we use
+  node.hidden_stats = vim.tbl_deep_extend("force", node.hidden_stats or {}, {
+    git = 0,
+    buf = 0,
+    dotfile = 0,
+    custom = 0,
+    bookmark = 0,
+  })
+
+  while true do
+    local name, _ = vim.loop.fs_scandir_next(handle)
+    if not name then
+      break
+    end
+
+    local abs = utils.path_join { cwd, name }
+    ---@type uv.fs_stat.result|nil
+    local stat = vim.loop.fs_stat(abs)
+
+    local filter_reason = self.filters:should_filter_as_reason(abs, stat, filter_status)
+    if filter_reason == FILTER_REASON.none then
+      remain_childs[abs] = true
+
+      -- Type must come from fs_stat and not fs_scandir_next to maintain sshfs compatibility
+      local type = stat and stat.type or nil
+
+      -- Recreate node if type changes.
+      if nodes_by_path[abs] then
+        local n = nodes_by_path[abs]
+
+        if n.type ~= type then
+          utils.array_remove(node.nodes, n)
+          explorer_node.node_destroy(n)
+          nodes_by_path[abs] = nil
+        end
+      end
+
+      if not nodes_by_path[abs] then
+        local new_child = nil
+        if type == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
+          new_child = builders.folder(node, abs, name, stat)
+        elseif type == "file" then
+          new_child = builders.file(node, abs, name, stat)
+        elseif type == "link" then
+          local link = builders.link(node, abs, name, stat)
+          if link.link_to ~= nil then
+            new_child = link
+          end
+        end
+        if new_child then
+          table.insert(node.nodes, new_child)
+          nodes_by_path[abs] = new_child
+        end
+      else
+        local n = nodes_by_path[abs]
+        if n then
+          n.executable = builders.is_executable(abs) or false
+          n.fs_stat = stat
+        end
+      end
+    else
+      for reason, value in pairs(FILTER_REASON) do
+        if filter_reason == value then
+          node.hidden_stats[reason] = node.hidden_stats[reason] + 1
+        end
+      end
+    end
+  end
+
+  node.nodes = vim.tbl_map(
+    self:update_status(nodes_by_path, node_ignored, git_status),
+    vim.tbl_filter(function(n)
+      if remain_childs[n.absolute_path] then
+        return remain_childs[n.absolute_path]
+      else
+        explorer_node.node_destroy(n)
+        return false
+      end
+    end, node.nodes)
+  )
+
+  local is_root = not node.parent
+  local child_folder_only = explorer_node.has_one_child_folder(node) and node.nodes[1]
+  if config.group_empty and not is_root and child_folder_only then
+    node.group_next = child_folder_only
+    local ns = self:reload(child_folder_only, git_status)
+    node.nodes = ns or {}
+    log.profile_end(profile)
+    return ns
+  end
+
+  self.sorters:sort(node.nodes)
+  self.live_filter:apply_filter(node)
+  log.profile_end(profile)
+  return node.nodes
 end

-M.Explorer = Explorer
+---TODO #2837 #2871 move this and similar to node
+---Refresh contents and git status for a single node
+---@param node Node
+---@param callback function
+function Explorer:refresh_node(node, callback)
+  if type(node) ~= "table" then
+    callback()
+  end

-return M
+  local parent_node = utils.get_parent_of_group(node)
+
+  self:reload_and_get_git_project(node.absolute_path, function(toplevel, project)
+    self:reload(parent_node, project)
+
+    self:update_parent_statuses(parent_node, project, toplevel)
+
+    callback()
+  end)
+end
+
+---Refresh contents of all nodes to a path: actual directory and links.
+---Groups will be expanded if needed.
+---@param path string absolute path
+function Explorer:refresh_parent_nodes_for_path(path)
+  local profile = log.profile_start("refresh_parent_nodes_for_path %s", path)
+
+  -- collect parent nodes from the top down
+  local parent_nodes = {}
+  NodeIterator.builder({ self })
+    :recursor(function(node)
+      return node.nodes
+    end)
+    :applier(function(node)
+      local abs_contains = node.absolute_path and path:find(node.absolute_path, 1, true) == 1
+      local link_contains = node.link_to and path:find(node.link_to, 1, true) == 1
+      if abs_contains or link_contains then
+        table.insert(parent_nodes, node)
+      end
+    end)
+    :iterate()
+
+  -- refresh in order; this will expand groups as needed
+  for _, node in ipairs(parent_nodes) do
+    local toplevel = git.get_toplevel(node.absolute_path)
+    local project = git.get_project(toplevel) or {}
+
+    self:reload(node, project)
+    self:update_parent_statuses(node, project, toplevel)
+  end
+
+  log.profile_end(profile)
+end
+
+---@private
+---@param node Node
+function Explorer:_load(node)
+  local cwd = node.link_to or node.absolute_path
+  local git_status = git.load_project_status(cwd)
+  Explorer.explore(node, git_status, self)
+end
+
+function Explorer.setup(opts)
+  config = opts
+  require("nvim-tree.explorer.node").setup(opts)
+  require("nvim-tree.explorer.explore").setup(opts)
+  require("nvim-tree.explorer.watch").setup(opts)
+
+  Marks = require "nvim-tree.marks"
+  Clipboard = require "nvim-tree.actions.fs.clipboard"
+end
+
+---@private
+---@param nodes_by_path table
+---@param node_ignored boolean
+---@param status table|nil
+---@return fun(node: Node): table
+function Explorer:update_status(nodes_by_path, node_ignored, status)
+  return function(node)
+    if nodes_by_path[node.absolute_path] then
+      explorer_node.update_git_status(node, node_ignored, status)
+    end
+    return node
+  end
+end
+
+---TODO #2837 #2871 move this and similar to node
+---@private
+---@param path string
+---@param callback fun(toplevel: string|nil, project: table|nil)
+function Explorer:reload_and_get_git_project(path, callback)
+  local toplevel = git.get_toplevel(path)
+
+  git.reload_project(toplevel, path, function()
+    callback(toplevel, git.get_project(toplevel) or {})
+  end)
+end
+
+---TODO #2837 #2871 move this and similar to node
+---@private
+---@param node Node
+---@param project table|nil
+---@param root string|nil
+function Explorer:update_parent_statuses(node, project, root)
+  while project and node do
+    -- step up to the containing project
+    if node.absolute_path == root then
+      -- stop at the top of the tree
+      if not node.parent then
+        break
+      end
+
+      root = git.get_toplevel(node.parent.absolute_path)
+
+      -- stop when no more projects
+      if not root then
+        break
+      end
+
+      -- update the containing project
+      project = git.get_project(root)
+      git.reload_project(root, node.absolute_path, nil)
+    end
+
+    -- update status
+    explorer_node.update_git_status(node, explorer_node.is_git_ignored(node.parent), project)
+
+    -- maybe parent
+    node = node.parent
+  end
+end
+
+return Explorer
--- a/lua/nvim-tree/explorer/live-filter.lua
+++ b/lua/nvim-tree/explorer/live-filter.lua
@@ -2,26 +2,50 @@ local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local Iterator = require "nvim-tree.iterators.node-iterator"

-local M = {
+---@class LiveFilter
+---@field explorer Explorer
+---@field prefix string
+---@field always_show_folders boolean
+---@field filter string
+local LiveFilter = {}
+
+---@param opts table
+---@param explorer Explorer
+function LiveFilter:new(opts, explorer)
+  local o = {
+    explorer = explorer,
+    prefix = opts.live_filter.prefix,
+    always_show_folders = opts.live_filter.always_show_folders,
    filter = nil,
-}
+  }
+  setmetatable(o, self)
+  self.__index = self
+  return o
+end

 local function redraw()
  require("nvim-tree.renderer").draw()
 end

 ---@param node_ Node|nil
-local function reset_filter(node_)
-  node_ = node_ or require("nvim-tree.core").get_explorer()
+local function reset_filter(self, node_)
+  node_ = node_ or self.explorer

  if node_ == nil then
    return
  end

+  node_.hidden_stats = vim.tbl_deep_extend("force", node_.hidden_stats or {}, {
+    live_filter = 0,
+  })
+
  Iterator.builder(node_.nodes)
    :hidden()
    :applier(function(node)
      node.hidden = false
+      node.hidden_stats = vim.tbl_deep_extend("force", node.hidden_stats or {}, {
+        live_filter = 0,
+      })
    end)
    :iterate()
 end
@@ -29,7 +53,7 @@ end
 local overlay_bufnr = 0
 local overlay_winnr = 0

-local function remove_overlay()
+local function remove_overlay(self)
  if view.View.float.enable and view.View.float.quit_on_focus_loss then
    -- return to normal nvim-tree float behaviour when filter window is closed
    vim.api.nvim_create_autocmd("WinLeave", {
@@ -48,28 +72,27 @@ local function remove_overlay()
  overlay_bufnr = 0
  overlay_winnr = 0

-  if M.filter == "" then
-    M.clear_filter()
+  if self.filter == "" then
+    self:clear_filter()
  end
 end

 ---@param node Node
 ---@return boolean
-local function matches(node)
-  local explorer = require("nvim-tree.core").get_explorer()
-  if not explorer or not explorer.filters.config.enable then
+local function matches(self, node)
+  if not self.explorer.filters.config.enable then
    return true
  end

  local path = node.absolute_path
  local name = vim.fn.fnamemodify(path, ":t")
-  return vim.regex(M.filter):match_str(name) ~= nil
+  return vim.regex(self.filter):match_str(name) ~= nil
 end

 ---@param node_ Node|nil
-function M.apply_filter(node_)
-  if not M.filter or M.filter == "" then
-    reset_filter(node_)
+function LiveFilter:apply_filter(node_)
+  if not self.filter or self.filter == "" then
+    reset_filter(self, node_)
    return
  end

@@ -79,6 +102,10 @@ function M.apply_filter(node_)
    local filtered_nodes = 0
    local nodes = node.group_next and { node.group_next } or node.nodes

+    node.hidden_stats = vim.tbl_deep_extend("force", node.hidden_stats or {}, {
+      live_filter = 0,
+    })
+
    if nodes then
      for _, n in pairs(nodes) do
        iterate(n)
@@ -88,31 +115,37 @@ function M.apply_filter(node_)
      end
    end

-    local has_nodes = nodes and (M.always_show_folders or #nodes > filtered_nodes)
-    local ok, is_match = pcall(matches, node)
+    node.hidden_stats.live_filter = filtered_nodes
+
+    local has_nodes = nodes and (self.always_show_folders or #nodes > filtered_nodes)
+    local ok, is_match = pcall(matches, self, node)
    node.hidden = not (has_nodes or (ok and is_match))
  end

-  iterate(node_ or require("nvim-tree.core").get_explorer())
+  iterate(node_ or self.explorer)
 end

-local function record_char()
+local function record_char(self)
  vim.schedule(function()
-    M.filter = vim.api.nvim_buf_get_lines(overlay_bufnr, 0, -1, false)[1]
-    M.apply_filter()
+    self.filter = vim.api.nvim_buf_get_lines(overlay_bufnr, 0, -1, false)[1]
+    self:apply_filter()
    redraw()
  end)
 end

-local function configure_buffer_overlay()
+local function configure_buffer_overlay(self)
  overlay_bufnr = vim.api.nvim_create_buf(false, true)

  vim.api.nvim_buf_attach(overlay_bufnr, true, {
-    on_lines = record_char,
+    on_lines = function()
+      return record_char(self)
+    end,
  })

  vim.api.nvim_create_autocmd("InsertLeave", {
-    callback = remove_overlay,
+    callback = function()
+      return remove_overlay(self)
+    end,
    once = true,
  })

@@ -120,17 +153,17 @@ local function configure_buffer_overlay()
 end

 ---@return integer
-local function calculate_overlay_win_width()
+local function calculate_overlay_win_width(self)
  local wininfo = vim.fn.getwininfo(view.get_winnr())[1]

  if wininfo then
-    return wininfo.width - wininfo.textoff - #M.prefix
+    return wininfo.width - wininfo.textoff - #self.prefix
  end

  return 20
 end

-local function create_overlay()
+local function create_overlay(self)
  if view.View.float.enable then
    -- don't close nvim-tree float when focus is changed to filter window
    vim.api.nvim_clear_autocmds {
@@ -140,12 +173,12 @@ local function create_overlay()
    }
  end

-  configure_buffer_overlay()
+  configure_buffer_overlay(self)
  overlay_winnr = vim.api.nvim_open_win(overlay_bufnr, true, {
    col = 1,
    row = 0,
    relative = "cursor",
-    width = calculate_overlay_win_width(),
+    width = calculate_overlay_win_width(self),
    height = 1,
    border = "none",
    style = "minimal",
@@ -157,29 +190,31 @@ local function create_overlay()
    vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
  end

-  vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { M.filter })
+  vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { self.filter })
  vim.cmd "startinsert"
-  vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #M.filter + 1 })
+  vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #self.filter + 1 })
 end

-function M.start_filtering()
+function LiveFilter:start_filtering()
  view.View.live_filter.prev_focused_node = require("nvim-tree.lib").get_node_at_cursor()
-  M.filter = M.filter or ""
+  self.filter = self.filter or ""

  redraw()
  local row = require("nvim-tree.core").get_nodes_starting_line() - 1
-  local col = #M.prefix > 0 and #M.prefix - 1 or 1
+  local col = #self.prefix > 0 and #self.prefix - 1 or 1
  view.set_cursor { row, col }
  -- needs scheduling to let the cursor move before initializing the window
-  vim.schedule(create_overlay)
+  vim.schedule(function()
+    return create_overlay(self)
+  end)
 end

-function M.clear_filter()
+function LiveFilter:clear_filter()
  local node = require("nvim-tree.lib").get_node_at_cursor()
  local last_node = view.View.live_filter.prev_focused_node

-  M.filter = nil
-  reset_filter()
+  self.filter = nil
+  reset_filter(self)
  redraw()

  if node then
@@ -189,9 +224,4 @@ function M.clear_filter()
  end
 end

-function M.setup(opts)
-  M.prefix = opts.live_filter.prefix
-  M.always_show_folders = opts.live_filter.always_show_folders
-end
-
-return M
+return LiveFilter
--- a/lua/nvim-tree/explorer/reload.lua
+++ b/lua/nvim-tree/explorer/reload.lua
@@ -1,234 +0,0 @@
-local utils = require "nvim-tree.utils"
-local builders = require "nvim-tree.explorer.node-builders"
-local explorer_node = require "nvim-tree.explorer.node"
-local live_filter = require "nvim-tree.live-filter"
-local git = require "nvim-tree.git"
-local log = require "nvim-tree.log"
-
-local NodeIterator = require "nvim-tree.iterators.node-iterator"
-local Watcher = require "nvim-tree.watcher"
-
-local M = {}
-
---@param nodes_by_path table
---@param node_ignored boolean
---@param status table
---@return fun(node: Node): table
-local function update_status(nodes_by_path, node_ignored, status)
-  return function(node)
-    if nodes_by_path[node.absolute_path] then
-      explorer_node.update_git_status(node, node_ignored, status)
-    end
-    return node
-  end
-end
-
---@param path string
---@param callback fun(toplevel: string|nil, project: table|nil)
-local function reload_and_get_git_project(path, callback)
-  local toplevel = git.get_toplevel(path)
-
-  git.reload_project(toplevel, path, function()
-    callback(toplevel, git.get_project(toplevel) or {})
-  end)
-end
-
---@param node Node
---@param project table|nil
---@param root string|nil
-local function update_parent_statuses(node, project, root)
-  while project and node do
-    -- step up to the containing project
-    if node.absolute_path == root then
-      -- stop at the top of the tree
-      if not node.parent then
-        break
-      end
-
-      root = git.get_toplevel(node.parent.absolute_path)
-
-      -- stop when no more projects
-      if not root then
-        break
-      end
-
-      -- update the containing project
-      project = git.get_project(root)
-      git.reload_project(root, node.absolute_path, nil)
-    end
-
-    -- update status
-    explorer_node.update_git_status(node, explorer_node.is_git_ignored(node.parent), project)
-
-    -- maybe parent
-    node = node.parent
-  end
-end
-
---@param node Node
---@param git_status table
-function M.reload(node, git_status)
-  local explorer = require("nvim-tree.core").get_explorer()
-  if not explorer then
-    return
-  end
-  local cwd = node.link_to or node.absolute_path
-  local handle = vim.loop.fs_scandir(cwd)
-  if not handle then
-    return
-  end
-
-  local profile = log.profile_start("reload %s", node.absolute_path)
-
-  local filter_status = explorer.filters:prepare(git_status)
-
-  if node.group_next then
-    node.nodes = { node.group_next }
-    node.group_next = nil
-  end
-
-  local remain_childs = {}
-
-  local node_ignored = explorer_node.is_git_ignored(node)
-  ---@type table<string, Node>
-  local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
-  while true do
-    local name, t = vim.loop.fs_scandir_next(handle)
-    if not name then
-      break
-    end
-
-    local abs = utils.path_join { cwd, name }
-    ---@type uv.fs_stat.result|nil
-    local stat = vim.loop.fs_stat(abs)
-
-    if not explorer.filters:should_filter(abs, stat, filter_status) then
-      remain_childs[abs] = true
-
-      -- Recreate node if type changes.
-      if nodes_by_path[abs] then
-        local n = nodes_by_path[abs]
-
-        if n.type ~= t then
-          utils.array_remove(node.nodes, n)
-          explorer_node.node_destroy(n)
-          nodes_by_path[abs] = nil
-        end
-      end
-
-      if not nodes_by_path[abs] then
-        local new_child = nil
-        if t == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
-          new_child = builders.folder(node, abs, name, stat)
-        elseif t == "file" then
-          new_child = builders.file(node, abs, name, stat)
-        elseif t == "link" then
-          local link = builders.link(node, abs, name, stat)
-          if link.link_to ~= nil then
-            new_child = link
-          end
-        end
-        if new_child then
-          table.insert(node.nodes, new_child)
-          nodes_by_path[abs] = new_child
-        end
-      else
-        local n = nodes_by_path[abs]
-        if n then
-          n.executable = builders.is_executable(abs) or false
-          n.fs_stat = stat
-        end
-      end
-    end
-  end
-
-  node.nodes = vim.tbl_map(
-    update_status(nodes_by_path, node_ignored, git_status),
-    vim.tbl_filter(function(n)
-      if remain_childs[n.absolute_path] then
-        return remain_childs[n.absolute_path]
-      else
-        explorer_node.node_destroy(n)
-        return false
-      end
-    end, node.nodes)
-  )
-
-  local is_root = not node.parent
-  local child_folder_only = explorer_node.has_one_child_folder(node) and node.nodes[1]
-  if M.config.group_empty and not is_root and child_folder_only then
-    node.group_next = child_folder_only
-    local ns = M.reload(child_folder_only, git_status)
-    node.nodes = ns or {}
-    log.profile_end(profile)
-    return ns
-  end
-
-  explorer.sorters:sort(node.nodes)
-  live_filter.apply_filter(node)
-  log.profile_end(profile)
-  return node.nodes
-end
-
---Refresh contents and git status for a single node
---@param node Node
---@param callback function
-function M.refresh_node(node, callback)
-  if type(node) ~= "table" then
-    callback()
-  end
-
-  local parent_node = utils.get_parent_of_group(node)
-
-  reload_and_get_git_project(node.absolute_path, function(toplevel, project)
-    require("nvim-tree.explorer.reload").reload(parent_node, project)
-
-    update_parent_statuses(parent_node, project, toplevel)
-
-    callback()
-  end)
-end
-
---Refresh contents of all nodes to a path: actual directory and links.
---Groups will be expanded if needed.
---@param path string absolute path
-function M.refresh_parent_nodes_for_path(path)
-  local explorer = require("nvim-tree.core").get_explorer()
-  if not explorer then
-    return
-  end
-
-  local profile = log.profile_start("refresh_parent_nodes_for_path %s", path)
-
-  -- collect parent nodes from the top down
-  local parent_nodes = {}
-  NodeIterator.builder({ explorer })
-    :recursor(function(node)
-      return node.nodes
-    end)
-    :applier(function(node)
-      local abs_contains = node.absolute_path and path:find(node.absolute_path, 1, true) == 1
-      local link_contains = node.link_to and path:find(node.link_to, 1, true) == 1
-      if abs_contains or link_contains then
-        table.insert(parent_nodes, node)
-      end
-    end)
-    :iterate()
-
-  -- refresh in order; this will expand groups as needed
-  for _, node in ipairs(parent_nodes) do
-    local toplevel = git.get_toplevel(node.absolute_path)
-    local project = git.get_project(toplevel) or {}
-
-    M.reload(node, project)
-    update_parent_statuses(node, project, toplevel)
-  end
-
-  log.profile_end(profile)
-end
-
-function M.setup(opts)
-  M.config = opts.renderer
-end
-
-return M
--- a/lua/nvim-tree/explorer/watch.lua
+++ b/lua/nvim-tree/explorer/watch.lua
@@ -76,9 +76,12 @@ function M.create_watcher(node)
      else
        log.line("watcher", "node event executing refresh '%s'", node.absolute_path)
      end
-      require("nvim-tree.explorer.reload").refresh_node(node, function()
+      local explorer = require("nvim-tree.core").get_explorer()
+      if explorer then
+        explorer:refresh_node(node, function()
          require("nvim-tree.renderer").draw()
        end)
+      end
    end)
  end

--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -15,25 +15,33 @@ local M = {
  target_winid = nil,
 }

---@return Node|nil
-function M.get_node_at_cursor()
+---Cursor position as per vim.api.nvim_win_get_cursor
+---@return integer[]|nil
+function M.get_cursor_position()
  if not core.get_explorer() then
    return
  end

  local winnr = view.get_winnr()
-  if not winnr then
+  if not winnr or not vim.api.nvim_win_is_valid(winnr) then
    return
  end

-  local cursor = vim.api.nvim_win_get_cursor(winnr)
-  local line = cursor[1]
+  return vim.api.nvim_win_get_cursor(winnr)
+end

-  if line == 1 and view.is_root_folder_visible(core.get_cwd()) then
+---@return Node|nil
+function M.get_node_at_cursor()
+  local cursor = M.get_cursor_position()
+  if not cursor then
+    return
+  end
+
+  if cursor[1] == 1 and view.is_root_folder_visible(core.get_cwd()) then
    return { name = ".." }
  end

-  return utils.get_nodes_by_line(core.get_explorer().nodes, core.get_nodes_starting_line())[line]
+  return utils.get_nodes_by_line(core.get_explorer().nodes, core.get_nodes_starting_line())[cursor[1]]
 end

 ---Create a sanitized partial copy of a node, populating children recursively.
--- a/lua/nvim-tree/marks/bulk-delete.lua
+++ b/lua/nvim-tree/marks/bulk-delete.lua
@@ -1,59 +0,0 @@
-local utils = require "nvim-tree.utils"
-local remove_file = require "nvim-tree.actions.fs.remove-file"
-local notify = require "nvim-tree.notify"
-local lib = require "nvim-tree.lib"
-
-local M = {
-  config = {},
-}
-
--- Delete nodes; each removal will be optionally notified
---@param nodes Node[]
---@param marks Marks
-local function do_delete(marks, nodes)
-  for _, node in pairs(nodes) do
-    remove_file.remove(node)
-  end
-
-  marks:clear_marks()
-
-  if not M.config.filesystem_watchers.enable then
-    require("nvim-tree.actions.reloaders").reload_explorer()
-  end
-end
-
--- Delete marked nodes, optionally prompting
---@param explorer Explorer
-function M.bulk_delete(explorer)
-  if not explorer then
-    return
-  end
-
-  local marks = explorer.marks
-
-  local nodes = marks:get_marks()
-  if not nodes or #nodes == 0 then
-    notify.warn "No bookmarksed to delete."
-    return
-  end
-
-  if M.config.ui.confirm.remove then
-    local prompt_select = "Remove bookmarked ?"
-    local prompt_input = prompt_select .. " y/N: "
-    lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, "nvimtree_bulk_delete", function(item_short)
-      utils.clear_prompt()
-      if item_short == "y" then
-        do_delete(marks, nodes)
-      end
-    end)
-  else
-    do_delete(marks, nodes)
-  end
-end
-
-function M.setup(opts)
-  M.config.ui = opts.ui
-  M.config.filesystem_watchers = opts.filesystem_watchers
-end
-
-return M
--- a/lua/nvim-tree/marks/bulk-move.lua
+++ b/lua/nvim-tree/marks/bulk-move.lua
@@ -1,67 +0,0 @@
-local core = require "nvim-tree.core"
-local utils = require "nvim-tree.utils"
-local rename_file = require "nvim-tree.actions.fs.rename-file"
-local notify = require "nvim-tree.notify"
-local lib = require "nvim-tree.lib"
-
-local M = {
-  config = {},
-}
-
---@param explorer Explorer
-function M.bulk_move(explorer)
-  if not explorer then
-    return
-  end
-  local marks = explorer.marks
-
-  if #marks:get_marks() == 0 then
-    notify.warn "No bookmarks to move."
-    return
-  end
-
-  local node_at_cursor = lib.get_node_at_cursor()
-  local default_path = core.get_cwd()
-
-  if node_at_cursor and node_at_cursor.type == "directory" then
-    default_path = node_at_cursor.absolute_path
-  elseif node_at_cursor and node_at_cursor.parent then
-    default_path = node_at_cursor.parent.absolute_path
-  end
-
-  local input_opts = {
-    prompt = "Move to: ",
-    default = default_path,
-    completion = "dir",
-  }
-
-  vim.ui.input(input_opts, function(location)
-    utils.clear_prompt()
-    if not location or location == "" then
-      return
-    end
-    if vim.fn.filewritable(location) ~= 2 then
-      notify.warn(location .. " is not writable, cannot move.")
-      return
-    end
-
-    local nodes = marks:get_marks()
-    for _, node in pairs(nodes) do
-      local head = vim.fn.fnamemodify(node.absolute_path, ":t")
-      local to = utils.path_join { location, head }
-      rename_file.rename(node, to)
-    end
-
-    marks:clear_marks()
-
-    if not M.config.filesystem_watchers.enable then
-      require("nvim-tree.actions.reloaders").reload_explorer()
-    end
-  end)
-end
-
-function M.setup(opts)
-  M.config.filesystem_watchers = opts.filesystem_watchers
-end
-
-return M
--- a/lua/nvim-tree/marks/bulk-trash.lua
+++ b/lua/nvim-tree/marks/bulk-trash.lua
@@ -1,53 +0,0 @@
-local utils = require "nvim-tree.utils"
-local remove_file = require "nvim-tree.actions.fs.trash"
-local notify = require "nvim-tree.notify"
-local lib = require "nvim-tree.lib"
-
-local M = {
-  config = {},
-}
-
--- Delete nodes; each removal will be optionally notified
---@param nodes Node[]
-local function do_trash(nodes)
-  for _, node in pairs(nodes) do
-    remove_file.remove(node)
-  end
-end
-
---@param explorer Explorer
-function M.bulk_trash(explorer)
-  if not explorer then
-    return
-  end
-
-  local marks = explorer.marks
-
-  local nodes = marks:get_marks()
-  if not nodes or #nodes == 0 then
-    notify.warn "No bookmarks to trash."
-    return
-  end
-
-  if M.config.ui.confirm.trash then
-    local prompt_select = "Trash bookmarked ?"
-    local prompt_input = prompt_select .. " y/N: "
-    lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, "nvimtree_bulk_trash", function(item_short)
-      utils.clear_prompt()
-      if item_short == "y" then
-        do_trash(nodes)
-        marks:clear_marks()
-      end
-    end)
-  else
-    do_trash(nodes)
-    marks:clear_marks()
-  end
-end
-
-function M.setup(opts)
-  M.config.ui = opts.ui
-  M.config.filesystem_watchers = opts.filesystem_watchers
-end
-
-return M
--- a/lua/nvim-tree/marks/init.lua
+++ b/lua/nvim-tree/marks/init.lua
@@ -1,65 +1,82 @@
-local renderer = {} -- circular dependency
+local Iterator = require "nvim-tree.iterators.node-iterator"
+local core = require "nvim-tree.core"
+local lib = require "nvim-tree.lib"
+local notify = require "nvim-tree.notify"
+local open_file = require "nvim-tree.actions.node.open-file"
+local remove_file = require "nvim-tree.actions.fs.remove-file"
+local rename_file = require "nvim-tree.actions.fs.rename-file"
+local renderer = require "nvim-tree.renderer"
+local trash = require "nvim-tree.actions.fs.trash"
+local utils = require "nvim-tree.utils"

 ---@class Marks
---@field private marks Node[]
+---@field config table hydrated user opts.filters
+---@field private explorer Explorer
+---@field private marks table<string, Node> by absolute path
 local Marks = {}

 ---@return Marks
-function Marks:new()
-  local o = {}
+---@param opts table user options
+---@param explorer Explorer
+function Marks:new(opts, explorer)
+  local o = {
+    explorer = explorer,
+    config = {
+      ui = opts.ui,
+      filesystem_watchers = opts.filesystem_watchers,
+    },
+    marks = {},
+  }
+
  setmetatable(o, self)
  self.__index = self
-
-  o.marks = {}
-
  return o
 end

+---Clear all marks and reload if watchers disabled
 ---@private
---@param node Node
-function Marks:add_mark(node)
-  self.marks[node.absolute_path] = node
+function Marks:clear_reload()
+  self:clear()
+  if not self.config.filesystem_watchers.enable then
+    require("nvim-tree.actions.reloaders").reload_explorer()
+  end
+end

+---Clear all marks and redraw
+---@public
+function Marks:clear()
+  self.marks = {}
  renderer.draw()
 end

---@private
+---@public
 ---@param node Node
-function Marks:remove_mark(node)
-  self.marks[node.absolute_path] = nil
-
-  renderer.draw()
-end
-
---@param node Node
-function Marks:toggle_mark(node)
+function Marks:toggle(node)
  if node.absolute_path == nil then
    return
  end

-  if self:get_mark(node) then
-    self:remove_mark(node)
+  if self:get(node) then
+    self.marks[node.absolute_path] = nil
  else
-    self:add_mark(node)
+    self.marks[node.absolute_path] = node
  end

  renderer.draw()
 end

-function Marks:clear_marks()
-  self.marks = {}
-
-  renderer.draw()
-end
-
+---Return node if marked
+---@public
 ---@param node Node
 ---@return Node|nil
-function Marks:get_mark(node)
+function Marks:get(node)
  return node and self.marks[node.absolute_path]
 end

+---List marked nodes
+---@public
 ---@return Node[]
-function Marks:get_marks()
+function Marks:list()
  local list = {}
  for _, node in pairs(self.marks) do
    table.insert(list, node)
@@ -67,12 +84,190 @@ function Marks:get_marks()
  return list
 end

-function Marks.setup(opts)
-  renderer = require "nvim-tree.renderer"
+---Delete marked; each removal will be optionally notified
+---@public
+function Marks:bulk_delete()
+  if not next(self.marks) then
+    notify.warn "No bookmarks to delete."
+    return
+  end

-  require("nvim-tree.marks.bulk-delete").setup(opts)
-  require("nvim-tree.marks.bulk-trash").setup(opts)
-  require("nvim-tree.marks.bulk-move").setup(opts)
+  local function execute()
+    for _, node in pairs(self.marks) do
+      remove_file.remove(node)
+    end
+    self:clear_reload()
+  end
+
+  if self.config.ui.confirm.remove then
+    local prompt_select = "Remove bookmarked ?"
+    local prompt_input = prompt_select .. " y/N: "
+    lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, "nvimtree_bulk_delete", function(item_short)
+      utils.clear_prompt()
+      if item_short == "y" then
+        execute()
+      end
+    end)
+  else
+    execute()
+  end
+end
+
+---Trash marked; each removal will be optionally notified
+---@public
+function Marks:bulk_trash()
+  if not next(self.marks) then
+    notify.warn "No bookmarks to trash."
+    return
+  end
+
+  local function execute()
+    for _, node in pairs(self.marks) do
+      trash.remove(node)
+    end
+    self:clear_reload()
+  end
+
+  if self.config.ui.confirm.trash then
+    local prompt_select = "Trash bookmarked ?"
+    local prompt_input = prompt_select .. " y/N: "
+    lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, "nvimtree_bulk_trash", function(item_short)
+      utils.clear_prompt()
+      if item_short == "y" then
+        execute()
+      end
+    end)
+  else
+    execute()
+  end
+end
+
+---Move marked
+---@public
+function Marks:bulk_move()
+  if not next(self.marks) then
+    notify.warn "No bookmarks to move."
+    return
+  end
+
+  local node_at_cursor = lib.get_node_at_cursor()
+  local default_path = core.get_cwd()
+
+  if node_at_cursor and node_at_cursor.type == "directory" then
+    default_path = node_at_cursor.absolute_path
+  elseif node_at_cursor and node_at_cursor.parent then
+    default_path = node_at_cursor.parent.absolute_path
+  end
+
+  local input_opts = {
+    prompt = "Move to: ",
+    default = default_path,
+    completion = "dir",
+  }
+
+  vim.ui.input(input_opts, function(location)
+    utils.clear_prompt()
+    if not location or location == "" then
+      return
+    end
+    if vim.fn.filewritable(location) ~= 2 then
+      notify.warn(location .. " is not writable, cannot move.")
+      return
+    end
+
+    for _, node in pairs(self.marks) do
+      local head = vim.fn.fnamemodify(node.absolute_path, ":t")
+      local to = utils.path_join { location, head }
+      rename_file.rename(node, to)
+    end
+
+    self:clear_reload()
+  end)
+end
+
+---Focus nearest marked node in direction.
+---@private
+---@param up boolean
+function Marks:navigate(up)
+  local node = lib.get_node_at_cursor()
+  if not node then
+    return
+  end
+
+  local first, prev, next, last = nil, nil, nil, nil
+  local found = false
+
+  Iterator.builder(self.explorer.nodes)
+    :recursor(function(n)
+      return n.open and n.nodes
+    end)
+    :applier(function(n)
+      if n.absolute_path == node.absolute_path then
+        found = true
+        return
+      end
+
+      if not self:get(n) then
+        return
+      end
+
+      last = n
+      first = first or n
+
+      if found and not next then
+        next = n
+      end
+
+      if not found then
+        prev = n
+      end
+    end)
+    :iterate()
+
+  if not found then
+    return
+  end
+
+  if up then
+    utils.focus_node_or_parent(prev or last)
+  else
+    utils.focus_node_or_parent(next or first)
+  end
+end
+
+---@public
+function Marks:navigate_prev()
+  self:navigate(true)
+end
+
+---@public
+function Marks:navigate_next()
+  self:navigate(false)
+end
+
+---Prompts for selection of a marked node, sorted by absolute paths.
+---A folder will be focused, a file will be opened.
+---@public
+function Marks:navigate_select()
+  local list = vim.tbl_map(function(n)
+    return n.absolute_path
+  end, self:list())
+
+  table.sort(list)
+
+  vim.ui.select(list, {
+    prompt = "Select a file to open or a folder to focus",
+  }, function(choice)
+    if not choice or choice == "" then
+      return
+    end
+    local node = self.marks[choice]
+    if node and not node.nodes and not utils.get_win_buf_from_path(node.absolute_path) then
+      open_file.fn("edit", node.absolute_path)
+    elseif node then
+      utils.focus_file(node.absolute_path)
+    end
+  end)
 end

 return Marks
--- a/lua/nvim-tree/marks/navigation.lua
+++ b/lua/nvim-tree/marks/navigation.lua
@@ -1,111 +0,0 @@
-local Iterator = require "nvim-tree.iterators.node-iterator"
-local core = require "nvim-tree.core"
-local open_file = require "nvim-tree.actions.node.open-file"
-local utils = require "nvim-tree.utils"
-local lib = require "nvim-tree.lib"
-
---@param node table
---@param where string
---@return Node|nil
-local function get_nearest(node, where)
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
-
-  local first, prev, next, last = nil, nil, nil, nil
-  local found = false
-
-  Iterator.builder(explorer.nodes)
-    :recursor(function(n)
-      return n.open and n.nodes
-    end)
-    :applier(function(n)
-      if n.absolute_path == node.absolute_path then
-        found = true
-        return
-      end
-
-      if not explorer.marks:get_mark(n) then
-        return
-      end
-
-      last = n
-      first = first or n
-
-      if found and not next then
-        next = n
-      end
-
-      if not found then
-        prev = n
-      end
-    end)
-    :iterate()
-
-  if not found then
-    return
-  end
-
-  if where == "next" then
-    return next or first
-  else
-    return prev or last
-  end
-end
-
---@param where string
---@param node table|nil
---@return Node|nil
-local function get(where, node)
-  if node then
-    return get_nearest(node, where)
-  end
-end
-
---@param node table|nil
-local function open_or_focus(node)
-  if node and not node.nodes and not utils.get_win_buf_from_path(node.absolute_path) then
-    open_file.fn("edit", node.absolute_path)
-  elseif node then
-    utils.focus_file(node.absolute_path)
-  end
-end
-
---@param where string
---@return function
-local function navigate_to(where)
-  return function()
-    local node = lib.get_node_at_cursor()
-    local next = get(where, node)
-    open_or_focus(next)
-  end
-end
-
-local M = {}
-
-M.next = navigate_to "next"
-M.prev = navigate_to "prev"
-
-function M.select()
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
-
-  local list = vim.tbl_map(function(n)
-    return n.absolute_path
-  end, explorer.marks:get_marks())
-
-  vim.ui.select(list, {
-    prompt = "Select a file to open or a folder to focus",
-  }, function(choice)
-    if not choice or choice == "" then
-      return
-    end
-    local node = explorer.marks:get_mark { absolute_path = choice }
-    open_or_focus(node)
-  end)
-end
-
-return M
--- a/lua/nvim-tree/node.lua
+++ b/lua/nvim-tree/node.lua
@@ -21,6 +21,7 @@
 ---@field group_next Node|nil
 ---@field nodes Node[]
 ---@field open boolean
+---@field hidden_stats table -- Each field of this table is a key for source and value for count

 ---@class FileNode: BaseNode
 ---@field extension string
--- a/lua/nvim-tree/renderer/builder.lua
+++ b/lua/nvim-tree/renderer/builder.lua
@@ -1,5 +1,4 @@
 local core = require "nvim-tree.core"
-local live_filter = require "nvim-tree.live-filter"
 local notify = require "nvim-tree.notify"
 local utils = require "nvim-tree.utils"
 local view = require "nvim-tree.view"
@@ -43,6 +42,8 @@ local M = {
 ---@field lines string[] includes icons etc.
 ---@field hl_args AddHighlightArgs[] line highlights
 ---@field signs string[] line signs
+---@field extmarks table[] extra marks for right icon placement
+---@field virtual_lines table[] virtual lines for hidden count display
 ---@field private root_cwd string absolute path
 ---@field private index number
 ---@field private depth number
@@ -62,6 +63,7 @@ function Builder:new()
    markers = {},
    signs = {},
    extmarks = {},
+    virtual_lines = {},
  }
  setmetatable(o, self)
  self.__index = self
@@ -351,7 +353,6 @@ function Builder:build_line(node, idx, num_children)
  self.index = self.index + 1

  node = require("nvim-tree.lib").get_last_group_node(node)
-
  if node.open then
    self.depth = self.depth + 1
    self:build_lines(node)
@@ -359,9 +360,36 @@ function Builder:build_line(node, idx, num_children)
  end
 end

+---Add virtual lines for rendering hidden count information per node
+---@private
+function Builder:add_hidden_count_string(node, idx, num_children)
+  if not node.open then
+    return
+  end
+  local hidden_count_string = M.opts.renderer.hidden_display(node.hidden_stats)
+  if hidden_count_string and hidden_count_string ~= "" then
+    local indent_markers = pad.get_indent_markers(self.depth, idx or 0, num_children or 0, node, self.markers, 1)
+    local indent_width = M.opts.renderer.indent_width
+
+    local indent_padding = string.rep(" ", indent_width)
+    local indent_string = indent_padding .. indent_markers.str
+    local line_nr = #self.lines - 1
+    self.virtual_lines[line_nr] = self.virtual_lines[line_nr] or {}
+
+    -- NOTE: We are inserting in depth order because of current traversal
+    -- if we change the traversal, we might need to sort by depth before rendering `self.virtual_lines`
+    -- to maintain proper ordering of parent and child folder hidden count info.
+    table.insert(self.virtual_lines[line_nr], {
+      { indent_string, indent_markers.hl },
+      { string.rep(indent_padding, (node.parent == nil and 0 or 1)) .. hidden_count_string, "NvimTreeHiddenDisplay" },
+    })
+  end
+end
+
 ---@private
 function Builder:get_nodes_number(nodes)
-  if not live_filter.filter then
+  local explorer = core.get_explorer()
+  if not explorer or not explorer.live_filter.filter then
    return #nodes
  end

@@ -388,6 +416,7 @@ function Builder:build_lines(node)
      idx = idx + 1
    end
  end
+  self:add_hidden_count_string(node)
 end

 ---@private
@@ -407,6 +436,7 @@ end

 ---@private
 function Builder:build_header()
+  local explorer = core.get_explorer()
  if view.is_root_folder_visible(core.get_cwd()) then
    local root_name = self:format_root_name(M.opts.renderer.root_folder_label)
    table.insert(self.lines, root_name)
@@ -414,8 +444,8 @@ function Builder:build_header()
    self.index = 1
  end

-  if live_filter.filter then
-    local filter_line = string.format("%s/%s/", M.opts.live_filter.prefix, live_filter.filter)
+  if explorer and explorer.live_filter.filter then
+    local filter_line = string.format("%s/%s/", M.opts.live_filter.prefix, explorer.live_filter.filter)
    table.insert(self.lines, filter_line)
    local prefix_length = string.len(M.opts.live_filter.prefix)
    self:insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
@@ -442,7 +472,50 @@ function Builder:build()
  return self
 end

+---@param opts table
+local setup_hidden_display_function = function(opts)
+  local hidden_display = opts.renderer.hidden_display
+  -- options are already validated, so ´hidden_display´ can ONLY be `string` or `function` if type(hidden_display) == "string" then
+  if type(hidden_display) == "string" then
+    if hidden_display == "none" then
+      opts.renderer.hidden_display = function()
+        return nil
+      end
+    elseif hidden_display == "simple" then
+      opts.renderer.hidden_display = function(hidden_stats)
+        return utils.default_format_hidden_count(hidden_stats, true)
+      end
+    elseif hidden_display == "all" then
+      opts.renderer.hidden_display = function(hidden_stats)
+        return utils.default_format_hidden_count(hidden_stats, false)
+      end
+    end
+  elseif type(hidden_display) == "function" then
+    local safe_render = function(hidden_stats)
+      -- In case of missing field such as live_filter we zero it, otherwise keep field as is
+      hidden_stats = vim.tbl_deep_extend("force", {
+        live_filter = 0,
+        git = 0,
+        buf = 0,
+        dotfile = 0,
+        custom = 0,
+        bookmark = 0,
+      }, hidden_stats or {})
+
+      local ok, result = pcall(hidden_display, hidden_stats)
+      if not ok then
+        notify.warn "Problem occurred in the function ``opts.renderer.hidden_display`` see nvim-tree.renderer.hidden_display on :h nvim-tree"
+        return nil
+      end
+      return result
+    end
+
+    opts.renderer.hidden_display = safe_render
+  end
+end
+
 function Builder.setup(opts)
+  setup_hidden_display_function(opts)
  M.opts = opts

  -- priority order
--- a/lua/nvim-tree/renderer/components/padding.lua
+++ b/lua/nvim-tree/renderer/components/padding.lua
@@ -19,7 +19,7 @@ local function check_siblings_for_folder(node, with_arrows)
  return false
 end

-local function get_padding_indent_markers(depth, idx, nodes_number, markers, with_arrows, inline_arrows, node)
+local function get_padding_indent_markers(depth, idx, nodes_number, markers, with_arrows, inline_arrows, node, early_stop)
  local base_padding = with_arrows and (not node.nodes or depth > 0) and "  " or ""
  local padding = (inline_arrows or depth == 0) and base_padding or ""

@@ -27,7 +27,7 @@ local function get_padding_indent_markers(depth, idx, nodes_number, markers, wit
    local has_folder_sibling = check_siblings_for_folder(node, with_arrows)
    local indent = string.rep(" ", M.config.indent_width - 1)
    markers[depth] = idx ~= nodes_number
-    for i = 1, depth do
+    for i = 1, depth - early_stop do
      local glyph
      if idx == nodes_number and i == depth then
        local bottom_width = M.config.indent_width - 2 + (with_arrows and not inline_arrows and has_folder_sibling and 2 or 0)
@@ -62,7 +62,7 @@ end
 ---@param node table
 ---@param markers table
 ---@return HighlightedString[]
-function M.get_indent_markers(depth, idx, nodes_number, node, markers)
+function M.get_indent_markers(depth, idx, nodes_number, node, markers, early_stop)
  local str = ""

  local show_arrows = M.config.icons.show.folder_arrow
@@ -71,7 +71,7 @@ function M.get_indent_markers(depth, idx, nodes_number, node, markers)
  local indent_width = M.config.indent_width

  if show_markers then
-    str = str .. get_padding_indent_markers(depth, idx, nodes_number, markers, show_arrows, inline_arrows, node)
+    str = str .. get_padding_indent_markers(depth, idx, nodes_number, markers, show_arrows, inline_arrows, node, early_stop or 0)
  else
    str = str .. string.rep(" ", depth * indent_width)
  end
--- a/lua/nvim-tree/renderer/decorator/bookmarks.lua
+++ b/lua/nvim-tree/renderer/decorator/bookmarks.lua
@@ -34,7 +34,7 @@ end
 ---@param node Node
 ---@return HighlightedString[]|nil icons
 function DecoratorBookmarks:calculate_icons(node)
-  if core.get_explorer() and core.get_explorer().marks:get_mark(node) then
+  if core.get_explorer() and core.get_explorer().marks:get(node) then
    return { self.icon }
  end
 end
@@ -43,7 +43,7 @@ end
 ---@param node Node
 ---@return string|nil group
 function DecoratorBookmarks:calculate_highlight(node)
-  if self.hl_pos ~= HL_POSITION.none and core.get_explorer() and core.get_explorer().marks:get_mark(node) then
+  if self.hl_pos ~= HL_POSITION.none and core.get_explorer() and core.get_explorer().marks:get(node) then
    return "NvimTreeBookmarkHL"
  end
 end
--- a/lua/nvim-tree/renderer/decorator/copied.lua
+++ b/lua/nvim-tree/renderer/decorator/copied.lua
@@ -1,4 +1,4 @@
-local copy_paste
+local core = require "nvim-tree.core"

 local HL_POSITION = require("nvim-tree.enum").HL_POSITION
 local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
@@ -20,9 +20,6 @@ function DecoratorCopied:new(opts)
  })
  ---@cast o DecoratorCopied

-  -- cyclic
-  copy_paste = copy_paste or require "nvim-tree.actions.fs.copy-paste"
-
  return o
 end

@@ -30,7 +27,7 @@ end
 ---@param node Node
 ---@return string|nil group
 function DecoratorCopied:calculate_highlight(node)
-  if self.hl_pos ~= HL_POSITION.none and copy_paste.is_copied(node) then
+  if self.hl_pos ~= HL_POSITION.none and core.get_explorer() and core.get_explorer().clipboard:is_copied(node) then
    return "NvimTreeCopiedHL"
  end
 end
--- a/lua/nvim-tree/renderer/decorator/cut.lua
+++ b/lua/nvim-tree/renderer/decorator/cut.lua
@@ -1,4 +1,4 @@
-local copy_paste
+local core = require "nvim-tree.core"

 local HL_POSITION = require("nvim-tree.enum").HL_POSITION
 local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
@@ -20,9 +20,6 @@ function DecoratorCut:new(opts)
  })
  ---@cast o DecoratorCut

-  -- cyclic
-  copy_paste = copy_paste or require "nvim-tree.actions.fs.copy-paste"
-
  return o
 end

@@ -30,7 +27,7 @@ end
 ---@param node Node
 ---@return string|nil group
 function DecoratorCut:calculate_highlight(node)
-  if self.hl_pos ~= HL_POSITION.none and copy_paste.is_cut(node) then
+  if self.hl_pos ~= HL_POSITION.none and core.get_explorer() and core.get_explorer().clipboard:is_cut(node) then
    return "NvimTreeCutHL"
  end
 end
--- a/lua/nvim-tree/renderer/decorator/hidden.lua
+++ b/lua/nvim-tree/renderer/decorator/hidden.lua
@@ -28,7 +28,7 @@ function DecoratorHidden:new(opts)
  return o
 end

---Hidden icon: hidden.enable, renderer.icons.show.hidden and node starts with `.` (dotfile).
+---Hidden icon: renderer.icons.show.hidden and node starts with `.` (dotfile).
 ---@param node Node
 ---@return HighlightedString[]|nil icons
 function DecoratorHidden:calculate_icons(node)
@@ -37,7 +37,7 @@ function DecoratorHidden:calculate_icons(node)
  end
 end

---Hidden highlight: hidden.enable, renderer.highlight_hidden and node starts with `.` (dotfile).
+---Hidden highlight: renderer.highlight_hidden and node starts with `.` (dotfile).
 ---@param node Node
 ---@return string|nil group
 function DecoratorHidden:calculate_highlight(node)
--- a/lua/nvim-tree/renderer/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -14,12 +14,13 @@ local SIGN_GROUP = "NvimTreeRendererSigns"

 local namespace_highlights_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
 local namespace_extmarks_id = vim.api.nvim_create_namespace "NvimTreeExtmarks"
+local namespace_virtual_lines_id = vim.api.nvim_create_namespace "NvimTreeVirtualLines"

 ---@param bufnr number
 ---@param lines string[]
 ---@param hl_args AddHighlightArgs[]
 ---@param signs string[]
-local function _draw(bufnr, lines, hl_args, signs, extmarks)
+local function _draw(bufnr, lines, hl_args, signs, extmarks, virtual_lines)
  if vim.fn.has "nvim-0.10" == 1 then
    vim.api.nvim_set_option_value("modifiable", true, { buf = bufnr })
  else
@@ -50,6 +51,15 @@ local function _draw(bufnr, lines, hl_args, signs, extmarks)
      })
    end
  end
+
+  vim.api.nvim_buf_clear_namespace(bufnr, namespace_virtual_lines_id, 0, -1)
+  for line_nr, vlines in pairs(virtual_lines) do
+    vim.api.nvim_buf_set_extmark(bufnr, namespace_virtual_lines_id, line_nr, 0, {
+      virt_lines = vlines,
+      virt_lines_above = false,
+      virt_lines_leftcol = true,
+    })
+  end
 end

 function M.render_hl(bufnr, hl)
@@ -79,7 +89,7 @@ function M.draw()

  local builder = Builder:new():build()

-  _draw(bufnr, builder.lines, builder.hl_args, builder.signs, builder.extmarks)
+  _draw(bufnr, builder.lines, builder.hl_args, builder.signs, builder.extmarks, builder.virtual_lines)

  if cursor and #builder.lines >= cursor[1] then
    vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
--- a/lua/nvim-tree/utils.lua
+++ b/lua/nvim-tree/utils.lua
@@ -112,7 +112,10 @@ function M.find_node(nodes, fn)
    end)
    :iterate()
  i = require("nvim-tree.view").is_root_folder_visible() and i or i - 1
-  i = require("nvim-tree.live-filter").filter and i + 1 or i
+  local explorer = require("nvim-tree.core").get_explorer()
+  if explorer and explorer.live_filter.filter then
+    i = i + 1
+  end
  return node, i
 end

@@ -181,6 +184,26 @@ function M.get_parent_of_group(node)
  return node
 end

+M.default_format_hidden_count = function(hidden_count, simple)
+  local parts = {}
+  local total_count = 0
+  for reason, count in pairs(hidden_count) do
+    total_count = total_count + count
+    if count > 0 then
+      table.insert(parts, reason .. ": " .. tostring(count))
+    end
+  end
+
+  local hidden_count_string = table.concat(parts, ", ") -- if empty then is "" (empty string)
+  if simple then
+    hidden_count_string = ""
+  end
+  if total_count > 0 then
+    return "(" .. tostring(total_count) .. (simple and " hidden" or " total ") .. hidden_count_string .. ")"
+  end
+  return nil
+end
+
 --- Return visible nodes indexed by line
 ---@param nodes_all Node[]
 ---@param line_start number
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -50,6 +50,7 @@ M.View = {
      "Normal:NvimTreeNormal",
      "NormalNC:NvimTreeNormalNC",
      "NormalFloat:NvimTreeNormalFloat",
+      "FloatBorder:NvimTreeNormalFloatBorder",
    }, ","),
  },
 }
@@ -345,14 +346,18 @@ function M.resize(size)
    return
  end

+  local winnr = M.get_winnr() or 0
+
  local new_size = get_width()
-  vim.api.nvim_win_set_width(M.get_winnr() or 0, new_size)
-
-  events._dispatch_on_tree_resize(new_size)

+  if new_size ~= vim.api.nvim_win_get_width(winnr) then
+    vim.api.nvim_win_set_width(winnr, new_size)
    if not M.View.preserve_window_proportions then
      vim.cmd ":wincmd ="
    end
+  end
+
+  events._dispatch_on_tree_resize(new_size)
 end

 function M.reposition_window()
Author	SHA1	Message	Date
github-actions[bot]	d41b4ca013	chore(master): release nvim-tree 1.6.1 (#2877 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-09-09 10:41:48 +10:00
Eric 李	2d6e64dd8c	fix(#2794 ): sshfs compatibility (#2893 ) * add type fallback for nil types * add PR suggestions * Update lua/nvim-tree/explorer/explore.lua Co-authored-by: Alexander Courtis <alex@courtis.org> * use type from fs_stat for sshfs compatibility --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-09-09 10:31:55 +10:00
Alexander Courtis	cb57691536	docs: clarify node parameters in API, use of function {rhs} in on_attach (#2899 ) * docs: specify node parameters for all API * docs: clarify need to use a custom functions in on_attach	2024-09-08 15:11:02 +10:00
Alexander Courtis	70d7377c3f	chore: lua-language-server 3.9.1 -> 3.10.5 (#2898 )	2024-09-08 14:40:17 +10:00
Alexander Courtis	ea55ef1203	refactor(#2837 ): multi instance reload (#2885 ) * refactor(#2837): multi instance reload * refactor(#2837): multi instance reload	2024-09-01 15:50:03 +10:00
Alexander Courtis	43c3c36c7a	doc(#2891 ): remove unused option hidden.enable	2024-09-01 14:52:25 +10:00
Alexander Courtis	d43ab67d0e	fix(#2879 ): remove unnecessary tree window width setting to prevent unnecessary :wincmd = (#2881 )	2024-08-25 13:23:28 +10:00
Alexander Courtis	6fbcb5a892	refactor(#2831 ): multi instance clipboard (#2869 ) * refactor(#2831): multi instance clipboard * refactor(#2831): multi instance clipboard * refactor(#2831): multi instance clipboard	2024-08-25 12:49:46 +10:00
Alexander Courtis	e962e97cab	refactor(#2830 ): multi instance marks (#2873 ) * refactor(#2830): multi instance marks * refactor(#2830): multi instance marks * refactor(#2830): multi instance marks	2024-08-25 12:32:09 +10:00
Alexander Courtis	42340952af	fix(#2878 ): nowrapscan prevents move from root (#2880 ) * fix(#2878): nowrapscan prevents move from root * fix(#2878): nowrapscan prevents move from root	2024-08-25 12:21:17 +10:00
Alexander Courtis	210478677c	fix(#2868 ): windows: do not visit unenumerable directories such as Application Data (#2874 )	2024-08-24 13:09:12 +10:00
github-actions[bot]	ad0b95dee5	chore(master): release nvim-tree 1.6.0 (#2845 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-08-10 12:26:42 +10:00
Michael Härtl	466fbed3e4	fix(#2859 ): make sure window still exists when restoring options (#2863 ) Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-08-10 12:21:48 +10:00
Mateusz Russak	15942df2bb	refactor(#2827 ): multi instance nvim-tree.live-filter (#2849 ) * feat(#2827): Multi Instance: Refactor: nvim-tree.live-filter * refactor: all usages going through the explorer * fix: api and filtration * fix: style * Update lua/nvim-tree/api.lua Co-authored-by: Alexander Courtis <alex@courtis.org> * docs: add missing live filter luadocs --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-08-10 12:02:13 +10:00
Everton Jr.	e25eb7fa83	feat(#2225 ): add renderer.hidden_display to show a summary of hidden files below the tree (#2856 ) * feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api * feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api * feat(icon_placement): consolidate doc * fix: extra namespace added to avoid colision between right_align and full_name features * feat(hidden_display): Allow fine grained rendering of hidden files in a folder * feat(hidden_display): update defaults in Builder to allow rendering * feat(hidden_display): Rename opts function name for the feature * feat(#2349): add "right_align" option for renderer.icons._placement (#2846) feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api * feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api feat(icon_placement): Allow right_align icon_placemente for decorator using ext_marks nvim api * feat(icon_placement): consolidate doc * fix: extra namespace added to avoid colision between right_align and full_name features * style: rename namespace_id --------- Co-authored-by: Alexander Courtis <alex@courtis.org> * docs: update docs * feat(hidden_display): Simplification and better performance by not sorting and grouping virtual lines * Update doc/nvim-tree-lua.txt Co-authored-by: Alexander Courtis <alex@courtis.org> * style: hidden_stats is better * docs: change to hidden_stats * add separate namespace for virtual lines * help: add highlight group --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-08-10 11:36:30 +10:00