chore(master): release nvim-tree 1.6.0 (#2845 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix(#2859 ): make sure window still exists when restoring options (#2863 )
2024-08-10 12:26:42 +10:00 · 2024-08-10 12:21:48 +10:00 · 2024-08-10 12:02:13 +10:00 · 2024-08-10 11:36:30 +10:00
32 changed files with 579 additions and 406 deletions
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.5.0"
+  ".": "1.6.0"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog

+## [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`
@@ -2461,6 +2505,9 @@ Hidden: >
    NvimTreeModifiedFileHL      NvimTreeHiddenIcon
    NvimTreeModifiedFolderHL    NvimTreeHiddenFileHL
 <
+Hidden Display: >
+    NvimTreeHiddenDisplay       Conceal
+<
 Opened: >
    NvimTreeOpenedHL            Special
 <
@@ -2872,6 +2919,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
@@ -2,6 +2,7 @@ local lib = require "nvim-tree.lib"
 local log = require "nvim-tree.log"
 local appearance = require "nvim-tree.appearance"
 local renderer = require "nvim-tree.renderer"
+local view = require "nvim-tree.view"
 local commands = require "nvim-tree.commands"
 local utils = require "nvim-tree.utils"
 local actions = require "nvim-tree.actions"
@@ -80,11 +81,7 @@ function M.change_root(path, bufnr)
 end

 function M.tab_enter()
-  local explorer = core.get_explorer();
-  if not explorer then
-    return
-  end
-  if explorer.view:is_visible { any_tabpage = true } then
+  if view.is_visible { any_tabpage = true } then
    local bufname = vim.api.nvim_buf_get_name(0)

    local ft
@@ -99,17 +96,13 @@ function M.tab_enter()
        return
      end
    end
-    explorer.view:open { focus_tree = false }
+    view.open { focus_tree = false }
    renderer.draw()
  end
 end

 function M.open_on_directory()
-  local explorer = core.get_explorer();
-  if not explorer then
-    return
-  end
-  local should_proceed = _config.hijack_directories.auto_open or explorer.view:is_visible()
+  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
  if not should_proceed then
    return
  end
@@ -184,12 +177,8 @@ local function setup_autocommands(opts)
  -- reset and draw (highlights) when colorscheme is changed
  create_nvim_tree_autocmd("ColorScheme", {
    callback = function()
-      local explorer = core.get_explorer();
-      if not explorer then
-        return
-      end
      appearance.setup()
-      explorer.view:reset_winhl()
+      view.reset_winhl()
      renderer.draw()
    end,
  })
@@ -201,14 +190,10 @@ local function setup_autocommands(opts)
      if not utils.is_nvim_tree_buf(0) then
        return
      end
-      local explorer = core.get_explorer();
-      if not explorer then
-        return
-      end
      if opts.actions.open_file.eject then
-        explorer.view:_prevent_buffer_override()
+        view._prevent_buffer_override()
      else
-        explorer.view:abandon_current_window()
+        view.abandon_current_window()
      end
    end,
  })
@@ -346,12 +331,8 @@ local function setup_autocommands(opts)
    create_nvim_tree_autocmd("WinLeave", {
      pattern = "NvimTree_*",
      callback = function()
-        local explorer = core.get_explorer()
-        if not explorer then
-          return
-        end
        if utils.is_nvim_tree_buf(0) then
-          explorer.view:close()
+          view.close()
        end
      end,
    })
@@ -417,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",
@@ -666,6 +648,7 @@ local ACCEPTED_TYPES = {
    },
  },
  renderer = {
+    hidden_display = { "function", "string" },
    group_empty = { "boolean", "function" },
    root_folder_label = { "function", "string", "boolean" },
  },
@@ -699,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" },
@@ -802,12 +786,8 @@ end

 function M.purge_all_state()
  require("nvim-tree.watcher").purge_watchers()
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
-  explorer.view:close_all_tabs()
-  explorer.view:abandon_all_windows()
+  view.close_all_tabs()
+  view.abandon_all_windows()
  if core.get_explorer() ~= nil then
    git.purge_state()
    core.reset_explorer()
@@ -857,6 +837,7 @@ function M.setup(conf)
  require("nvim-tree.explorer").setup(opts)
  require("nvim-tree.git").setup(opts)
  require("nvim-tree.git.utils").setup(opts)
+  require("nvim-tree.view").setup(opts)
  require("nvim-tree.lib").setup(opts)
  require("nvim-tree.renderer").setup(opts)
  require("nvim-tree.marks").setup(opts)
--- a/lua/nvim-tree/actions/finders/find-file.lua
+++ b/lua/nvim-tree/actions/finders/find-file.lua
@@ -1,4 +1,5 @@
 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"
@@ -12,8 +13,7 @@ local running = {}
 ---Find a path in the tree, expand it and focus it
 ---@param path string relative or absolute
 function M.fn(path)
-  local explorer = core.get_explorer()
-  if not explorer or not explorer.view:is_visible() then
+  if not core.get_explorer() or not view.is_visible() then
    return
  end

@@ -75,9 +75,9 @@ function M.fn(path)
    end)
    :iterate()

-  if found and explorer.view:is_visible() then
+  if found and view.is_visible() then
    renderer.draw()
-    explorer.view:set_cursor { line, 0 }
+    view.set_cursor { line, 0 }
  end

  running[path_real] = false
--- a/lua/nvim-tree/actions/fs/remove-file.lua
+++ b/lua/nvim-tree/actions/fs/remove-file.lua
@@ -1,5 +1,6 @@
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
+local view = require "nvim-tree.view"
 local lib = require "nvim-tree.lib"
 local notify = require "nvim-tree.notify"

