chore(master): release nvim-tree 1.14.0 (#3146)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ 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

.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,
@@ -770,6 +771,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 +1071,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.
@@ -1380,7 +1385,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 +1519,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 +1841,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 +2285,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.
@@ -2928,43 +2940,71 @@ Decorators may:
 - Set highlight group for the name or icons
 - Override node icon
 
-Specify decorators and their precedence via |nvim-tree.renderer.decorators|
-e.g. defaults with a user decorator class being overridden only by Cut: >lua
-  {
-    "Git",
-    "Open",
-    "Hidden",
-    "Modified",
-    "Bookmark",
-    "Diagnostics",
-    "Copied",
-    MyDecorator,
-    "Cut",
-  }
+Create a `nvim_tree.api.decorator.UserDecorator` class and register it with
+precedence via |nvim-tree.renderer.decorators|
+
+See |nvim-tree-decorator-example|
+
+See `nvim-tree/_meta/api_decorator.lua` for full class documentation.
 
-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.highlight_range = "all"
-    self.icon_placement  = "signcolumn"
+    self.enabled            = true
+    self.highlight_range    = "name"
+    self.icon_placement     = "after"
 
-    -- create your icon once, for convenience
-    self.my_icon         = { str = "I", hl = { "MyIcon" } }
+    -- create your icons and highlights once, applied to every node
+    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 +3012,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 +3050,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*
@@ -3145,7 +3184,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 +3304,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,

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/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
 

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
-
-  if gen_iterator()(node) then
-    notify.warn("expansion iteration was halted after " .. M.MAX_FOLDER_DISCOVERY .. " discovered folders")
-  end
+  local descend_until = limit_folder_discovery((expand_opts and expand_opts.expand_until) or descend_until_empty)
+  gen_iterator(descend_until)(node)
 
   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)
-  expand_node(node and node:as(DirectoryNode) or core.get_explorer())
+---@param expand_opts ApiTreeExpandOpts?
+function M.all(node, expand_opts)
+  expand_node(node and node:as(DirectoryNode) or core.get_explorer(), expand_opts)
 end
 
 ---Expand the directory node or parent node
 ---@param node Node
-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/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")

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/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/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