add padding first column

feat: add NvimTreeFilter filetype

.github/workflows/ci.yml

@@ -24,15 +24,15 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: install lua ${{ matrix.lua_version }}
-        uses: leafo/gh-actions-lua@v11
+        uses: leafo/gh-actions-lua@v12
         with:
           luaVersion: ${{ matrix.lua_version }}
 
       - name: install luarocks
-        uses: leafo/gh-actions-luarocks@v5
+        uses: leafo/gh-actions-luarocks@v6
 
       - name: install luacheck ${{ matrix.luacheck_version }}
         run: luarocks install luacheck ${{ matrix.luacheck_version }}
@@ -49,14 +49,14 @@ jobs:
     strategy:
       matrix:
         nvim_version: [ stable, nightly ]
-        luals_version: [ 3.13.9 ]
+        luals_version: [ 3.15.0 ]
 
     env:
       VIMRUNTIME: /home/runner/nvim-${{ matrix.nvim_version }}/share/nvim/runtime
 
     steps:
       - name: checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: install nvim ${{ matrix.nvim_version }}
         uses: rhysd/action-setup-vim@v1

.github/workflows/luarocks-release.yml

@@ -10,7 +10,7 @@ jobs:
   luarocks-upload:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: LuaRocks Upload
         uses: nvim-neorocks/luarocks-tag-release@v7
         env:

.github/workflows/release-please.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: google-github-actions/release-please-action@v4
         id: release
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: tag major and minor versions
         if: ${{ steps.release.outputs.release_created }}
         run: |

.github/workflows/semantic-pr-subject.yml

@@ -14,6 +14,6 @@ jobs:
   semantic-pr-subject:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5.5.3