@@ -9,14 +10,10 @@ local M = {

 ---@param windows integer[]
 local function close_windows(windows)
-  local explorer = require "nvim-tree.core".get_explorer()
-  if not explorer then
-    return
-  end
  -- Prevent from closing when the win count equals 1 or 2,
  -- where the win to remove could be the last opened.
  -- For details see #2503.
-  if explorer.view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
    return
  end

@@ -29,20 +26,16 @@ end

 ---@param absolute_path string
 local function clear_buffer(absolute_path)
-  local explorer = require "nvim-tree.core".get_explorer()
-  if not explorer then
-    return
-  end
  local bufs = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
  for _, buf in pairs(bufs) do
    if buf.name == absolute_path then
      local tree_winnr = vim.api.nvim_get_current_win()
-      if buf.hidden == 0 and (#bufs > 1 or explorer.view.View.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or view.View.float.enable) then
        vim.api.nvim_set_current_win(buf.windows[1])
        vim.cmd ":bn"
      end
      vim.api.nvim_buf_delete(buf.bufnr, { force = true })
-      if not explorer.view.View.float.quit_on_focus_loss then
+      if not view.View.float.quit_on_focus_loss then
        vim.api.nvim_set_current_win(tree_winnr)
      end
      if M.config.actions.remove_file.close_window then
--- a/lua/nvim-tree/actions/moves/item.lua
+++ b/lua/nvim-tree/actions/moves/item.lua
@@ -1,4 +1,5 @@
 local utils = require "nvim-tree.utils"
+local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
 local explorer_node = require "nvim-tree.explorer.node"
@@ -59,14 +60,10 @@ local function move(where, what, skip_gitignored)
    end
  end

-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
  if nex then
-    explorer.view:set_cursor { nex, 0 }
+    view.set_cursor { nex, 0 }
  elseif vim.o.wrapscan and first then
-    explorer.view:set_cursor { first, 0 }
+    view.set_cursor { first, 0 }
  end
 end

@@ -185,19 +182,13 @@ local function move_prev_recursive(what, skip_gitignored)

      -- 4.3)
      if node_init.name == ".." then -- root node
-        local explorer = core.get_explorer()
-        if explorer then
-          explorer.view:set_cursor { 1, 0 } -- move to root node (position 1)
-        end
+        view.set_cursor { 1, 0 } -- move to root node (position 1)
      else
        local node_init_line = utils.find_node_line(node_init)
        if node_init_line < 0 then
          return
        end
-        local explorer = core.get_explorer()
-        if explorer then
-          explorer.view:set_cursor { node_init_line, 0 } -- move to root node (position 1)
-        end
+        view.set_cursor { node_init_line, 0 }
      end

      -- 4.4)
--- a/lua/nvim-tree/actions/moves/parent.lua
+++ b/lua/nvim-tree/actions/moves/parent.lua
@@ -1,4 +1,5 @@
 local renderer = require "nvim-tree.renderer"
+local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
@@ -20,20 +21,14 @@ function M.fn(should_close)
    local parent = utils.get_parent_of_group(node).parent

    if not parent or not parent.parent then
-      local explorer = core.get_explorer()
-      if explorer then
-        return explorer.view:set_cursor { 1, 0 }
-      end
+      return view.set_cursor { 1, 0 }
    end

    local _, line = utils.find_node(core.get_explorer().nodes, function(n)
      return n.absolute_path == parent.absolute_path
    end)

-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.view:set_cursor { line + 1, 0 }
-    end
+    view.set_cursor { line + 1, 0 }
    if should_close then
      parent.open = false
      renderer.draw()
--- a/lua/nvim-tree/actions/node/open-file.lua
+++ b/lua/nvim-tree/actions/node/open-file.lua
@@ -2,6 +2,7 @@
 local lib = require "nvim-tree.lib"
 local notify = require "nvim-tree.notify"
 local utils = require "nvim-tree.utils"
+local view = require "nvim-tree.view"

 local M = {}

@@ -18,11 +19,9 @@ end
 ---Get all windows in the current tabpage that aren't NvimTree.
 ---@return table with valid win_ids
 local function usable_win_ids()
-  local explorer = require "nvim-tree.core".get_explorer()
-
  local tabpage = vim.api.nvim_get_current_tabpage()
  local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = explorer and explorer.view:get_winnr(tabpage)
+  local tree_winid = view.get_winnr(tabpage)

  return vim.tbl_filter(function(id)
    local bufid = vim.api.nvim_win_get_buf(id)
@@ -168,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 })
@@ -177,6 +178,7 @@ local function pick_win_id()
        end
      end
    end
+  end

  vim.o.laststatus = laststatus

@@ -189,10 +191,7 @@ end

 local function open_file_in_tab(filename)
  if M.quit_on_open then
-    local explorer = require "nvim-tree.core".get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
  end
  if M.relative_path then
    filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -202,10 +201,7 @@ end

 local function drop(filename)
  if M.quit_on_open then
-    local explorer = require"nvim-tree.core".get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
  end
  if M.relative_path then
    filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -215,10 +211,7 @@ end

 local function tab_drop(filename)
  if M.quit_on_open then
-    local explorer = require"nvim-tree.core".get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
  end
  if M.relative_path then
    filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -239,10 +232,7 @@ local function on_preview(buf_loaded)
      once = true,
    })
  end
-  local explorer = require"nvim-tree.core".get_explorer()
-  if explorer then
-    explorer.view:focus()
-  end
+  view.focus()
 end

 local function get_target_winid(mode)
@@ -300,8 +290,7 @@ local function open_in_new_window(filename, mode)
  end, vim.api.nvim_list_wins())

  local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one
-  local explorer = require"nvim-tree.core".get_explorer()
-  local new_window_side = (explorer and view.View.side == "right") and "aboveleft" or "belowright"
+  local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright"

  -- Target is invalid: create new window
  if not vim.tbl_contains(win_ids, target_winid) then
@@ -333,7 +322,7 @@ local function open_in_new_window(filename, mode)
    end
  end

-  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.view.View.float.enable then
+  if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
    -- ignore "WinLeave" autocmd on preview
    -- because the registered "WinLeave"
    -- will kill the floating window immediately
@@ -373,10 +362,7 @@ local function is_already_loaded(filename)
 end

 local function edit_in_current_buf(filename)
-  local explorer = require"nvim-tree.core".get_explorer()
-  if explorer then
-    explorer.view:abandon_current_window()
-  end
+  require("nvim-tree.view").abandon_current_window()
  if M.relative_path then
    filename = utils.path_relative(filename, vim.fn.getcwd())
  end
@@ -421,10 +407,7 @@ function M.fn(mode, filename)
  end

  if M.resize_window then
-    local explorer = require"nvim-tree.core".get_explorer()
-    if explorer then
-      explorer.view:resize()
-    end
+    view.resize()
  end

  if mode == "preview" or mode == "preview_no_picker" then
@@ -432,10 +415,7 @@ function M.fn(mode, filename)
  end

  if M.quit_on_open then
-    local explorer = require"nvim-tree.core".get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
  end
 end

--- a/lua/nvim-tree/actions/reloaders.lua
+++ b/lua/nvim-tree/actions/reloaders.lua
@@ -1,4 +1,5 @@
 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"
@@ -42,15 +43,14 @@ end

 local event_running = false
 function M.reload_explorer()
-  local explorer = core.get_explorer()
-  if event_running or not explorer or vim.v.exiting ~= vim.NIL then
+  if event_running or not core.get_explorer() or vim.v.exiting ~= vim.NIL then
    return
  end
  event_running = true

  local projects = git.reload()
  refresh_nodes(core.get_explorer(), projects)
-  if explorer.view:is_visible() then
+  if view.is_visible() then
    renderer.draw()
  end
  event_running = false
--- a/lua/nvim-tree/actions/tree/find-file.lua
+++ b/lua/nvim-tree/actions/tree/find-file.lua
@@ -1,5 +1,6 @@
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
+local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"

 local M = {}
@@ -40,12 +41,11 @@ function M.fn(opts)
    return
  end

-  local explorer = core.get_explorer()
-  if explorer and explorer.view:is_visible() then
+  if view.is_visible() then
    -- focus
    if opts.focus then
      lib.set_target_win()
-      explorer.view:focus()
+      view.focus()
    end
  elseif opts.open then
    -- open
--- a/lua/nvim-tree/actions/tree/open.lua
+++ b/lua/nvim-tree/actions/tree/open.lua
@@ -1,4 +1,5 @@
 local lib = require "nvim-tree.lib"
+local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"

 local M = {}
@@ -22,11 +23,10 @@ function M.fn(opts)
    opts.path = nil
  end

-  local explorer = require"nvim-tree.core".get_explorer()
-  if explorer and explorer.view:is_visible() then
+  if view.is_visible() then
    -- focus
    lib.set_target_win()
-    explorer.view:focus()
+    view.focus()
  else
    -- open
    lib.open {
--- a/lua/nvim-tree/actions/tree/resize.lua
+++ b/lua/nvim-tree/actions/tree/resize.lua
@@ -1,18 +1,14 @@
+local view = require "nvim-tree.view"

 local M = {}

 ---Resize the tree, persisting the new size.
 ---@param opts ApiTreeResizeOpts|nil
 function M.fn(opts)
-  local explorer = require"nvim-tree.core".get_explorer()
-  if not explorer then
-    return
-  end
-
  if opts == nil then
    -- reset to config values
-    explorer.view:configure_width()
-    explorer.view:resize()
+    view.configure_width()
+    view.resize()
    return
  end

@@ -20,19 +16,19 @@ function M.fn(opts)
  local width_cfg = options.width

  if width_cfg ~= nil then
-    explorer.view:configure_width(width_cfg)
-    explorer.view:resize()
+    view.configure_width(width_cfg)
+    view.resize()
    return
  end

-  if not explorer.view:is_width_determined() then
+  if not view.is_width_determined() then
    -- {absolute} and {relative} do nothing when {width} is a function.
    return
  end

  local absolute = options.absolute
  if type(absolute) == "number" then
-    explorer.view:resize(absolute)
+    view.resize(absolute)
    return
  end

@@ -43,7 +39,7 @@ function M.fn(opts)
      relative_size = "+" .. relative_size
    end

-    explorer.view:resize(relative_size)
+    view.resize(relative_size)
    return
  end
 end
--- a/lua/nvim-tree/actions/tree/toggle.lua
+++ b/lua/nvim-tree/actions/tree/toggle.lua
@@ -1,4 +1,5 @@
 local lib = require "nvim-tree.lib"
+local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"

 local M = {}
@@ -39,14 +40,9 @@ function M.fn(opts, no_focus, cwd, bang)
    opts.path = nil
  end

-  local explorer = require"nvim-tree.core".get_explorer()
-  if not explorer then
-    return
-  end
-
-  if explorer.view:is_visible() then
+  if view.is_visible() then
    -- close
-    explorer.view:close()
+    view.close()
  else
    -- open
    lib.open {
--- a/lua/nvim-tree/api.lua
+++ b/lua/nvim-tree/api.lua
@@ -1,5 +1,6 @@
 local lib = require "nvim-tree.lib"
 local core = require "nvim-tree.core"
+local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local actions = require "nvim-tree.actions"
 local appearance_diagnostics = require "nvim-tree.appearance.diagnostics"
@@ -120,9 +121,9 @@ Api.tree.focus = Api.tree.open
 ---@field focus boolean|nil default true

 Api.tree.toggle = wrap(actions.tree.toggle.fn)
-Api.tree.close = wrap_explorer_member("view", "close")
-Api.tree.close_in_this_tab = wrap_explorer_member("view", "close_this_tab_only")
-Api.tree.close_in_all_tabs = wrap_explorer_member("view", "close_all_tabs")
+Api.tree.close = wrap(view.close)
+Api.tree.close_in_this_tab = wrap(view.close_this_tab_only)
+Api.tree.close_in_all_tabs = wrap(view.close_all_tabs)
 Api.tree.reload = wrap(actions.reloaders.reload_explorer)

 ---@class ApiTreeResizeOpts
@@ -174,12 +175,12 @@ Api.tree.is_tree_buf = wrap(utils.is_nvim_tree_buf)
 ---@field tabpage number|nil
 ---@field any_tabpage boolean|nil default false

-Api.tree.is_visible = wrap_explorer_member("view", "is_visible")
+Api.tree.is_visible = wrap(view.is_visible)

 ---@class ApiTreeWinIdOpts
 ---@field tabpage number|nil default nil

-Api.tree.winid = wrap_explorer_member("view", "winid")
+Api.tree.winid = wrap(view.winid)

 Api.fs.create = wrap_node_or_nil(actions.fs.create_file.fn)
 Api.fs.remove = wrap_node(actions.fs.remove_file.fn)
--- 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/commands.lua
+++ b/lua/nvim-tree/commands.lua
@@ -1,4 +1,5 @@
 local api = require "nvim-tree.api"
+local view = require "nvim-tree.view"

 local M = {}

@@ -110,11 +111,7 @@ local CMDS = {
      bar = true,
    },
    command = function(c)
-      local explorer = require "nvim-tree.core".get_explorer();
-      if not explorer then
-        return
-      end
-      explorer.view:resize(c.args)
+      view.resize(c.args)
    end,
  },
  {
--- a/lua/nvim-tree/core.lua
+++ b/lua/nvim-tree/core.lua
@@ -1,5 +1,6 @@
 local events = require "nvim-tree.events"
 local explorer = require "nvim-tree.explorer"
+local view = require "nvim-tree.view"
 local log = require "nvim-tree.log"

 local M = {}
@@ -40,7 +41,7 @@ end
 ---@return integer
 function M.get_nodes_starting_line()
  local offset = 1
-  if TreeExplorer and TreeExplorer.view:is_root_folder_visible(M.get_cwd()) then
+  if view.is_root_folder_visible(M.get_cwd()) then
    offset = offset + 1
  end
  if TreeExplorer and TreeExplorer.live_filter.filter then
--- a/lua/nvim-tree/diagnostics.lua
+++ b/lua/nvim-tree/diagnostics.lua
@@ -1,4 +1,5 @@
 local utils = require "nvim-tree.utils"
+local view = require "nvim-tree.view"
 local log = require "nvim-tree.log"

 local M = {}
@@ -163,9 +164,7 @@ function M.update()
      end
    end
    log.profile_end(profile)
-    local explorer = require "nvim-tree.core".get_explorer()
-
-    if explorer and explorer.view:is_buf_valid(explorer.view:get_bufnr()) then
+    if view.is_buf_valid(view.get_bufnr()) then
      require("nvim-tree.renderer").draw()
    end
  end)
--- 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
@@ -4,6 +4,7 @@ local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"

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

 local M = {}
@@ -16,7 +17,17 @@ 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)
    if not name then