+      - uses: amannn/action-semantic-pull-request@v6.1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.13.0"
+  ".": "1.14.0"
 }

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [1.14.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.13.0...nvim-tree-v1.14.0) (2025-08-12)
+
+
+### Features
+
+* **#2685:** highlight git new tracked with NvimTreeGitFileNewHL ([#3176](https://github.com/nvim-tree/nvim-tree.lua/issues/3176)) ([0a52012](https://github.com/nvim-tree/nvim-tree.lua/commit/0a52012d611f3c1492b8d2aba363fabf734de91d))
+* **#2789:** add optional function expand_until to api.tree.expand_all and api.node.expand ([#3166](https://github.com/nvim-tree/nvim-tree.lua/issues/3166)) ([1b876db](https://github.com/nvim-tree/nvim-tree.lua/commit/1b876db04903b93c78c97fd3f3dd85d59eeef5ff))
+* **#2826:** allow only one window with nvim-tree buffer per tab ([#3174](https://github.com/nvim-tree/nvim-tree.lua/issues/3174)) ([dd2364d](https://github.com/nvim-tree/nvim-tree.lua/commit/dd2364d6802f7f57a98acb8b545ed484c6697626))
+* **#3157:** add view.cursorlineopt ([#3158](https://github.com/nvim-tree/nvim-tree.lua/issues/3158)) ([8eb5e0b](https://github.com/nvim-tree/nvim-tree.lua/commit/8eb5e0bfd1c4da6efc03ab0c1ccf463dbaae831e))
+
+
+### Bug Fixes
+
+* **#3077:** deleting a directory containing symlinked directory will delete the contents of the linked directory ([#3168](https://github.com/nvim-tree/nvim-tree.lua/issues/3168)) ([10db694](https://github.com/nvim-tree/nvim-tree.lua/commit/10db6943cb40625941a35235eeb385ffdfbf827a))
+* **#3157:** add view.cursorlineopt ([8eb5e0b](https://github.com/nvim-tree/nvim-tree.lua/commit/8eb5e0bfd1c4da6efc03ab0c1ccf463dbaae831e))
+* **#3172:** live filter exception ([#3173](https://github.com/nvim-tree/nvim-tree.lua/issues/3173)) ([0a7fcdf](https://github.com/nvim-tree/nvim-tree.lua/commit/0a7fcdf3f8ba208f4260988a198c77ec11748339))
+* invalid window id for popup info window ([#3147](https://github.com/nvim-tree/nvim-tree.lua/issues/3147)) ([d54a187](https://github.com/nvim-tree/nvim-tree.lua/commit/d54a1875a91e1a705795ea26074795210b92ce7f))
+* **picker:** exclude full_name window id from the choice ([#3165](https://github.com/nvim-tree/nvim-tree.lua/issues/3165)) ([543ed3c](https://github.com/nvim-tree/nvim-tree.lua/commit/543ed3cac212dc3993ef9f042f6c0812e34ddd43))
+* window picker ignore hidden window ([#3145](https://github.com/nvim-tree/nvim-tree.lua/issues/3145)) ([d87b41c](https://github.com/nvim-tree/nvim-tree.lua/commit/d87b41ca537e2131622d48a6c25ccf2fbe0e5d62))
+
+
+### Performance Improvements
+
+* **#3171:** cache toplevel for untracked ([#3185](https://github.com/nvim-tree/nvim-tree.lua/issues/3185)) ([4425136](https://github.com/nvim-tree/nvim-tree.lua/commit/442513648c6936e754c3308a1c58591a399493e5))
+* **#3171:** use vim.system() instead of vim.fn.system() to execute git toplevel ([#3175](https://github.com/nvim-tree/nvim-tree.lua/issues/3175)) ([9a05b9e](https://github.com/nvim-tree/nvim-tree.lua/commit/9a05b9e9f928856ca23dbf876fab372003180c3f))
+
+
+### Reverts
+
+* **#3180, #3177:** invalid group or tabpage ([#3181](https://github.com/nvim-tree/nvim-tree.lua/issues/3181)) ([9b289ab](https://github.com/nvim-tree/nvim-tree.lua/commit/9b289abd6998e30fd24cbc9919e0b0cbed6364ce))
+* **#3180, #3177:** resolve live filter failures ([#3183](https://github.com/nvim-tree/nvim-tree.lua/issues/3183)) ([a4699c0](https://github.com/nvim-tree/nvim-tree.lua/commit/a4699c0904103e7767334f6da05f5c2ea5514845))
+
 ## [1.13.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.12.0...nvim-tree-v1.13.0) (2025-06-14)
 
 

CONTRIBUTING.md

@@ -4,6 +4,30 @@ Thank you for contributing.
 
 See [wiki: Development](https://github.com/nvim-tree/nvim-tree.lua/wiki/Development) for environment setup, tips and tools.
 
+<!-- 
+https://github.com/jonschlinkert/markdown-toc
+markdown-toc --maxdepth=2 -i CONTRIBUTING.md
+-->
+
+<!-- toc -->
+
+- [Tools](#tools)
+- [Quality](#quality)
+  * [lint](#lint)
+  * [style](#style)
+  * [check](#check)
+- [Diagnostics](#diagnostics)
+- [Backwards Compatibility](#backwards-compatibility)
+- [Adding New Actions](#adding-new-actions)
+- [Documentation](#documentation)
+  * [Opts](#opts)
+  * [API](#api)
+- [Windows](#windows)
+- [Pull Request](#pull-request)
+  * [Subject](#subject)
+
+<!-- tocstop -->
+
 # Tools
 
 Following are used during CI and strongly recommended during local development.
@@ -72,6 +96,30 @@ curl -L "https://github.com/LuaLS/lua-language-server/releases/download/3.9.1/lu
 PATH="luals/bin:${PATH}" make check
 ```
 
+# Diagnostics
+
+Diagnostics issues may not be suppressed. See [luals](https://luals.github.io) documentation for details on how to structure the code and comments.
+
+Suppressions are permitted only in the following cases:
+
+- Backwards compatibility shims
+- neovim API metadata incorrect, awaiting upstream fix
+- classic class framework
+
+# Backwards Compatibility
+
+Whenever new neovim API is introduced, please ensure that it is available in older versions. See `:help deprecated.txt` and `$VIMRUNTIME/lua/vim/_meta/api.lua`
+
+See `nvim-tree.setup` for the oldest supported version of neovim. If the API is not availble in that version, a backwards compatibility shim must be used e.g.
+
+```lua
+if vim.fn.has("nvim-0.10") == 1 then
+  modified = vim.api.nvim_get_option_value("modified", { buf = target_bufid })
+else
+  modified = vim.api.nvim_buf_get_option(target_bufid, "modified") ---@diagnostic disable-line: deprecated
+end
+```
+
 # Adding New Actions
 
 To add a new action, add a file in `actions/name-of-the-action.lua`. You should export a `setup` function if some configuration is needed.

doc/nvim-tree-lua.txt

@@ -398,6 +398,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
       view = {
         centralize_selection = false,
         cursorline = true,
+        cursorlineopt = "both",
         debounce_delay = 15,
         side = "left",
         preserve_window_proportions = false,
@@ -544,6 +545,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
           warning = "",
           error = "",
         },
+        diagnostic_opts = false,
       },
       modified = {
         enable = false,
@@ -770,6 +772,10 @@ initially centralized, see |zz|.
 Enable |cursorline| in the tree window.
   Type: `boolean`, Default: `true`
 
+*nvim-tree.view.cursorlineopt*
+Set |cursorlineopt| in the tree window.
+  Type: `string`, Default: `"both"`
+
 *nvim-tree.view.debounce_delay*
 Idle milliseconds before some reload / refresh operations.
 Increase if you experience performance issues around screen refresh.
@@ -1066,7 +1072,7 @@ Configuration options for icons.
 
     *nvim-tree.renderer.icons.bookmarks_placement*
     Bookmark icon placement.
-      Type: `string`, Default: `signcolumn`
+      Type: `string`, Default: `"signcolumn"`
 
     *nvim-tree.renderer.icons.padding.icon*
     Inserted between icon and filename.
@@ -1324,6 +1330,10 @@ Icons for diagnostic severity.
       error = ""
     }
 <
+*nvim-tree.diagnostics.diagnostic_opts*
+|vim.diagnostic.Opts| overrides |nvim-tree.diagnostics.severity| and
+|nvim-tree.diagnostics.icons|
+  Type: `boolean`, Default: `false`
 ==============================================================================
  5.9 OPTS: MODIFIED                                  *nvim-tree-opts-modified*
 
@@ -1380,7 +1390,7 @@ delete/wipe. A reload or filesystem event will result in an update.
   Type: `boolean`, Default: `false`
 
 *nvim-tree.filters.no_bookmark*
-Do not show files that are not bookarked.
+Do not show files that are not bookmarked.
 Toggle via |nvim-tree-api.tree.toggle_no_bookmark_filter()|, default `M`
 Enabling this is not useful as there is no means yet to persist bookmarks.
   Type: `boolean`, Default: `false`
@@ -1514,11 +1524,6 @@ Configuration options for opening a file from nvim-tree.
     Resizes the tree when opening a file.
       Type: `boolean`, Default: `true`
 
-    *nvim-tree.experimental.actions.open_file.relative_path*
-    Buffers opened by nvim-tree will use with relative paths instead of
-    absolute.
-      Type: `boolean`, Default: `true`
-
     *nvim-tree.actions.open_file.window_picker*
     Window picker configuration.
 
@@ -1841,11 +1846,17 @@ tree.collapse_all({opts})                  *nvim-tree-api.tree.collapse_all()*
     Options: ~
       • {keep_buffers} (boolean) do not collapse nodes with open buffers.
 
-tree.expand_all({node})                      *nvim-tree-api.tree.expand_all()*
+tree.expand_all({node}, {opts})              *nvim-tree-api.tree.expand_all()*
     Recursively expand all nodes under the tree root or specified folder.
 
     Parameters: ~
       • {node} (Node|nil) folder
+      • {opts} (ApiTreeExpandOpts) optional parameters
+
+    Options: ~
+      • {expand_until} ((fun(expansion_count: integer, node: Node?): boolean)?)
+            Return true if {node} should be expanded.
+            {expansion_count} is the total number of folders expanded.
 
                                   *nvim-tree-api.tree.toggle_enable_filters()*
 tree.toggle_enable_filters()
@@ -2279,12 +2290,18 @@ node.buffer.wipe({node}, {opts})            *nvim-tree-api.node.buffer.wipe()*
     Options: ~
       • {force} (boolean) wipe even if buffer is modified, default false
 
-node.expand({node})                              *nvim-tree-api.node.expand()*
+node.expand({node}, {opts})                      *nvim-tree-api.node.expand()*
     Recursively expand all nodes under a directory or a file's parent
     directory.
 
     Parameters: ~
       • {node} (Node|nil) file or folder
+      • {opts} (ApiTreeExpandOpts) optional parameters
+
+    Options: ~
+      • {expand_until} ((fun(expansion_count: integer, node: Node?): boolean)?)
+            Return true if {node} should be expanded.
+            {expansion_count} is the total number of folders expanded.
 
 node.collapse({node}, {opts})                  *nvim-tree-api.node.collapse()*
     Collapse the tree under a directory or a file's parent directory.
@@ -2322,6 +2339,7 @@ events.Event                                      *nvim-tree-api.events.Event*
 
 live_filter.start()                        *nvim-tree-api.live_filter.start()*
     Enter |nvim-tree.live_filter| mode.
+    Opens an input window with |filetype| `"NvimTreeFilter"`
 
 live_filter.clear()                        *nvim-tree-api.live_filter.clear()*
     Exit |nvim-tree.live_filter| mode.
@@ -2928,43 +2946,71 @@ Decorators may:
 - Set highlight group for the name or icons
 - Override node icon
 
-Specify decorators and their precedence via |nvim-tree.renderer.decorators|
+Create a `nvim_tree.api.decorator.UserDecorator` class and register it with
-e.g. defaults with a user decorator class being overridden only by Cut: >lua
+precedence via |nvim-tree.renderer.decorators|
-  {
+
-    "Git",
+See |nvim-tree-decorator-example|
-    "Open",
+
-    "Hidden",
+See `nvim-tree/_meta/api_decorator.lua` for full class documentation.
-    "Modified",
-    "Bookmark",
-    "Diagnostics",
-    "Copied",
-    MyDecorator,
-    "Cut",
-  }
 
-See `nvim-tree/_meta/api_decorator.lua` for full
-`nvim_tree.api.decorator.UserDecorator` class documentation.
-<
 ==============================================================================
  11.1. DECORATOR EXAMPLE                         *nvim-tree-decorator-example*
+
+A decorator class for nodes named "example", overridind all builtin decorators
+except for Cut.
+
+- Highlights node name with `IncSearch`
+- Creates two icons `"1"` and `"2"` placed after the node name, highlighted with
+  `DiffAdd` and `DiffText`
+- Replaces the node icon with `"N"`, highlighted with `Error `
+
+Create a class file `~/.config/nvim/lua/my-decorator.lua`
+
+Require and register it during |nvim-tree-setup|:
+>lua
+  local MyDecorator = require("my-decorator")
+
+  require("nvim-tree").setup({
+    renderer = {
+      decorators = {
+        "Git",
+        "Open",
+        "Hidden",
+        "Modified",
+        "Bookmark",
+        "Diagnostics",
+        "Copied",
+        MyDecorator,
+        "Cut",
+      },
+    },
+  })
+<
+Contents of `my-decorator.lua`:
 >lua
-  ---Create your decorator class
   ---@class (exact) MyDecorator: nvim_tree.api.decorator.UserDecorator
-  ---@field private my_icon nvim_tree.api.HighlightedString
+  ---@field private my_icon1 nvim_tree.api.HighlightedString
+  ---@field private my_icon2 nvim_tree.api.HighlightedString
+  ---@field private my_icon_node nvim_tree.api.HighlightedString
+  ---@field private my_highlight_group string
   local MyDecorator = require("nvim-tree.api").decorator.UserDecorator:extend()
 
   ---Mandatory constructor  :new()  will be called once per tree render, with no arguments.
   function MyDecorator:new()
-    self.enabled         = true
+    self.enabled            = true
-    self.highlight_range = "all"
+    self.highlight_range    = "name"
-    self.icon_placement  = "signcolumn"
+    self.icon_placement     = "after"
 
-    -- create your icon once, for convenience
+    -- create your icons and highlights once, applied to every node
-    self.my_icon         = { str = "I", hl = { "MyIcon" } }
+    self.my_icon1           = { str = "1", hl = { "DiffAdd" } }
+    self.my_icon2           = { str = "2", hl = { "DiffText" } }
+    self.my_icon_node       = { str = "N", hl = { "Error" } }
+    self.my_highlight_group = "IncSearch"
 
-    -- Define the icon sign only once
+    -- Define the icon signs only once
     -- Only needed if you are using icon_placement = "signcolumn"
-    self:define_sign(self.my_icon)
+    -- self:define_sign(self.my_icon1)
+    -- self:define_sign(self.my_icon2)
   end
 
   ---Override node icon
@@ -2972,33 +3018,35 @@ See `nvim-tree/_meta/api_decorator.lua` for full
   ---@return nvim_tree.api.HighlightedString? icon_node
   function MyDecorator:icon_node(node)
     if node.name == "example" then
-      return self.my_icon
+      return self.my_icon_node
     else
       return nil
     end
   end
 
-  ---Return one icon for DecoratorIconPlacement
+  ---Return two icons for DecoratorIconPlacement "after"
   ---@param node nvim_tree.api.Node
   ---@return nvim_tree.api.HighlightedString[]? icons
   function MyDecorator:icons(node)
     if node.name == "example" then
-      return { self.my_icon }
+      return { self.my_icon1, self.my_icon2, }
     else
       return nil
     end
   end
 
-  ---Exactly one highlight group for DecoratorHighlightRange
+  ---Exactly one highlight group for DecoratorHighlightRange "name"
   ---@param node nvim_tree.api.Node
   ---@return string? highlight_group
   function MyDecorator:highlight_group(node)
     if node.name == "example" then
-      return "MyHighlight"
+      return self.my_highlight_group
     else
       return nil
     end
   end
+
+  return MyDecorator
 <
 ==============================================================================
  12. OS SPECIFIC RESTRICTIONS                          *nvim-tree-os-specific*
@@ -3008,9 +3056,6 @@ Windows WSL and PowerShell
 - Executable file detection is disabled as this is non-performant and can
   freeze nvim
 - Some filesystem watcher error related to permissions will not be reported
-- Some users have reported unspecified issues with
-  |nvim-tree.experimental.actions.open_file.relative_path|. Please report any
-  issues or disable this feature.
 
 ==============================================================================
  13. NETRW                                                   *nvim-tree-netrw*
@@ -3136,6 +3181,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.actions.use_system_clipboard|
 |nvim-tree.auto_reload_on_write|
 |nvim-tree.diagnostics.debounce_delay|
+|nvim-tree.diagnostics.diagnostic_opts|
 |nvim-tree.diagnostics.enable|
 |nvim-tree.diagnostics.icons|
 |nvim-tree.diagnostics.severity|
@@ -3145,7 +3191,6 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.diagnostics.show_on_open_dirs|
 |nvim-tree.disable_netrw|
 |nvim-tree.experimental|
-|nvim-tree.experimental.actions.open_file.relative_path|
 |nvim-tree.filesystem_watchers.debounce_delay|
 |nvim-tree.filesystem_watchers.enable|
 |nvim-tree.filesystem_watchers.ignore_dirs|
@@ -3266,6 +3311,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.update_focused_file.update_root.ignore_list|
 |nvim-tree.view.centralize_selection|
 |nvim-tree.view.cursorline|
+|nvim-tree.view.cursorlineopt|
 |nvim-tree.view.debounce_delay|
 |nvim-tree.view.float|
 |nvim-tree.view.float.enable|

lua/nvim-tree.lua

@@ -273,6 +273,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
   view = {
     centralize_selection = false,
     cursorline = true,
+    cursorlineopt = "both",
     debounce_delay = 15,
     side = "left",
     preserve_window_proportions = false,
@@ -419,6 +420,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
       warning = "",
       error = "",
     },
+    diagnostic_opts = false,
   },
   modified = {
     enable = false,

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

@@ -32,7 +32,7 @@ function M.fn(path)
   local profile = log.profile_start("find file %s", path_real)
 
   -- refresh the contents of all parents, expanding groups as needed
-  if utils.get_node_from_path(path_real) == nil then
+  if explorer:get_node_from_path(path_real) == nil then
     explorer:refresh_parent_nodes_for_path(vim.fn.fnamemodify(path_real, ":h"))
   end
 

lua/nvim-tree/actions/fs/remove-file.lua

@@ -69,9 +69,16 @@ local function remove_dir(cwd)
 
     -- 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
+    -- TODO remove once 0.12 is the minimum neovim version
+    -- path incorrectly specified as an integer, fixed upstream for neovim 0.12 https://github.com/neovim/neovim/pull/33872
+    ---@diagnostic disable-next-line: param-type-mismatch
+    local lstat = vim.loop.fs_lstat(new_cwd)
 
-    if type == "directory" then
+    local type = stat and stat.type or nil
+    -- Checks if file is a link file to ensure deletion of the symlink instead of the file it points to
+    local ltype = lstat and lstat.type or nil
+
+    if type == "directory" and ltype ~= "link" then
       local success = remove_dir(new_cwd)
       if not success then
         return false

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

@@ -1,4 +1,3 @@
-local utils = require("nvim-tree.utils")
 local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
 local diagnostics = require("nvim-tree.diagnostics")
@@ -36,7 +35,7 @@ end
 ---@param skip_gitignored boolean? default false
 local function move(explorer, where, what, skip_gitignored)
   local first_node_line = core.get_nodes_starting_line()
-  local nodes_by_line = utils.get_nodes_by_line(explorer.nodes, first_node_line)
+  local nodes_by_line = explorer:get_nodes_by_line(first_node_line)
   local iter_start, iter_end, iter_step, cur, first, nex
 
   local cursor = explorer:get_cursor_position()
@@ -191,7 +190,7 @@ local function move_prev_recursive(explorer, what, skip_gitignored)
       if node_init.name == ".." then -- root node
         view.set_cursor({ 1, 0 })    -- move to root node (position 1)
       else
-        local node_init_line = utils.find_node_line(node_init)
+        local node_init_line = explorer:find_node_line(node_init)
         if node_init_line < 0 then
           return
         end

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

@@ -1,6 +1,4 @@
 local view = require("nvim-tree.view")
-local utils = require("nvim-tree.utils")
-
 local DirectoryNode = require("nvim-tree.node.directory")
 
 local M = {}
@@ -29,7 +27,7 @@ function M.fn(should_close)
       return
     end
 
-    local _, line = utils.find_node(parent.explorer.nodes, function(n)
+    local _, line = parent.explorer:find_node(function(n)
       return n.absolute_path == parent.absolute_path
     end)
 

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

@@ -1,4 +1,3 @@
-local utils = require("nvim-tree.utils")
 local core = require("nvim-tree.core")
 local Iterator = require("nvim-tree.iterators.node-iterator")
 
@@ -12,9 +11,14 @@ function M.fn(direction)
       return
     end
 
+    local explorer = core.get_explorer()
+    if not explorer then
+      return
+    end
+
     local first, last, next, prev = nil, nil, nil, nil
     local found = false
-    local parent = node.parent or core.get_explorer()
+    local parent = node.parent or explorer
     Iterator.builder(parent and parent.nodes or {})
       :recursor(function()
         return nil
@@ -45,7 +49,7 @@ function M.fn(direction)
     end
 
     if target_node then
-      utils.focus_file(target_node.absolute_path)
+      explorer:focus_node_or_parent(target_node)
     end
   end
 end

lua/nvim-tree/actions/node/file-popup.lua

@@ -57,7 +57,9 @@ end
 
 function M.close_popup()
   if current_popup ~= nil then
-    vim.api.nvim_win_close(current_popup.winnr, true)
+    if vim.api.nvim_win_is_valid(current_popup.winnr) then
+      vim.api.nvim_win_close(current_popup.winnr, true)
+    end
     vim.cmd("augroup NvimTreeRemoveFilePopup | au! CursorMoved | augroup END")
 
     current_popup = nil

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 full_name = require("nvim-tree.renderer.components.full-name")
 local view = require("nvim-tree.view")
 
 local M = {}
@@ -39,7 +40,12 @@ local function usable_win_ids()
     end
 
     local win_config = vim.api.nvim_win_get_config(id)
-    return id ~= tree_winid and win_config.focusable and not win_config.external or false
+    return id ~= tree_winid
+      and id ~= full_name.popup_win
+      and win_config.focusable
+      and not win_config.hide
+      and not win_config.external
+      or false
   end, win_ids)
 end
 
@@ -192,7 +198,15 @@ local function open_file_in_tab(filename)
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
   end
-  vim.cmd("tabe " .. vim.fn.fnameescape(filename))
+  vim.cmd.tabnew()
+  vim.bo.bufhidden = "wipe"
+  -- Following vim.fn.tabnew the # buffer may be set to the tree buffer. There is no way to clear the # buffer via vim.fn.setreg as it requires a valid buffer. Clear # by setting it to a new temporary scratch buffer.
+  if utils.is_nvim_tree_buf(vim.fn.bufnr("#")) then
+    local tmpbuf = vim.api.nvim_create_buf(false, true)
+    vim.fn.setreg("#", tmpbuf)
+    vim.api.nvim_buf_delete(tmpbuf, { force = true })
+  end
+  vim.cmd.edit(vim.fn.fnameescape(filename))
 end
 
 local function drop(filename)

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

@@ -56,7 +56,7 @@ local function collapse(node, opts)
     :iterate()
 
   explorer.renderer:draw()
-  utils.focus_node_or_parent(node_at_cursor)
+  explorer:focus_node_or_parent(node_at_cursor)
 end
 
 

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

@@ -27,20 +27,66 @@ local function expand(node)
   end
 end
 
----@param expansion_count integer
+---@param should_descend fun(expansion_count: integer, node: Node): boolean
+---@return fun(expansion_count: integer, node: Node): boolean
+local function limit_folder_discovery(should_descend)
+  return function(expansion_count, node)
+    local should_halt = expansion_count >= M.MAX_FOLDER_DISCOVERY
+    if should_halt then
+      notify.warn("expansion iteration was halted after " .. M.MAX_FOLDER_DISCOVERY .. " discovered folders")
+      return false
+    end
+
+    return should_descend(expansion_count, node)
+  end
+end
+
+---@param _ integer expansion_count
 ---@param node Node
 ---@return boolean
-local function should_expand(expansion_count, node)
+local function descend_until_empty(_, node)
+
   local dir = node:as(DirectoryNode)
   if not dir then
     return false
   end
-  local should_halt = expansion_count >= M.MAX_FOLDER_DISCOVERY
+
   local should_exclude = M.EXCLUDE[dir.name]
-  return not should_halt and not dir.open and not should_exclude
+  return not should_exclude
 end
 
-local function gen_iterator()
+---@param expansion_count integer
+---@param node Node
+---@param should_descend fun(expansion_count: integer, node: Node): boolean
+---@return boolean
+local function should_expand(expansion_count, node, should_descend)
+  local dir = node:as(DirectoryNode)
+  if not dir then
+    return false
+  end
+
+  if not dir.open and should_descend(expansion_count, node) then
+    if #node.nodes == 0 then
+      core.get_explorer():expand(dir) -- populate node.group_next
+    end
+
+    if dir.group_next then
+      local expand_next = should_expand(expansion_count, dir.group_next, should_descend)
+      if expand_next then
+        dir.open = true
+      end
+      return expand_next
+    else
+      return true
+    end
+  end
+  return false
+end
+
+
+---@param should_descend fun(expansion_count: integer, node: Node): boolean
+---@return fun(node): any
+local function gen_iterator(should_descend)
   local expansion_count = 0
 
   return function(parent)
@@ -52,7 +98,7 @@ local function gen_iterator()
     Iterator.builder(parent.nodes)
       :hidden()
       :applier(function(node)
-        if should_expand(expansion_count, node) then
+        if should_expand(expansion_count, node, should_descend) then
           expansion_count = expansion_count + 1
           node = node:as(DirectoryNode)
           if node then
@@ -61,25 +107,32 @@ local function gen_iterator()
         end
       end)
       :recursor(function(node)
-        return expansion_count < M.MAX_FOLDER_DISCOVERY and (node.group_next and { node.group_next } or (node.open and node.nodes))
+        if not should_descend(expansion_count, node) then
+          return nil
+        end
+
+        if node.group_next then
+          return { node.group_next }
+        end
+
+        if node.open and node.nodes then
+          return node.nodes
+        end
+
+        return nil
       end)
       :iterate()
-
-    if expansion_count >= M.MAX_FOLDER_DISCOVERY then
-      return true
-    end
   end
 end
 
 ---@param node Node?
-local function expand_node(node)
+---@param expand_opts ApiTreeExpandOpts?
+local function expand_node(node, expand_opts)
   if not node then
     return
   end
-
+  local descend_until = limit_folder_discovery((expand_opts and expand_opts.expand_until) or descend_until_empty)
-  if gen_iterator()(node) then
+  gen_iterator(descend_until)(node)
-    notify.warn("expansion iteration was halted after " .. M.MAX_FOLDER_DISCOVERY .. " discovered folders")
-  end
 
   local explorer = core.get_explorer()
   if explorer then
@@ -89,18 +142,20 @@ end
 
 ---Expand the directory node or the root
 ---@param node Node
-function M.all(node)
+---@param expand_opts ApiTreeExpandOpts?
-  expand_node(node and node:as(DirectoryNode) or core.get_explorer())
+function M.all(node, expand_opts)
+  expand_node(node and node:as(DirectoryNode) or core.get_explorer(), expand_opts)
 end
 
 ---Expand the directory node or parent node
 ---@param node Node
-function M.node(node)
+---@param expand_opts ApiTreeExpandOpts?
+function M.node(node, expand_opts)
   if not node then
     return
   end
 
-  expand_node(node:is(FileNode) and node.parent or node:as(DirectoryNode))
+  expand_node(node:is(FileNode) and node.parent or node:as(DirectoryNode), expand_opts)
 end
 
 function M.setup(opts)

lua/nvim-tree/api.lua

@@ -187,6 +187,10 @@ Api.tree.search_node = wrap(actions.finders.search_node.fn)
 ---@field keep_buffers boolean|nil default false
 
 Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse.all)
+
+---@class ApiTreeExpandOpts
+---@field expand_until (fun(expansion_count: integer, node: Node): boolean)|nil
+
 Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand.all)
 Api.tree.toggle_enable_filters = wrap_explorer_member("filters", "toggle")
 Api.tree.toggle_gitignore_filter = wrap_explorer_member_args("filters", "toggle", "git_ignored")

lua/nvim-tree/diagnostics.lua

@@ -231,7 +231,10 @@ end
 function M.setup(opts)
   M.enable = opts.diagnostics.enable
   M.debounce_delay = opts.diagnostics.debounce_delay
-  M.severity = opts.diagnostics.severity
+  M.severity = opts.diagnostics.diagnostic_opts and {
+    min = vim.diagnostic.severity.HINT,
+    max = vim.diagnostic.severity.ERROR
+  } or opts.diagnostics.severity
 
   if M.enable then
     log.line("diagnostics", "setup")

lua/nvim-tree/explorer/filters.lua

@@ -280,7 +280,7 @@ function Filters:toggle(type)
   local node = self.explorer:get_node_at_cursor()
   self.explorer:reload_explorer()
   if node then
-    utils.focus_node_or_parent(node)
+    self.explorer:focus_node_or_parent(node)
   end
 end
 

lua/nvim-tree/explorer/init.lua

@@ -527,7 +527,7 @@ function Explorer:get_node_at_cursor()
     return self
   end
 
-  return utils.get_nodes_by_line(self.nodes, core.get_nodes_starting_line())[cursor[1]]
+  return self:get_nodes_by_line(core.get_nodes_starting_line())[cursor[1]]
 end
 
 function Explorer:place_cursor_on_node()
@@ -551,6 +551,114 @@ function Explorer:place_cursor_on_node()
   end
 end
 
+-- Find the line number of a node.
+---@param node Node?
+---@return integer -1 not found
+function Explorer:find_node_line(node)
+  if not node then
+    return -1
+  end
+
+  local first_node_line = core.get_nodes_starting_line()
+  local nodes_by_line = self:get_nodes_by_line(first_node_line)
+  local iter_start, iter_end = first_node_line, #nodes_by_line
+
+  for line = iter_start, iter_end, 1 do
+    if nodes_by_line[line] == node then
+      return line
+    end
+  end
+
+  return -1
+end
+
+-- get the node in the tree state depending on the absolute path of the node
+-- (grouped or hidden too)
+---@param path string
+---@return Node|nil
+---@return number|nil
+function Explorer:get_node_from_path(path)
+  if self.absolute_path == path then
+    return self
+  end
+
+  return Iterator.builder(self.nodes)
+    :hidden()
+    :matcher(function(node)
+      return node.absolute_path == path or node.link_to == path
+    end)
+    :recursor(function(node)
+      if node.group_next then
+        return { node.group_next }
+      end
+      if node.nodes then
+        return node.nodes
+      end
+    end)
+    :iterate()
+end
+
+---Focus node passed as parameter if visible, otherwise focus first visible parent.
+---If none of the parents is visible focus root.
+---If node is nil do nothing.
+---@param node Node? node to focus
+function Explorer:focus_node_or_parent(node)
+  while node do
+    local found_node, i = self:find_node(function(node_)
+      return node_.absolute_path == node.absolute_path
+    end)
+
+    if found_node or node.parent == nil then
+      view.set_cursor({ i + 1, 1 })
+      break
+    end
+
+    node = node.parent
+  end
+end
+
+--- Get the node and index of the node from the tree that matches the predicate.
+--- The explored nodes are those displayed on the view.
+---@param fn fun(node: Node): boolean
+---@return table|nil
+---@return number
+function Explorer:find_node(fn)
+  local node, i = Iterator.builder(self.nodes)
+    :matcher(fn)
+    :recursor(function(node)
+      return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes)
+    end)
+    :iterate()
+  i = view.is_root_folder_visible() and i or i - 1
+  if node and node.explorer.live_filter.filter then
+    i = i + 1
+  end
+  return node, i
+end
+
+--- Return visible nodes indexed by line
+---@param line_start number
+---@return table
+function Explorer:get_nodes_by_line(line_start)
+  local nodes_by_line = {}
+  local line = line_start
+
+  Iterator.builder(self.nodes)
+    :applier(function(node)
+      if node.group_next then
+        return
+      end
+      nodes_by_line[line] = node
+      line = line + 1
+    end)
+    :recursor(function(node)
+      return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes)
+    end)
+    :iterate()
+
+  return nodes_by_line
+end
+
 ---Api.tree.get_nodes
 ---@return nvim_tree.api.Node
 function Explorer:get_nodes()

lua/nvim-tree/explorer/live-filter.lua

@@ -188,8 +188,10 @@ local function create_overlay(self)
 
   if vim.fn.has("nvim-0.10") == 1 then
     vim.api.nvim_set_option_value("modifiable", true, { buf = overlay_bufnr })
+    vim.api.nvim_set_option_value("filetype", "NvimTreeFilter", { buf = overlay_bufnr })
   else
     vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
+    vim.api.nvim_buf_set_option(overlay_bufnr, "filetype", "NvimTreeFilter") ---@diagnostic disable-line: deprecated
   end
 
   vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { self.filter })
@@ -220,9 +222,9 @@ function LiveFilter:clear_filter()
   self.explorer.renderer:draw()
 
   if node then
-    utils.focus_file(node.absolute_path)
+    self.explorer:focus_node_or_parent(node)
   elseif last_node then
-    utils.focus_file(last_node.absolute_path)
+    self.explorer:focus_node_or_parent(last_node)
   end
 end
 

lua/nvim-tree/git/init.lua

@@ -193,9 +193,10 @@ function M.get_toplevel(path)
     end
   end
 
-  -- attempt to fetch toplevel
+  -- attempt to fetch toplevel, cache if untracked
   local toplevel, git_dir = git_utils.get_toplevel(path)
   if not toplevel or not git_dir then
+    M._toplevels_by_path[path] = false
     return nil
   end
   local toplevel_norm = vim.fn.fnamemodify(toplevel, ":p")
@@ -232,7 +233,13 @@ local function reload_tree_at(toplevel)
   end
 
   log.line("watcher", "git event executing '%s'", toplevel)
-  local root_node = utils.get_node_from_path(toplevel)
+
+  local explorer = require("nvim-tree.core").get_explorer()
+  if not explorer then
+    return nil
+  end
+
+  local root_node = explorer:get_node_from_path(toplevel)
   if not root_node then
     return
   end
@@ -251,7 +258,7 @@ local function reload_tree_at(toplevel)
       end)
       :iterate()
 
-    root_node.explorer.renderer:draw()
+    explorer.renderer:draw()
   end)
 end
 

lua/nvim-tree/git/utils.lua

@@ -5,6 +5,19 @@ local M = {
   use_cygpath = false,
 }
 
+--- Execute system command
+---@param cmd string[]
+---@return string stdout
+---@return integer exit code
+local function system(cmd)
+  if vim.fn.has("nvim-0.10") == 1 then
+    local obj = vim.system(cmd):wait()
+    return obj.stdout or "", obj.code
+  else
+    return vim.fn.system(cmd), vim.v.shell_error
+  end
+end
+
 --- Retrieve the git toplevel directory
 ---@param cwd string path
 ---@return string|nil toplevel absolute path
@@ -16,12 +29,12 @@ function M.get_toplevel(cwd)
   local cmd = { "git", "-C", cwd, "rev-parse", "--show-toplevel", "--absolute-git-dir" }
   log.line("git", "%s", table.concat(cmd, " "))
 
-  local out = vim.fn.system(cmd)
+  local out, exitCode = system(cmd)
 
   log.raw("git", out)
   log.profile_end(profile)
 
-  if vim.v.shell_error ~= 0 or not out or #out == 0 or out:match("fatal") then
+  if exitCode ~= 0 or not out or #out == 0 or out:match("fatal") then
     return nil, nil
   end
 
@@ -73,7 +86,7 @@ function M.should_show_untracked(cwd)
   local cmd = { "git", "-C", cwd, "config", "status.showUntrackedFiles" }
   log.line("git", table.concat(cmd, " "))
 
-  local has_untracked = vim.fn.system(cmd)
+  local has_untracked = system(cmd)
 
   log.raw("git", has_untracked)
   log.profile_end(profile)

lua/nvim-tree/legacy.lua

@@ -1,27 +1,74 @@
-local utils = require("nvim-tree.utils")
 local notify = require("nvim-tree.notify")
 
 local M = {}
 
+--- Create empty sub-tables if not present
+---@param tbl table to create empty inside of
+---@param path string dot separated string of sub-tables
+---@return table deepest sub-table
+local function create(tbl, path)
+  local t = tbl
+  for s in string.gmatch(path, "([^%.]+)%.*") do
+    if t[s] == nil then
+      t[s] = {}
+    end
+    t = t[s]
+  end
+
+  return t
+end
+
+--- Move a value from src to dst if value is nil on dst.
+--- Remove value from src
+---@param src table to copy from
+---@param src_path string dot separated string of sub-tables
+---@param src_pos string value pos
+---@param dst table to copy to
+---@param dst_path string dot separated string of sub-tables, created when missing
+---@param dst_pos string value pos
+---@param remove boolean
+local function move(src, src_path, src_pos, dst, dst_path, dst_pos, remove)
+  for pos in string.gmatch(src_path, "([^%.]+)%.*") do
+    if src[pos] and type(src[pos]) == "table" then
+      src = src[pos]
+    else
+      return
+    end
+  end
+  local src_val = src[src_pos]
+  if src_val == nil then
+    return
+  end
+
+  dst = create(dst, dst_path)
+  if dst[dst_pos] == nil then
+    dst[dst_pos] = src_val
+  end
+
+  if remove then
+    src[src_pos] = nil
+  end
+end
+
 -- silently move, please add to help nvim-tree-legacy-opts
 local function refactored(opts)
   -- 2022/06/20
-  utils.move_missing_val(opts, "update_focused_file", "update_cwd", opts, "update_focused_file", "update_root",        true)
+  move(opts, "update_focused_file", "update_cwd", opts, "update_focused_file", "update_root",        true)
-  utils.move_missing_val(opts, "",                    "update_cwd", opts, "",                    "sync_root_with_cwd", true)
+  move(opts, "",                    "update_cwd", opts, "",                    "sync_root_with_cwd", true)
 
   -- 2022/11/07
-  utils.move_missing_val(opts, "", "open_on_tab",              opts, "tab.sync", "open",   false)
+  move(opts, "", "open_on_tab",              opts, "tab.sync", "open",   false)
-  utils.move_missing_val(opts, "", "open_on_tab",              opts, "tab.sync", "close",  true)
+  move(opts, "", "open_on_tab",              opts, "tab.sync", "close",  true)
-  utils.move_missing_val(opts, "", "ignore_buf_on_tab_change", opts, "tab.sync", "ignore", true)
+  move(opts, "", "ignore_buf_on_tab_change", opts, "tab.sync", "ignore", true)
 
   -- 2022/11/22
-  utils.move_missing_val(opts, "renderer", "root_folder_modifier", opts, "renderer", "root_folder_label", true)
+  move(opts, "renderer", "root_folder_modifier", opts, "renderer", "root_folder_label", true)
 
   -- 2023/01/01
-  utils.move_missing_val(opts, "update_focused_file", "debounce_delay", opts, "view", "debounce_delay", true)
+  move(opts, "update_focused_file", "debounce_delay", opts, "view", "debounce_delay", true)
 
   -- 2023/01/08
-  utils.move_missing_val(opts, "trash", "require_confirm", opts, "ui.confirm", "trash", true)
+  move(opts, "trash", "require_confirm", opts, "ui.confirm", "trash", true)
 
   -- 2023/01/15
   if type(opts.view) == "table" and opts.view.adaptive_size ~= nil then
@@ -35,13 +82,13 @@ local function refactored(opts)
   end
 
   -- 2023/07/15
-  utils.move_missing_val(opts, "", "sort_by", opts, "sort", "sorter", true)
+  move(opts, "", "sort_by", opts, "sort", "sorter", true)
 
   -- 2023/07/16
-  utils.move_missing_val(opts, "git", "ignore", opts, "filters", "git_ignored", true)
+  move(opts, "git", "ignore", opts, "filters", "git_ignored", true)
 
   -- 2023/08/26
-  utils.move_missing_val(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
+  move(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
 
   -- 2023/10/08
   if type(opts.renderer) == "table" and type(opts.renderer.highlight_diagnostics) == "boolean" then
@@ -59,7 +106,7 @@ local function refactored(opts)
       opts.update_focused_file.update_root = { enable = opts.update_focused_file.update_root }
     end
   end
-  utils.move_missing_val(opts, "update_focused_file", "ignore_list", opts, "update_focused_file.update_root", "ignore_list", true)
+  move(opts, "update_focused_file", "ignore_list", opts, "update_focused_file.update_root", "ignore_list", true)
 
   -- 2025/04/30
   if opts.renderer and opts.renderer.icons and type(opts.renderer.icons.padding) == "string" then

lua/nvim-tree/marks/init.lua

@@ -227,9 +227,9 @@ function Marks:navigate(up)
   end
 
   if up then
-    utils.focus_node_or_parent(prev or last)
+    self.explorer:focus_node_or_parent(prev or last)
   else
-    utils.focus_node_or_parent(next or first)
+    self.explorer:focus_node_or_parent(next or first)
   end
 end
 
@@ -263,7 +263,7 @@ function Marks:navigate_select()
     if node and not node:is(DirectoryNode) 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)
+      self.explorer:focus_node_or_parent(node)
     end
   end)
 end

lua/nvim-tree/renderer/builder.lua

@@ -58,18 +58,18 @@ local Builder = Class:extend()
 ---@protected
 ---@param args BuilderArgs
 function Builder:new(args)
-  self.explorer        = args.explorer
+  self.explorer = args.explorer
-  self.index           = 0
+  self.index = 0
-  self.depth           = 0
+  self.depth = 0
-  self.hl_range_args   = {}
+  self.hl_range_args = {}
   self.combined_groups = {}
-  self.lines           = {}
+  self.lines = {}
-  self.markers         = {}
+  self.markers = {}
-  self.signs           = {}
+  self.signs = {}
-  self.extmarks        = {}
+  self.extmarks = {}
-  self.virtual_lines   = {}
+  self.virtual_lines = {}
-  self.decorators      = {}
+  self.decorators = {}
-  self.hidden_display  = Builder:setup_hidden_display_function(self.explorer.opts)
+  self.hidden_display = Builder:setup_hidden_display_function(self.explorer.opts)
 
   -- instantiate all the builtin and user decorator instances
   local builtin, user
@@ -101,7 +101,7 @@ end
 ---@param end_ number|nil
 function Builder:insert_highlight(groups, start, end_)
   for _, higroup in ipairs(groups) do
-    table.insert(self.hl_range_args, { higroup = higroup, start = { self.index, start, }, finish = { self.index, end_ or -1, } })
+    table.insert(self.hl_range_args, { higroup = higroup, start = { self.index, start }, finish = { self.index, end_ or -1 } })
   end
 end
 
@@ -321,7 +321,7 @@ function Builder:add_hidden_count_string(node, idx, num_children)
     -- 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 },
+      { indent_string, indent_markers.hl },
       { string.rep(indent_padding, (node.parent == nil and 0 or 1)) .. hidden_count_string, "NvimTreeHiddenDisplay" },
     })
   end
@@ -381,8 +381,28 @@ end
 function Builder:build_header()
   if view.is_root_folder_visible(self.explorer.absolute_path) then
     local root_name = self:format_root_name(self.explorer.opts.renderer.root_folder_label)
-    table.insert(self.lines, root_name)
+
-    self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
+    -- Pad to window width so the highlight spans the whole row.
+    local win = view.get_winnr()
+    local width = 0
+    if win and vim.api.nvim_win_is_valid(win) then
+      width = vim.api.nvim_win_get_width(win)
+    end
+
+    -- Use display width for proper padding with Nerd Font / wide glyphs.
+    local name_display_w = vim.fn.strdisplaywidth(root_name)
+    local pad = 0
+    if width and width > name_display_w then
+      pad = width - name_display_w
+    end
+
+    local padded_root = pad > 0 and (root_name .. string.rep(" ", pad)) or root_name
+
+    table.insert(self.lines, padded_root)
+    -- Highlight the entire padded string (covers the full visible row)
+    self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(padded_root))
+
+    -- Keep original indexing behavior
     self.index = 1
   end
 
@@ -390,12 +410,11 @@ function Builder:build_header()
     local filter_line = string.format("%s/%s/", self.explorer.opts.live_filter.prefix, self.explorer.live_filter.filter)
     table.insert(self.lines, filter_line)
     local prefix_length = string.len(self.explorer.opts.live_filter.prefix)
-    self:insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0,             prefix_length)
+    self:insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
-    self:insert_highlight({ "NvimTreeLiveFilterValue" },  prefix_length, string.len(filter_line))
+    self:insert_highlight({ "NvimTreeLiveFilterValue" }, prefix_length, string.len(filter_line))
     self.index = self.index + 1
   end
 end
-
 ---Sanitize lines for rendering.
 ---Replace newlines with literal \n
 ---@private
@@ -439,17 +458,18 @@ function Builder:setup_hidden_display_function(opts)
       -- 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,
+        git = 0,
-        buf         = 0,
+        buf = 0,
-        dotfile     = 0,
+        dotfile = 0,
-        custom      = 0,
+        custom = 0,
-        bookmark    = 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")
+          "Problem occurred in the function ``opts.renderer.hidden_display`` see nvim-tree.renderer.hidden_display on :h nvim-tree"
+        )
         return nil
       end
       return result

lua/nvim-tree/renderer/components/padding.lua

@@ -22,8 +22,8 @@ local function check_siblings_for_folder(node, with_arrows)
 end
 
 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 base_padding = with_arrows and (not node.nodes or depth > 0) and "  " or " "
-  local padding = (inline_arrows or depth == 0) and base_padding or ""
+  local padding = (inline_arrows or depth == 0) and base_padding or " "
 
   if depth > 0 then
     local has_folder_sibling = check_siblings_for_folder(node, with_arrows)

lua/nvim-tree/renderer/decorator/diagnostics.lua

@@ -41,17 +41,29 @@ local DiagnosticsDecorator = Decorator:extend()
 ---@protected
 ---@param args DecoratorArgs
 function DiagnosticsDecorator:new(args)
-  self.explorer        = args.explorer
+  self.explorer              = args.explorer
 
-  self.enabled         = true
+  self.enabled               = true
-  self.highlight_range = self.explorer.opts.renderer.highlight_diagnostics or "none"
+  self.highlight_range       = self.explorer.opts.renderer.highlight_diagnostics or "none"
-  self.icon_placement  = self.explorer.opts.renderer.icons.diagnostics_placement or "none"
+  self.icon_placement        = self.explorer.opts.renderer.icons.diagnostics_placement or "none"
+
+  local vim_diagnostic_icons = {}
+
+  if self.explorer.opts.diagnostics.diagnostic_opts then
+    local vim_diagnostic_config = vim.diagnostic.config() or {}
+    local signs                 = vim_diagnostic_config.signs or {}
+    if type(signs) == "function" then
+      signs = signs(0, 0)
+    end
+
+    vim_diagnostic_icons = (type(signs) == "table" and signs.text) or {}
+  end
 
   if self.explorer.opts.renderer.icons.show.diagnostics then
     self.diag_icons = {}
     for name, sev in pairs(ICON_KEYS) do
       self.diag_icons[sev] = {
-        str = self.explorer.opts.diagnostics.icons[name],
+        str = vim_diagnostic_icons[sev] or self.explorer.opts.diagnostics.icons[name],
         hl = { HG_ICON[sev] },
       }
       self:define_sign(self.diag_icons[sev])

lua/nvim-tree/renderer/decorator/git.lua

@@ -131,7 +131,7 @@ function GitDecorator:build_file_folder_hl_by_xy()
     ["RM"] = "NvimTreeGitFileRenamedHL",
     [" R"] = "NvimTreeGitFileRenamedHL",
     ["!!"] = "NvimTreeGitFileIgnoredHL",
-    [" A"] = "none",
+    [" A"] = "NvimTreeGitFileNewHL",
   }
 
   self.folder_hl_by_xy = {}

lua/nvim-tree/utils.lua

@@ -1,5 +1,3 @@
-local Iterator = require("nvim-tree.iterators.node-iterator")
-
 local M = {
   debouncers = {},
 }
@@ -17,22 +15,6 @@ function M.str_find(haystack, needle)
   return vim.fn.stridx(haystack, needle) ~= -1
 end
 
----@param path string
----@return string|uv.uv_fs_t
-function M.read_file(path)
-  local fd = vim.loop.fs_open(path, "r", 438)
-  if not fd then
-    return ""
-  end
-  local stat = vim.loop.fs_fstat(fd)
-  if not stat then
-    return ""
-  end
-  local data = vim.loop.fs_read(fd, stat.size, 0)
-  vim.loop.fs_close(fd)
-  return data or ""
-end
-
 local path_separator = package.config:sub(1, 1)
 ---@param paths string[]
 ---@return string
@@ -130,48 +112,6 @@ end
 
 M.path_separator = path_separator
 
---- Get the node and index of the node from the tree that matches the predicate.
---- The explored nodes are those displayed on the view.
----@param nodes Node[]
----@param fn fun(node: Node): boolean
----@return table|nil
----@return number
-function M.find_node(nodes, fn)
-  local node, i = Iterator.builder(nodes)
-    :matcher(fn)
-    :recursor(function(node)
-      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
-  if node and node.explorer.live_filter.filter then
-    i = i + 1
-  end
-  return node, i
-end
-
--- Find the line number of a node.
--- Return -1 is node is nil or not found.
----@param node Node?
----@return integer
-function M.find_node_line(node)
-  if not node then
-    return -1
-  end
-
-  local first_node_line = require("nvim-tree.core").get_nodes_starting_line()
-  local nodes_by_line = M.get_nodes_by_line(require("nvim-tree.core").get_explorer().nodes, first_node_line)
-  local iter_start, iter_end = first_node_line, #nodes_by_line
-
-  for line = iter_start, iter_end, 1 do
-    if nodes_by_line[line] == node then
-      return line
-    end
-  end
-
-  return -1
-end
-
 ---@param extmarks vim.api.keyset.get_extmark_item[] as per vim.api.nvim_buf_get_extmarks
 ---@return number
 function M.extmarks_length(extmarks)
@@ -187,39 +127,6 @@ function M.extmarks_length(extmarks)
   return length
 end
 
--- get the node in the tree state depending on the absolute path of the node
--- (grouped or hidden too)
----@param path string
----@return Node|nil
----@return number|nil
-function M.get_node_from_path(path)
-  local explorer = require("nvim-tree.core").get_explorer()
-
-  -- tree may not yet be loaded
-  if not explorer then
-    return
-  end
-
-  if explorer.absolute_path == path then
-    return explorer
-  end
-
-  return Iterator.builder(explorer.nodes)
-    :hidden()
-    :matcher(function(node)
-      return node.absolute_path == path or node.link_to == path
-    end)
-    :recursor(function(node)
-      if node.group_next then
-        return { node.group_next }
-      end
-      if node.nodes then
-        return node.nodes
-      end
-    end)
-    :iterate()
-end
-
 M.default_format_hidden_count = function(hidden_count, simple)
   local parts = {}
   local total_count = 0
@@ -240,30 +147,6 @@ M.default_format_hidden_count = function(hidden_count, simple)
   return nil
 end
 
---- Return visible nodes indexed by line
----@param nodes_all Node[]
----@param line_start number
----@return table
-function M.get_nodes_by_line(nodes_all, line_start)
-  local nodes_by_line = {}
-  local line = line_start
-
-  Iterator.builder(nodes_all)
-    :applier(function(node)
-      if node.group_next then
-        return
-      end
-      nodes_by_line[line] = node
-      line = line + 1
-    end)
-    :recursor(function(node)
-      return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes)
-    end)
-    :iterate()
-
-  return nodes_by_line
-end
-
 function M.rename_loaded_buffers(old_path, new_path)
   -- delete new if it exists
   for _, buf in pairs(vim.api.nvim_list_bufs()) do
@@ -377,54 +260,6 @@ function M.escape_special_chars(path)
   return M.is_windows and escape_special_char_for_windows(path) or path
 end
 
---- Create empty sub-tables if not present
----@param tbl table to create empty inside of
----@param path string dot separated string of sub-tables
----@return table deepest sub-table
-function M.table_create_missing(tbl, path)
-  local t = tbl
-  for s in string.gmatch(path, "([^%.]+)%.*") do
-    if t[s] == nil then
-      t[s] = {}
-    end
-    t = t[s]
-  end
-
-  return t
-end
-
---- Move a value from src to dst if value is nil on dst.
---- Remove value from src
----@param src table to copy from
----@param src_path string dot separated string of sub-tables
----@param src_pos string value pos
----@param dst table to copy to
----@param dst_path string dot separated string of sub-tables, created when missing
----@param dst_pos string value pos
----@param remove boolean
-function M.move_missing_val(src, src_path, src_pos, dst, dst_path, dst_pos, remove)
-  for pos in string.gmatch(src_path, "([^%.]+)%.*") do
-    if src[pos] and type(src[pos]) == "table" then
-      src = src[pos]
-    else
-      return
-    end
-  end
-  local src_val = src[src_pos]
-  if src_val == nil then
-    return
-  end
-
-  dst = M.table_create_missing(dst, dst_path)
-  if dst[dst_pos] == nil then
-    dst[dst_pos] = src_val
-  end
-
-  if remove then
-    src[src_pos] = nil
-  end
-end
-
 local function round(value)
   -- Amount of digits to round to after floating point.
   local digits = 2
@@ -533,38 +368,6 @@ function M.debounce(context, timeout, callback)
   end)
 end
 
-function M.focus_file(path)
-  local _, i = M.find_node(require("nvim-tree.core").get_explorer().nodes, function(node)
-    return node.absolute_path == path
-  end)
-  require("nvim-tree.view").set_cursor({ i + 1, 1 })
-end
-
----Focus node passed as parameter if visible, otherwise focus first visible parent.
----If none of the parents is visible focus root.
----If node is nil do nothing.
----@param node Node? node to focus
-function M.focus_node_or_parent(node)
-  local explorer = require("nvim-tree.core").get_explorer()
-
-  if explorer == nil then
-    return
-  end
-
-  while node do
-    local found_node, i = M.find_node(explorer.nodes, function(node_)
-      return node_.absolute_path == node.absolute_path
-    end)
-
-    if found_node or node.parent == nil then
-      require("nvim-tree.view").set_cursor({ i + 1, 1 })
-      break
-    end
-
-    node = node.parent
-  end
-end
-
 ---@param path string
 ---@return integer|nil
 ---@return integer|nil

lua/nvim-tree/view.lua

@@ -624,6 +624,7 @@ function M.setup(opts)
   M.View.tab = opts.tab
   M.View.preserve_window_proportions = options.preserve_window_proportions
   M.View.winopts.cursorline = options.cursorline
+  M.View.winopts.cursorlineopt = options.cursorlineopt
   M.View.winopts.number = options.number
   M.View.winopts.relativenumber = options.relativenumber
   M.View.winopts.signcolumn = options.signcolumn