@@ -28,8 +39,8 @@ local function populate_children(handle, cwd, node, git_status, parent)

    ---@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
+    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] and Watcher.is_fs_event_capable(abs) then
      local child = nil
      if t == "directory" and vim.loop.fs_access(abs, "R") then
        child = builders.folder(node, abs, name, stat)
@@ -46,6 +57,12 @@ 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)
--- 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
@@ -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
@@ -6,7 +6,6 @@ local Filters = require "nvim-tree.explorer.filters"
 local Marks = require "nvim-tree.marks"
 local LiveFilter = require "nvim-tree.explorer.live-filter"
 local Sorters = require "nvim-tree.explorer.sorters"
-local View = require "nvim-tree.explorer.view"

 local M = {}

@@ -47,7 +46,6 @@ function Explorer.new(path)
    open = true,
    marks = Marks:new(),
    sorters = Sorters:new(M.config),
-    view = View:new(M.config),
  }, Explorer)
  explorer.watcher = watch.create_watcher(explorer)
  explorer.filters = Filters:new(M.config, explorer)
--- a/lua/nvim-tree/explorer/live-filter.lua
+++ b/lua/nvim-tree/explorer/live-filter.lua
@@ -1,3 +1,4 @@
+local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local Iterator = require "nvim-tree.iterators.node-iterator"

@@ -34,10 +35,17 @@ local function reset_filter(self, node_)
    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
@@ -46,14 +54,14 @@ local overlay_bufnr = 0
 local overlay_winnr = 0

 local function remove_overlay(self)
-  if self.explorer.view.View.float.enable and self.explorer.view.View.float.quit_on_focus_loss then
+  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", {
      pattern = "NvimTree_*",
      group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
      callback = function()
        if utils.is_nvim_tree_buf(0) then
-          self.explorer.view:close()
+          view.close()
        end
      end,
    })
@@ -94,6 +102,10 @@ function LiveFilter: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)
@@ -103,6 +115,8 @@ function LiveFilter:apply_filter(node_)
      end
    end

+    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))
@@ -140,7 +154,7 @@ end

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

  if wininfo then
    return wininfo.width - wininfo.textoff - #self.prefix
@@ -150,7 +164,7 @@ local function calculate_overlay_win_width(self)
 end

 local function create_overlay(self)
-  if self.explorer.view.View.float.enable then
+  if view.View.float.enable then
    -- don't close nvim-tree float when focus is changed to filter window
    vim.api.nvim_clear_autocmds {
      event = "WinLeave",
@@ -182,13 +196,13 @@ local function create_overlay(self)
 end

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

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

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

  self.filter = nil
  reset_filter(self)
--- a/lua/nvim-tree/explorer/reload.lua
+++ b/lua/nvim-tree/explorer/reload.lua
@@ -4,6 +4,7 @@ local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"

+local FILTER_REASON = require("nvim-tree.enum").FILTER_REASON
 local NodeIterator = require "nvim-tree.iterators.node-iterator"
 local Watcher = require "nvim-tree.watcher"

@@ -91,6 +92,16 @@ function M.reload(node, git_status)
  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, t = vim.loop.fs_scandir_next(handle)
    if not name then
@@ -101,7 +112,8 @@ function M.reload(node, git_status)
    ---@type uv.fs_stat.result|nil
    local stat = vim.loop.fs_stat(abs)

-    if not explorer.filters:should_filter(abs, stat, filter_status) then
+    local filter_reason = explorer.filters:should_filter_as_reason(abs, stat, filter_status)
+    if filter_reason == FILTER_REASON.none then
      remain_childs[abs] = true

      -- Recreate node if type changes.
@@ -138,6 +150,12 @@ function M.reload(node, git_status)
          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

--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -1,4 +1,5 @@
 local renderer = require "nvim-tree.renderer"
+local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
@@ -16,12 +17,11 @@ local M = {

 ---@return Node|nil
 function M.get_node_at_cursor()
-  local explorer = core.get_explorer()
-  if not explorer then
+  if not core.get_explorer() then
    return
  end

-  local winnr = explorer.view:get_winnr()
+  local winnr = view.get_winnr()
  if not winnr then
    return
  end
@@ -29,7 +29,7 @@ function M.get_node_at_cursor()
  local cursor = vim.api.nvim_win_get_cursor(winnr)
  local line = cursor[1]

-  if line == 1 and explorer.view:is_root_folder_visible(core.get_cwd()) then
+  if line == 1 and view.is_root_folder_visible(core.get_cwd()) then
    return { name = ".." }
  end

@@ -189,12 +189,8 @@ local function handle_buf_cwd(cwd)
 end

 local function open_view_and_draw()
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
  local cwd = vim.fn.getcwd()
-  explorer.view:open()
+  view.open()
  handle_buf_cwd(cwd)
  renderer.draw()
 end
@@ -265,24 +261,20 @@ function M.open(opts)
      core.init(cwd)
    end
  end
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
  if should_hijack_current_buf() then
-    explorer.view:close_this_tab_only()
-    explorer.view:open_in_win()
+    view.close_this_tab_only()
+    view.open_in_win()
    renderer.draw()
  elseif opts.winid then
-    explorer.view:open_in_win { hijack_current_buf = false, resize = false, winid = opts.winid }
+    view.open_in_win { hijack_current_buf = false, resize = false, winid = opts.winid }
    renderer.draw()
  elseif opts.current_window then
-    explorer.view:open_in_win { hijack_current_buf = false, resize = false }
+    view.open_in_win { hijack_current_buf = false, resize = false }
    renderer.draw()
  else
    open_view_and_draw()
  end
-  explorer.view:restore_tab_state()
+  view.restore_tab_state()
  events._dispatch_on_tree_open()
 end

--- 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,6 +1,7 @@
 local core = require "nvim-tree.core"
 local notify = require "nvim-tree.notify"
 local utils = require "nvim-tree.utils"
+local view = require "nvim-tree.view"

 local DecoratorBookmarks = require "nvim-tree.renderer.decorator.bookmarks"
 local DecoratorCopied = require "nvim-tree.renderer.decorator.copied"
@@ -41,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
@@ -60,6 +63,7 @@ function Builder:new()
    markers = {},
    signs = {},
    extmarks = {},
+    virtual_lines = {},
  }
  setmetatable(o, self)
  self.__index = self
@@ -349,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)
@@ -357,6 +360,32 @@ 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)
  local explorer = core.get_explorer()
@@ -387,6 +416,7 @@ function Builder:build_lines(node)
      idx = idx + 1
    end
  end
+  self:add_hidden_count_string(node)
 end

 ---@private
@@ -407,17 +437,14 @@ end
 ---@private
 function Builder:build_header()
  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
-  if explorer.view:is_root_folder_visible(core.get_cwd()) then
+  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)
    self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
    self.index = 1
  end

-  if explorer.live_filter.filter then
+  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)
@@ -445,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/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -1,5 +1,6 @@
 local core = require "nvim-tree.core"
 local log = require "nvim-tree.log"
+local view = require "nvim-tree.view"
 local events = require "nvim-tree.events"

 local _padding = require "nvim-tree.renderer.components.padding"
@@ -13,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
@@ -49,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)
@@ -66,33 +77,29 @@ function M.render_hl(bufnr, hl)
 end

 function M.draw()
-  local explorer = core.get_explorer()
-  if not explorer then
-    return
-  end
-  local bufnr = explorer.view:get_bufnr()
-  if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
+  local bufnr = view.get_bufnr()
+  if not core.get_explorer() or not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
    return
  end

  local profile = log.profile_start "draw"

-  local cursor = vim.api.nvim_win_get_cursor(explorer.view:get_winnr() or 0)
+  local cursor = vim.api.nvim_win_get_cursor(view.get_winnr() or 0)
  icon_component.reset_config()

  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(explorer.view:get_winnr() or 0, cursor)
+    vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
  end

-  explorer.view:grow_from_content()
+  view.grow_from_content()

  log.profile_end(profile)

-  events._dispatch_on_tree_rendered(bufnr, explorer.view:get_winnr())
+  events._dispatch_on_tree_rendered(bufnr, view.get_winnr())
 end

 function M.setup(opts)
--- a/lua/nvim-tree/utils.lua
+++ b/lua/nvim-tree/utils.lua
@@ -111,8 +111,8 @@ function M.find_node(nodes, fn)
      return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes)
    end)
    :iterate()
+  i = require("nvim-tree.view").is_root_folder_visible() and i or i - 1
  local explorer = require("nvim-tree.core").get_explorer()
-  i = explorer and explorer.view:is_root_folder_visible() and i or i - 1
  if explorer and explorer.live_filter.filter then
    i = i + 1
  end
@@ -184,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
@@ -444,14 +464,10 @@ function M.debounce(context, timeout, callback)
 end

 function M.focus_file(path)
-  local explorer = require("nvim-tree.core").get_explorer()
-  if not explorer then
-    return
-  end
-  local _, i = M.find_node(explorer.nodes, function(node)
+  local _, i = M.find_node(require("nvim-tree.core").get_explorer().nodes, function(node)
    return node.absolute_path == path
  end)
-  explorer.view:set_cursor { i + 1, 1 }
+  require("nvim-tree.view").set_cursor { i + 1, 1 }
 end

 ---Focus node passed as parameter if visible, otherwise focus first visible parent.
@@ -471,7 +487,7 @@ function M.focus_node_or_parent(node)
    end)

    if found_node or node.parent == nil then
-      explorer.view:set_cursor { i + 1, 1 }
+      require("nvim-tree.view").set_cursor { i + 1, 1 }
      break
    end

--- a/lua/nvim-tree/explorer/view.lua
+++ b/lua/nvim-tree/explorer/view.lua
@@ -2,15 +2,18 @@ local events = require "nvim-tree.events"
 local utils = require "nvim-tree.utils"
 local log = require "nvim-tree.log"

-local ExplorerView = {}
+---@class OpenInWinOpts
+---@field hijack_current_buf boolean|nil default true
+---@field resize boolean|nil default true
+---@field winid number|nil 0 or nil for current
+
+local M = {}

 local DEFAULT_MIN_WIDTH = 30
 local DEFAULT_MAX_WIDTH = -1
 local DEFAULT_PADDING = 1

-function ExplorerView:new(opts)
-  local o = {
-    View = {
+M.View = {
  adaptive_size = false,
  centralize_selection = false,
  tabpages = {},
@@ -47,32 +50,10 @@ function ExplorerView:new(opts)
      "Normal:NvimTreeNormal",
      "NormalNC:NvimTreeNormalNC",
      "NormalFloat:NvimTreeNormalFloat",
+      "FloatBorder:NvimTreeNormalFloatBorder",
    }, ","),
  },
-    }
-  }
-  local options = opts.view or {}
-  o.View.centralize_selection = options.centralize_selection
-  o.View.side = (options.side == "right") and "right" or "left"
-  o.View.height = options.height
-  o.View.hide_root_folder = opts.renderer.root_folder_label == false
-  o.View.tab = opts.tab
-  o.View.preserve_window_proportions = options.preserve_window_proportions
-  o.View.winopts.cursorline = options.cursorline
-  o.View.winopts.number = options.number
-  o.View.winopts.relativenumber = options.relativenumber
-  o.View.winopts.signcolumn = options.signcolumn
-  o.View.float = options.float
-  o.on_attach = opts.on_attach
-
-  o.config = vim.deepcopy(options)
-  setmetatable(o, self)
-  self.__index = self
-
-  o:configure_width(options.width)
-
-  o.View.initial_width = o:get_width()
-end
+}

 -- The initial state of a tab
 local tabinitial = {
@@ -112,20 +93,20 @@ local function wipe_rogue_buffer()
 end

 ---@param bufnr integer|boolean|nil
-local function create_buffer(self, bufnr)
+local function create_buffer(bufnr)
  wipe_rogue_buffer()

  local tab = vim.api.nvim_get_current_tabpage()
  BUFNR_PER_TAB[tab] = bufnr or vim.api.nvim_create_buf(false, false)
-  vim.api.nvim_buf_set_name(self:get_bufnr(), "NvimTree_" .. tab)
+  vim.api.nvim_buf_set_name(M.get_bufnr(), "NvimTree_" .. tab)

  for option, value in pairs(BUFFER_OPTIONS) do
-    vim.bo[self:get_bufnr()][option] = value
+    vim.bo[M.get_bufnr()][option] = value
  end

-  require("nvim-tree.keymap").on_attach(self:get_bufnr())
+  require("nvim-tree.keymap").on_attach(M.get_bufnr())

-  events._dispatch_tree_attached_post(self:get_bufnr())
+  events._dispatch_tree_attached_post(M.get_bufnr())
 end

 ---@param size (fun():integer)|integer|string
@@ -142,11 +123,11 @@ local function get_size(size)
 end

 ---@param size (fun():integer)|integer|nil
-function ExplorerView:get_width(size)
+local function get_width(size)
  if size then
    return get_size(size)
  else
-    return get_size(self.View.width)
+    return get_size(M.View.width)
  end
 end

@@ -157,39 +138,39 @@ local move_tbl = {

 -- setup_tabpage sets up the initial state of a tab
 ---@param tabpage integer
-local function setup_tabpage(self, tabpage)
+local function setup_tabpage(tabpage)
  local winnr = vim.api.nvim_get_current_win()
-  self.View.tabpages[tabpage] = vim.tbl_extend("force", self.View.tabpages[tabpage] or tabinitial, { winnr = winnr })
+  M.View.tabpages[tabpage] = vim.tbl_extend("force", M.View.tabpages[tabpage] or tabinitial, { winnr = winnr })
 end

-local function set_window_options_and_buffer(self)
-  pcall(vim.api.nvim_command, "buffer " .. self:get_bufnr())
+local function set_window_options_and_buffer()
+  pcall(vim.api.nvim_command, "buffer " .. M.get_bufnr())
  local eventignore = vim.opt.eventignore:get()
  vim.opt.eventignore = "all"
-  for k, v in pairs(self.View.winopts) do
+  for k, v in pairs(M.View.winopts) do
    vim.opt_local[k] = v
  end
  vim.opt.eventignore = eventignore
 end

 ---@return table
-local function open_win_config(self)
-  if type(self.View.float.open_win_config) == "function" then
-    return self.View.float.open_win_config(self)
+local function open_win_config()
+  if type(M.View.float.open_win_config) == "function" then
+    return M.View.float.open_win_config()
  else
-    return self.View.float.open_win_config
+    return M.View.float.open_win_config
  end
 end

-local function open_window(self)
-  if self.View.float.enable then
-    vim.api.nvim_open_win(0, true, open_win_config(self))
+local function open_window()
+  if M.View.float.enable then
+    vim.api.nvim_open_win(0, true, open_win_config())
  else
    vim.api.nvim_command "vsp"
-    self:reposition_window()
+    M.reposition_window()
  end
-  setup_tabpage(self, vim.api.nvim_get_current_tabpage())
-  set_window_options_and_buffer(self)
+  setup_tabpage(vim.api.nvim_get_current_tabpage())
+  set_window_options_and_buffer()
 end

 ---@param buf integer
@@ -225,19 +206,19 @@ end

 -- save_tab_state saves any state that should be preserved across redraws.
 ---@param tabnr integer
-local function save_tab_state(self, tabnr)
+local function save_tab_state(tabnr)
  local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
-  self.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(self:get_winnr(tabpage) or 0)
+  M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0)
 end

 ---@param tabpage integer
-local function close(self, tabpage)
-  if not self:is_visible { tabpage = tabpage } then
+local function close(tabpage)
+  if not M.is_visible { tabpage = tabpage } then
    return
  end
-  save_tab_state(self, tabpage)
+  save_tab_state(tabpage)
  switch_buf_if_last_buf()
-  local tree_win = self:get_winnr(tabpage)
+  local tree_win = M.get_winnr(tabpage)
  local current_win = vim.api.nvim_get_current_win()
  for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabpage)) do
    if vim.api.nvim_win_get_config(win).relative == "" then
@@ -254,35 +235,35 @@ local function close(self, tabpage)
  end
 end

-function ExplorerView:close_this_tab_only()
-  close(self, vim.api.nvim_get_current_tabpage())
+function M.close_this_tab_only()
+  close(vim.api.nvim_get_current_tabpage())
 end

-function ExplorerView:close_all_tabs()
-  for tabpage, _ in pairs(self.View.tabpages) do
-    close(self, tabpage)
+function M.close_all_tabs()
+  for tabpage, _ in pairs(M.View.tabpages) do
+    close(tabpage)
  end
 end

-function ExplorerView:close()
-  if self.View.tab.sync.close then
-    self:close_all_tabs()
+function M.close()
+  if M.View.tab.sync.close then
+    M.close_all_tabs()
  else
-    self:close_this_tab_only()
+    M.close_this_tab_only()
  end
 end

 ---@param options table|nil
-function ExplorerView:open(options)
-  if self:is_visible() then
+function M.open(options)
+  if M.is_visible() then
    return
  end

  local profile = log.profile_start "view open"

-  create_buffer(self)
-  open_window(self)
-  self:resize()
+  create_buffer()
+  open_window()
+  M.resize()

  local opts = options or { focus_tree = true }
  if not opts.focus_tree then
@@ -293,26 +274,26 @@ function ExplorerView:open(options)
  log.profile_end(profile)
 end

-local function grow(self)
-  local starts_at = self:is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0
-  local lines = vim.api.nvim_buf_get_lines(self:get_bufnr(), starts_at, -1, false)
+local function grow()
+  local starts_at = M.is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0
+  local lines = vim.api.nvim_buf_get_lines(M.get_bufnr(), starts_at, -1, false)
  -- number of columns of right-padding to indicate end of path
-  local padding = get_size(self.View.padding)
+  local padding = get_size(M.View.padding)

  -- account for sign/number columns etc.
-  local wininfo = vim.fn.getwininfo(self:get_winnr())
+  local wininfo = vim.fn.getwininfo(M.get_winnr())
  if type(wininfo) == "table" and type(wininfo[1]) == "table" then
    padding = padding + wininfo[1].textoff
  end

-  local resizing_width = self.View.initial_width - padding
+  local resizing_width = M.View.initial_width - padding
  local max_width

  -- maybe bound max
-  if self.View.max_width == -1 then
+  if M.View.max_width == -1 then
    max_width = -1
  else
-    max_width = self:get_width(self.View.max_width) - padding
+    max_width = get_width(M.View.max_width) - padding
  end

  for _, l in pairs(lines) do
@@ -320,23 +301,23 @@ local function grow(self)
    if resizing_width < count then
      resizing_width = count
    end
-    if self.View.adaptive_size and max_width >= 0 and resizing_width >= max_width then
+    if M.View.adaptive_size and max_width >= 0 and resizing_width >= max_width then
      resizing_width = max_width
      break
    end
  end
-  self:resize(resizing_width + padding)
+  M.resize(resizing_width + padding)
 end

-function ExplorerView:grow_from_content()
-  if self.View.adaptive_size then
-    grow(self)
+function M.grow_from_content()
+  if M.View.adaptive_size then
+    grow()
  end
 end

 ---@param size string|number|nil
-function ExplorerView:resize(size)
-  if self.View.float.enable and not self.View.adaptive_size then
+function M.resize(size)
+  if M.View.float.enable and not M.View.adaptive_size then
    -- if the floating windows's adaptive size is not desired, then the
    -- float size should be defined in view.float.open_win_config
    return
@@ -348,7 +329,7 @@ function ExplorerView:resize(size)
    size = tonumber(size)

    if first_char == "+" or first_char == "-" then
-      size = self.View.width + size
+      size = M.View.width + size
    end
  end

@@ -357,81 +338,81 @@ function ExplorerView:resize(size)
  end

  if size then
-    self.View.width = size
-    self.View.height = size
+    M.View.width = size
+    M.View.height = size
  end

-  if not self:is_visible() then
+  if not M.is_visible() then
    return
  end

-  local new_size = self:get_width()
-  vim.api.nvim_win_set_width(self:get_winnr() or 0, new_size)
+  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 not self.View.preserve_window_proportions then
+  if not M.View.preserve_window_proportions then
    vim.cmd ":wincmd ="
  end
 end

-function ExplorerView:reposition_window()
-  local move_to = move_tbl[self.View.side]
+function M.reposition_window()
+  local move_to = move_tbl[M.View.side]
  vim.api.nvim_command("wincmd " .. move_to)
-  self:resize()
+  M.resize()
 end

-local function set_current_win(self)
+local function set_current_win()
  local current_tab = vim.api.nvim_get_current_tabpage()
-  self.View.tabpages[current_tab].winnr = vim.api.nvim_get_current_win()
+  M.View.tabpages[current_tab].winnr = vim.api.nvim_get_current_win()
 end

 ---Open the tree in the a window
 ---@param opts OpenInWinOpts|nil
-function ExplorerView:open_in_win(opts)
+function M.open_in_win(opts)
  opts = opts or { hijack_current_buf = true, resize = true }
  if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then
    vim.api.nvim_set_current_win(opts.winid)
  end
-  create_buffer(self, opts.hijack_current_buf and vim.api.nvim_get_current_buf())
-  setup_tabpage(self, vim.api.nvim_get_current_tabpage())
-  set_current_win(self)
-  set_window_options_and_buffer(self)
+  create_buffer(opts.hijack_current_buf and vim.api.nvim_get_current_buf())
+  setup_tabpage(vim.api.nvim_get_current_tabpage())
+  set_current_win()
+  set_window_options_and_buffer()
  if opts.resize then
-    self:reposition_window()
-    self:resize()
+    M.reposition_window()
+    M.resize()
  end
 end

-function ExplorerView:abandon_current_window()
+function M.abandon_current_window()
  local tab = vim.api.nvim_get_current_tabpage()
  BUFNR_PER_TAB[tab] = nil
-  if self.View.tabpages[tab] then
-    self.View.tabpages[tab].winnr = nil
+  if M.View.tabpages[tab] then
+    M.View.tabpages[tab].winnr = nil
  end
 end

-function ExplorerView:abandon_all_windows()
+function M.abandon_all_windows()
  for tab, _ in pairs(vim.api.nvim_list_tabpages()) do
    BUFNR_PER_TAB[tab] = nil
-    if self.View.tabpages[tab] then
-      self.View.tabpages[tab].winnr = nil
+    if M.View.tabpages[tab] then
+      M.View.tabpages[tab].winnr = nil
    end
  end
 end

 ---@param opts table|nil
-function ExplorerView:is_visible(opts)
+function M.is_visible(opts)
  if opts and opts.tabpage then
-    if self.View.tabpages[opts.tabpage] == nil then
+    if M.View.tabpages[opts.tabpage] == nil then
      return false
    end
-    local winnr = self.View.tabpages[opts.tabpage].winnr
+    local winnr = M.View.tabpages[opts.tabpage].winnr
    return winnr and vim.api.nvim_win_is_valid(winnr)
  end

  if opts and opts.any_tabpage then
-    for _, v in pairs(self.View.tabpages) do
+    for _, v in pairs(M.View.tabpages) do
      if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then
        return true
      end
@@ -439,27 +420,27 @@ function ExplorerView:is_visible(opts)
    return false
  end

-  return self:get_winnr() ~= nil and vim.api.nvim_win_is_valid(self:get_winnr() or 0)
+  return M.get_winnr() ~= nil and vim.api.nvim_win_is_valid(M.get_winnr() or 0)
 end

 ---@param opts table|nil
-function ExplorerView:set_cursor(opts)
-  if self:is_visible() then
-    pcall(vim.api.nvim_win_set_cursor, self:get_winnr(), opts)
+function M.set_cursor(opts)
+  if M.is_visible() then
+    pcall(vim.api.nvim_win_set_cursor, M.get_winnr(), opts)
  end
 end

 ---@param winnr number|nil
 ---@param open_if_closed boolean|nil
-function ExplorerView:focus(winnr, open_if_closed)
-  local wnr = winnr or self:get_winnr()
+function M.focus(winnr, open_if_closed)
+  local wnr = winnr or M.get_winnr()

  if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then
-    self:close()
-    self:open()
-    wnr = self:get_winnr()
-  elseif open_if_closed and not self:is_visible() then
-    self:open()
+    M.close()
+    M.open()
+    wnr = M.get_winnr()
+  elseif open_if_closed and not M.is_visible() then
+    M.open()
  end

  if wnr then
@@ -470,30 +451,30 @@ end
 --- Retrieve the winid of the open tree.
 ---@param opts ApiTreeWinIdOpts|nil
 ---@return number|nil winid unlike get_winnr(), this returns nil if the nvim-tree window is not visible
-function ExplorerView:winid(opts)
+function M.winid(opts)
  local tabpage = opts and opts.tabpage
  if tabpage == 0 then
    tabpage = vim.api.nvim_get_current_tabpage()
  end
-  if self:is_visible { tabpage = tabpage } then
-    return self:get_winnr(tabpage)
+  if M.is_visible { tabpage = tabpage } then
+    return M.get_winnr(tabpage)
  else
    return nil
  end
 end

 --- Restores the state of a NvimTree window if it was initialized before.
-function ExplorerView:restore_tab_state()
+function M.restore_tab_state()
  local tabpage = vim.api.nvim_get_current_tabpage()
-  self:set_cursor(self.View.cursors[tabpage])
+  M.set_cursor(M.View.cursors[tabpage])
 end

 --- Returns the window number for nvim-tree within the tabpage specified
 ---@param tabpage number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
 ---@return number|nil
-function ExplorerView:get_winnr(tabpage)
+function M.get_winnr(tabpage)
  tabpage = tabpage or vim.api.nvim_get_current_tabpage()
-  local tabinfo = self.View.tabpages[tabpage]
+  local tabinfo = M.View.tabpages[tabpage]
  if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
    return tabinfo.winnr
  end
@@ -501,19 +482,19 @@ end

 --- Returns the current nvim tree bufnr
 ---@return number
-function ExplorerView:get_bufnr()
+function M.get_bufnr()
  return BUFNR_PER_TAB[vim.api.nvim_get_current_tabpage()]
 end

 ---@param bufnr number
 ---@return boolean
-function ExplorerView:is_buf_valid(bufnr)
+function M.is_buf_valid(bufnr)
  return bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
 end

-function ExplorerView:_prevent_buffer_override()
-  local view_winnr = self:get_winnr()
-  local view_bufnr = self:get_bufnr()
+function M._prevent_buffer_override()
+  local view_winnr = M.get_winnr()
+  local view_bufnr = M.get_bufnr()

  -- need to schedule to let the new buffer populate the window
  -- because this event needs to be run on bufWipeout.
@@ -525,7 +506,7 @@ function ExplorerView:_prevent_buffer_override()
    local bufname = vim.api.nvim_buf_get_name(curbuf)

    if not bufname:match "NvimTree" then
-      for i, tabpage in ipairs(self.View.tabpages) do
+      for i, tabpage in ipairs(M.View.tabpages) do
        if tabpage.winnr == view_winnr then
          M.View.tabpages[i] = nil
          break
@@ -556,44 +537,65 @@ end

 ---@param cwd string|nil
 ---@return boolean
-function ExplorerView:is_root_folder_visible(cwd)
-  return cwd ~= "/" and not self.View.hide_root_folder
+function M.is_root_folder_visible(cwd)
+  return cwd ~= "/" and not M.View.hide_root_folder
 end

 -- used on ColorScheme event
-function ExplorerView:reset_winhl()
-  local winnr = self:get_winnr()
+function M.reset_winhl()
+  local winnr = M.get_winnr()
  if winnr and vim.api.nvim_win_is_valid(winnr) then
-    vim.wo[self:get_winnr()].winhl = self.View.winopts.winhl
+    vim.wo[M.get_winnr()].winhl = M.View.winopts.winhl
  end
 end

 ---Check if width determined or calculated on-fly
 ---@return boolean
-function ExplorerView:is_width_determined()
-  return type(self.View.width) ~= "function"
+function M.is_width_determined()
+  return type(M.View.width) ~= "function"
 end

 ---Configure width-related config
 ---@param width string|function|number|table|nil
-function ExplorerView:configure_width(width)
+function M.configure_width(width)
  if type(width) == "table" then
-    self.View.adaptive_size = true
-    self.View.width = width.min or DEFAULT_MIN_WIDTH
-    self.View.max_width = width.max or DEFAULT_MAX_WIDTH
-    self.View.padding = width.padding or DEFAULT_PADDING
+    M.View.adaptive_size = true
+    M.View.width = width.min or DEFAULT_MIN_WIDTH
+    M.View.max_width = width.max or DEFAULT_MAX_WIDTH
+    M.View.padding = width.padding or DEFAULT_PADDING
  elseif width == nil then
-    if self.config.width ~= nil then
+    if M.config.width ~= nil then
      -- if we had input config - fallback to it
-      self.configure_width(self.config.width)
+      M.configure_width(M.config.width)
    else
      -- otherwise - restore initial width
-      self.View.width = self.View.initial_width
+      M.View.width = M.View.initial_width
    end
  else
-    self.View.adaptive_size = false
-    self.View.width = width
+    M.View.adaptive_size = false
+    M.View.width = width
  end
 end

-return ExplorerView
+function M.setup(opts)
+  local options = opts.view or {}
+  M.View.centralize_selection = options.centralize_selection
+  M.View.side = (options.side == "right") and "right" or "left"
+  M.View.height = options.height
+  M.View.hide_root_folder = opts.renderer.root_folder_label == false
+  M.View.tab = opts.tab
+  M.View.preserve_window_proportions = options.preserve_window_proportions
+  M.View.winopts.cursorline = options.cursorline
+  M.View.winopts.number = options.number
+  M.View.winopts.relativenumber = options.relativenumber
+  M.View.winopts.signcolumn = options.signcolumn
+  M.View.float = options.float
+  M.on_attach = opts.on_attach
+
+  M.config = options
+  M.configure_width(options.width)
+
+  M.View.initial_width = get_width()
+end
+
+return M
Author	SHA1	Message	Date
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