chore(master): release nvim-tree 1.12.0 (#3099 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Alexander Courtis <alex@courtis.org>
ci: simplify luarocks release tag pattern as it was not firing
2025-04-21 12:04:41 +10:00 · 2025-04-21 08:59:56 +10:00 · 2025-04-21 08:39:48 +10:00 · 2025-04-20 09:49:28 +10:00 · 2025-04-11 12:48:34 +10:00 · 2025-04-04 17:29:38 +11:00
48 changed files with 1167 additions and 500 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,9 @@ end_of_line = lf
 [nvim-tree-lua.txt]
 max_line_length = 78

+# keep these in sync with .luarc.json
+#   .editorconfig is used within nvim, overriding .luarc.json
+#   .luarc.json is used by style check
 [*.lua]
 indent_style = space
 max_line_length = 140
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,45 +20,25 @@ jobs:
    strategy:
      matrix:
        lua_version: [ 5.1 ]
+        luacheck_version: [ 1.2.0 ]

    steps:
-      - uses: actions/checkout@v4
+      - name: checkout
+        uses: actions/checkout@v4

-      - uses: leafo/gh-actions-lua@v10
+      - name: install lua ${{ matrix.lua_version }}
+        uses: leafo/gh-actions-lua@v11
        with:
          luaVersion: ${{ matrix.lua_version }}

-      - uses: leafo/gh-actions-luarocks@v4
+      - name: install luarocks
+        uses: leafo/gh-actions-luarocks@v5

-      - run: luarocks install luacheck 1.1.1
+      - name: install luacheck ${{ matrix.luacheck_version }}
+        run: luarocks install luacheck ${{ matrix.luacheck_version }}

      - run: make lint

-  style:
-    runs-on: ubuntu-latest
-
-    concurrency:
-      group: ${{ github.workflow }}-${{ matrix.emmy_lua_code_style_version }}-${{ github.head_ref || github.ref_name }}
-      cancel-in-progress: true
-
-    strategy:
-      matrix:
-        emmy_lua_code_style_version: [ 1.5.6 ]
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install emmy_lua_code_style
-        run: |
-          mkdir -p CodeFormat
-          curl -L "https://github.com/CppCXY/EmmyLuaCodeStyle/releases/download/${{ matrix.emmy_lua_code_style_version }}/linux-x64.tar.gz" | tar zx --directory CodeFormat
-
-      - run: echo "CodeFormat/linux-x64/bin" >> "$GITHUB_PATH"
-
-      - run: make style
-
-      - run: make style-doc
-
  check:
    runs-on: ubuntu-latest

@@ -69,26 +49,31 @@ jobs:
    strategy:
      matrix:
        nvim_version: [ stable, nightly ]
-        luals_version: [ 3.11.0 ]
+        luals_version: [ 3.13.9 ]
+
+    env:
+      VIMRUNTIME: /home/runner/nvim-${{ matrix.nvim_version }}/share/nvim/runtime

    steps:
-      - uses: actions/checkout@v4
+      - name: checkout
+        uses: actions/checkout@v4

-      - uses: rhysd/action-setup-vim@v1
+      - name: install nvim ${{ matrix.nvim_version }}
+        uses: rhysd/action-setup-vim@v1
        with:
          neovim: true
          version: ${{ matrix.nvim_version }}

-      - name: install luals
+      - name: install lua-language-server ${{ matrix.luals_version }}
        run: |
          mkdir -p luals
          curl -L "https://github.com/LuaLS/lua-language-server/releases/download/${{ matrix.luals_version }}/lua-language-server-${{ matrix.luals_version }}-linux-x64.tar.gz" | tar zx --directory luals
+          echo "luals/bin" >> "$GITHUB_PATH"

-      - run: echo "luals/bin" >> "$GITHUB_PATH"
-
-      - name: make check
-        env:
-          VIMRUNTIME: /home/runner/nvim-${{ matrix.nvim_version }}/share/nvim/runtime
-        run: make check
+      - run: make check

      - run: make help-check
+
+      - run: make style
+
+      - run: make style-doc
--- a/.github/workflows/luarocks-release.yml
+++ b/.github/workflows/luarocks-release.yml
@@ -1,9 +1,11 @@
 name: Luarocks Release
+
 on:
  push:
    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - v*
  workflow_dispatch:
+
 jobs:
  luarocks-upload:
    runs-on: ubuntu-latest
--- a/.luarc.json
+++ b/.luarc.json
@@ -1,12 +1,23 @@
 {
  "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
-  "runtime.version.luals-check-only": "Lua 5.1",
  "workspace": {
    "library": [
      "$VIMRUNTIME/lua/vim",
      "${3rd}/luv/library"
    ]
  },
+  "format": {
+    "defaultConfig": {
+      "indent_style": "space",
+      "max_line_length": "140",
+      "indent_size": "2",
+      "continuation_indent": "2",
+      "quote_style": "double",
+      "call_arg_parentheses": "always",
+      "space_before_closure_open_parenthesis": "false",
+      "align_continuous_similar_call_args": "true"
+    }
+  },
  "diagnostics": {
    "libraryFiles": "Disable",
    "globals": [],
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.8.0"
+  ".": "1.12.0"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,68 @@
 # Changelog

+## [1.12.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.11.0...nvim-tree-v1.12.0) (2025-04-20)
+
+
+### Features
+
+* add TreePreOpen event ([#3105](https://github.com/nvim-tree/nvim-tree.lua/issues/3105)) ([c24c047](https://github.com/nvim-tree/nvim-tree.lua/commit/c24c0470d9de277fbebecd718f33561ed7c90298))
+
+
+### Bug Fixes
+
+* **#3101:** when renderer.highlight_opened_files = "none" do not reload on BufUnload and BufReadPost ([#3102](https://github.com/nvim-tree/nvim-tree.lua/issues/3102)) ([5bea2b3](https://github.com/nvim-tree/nvim-tree.lua/commit/5bea2b37523a31288e0fcab42f3be5c1bd4516bb))
+* explicitly set `border` to `"none"` in full name float ([#3094](https://github.com/nvim-tree/nvim-tree.lua/issues/3094)) ([c3c1935](https://github.com/nvim-tree/nvim-tree.lua/commit/c3c193594213c5e2f89ec5d7729cad805f76b256))
+* reliably dispatch exactly one TreeOpen and TreeClose events ([#3107](https://github.com/nvim-tree/nvim-tree.lua/issues/3107)) ([3a63717](https://github.com/nvim-tree/nvim-tree.lua/commit/3a63717d3d332d8f39aaf65be7a0e4c2265af021))
+
+## [1.11.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.10.0...nvim-tree-v1.11.0) (2025-02-22)
+
+
+### Features
+
+* **#1984:** add quit_on_open and focus opts to various api.node.open functions ([#3054](https://github.com/nvim-tree/nvim-tree.lua/issues/3054)) ([3281f33](https://github.com/nvim-tree/nvim-tree.lua/commit/3281f331f7f0bef13eb00fb2d5a9d28b2f6155a2))
+* **#3037:** add API node.buffer.delete, node.buffer.wipe ([#3040](https://github.com/nvim-tree/nvim-tree.lua/issues/3040)) ([fee1da8](https://github.com/nvim-tree/nvim-tree.lua/commit/fee1da88972f5972a8296813f6c00d7598325ebd))
+
+
+### Bug Fixes
+
+* **#3045:** wipe scratch buffers for full name and show info popups ([#3050](https://github.com/nvim-tree/nvim-tree.lua/issues/3050)) ([fca0b67](https://github.com/nvim-tree/nvim-tree.lua/commit/fca0b67c0b5a31727fb33addc4d9c100736a2894))
+* **#3059:** test for presence of new 0.11 API vim.hl.range ([#3060](https://github.com/nvim-tree/nvim-tree.lua/issues/3060)) ([70825f2](https://github.com/nvim-tree/nvim-tree.lua/commit/70825f23db61ecd900c4cfea169bffe931926a9d))
+* arithmetic on nil value error on first git project open ([#3064](https://github.com/nvim-tree/nvim-tree.lua/issues/3064)) ([8052310](https://github.com/nvim-tree/nvim-tree.lua/commit/80523101f0ae48b7f1990e907b685a3d79776c01))
+* stl and stlnc fillchars are hidden in window picker ([b699143](https://github.com/nvim-tree/nvim-tree.lua/commit/b69914325a945ee5157f0d21047210b42af5776e))
+* window picker: hide fillchars: stl and stlnc ([#3066](https://github.com/nvim-tree/nvim-tree.lua/issues/3066)) ([b699143](https://github.com/nvim-tree/nvim-tree.lua/commit/b69914325a945ee5157f0d21047210b42af5776e))
+
+## [1.10.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.9.0...nvim-tree-v1.10.0) (2025-01-13)
+
+
+### Features
+
+* **api:** add node.open.vertical_no_picker, node.open.horizontal_no_picker ([#3031](https://github.com/nvim-tree/nvim-tree.lua/issues/3031)) ([68fc4c2](https://github.com/nvim-tree/nvim-tree.lua/commit/68fc4c20f5803444277022c681785c5edd11916d))
+
+
+### Bug Fixes
+
+* **#3015:** dynamic width no longer truncates on right_align icons ([#3022](https://github.com/nvim-tree/nvim-tree.lua/issues/3022)) ([f7b76cd](https://github.com/nvim-tree/nvim-tree.lua/commit/f7b76cd1a75615c8d6254fc58bedd2a7304eb7d8))
+* **#3018:** error when focusing nvim-tree when in terminal mode ([#3019](https://github.com/nvim-tree/nvim-tree.lua/issues/3019)) ([db8d7ac](https://github.com/nvim-tree/nvim-tree.lua/commit/db8d7ac1f524fc6f808764b29fa695c51e014aa6))
+* **#3041:** use vim.diagnostic.get for updating diagnostics ([#3042](https://github.com/nvim-tree/nvim-tree.lua/issues/3042)) ([aae0185](https://github.com/nvim-tree/nvim-tree.lua/commit/aae01853ddbd790d1efd6ff04ff96cf38c02c95f))
+* Can't re-enter normal mode from terminal mode ([db8d7ac](https://github.com/nvim-tree/nvim-tree.lua/commit/db8d7ac1f524fc6f808764b29fa695c51e014aa6))
+* hijack directory "BufEnter", "BufNewFile" events are nested ([#3044](https://github.com/nvim-tree/nvim-tree.lua/issues/3044)) ([39bc630](https://github.com/nvim-tree/nvim-tree.lua/commit/39bc63081605c1d4b974131ebecaea11e8a8595f))
+* view.width functions may return strings ([#3020](https://github.com/nvim-tree/nvim-tree.lua/issues/3020)) ([6b4be1d](https://github.com/nvim-tree/nvim-tree.lua/commit/6b4be1dc0cd4d5d5b8e8b56b510a75016e99746f))
+
+## [1.9.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.8.0...nvim-tree-v1.9.0) (2024-12-07)
+
+
+### Features
+
+* **#2948:** add custom decorators, :help nvim-tree-decorators ([#2996](https://github.com/nvim-tree/nvim-tree.lua/issues/2996)) ([7a4ff1a](https://github.com/nvim-tree/nvim-tree.lua/commit/7a4ff1a516fe92a5ed6b79d7ce31ea4d8f341a72))
+
+
+### Bug Fixes
+
+* **#2954:** more efficient LSP updates, increase diagnostics.debounce_delay from 50ms to 500ms ([#3007](https://github.com/nvim-tree/nvim-tree.lua/issues/3007)) ([1f3ffd6](https://github.com/nvim-tree/nvim-tree.lua/commit/1f3ffd6af145af2a4930a61c50f763264922c3fe))
+* **#2990:** Do not check if buffer is buflisted in diagnostics.update() ([#2998](https://github.com/nvim-tree/nvim-tree.lua/issues/2998)) ([28eac28](https://github.com/nvim-tree/nvim-tree.lua/commit/28eac2801b201f301449e976d7a9e8cfde053ba3))
+* **#3009:** nvim &lt; 0.10 apply view options locally ([#3010](https://github.com/nvim-tree/nvim-tree.lua/issues/3010)) ([ca7c4c3](https://github.com/nvim-tree/nvim-tree.lua/commit/ca7c4c33cac2ad66ec69d45e465379716ef0cc97))
+* **api:** correct argument types in `wrap_node` and `wrap_node_or_nil` ([#3006](https://github.com/nvim-tree/nvim-tree.lua/issues/3006)) ([f7c65e1](https://github.com/nvim-tree/nvim-tree.lua/commit/f7c65e11d695a084ca10b93df659bb7e68b71f9f))
+
 ## [1.8.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.7.1...nvim-tree-v1.8.0) (2024-11-09)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,9 +12,9 @@ Language server: [luals](https://luals.github.io)

 Lint: [luacheck](https://github.com/lunarmodules/luacheck/)

-Style: [EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle): `CodeCheck`
+Style Fixing: [EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle): `CodeCheck`

-nvim-tree.lua migrated from stylua to EmmyLuaCodeStyle ~2024/10. `vim.lsp.buf.format()` may be used as it is the default formatter for luals
+nvim-tree.lua migrated from stylua to EmmyLuaCodeStyle ~2024/10. `vim.lsp.buf.format()` may be used as it is the default formatter for luals, using an embedded [EmmyLuaCodeStyle](https://github.com/CppCXY/EmmyLuaCodeStyle)

 You can install them via you OS package manager e.g. `pacman`, `brew` or other via other package managers such as `cargo` or `luarocks`

@@ -36,14 +36,14 @@ make lint

 ## style

-1. Runs CodeCheck using `.editorconfig` settings
+1. Runs lua language server `codestyle-check` only, using `.luarc.json` settings
 1. Runs `scripts/doc-comments.sh` to validate annotated documentation

 ```sh
 make style
 ```

-You can automatically fix `CodeCheck` issues via:
+You can automatically fix style issues using `CodeCheck`:

 ```sh
 make style-fix
--- a/4
+++ b/4
@@ -13,11 +13,11 @@ check: luals
 # subtasks
 #
 luacheck:
-	luacheck -q lua
+	luacheck --codes --quiet lua --exclude-files "**/_meta/**"

 # --diagnosis-as-error does not function for workspace, hence we post-process the output
 style-check:
-	CodeFormat check --config .editorconfig --diagnosis-as-error --workspace lua
+	@scripts/luals-check.sh codestyle-check

 style-doc:
 	scripts/doc-comments.sh
--- a/README.md
+++ b/README.md
@@ -162,13 +162,13 @@ nvim-tree exposes a public API. This is non breaking, with additions made as nec

 See wiki [Recipes](https://github.com/nvim-tree/nvim-tree.lua/wiki/Recipes) and [Tips](https://github.com/nvim-tree/nvim-tree.lua/wiki/Tips) for ideas and inspiration.

-Please raise a [feature request](https://github.com/nvim-tree/nvim-tree.lua/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=) if the API is insufficient for your needs. [Contributions](#Contributing) are always welcome.
+Please raise a [feature request](https://github.com/nvim-tree/nvim-tree.lua/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=) if the API is insufficient for your needs. Contributions are always welcome, see below.

 You may also subscribe to events that nvim-tree will dispatch in a variety of situations, see [:help nvim-tree-events](doc/nvim-tree-lua.txt)

 ## Contributing

-PRs are always welcome. See [wiki](https://github.com/nvim-tree/nvim-tree.lua/wiki/Development) to get started.
+PRs are always welcome. See [CONTRIBUTING](CONTRIBUTING.md) and [wiki: Development](https://github.com/nvim-tree/nvim-tree.lua/wiki/Development) to get started.

 See [bug](https://github.com/nvim-tree/nvim-tree.lua/issues?q=is%3Aissue+is%3Aopen+label%3Abug) and [PR Please](https://github.com/nvim-tree/nvim-tree.lua/issues?q=is%3Aopen+is%3Aissue+label%3A%22PR+please%22) issues if you are looking for some work to get you started.

--- a/doc/nvim-tree-lua.txt
+++ b/doc/nvim-tree-lua.txt
@@ -52,14 +52,16 @@ CONTENTS                                                           *nvim-tree*
  8.2  Highlight: Overhaul                      |nvim-tree-highlight-overhaul|
  9. Events                                   |nvim-tree-events|
 10. Prompts                                  |nvim-tree-prompts|
- 11. OS Specific Restrictions                 |nvim-tree-os-specific|
- 12. Netrw                                    |nvim-tree-netrw|
- 13. Legacy                                   |nvim-tree-legacy|
- 13.1  Legacy: Opts                             |nvim-tree-legacy-opts|
- 13.2  Legacy: Highlight                        |nvim-tree-legacy-highlight|
- 14. Index                                    |nvim-tree-index|
- 14.1  Index: Opts                              |nvim-tree-index-opts|
- 14.2  Index: API                               |nvim-tree-index-api|
+ 11. Decorators                               |nvim-tree-decorators|
+ 11.1  Decorator Example                        |nvim-tree-decorator-example|
+ 12. OS Specific Restrictions                 |nvim-tree-os-specific|
+ 13. Netrw                                    |nvim-tree-netrw|
+ 14. Legacy                                   |nvim-tree-legacy|
+ 14.1  Legacy: Opts                             |nvim-tree-legacy-opts|
+ 14.2  Legacy: Highlight                        |nvim-tree-legacy-highlight|
+ 15. Index                                    |nvim-tree-index|
+ 15.1  Index: Opts                              |nvim-tree-index-opts|
+ 15.2  Index: API                               |nvim-tree-index-api|

 ==============================================================================
 1. INTRODUCTION                                      *nvim-tree-introduction*
@@ -425,6 +427,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
        special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
        hidden_display = "none",
        symlink_destination = true,
+        decorators = { "Git", "Open", "Hidden", "Modified", "Bookmark", "Diagnostics", "Copied", "Cut", },
        highlight_git = "none",
        highlight_diagnostics = "none",
        highlight_opened_files = "none",
@@ -527,7 +530,7 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
        enable = false,
        show_on_dirs = false,
        show_on_open_dirs = true,
-        debounce_delay = 50,
+        debounce_delay = 500,
        severity = {
          min = vim.diagnostic.severity.HINT,
          max = vim.diagnostic.severity.ERROR,
@@ -797,22 +800,22 @@ Width of the window: can be a `%` string, a number representing columns, a
 function or a table.
 A table indicates that the view should be dynamically sized based on the
 longest line.
-  Type: `string | number | table | function()` returning a number
+  Type: `string | number | table | fun(): number|string`
  Default: `30`

    *nvim-tree.view.width.min*
    Minimum dynamic width.
-      Type: `string | number | function()` returning a number
+      Type: `string | number | fun(): number|string`
      Default: `30`

    *nvim-tree.view.width.max*
    Maximum dynamic width, -1 for unbounded.
-      Type: `string | number | function()` returning a number
+      Type: `string | number | fun(): number|string`
      Default: `-1`

    *nvim-tree.view.width.padding*
    Extra padding to the right.
-      Type: `number | function()` returning a number
+      Type: `number | fun(): number|string`
      Default: `1`

 *nvim-tree.view.float*
@@ -842,9 +845,6 @@ Use nvim-tree in a floating window.
 ==============================================================================
 5.3 OPTS: RENDERER                                  *nvim-tree-opts-renderer*

-Highlight precedence, additive:
-  git < opened < modified < bookmarked < diagnostics < copied < cut
-
 *nvim-tree.renderer.add_trailing*
 Appends a trailing slash to folder names.
  Type: `boolean`, Default: `false`
@@ -927,6 +927,22 @@ Show a summary of hidden files below the tree using `NvimTreeHiddenDisplay
 Whether to show the destination of the symlink.
  Type: `boolean`, Default: `true`

+*nvim-tree.renderer.decorators*
+Highlighting and icons for the nodes, in increasing order of precedence.
+Uses strings to specify builtin decorators otherwise specify your
+`nvim_tree.api.decorator.UserDecorator` class.
+  Type: `nvim_tree.api.decorator.Name[]`, Default: >lua
+    {
+      "Git",
+      "Open",
+      "Hidden",
+      "Modified",
+      "Bookmark",
+      "Diagnostics",
+      "Copied",
+      "Cut",
+    }
+<
 *nvim-tree.renderer.highlight_git*
 Enable highlight for git attributes using `NvimTreeGit*HL` highlight groups.
 Requires |nvim-tree.git.enable|
@@ -996,9 +1012,6 @@ Configuration options for tree indent markers.
 *nvim-tree.renderer.icons*
 Configuration options for icons.

-Icon order and sign column precedence:
-  git < hidden < modified < bookmarked < diagnostics
-
 `renderer.icons.*_placement` options may be:
 - `"before"` : before file/folder, after the file/folders icons
 - `"after"` : after file/folder
@@ -1272,7 +1285,7 @@ Enable/disable the feature.

 *nvim-tree.diagnostics.debounce_delay*
 Idle milliseconds between diagnostic event and update.
-  Type: `number`, Default: `50` (ms)
+  Type: `number`, Default: `500` (ms)

 *nvim-tree.diagnostics.show_on_dirs*
 Show diagnostic icons on parent directories.
@@ -1881,7 +1894,7 @@ tree.winid({opts})                              *nvim-tree-api.tree.winid()*
      • {opts} (table) optional parameters

    Options: ~
-      • {tabpage}        (number|nil)  tabpage, 0 or nil for current, default nil
+      • {tabpage} (number|nil)  tabpage, 0 or nil for current, default nil

    Return: ~
      (number) winid or nil if tree is not visible
@@ -1994,33 +2007,99 @@ fs.print_clipboard()                      *nvim-tree-api.fs.print_clipboard()*
 Parameters: ~
  • {node} (Node|nil) file or folder

-node.open.edit({node})                        *nvim-tree-api.node.open.edit()*
+node.open.edit({node}, {opts})                        *nvim-tree-api.node.open.edit()*
    File:   open as per |nvim-tree.actions.open_file|
    Folder: expand or collapse
    Root:   change directory up

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
                               *nvim-tree-api.node.open.replace_tree_buffer()*
 node.open.replace_tree_buffer({node})
    |nvim-tree-api.node.edit()|, file will be opened in place: in the
    nvim-tree window.

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

-node.open.vertical({node})                *nvim-tree-api.node.open.vertical()*
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
+node.open.vertical({node}, {opts})                *nvim-tree-api.node.open.vertical()*
    |nvim-tree-api.node.edit()|, file will be opened in a new vertical split.

-node.open.horizontal({node})            *nvim-tree-api.node.open.horizontal()*
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
+                                *nvim-tree-api.node.open.vertical_no_picker()*
+node.open.vertical_no_picker({node}, {opts})
+    |nvim-tree-api.node.vertical()|, window picker will never be used as per
+    |nvim-tree.actions.open_file.window_picker.enable| `false`
+
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
+node.open.horizontal({node}, {opts})            *nvim-tree-api.node.open.horizontal()*
    |nvim-tree-api.node.edit()|, file will be opened in a new horizontal split.

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
+                              *nvim-tree-api.node.open.horizontal_no_picker()*
+node.open.horizontal_no_picker({node}, {opts})
+    |nvim-tree-api.node.horizontal()|, window picker will never be used as per
+    |nvim-tree.actions.open_file.window_picker.enable| `false`
+
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
                                *nvim-tree-api.node.open.toggle_group_empty()*
-node.open.toggle_group_empty({node})
+node.open.toggle_group_empty({node}, {opts})
    Toggle |nvim-tree.renderer.group_empty| for a specific folder.
    Does nothing on files.
    Needs |nvim-tree.renderer.group_empty| set.

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
 node.open.drop({node})                        *nvim-tree-api.node.open.drop()*
    Switch to window with selected file if it exists.
    Open file otherwise.
@@ -2030,9 +2109,17 @@ node.open.drop({node})                        *nvim-tree-api.node.open.drop()*
    Folder: expand or collapse
    Root:   change directory up

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

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
                                          *nvim-tree-api.node.open.tab_drop()*
 node.open.tab_drop({node})
    Switch to tab containing window with selected file if it exists.
@@ -2042,15 +2129,31 @@ node.open.tab_drop({node})
    Folder: expand or collapse
    Root:   change directory up

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

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
                                 *nvim-tree-api.node.open.preview_no_picker()*
-node.open.preview_no_picker({node})
+node.open.preview_no_picker({node}, {opts})
    |nvim-tree-api.node.edit()|, file buffer will have |bufhidden| set to `delete`.
    window picker will never be used as per
    |nvim-tree.actions.open_file.window_picker.enable| `false`

+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {quit_on_open} (boolean) quits the tree when opening the file
+      • {focus} (boolean) keep focus in the tree when opening the file
+
 node.navigate.git.next({node})        *nvim-tree-api.node.navigate.git.next()*
    Navigate to the next item showing git status.

@@ -2141,6 +2244,28 @@ node.run.cmd({node})                            *nvim-tree-api.node.run.cmd()*
 node.run.system({node})                      *nvim-tree-api.node.run.system()*
    Execute |nvim-tree.system_open|

+node.buffer.delete({node}, {opts})        *nvim-tree-api.node.buffer.delete()*
+    Deletes node's related buffer, if one exists.
+    Executes |:bdelete| or |:bdelete|!
+
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {force} (boolean) delete even if buffer is modified, default false
+
+node.buffer.wipe({node}, {opts})            *nvim-tree-api.node.buffer.wipe()*
+    Wipes node's related buffer, if one exists.
+    Executes |:bwipe| or |:bwipe|!
+
+    Parameters: ~
+      • {node} (Node|nil) file or folder
+      • {opts} (table) optional parameters
+
+    Options: ~
+      • {force} (boolean) wipe even if buffer is modified, default false
+
 ==============================================================================
 6.4 API GIT                                               *nvim-tree-api.git*

@@ -2644,13 +2769,21 @@ e.g. handler for node renamed: >lua
 |nvim_tree_events_kind|

 - Event.Ready
-                When NvimTree has been initialized
+                When NvimTree has been initialized.
+                • Note: Handler takes no parameter.
+
+- Event.TreePreOpen
+                Invoked before the window and buffer for NvimTree are created
+                or opened. Before |Event.TreeOpen| event.
                • Note: Handler takes no parameter.

 - Event.TreeOpen
+                Invoked after the NvimTree is opened.
                • Note: Handler takes no parameter.

 - Event.TreeClose
+                Invoked after the NvimTree is closed, but before the window is
+                closed. Dispatched on |WinClosed| event for NvimTree window.
                • Note: Handler takes no parameter.

 - Event.Resize - When NvimTree is resized.
@@ -2755,7 +2888,90 @@ configurations for different types of prompts.
    send all bookmarked to trash during |nvim-tree-api.marks.bulk.trash()|

 ==============================================================================
- 11. OS SPECIFIC RESTRICTIONS                          *nvim-tree-os-specific*
+ 11. DECORATORS                                         *nvim-tree-decorators*
+
+Highlighting and icons for nodes are provided by Decorators. You may provide
+your own in addition to the builtin decorators.
+
+Decorators may:
+- Add icons
+- 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",
+  }
+
+See `nvim-tree/_meta/api_decorator.lua` for full
+`nvim_tree.api.decorator.UserDecorator` class documentation.
+<
+==============================================================================
+ 11.1. DECORATOR EXAMPLE                         *nvim-tree-decorator-example*
+>lua
+  ---Create your decorator class
+  ---@class (exact) MyDecorator: nvim_tree.api.decorator.UserDecorator
+  ---@field private my_icon nvim_tree.api.HighlightedString
+  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"
+
+    -- create your icon once, for convenience
+    self.my_icon         = { str = "I", hl = { "MyIcon" } }
+
+    -- Define the icon sign only once
+    -- Only needed if you are using icon_placement = "signcolumn"
+    self:define_sign(self.my_icon)
+  end
+
+  ---Override node icon
+  ---@param node nvim_tree.api.Node
+  ---@return nvim_tree.api.HighlightedString? icon_node
+  function MyDecorator:icon_node(node)
+    if node.name == "example" then
+      return self.my_icon
+    else
+      return nil
+    end
+  end
+
+  ---Return one icon for DecoratorIconPlacement
+  ---@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 }
+    else
+      return nil
+    end
+  end
+
+  ---Exactly one highlight group for DecoratorHighlightRange
+  ---@param node nvim_tree.api.Node
+  ---@return string? highlight_group
+  function MyDecorator:highlight_group(node)
+    if node.name == "example" then
+      return "MyHighlight"
+    else
+      return nil
+    end
+  end
+<
+==============================================================================
+ 12. OS SPECIFIC RESTRICTIONS                          *nvim-tree-os-specific*

 Windows WSL and PowerShell
 - Trash is synchronized
@@ -2767,7 +2983,7 @@ Windows WSL and PowerShell
  issues or disable this feature.

 ==============================================================================
- 12. NETRW                                                   *nvim-tree-netrw*
+ 13. NETRW                                                   *nvim-tree-netrw*

 |netrw| is a standard neovim plugin that is enabled by default. It provides,
 amongst other functionality, a file/directory browser.
@@ -2788,14 +3004,14 @@ keep using |netrw| without its browser features please ensure:
 |nvim-tree.hijack_netrw| ` = true`

 ==============================================================================
- 13. LEGACY                                                 *nvim-tree-legacy*
+ 14. LEGACY                                                 *nvim-tree-legacy*

 Breaking refactors have been made however the legacy versions will be silently
 migrated and used.
 There are no plans to remove this migration.

 ==============================================================================
- 13.1 LEGACY: OPTS                                     *nvim-tree-legacy-opts*
+ 14.1 LEGACY: OPTS                                     *nvim-tree-legacy-opts*

 Legacy options are translated to the current, making type and value changes as
 needed.
@@ -2813,7 +3029,7 @@ needed.
 `renderer.icons.webdev_colors`       |nvim-tree.renderer.icons.web_devicons.file.color|

 ==============================================================================
- 13.2 LEGACY: HIGHLIGHT                           *nvim-tree-legacy-highlight*
+ 14.2 LEGACY: HIGHLIGHT                           *nvim-tree-legacy-highlight*

 Legacy highlight group are still obeyed when they are defined and the current
 highlight group is not, hard linking as follows: >
@@ -2862,10 +3078,10 @@ highlight group is not, hard linking as follows: >
    NvimTreeLspDiagnosticsHintFolderText        NvimTreeDiagnosticHintFolderHL
 <
 ==============================================================================
- 14 INDEX                                                    *nvim-tree-index*
+ 15 INDEX                                                    *nvim-tree-index*

 ==============================================================================
- 14.1 INDEX: OPTS                                       *nvim-tree-index-opts*
+ 15.1 INDEX: OPTS                                       *nvim-tree-index-opts*

 |nvim-tree.actions.change_dir|
 |nvim-tree.actions.change_dir.enable|
@@ -2943,6 +3159,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.prefer_startup_root|
 |nvim-tree.reload_on_bufenter|
 |nvim-tree.renderer.add_trailing|
+|nvim-tree.renderer.decorators|
 |nvim-tree.renderer.full_name|
 |nvim-tree.renderer.group_empty|
 |nvim-tree.renderer.hidden_display|
@@ -3033,7 +3250,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree.view.width.padding|

 ==============================================================================
- 14.2 INDEX: API                                         *nvim-tree-index-api*
+ 15.2 INDEX: API                                         *nvim-tree-index-api*

 |nvim-tree-api.commands.get()|
 |nvim-tree-api.config.mappings.default_on_attach()|
@@ -3071,6 +3288,8 @@ highlight group is not, hard linking as follows: >
 |nvim-tree-api.marks.navigate.prev()|
 |nvim-tree-api.marks.navigate.select()|
 |nvim-tree-api.marks.toggle()|
+|nvim-tree-api.node.buffer.delete()|
+|nvim-tree-api.node.buffer.wipe()|
 |nvim-tree-api.node.navigate.diagnostics.next()|
 |nvim-tree-api.node.navigate.diagnostics.next_recursive()|
 |nvim-tree-api.node.navigate.diagnostics.prev()|
@@ -3092,6 +3311,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree-api.node.open.drop()|
 |nvim-tree-api.node.open.edit()|
 |nvim-tree-api.node.open.horizontal()|
+|nvim-tree-api.node.open.horizontal_no_picker()|
 |nvim-tree-api.node.open.no_window_picker()|
 |nvim-tree-api.node.open.preview()|
 |nvim-tree-api.node.open.preview_no_picker()|
@@ -3100,6 +3320,7 @@ highlight group is not, hard linking as follows: >
 |nvim-tree-api.node.open.tab_drop()|
 |nvim-tree-api.node.open.toggle_group_empty()|
 |nvim-tree-api.node.open.vertical()|
+|nvim-tree-api.node.open.vertical_no_picker()|
 |nvim-tree-api.node.run.cmd()|
 |nvim-tree-api.node.run.system()|
 |nvim-tree-api.node.show_info_popup()|
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -190,7 +190,7 @@ local function setup_autocommands(opts)
  end

  if opts.hijack_directories.enable then
-    create_nvim_tree_autocmd({ "BufEnter", "BufNewFile" }, { callback = M.open_on_directory })
+    create_nvim_tree_autocmd({ "BufEnter", "BufNewFile" }, { callback = M.open_on_directory, nested = true })
  end

  if opts.view.centralize_selection then
@@ -199,6 +199,10 @@ local function setup_autocommands(opts)
      callback = function()
        vim.schedule(function()
          vim.api.nvim_buf_call(0, function()
+            local is_term_mode = vim.api.nvim_get_mode().mode == "t"
+            if is_term_mode then
+              return
+            end
            vim.cmd([[norm! zz]])
          end)
        end)
@@ -208,16 +212,16 @@ local function setup_autocommands(opts)

  if opts.diagnostics.enable then
    create_nvim_tree_autocmd("DiagnosticChanged", {
-      callback = function()
+      callback = function(ev)
        log.line("diagnostics", "DiagnosticChanged")
-        require("nvim-tree.diagnostics").update()
+        require("nvim-tree.diagnostics").update_lsp(ev)
      end,
    })
    create_nvim_tree_autocmd("User", {
      pattern = "CocDiagnosticChange",
      callback = function()
        log.line("diagnostics", "CocDiagnosticChange")
-        require("nvim-tree.diagnostics").update()
+        require("nvim-tree.diagnostics").update_coc()
      end,
    })
  end
@@ -232,6 +236,17 @@ local function setup_autocommands(opts)
      end,
    })
  end
+
+  -- Handles event dispatch when tree is closed by `:q`
+  create_nvim_tree_autocmd("WinClosed", {
+    pattern = "*",
+    ---@param ev vim.api.keyset.create_autocmd.callback_args
+    callback = function(ev)
+      if vim.api.nvim_get_option_value("filetype", { buf = ev.buf }) == "NvimTree" then
+        require("nvim-tree.events")._dispatch_on_tree_close()
+      end
+    end,
+  })
 end

 local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
@@ -284,6 +299,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
    special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
    hidden_display = "none",
    symlink_destination = true,
+    decorators = { "Git", "Open", "Hidden", "Modified", "Bookmark", "Diagnostics", "Copied", "Cut", },
    highlight_git = "none",
    highlight_diagnostics = "none",
    highlight_opened_files = "none",
@@ -386,7 +402,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
    enable = false,
    show_on_dirs = false,
    show_on_open_dirs = true,
-    debounce_delay = 50,
+    debounce_delay = 500,
    severity = {
      min = vim.diagnostic.severity.HINT,
      max = vim.diagnostic.severity.ERROR,
--- a/lua/nvim-tree/_meta/api.lua
+++ b/lua/nvim-tree/_meta/api.lua
@@ -0,0 +1,51 @@
+---@meta
+error("Cannot require a meta file")
+
+--
+-- Nodes
+--
+
+---Base Node, Abstract
+---@class (exact) nvim_tree.api.Node
+---@field type "file" | "directory" | "link" uv.fs_stat.result.type
+---@field absolute_path string
+---@field executable boolean
+---@field fs_stat uv.fs_stat.result?
+---@field git_status GitNodeStatus?
+---@field hidden boolean
+---@field name string
+---@field parent nvim_tree.api.DirectoryNode?
+---@field diag_severity lsp.DiagnosticSeverity?
+
+---File
+---@class (exact) nvim_tree.api.FileNode: nvim_tree.api.Node
+---@field extension string
+
+---Directory
+---@class (exact) nvim_tree.api.DirectoryNode: nvim_tree.api.Node
+---@field has_children boolean
+---@field nodes nvim_tree.api.Node[]
+---@field open boolean
+
+---Root Directory
+---@class (exact) nvim_tree.api.RootNode: nvim_tree.api.DirectoryNode
+
+---Link mixin
+---@class (exact) nvim_tree.api.LinkNode
+---@field link_to string
+---@field fs_stat_target uv.fs_stat.result
+
+---File Link
+---@class (exact) nvim_tree.api.FileLinkNode: nvim_tree.api.FileNode, nvim_tree.api.LinkNode
+
+---DirectoryLink
+---@class (exact) nvim_tree.api.DirectoryLinkNode: nvim_tree.api.DirectoryNode, nvim_tree.api.LinkNode
+
+--
+-- Various Types
+--
+
+---A string for rendering, with optional highlight groups to apply to it
+---@class (exact) nvim_tree.api.HighlightedString
+---@field str string
+---@field hl string[]
--- a/lua/nvim-tree/_meta/api_decorator.lua
+++ b/lua/nvim-tree/_meta/api_decorator.lua
@@ -0,0 +1,54 @@
+---@meta
+error("Cannot require a meta file")
+
+local nvim_tree = { api = { decorator = {} } }
+
+---Highlight group range as per nvim-tree.renderer.highlight_*
+---@alias nvim_tree.api.decorator.HighlightRange "none" | "icon" | "name" | "all"
+
+---Icon position as per renderer.icons.*_placement
+---@alias nvim_tree.api.decorator.IconPlacement "none" | "before" | "after" | "signcolumn" | "right_align"
+
+---Names of builtin decorators or your decorator classes. Builtins are ordered lowest to highest priority.
+---@alias nvim_tree.api.decorator.Name "Git" | "Opened" | "Hidden" | "Modified" | "Bookmarks" | "Diagnostics" | "Copied" | "Cut" | nvim_tree.api.decorator.UserDecorator
+
+---Custom decorator, see :help nvim-tree-decorators
+---
+---@class (exact) nvim_tree.api.decorator.UserDecorator
+---@field protected enabled boolean
+---@field protected highlight_range nvim_tree.api.decorator.HighlightRange
+---@field protected icon_placement nvim_tree.api.decorator.IconPlacement
+nvim_tree.api.decorator.UserDecorator = {}
+
+---Create your decorator class
+---
+function nvim_tree.api.decorator.UserDecorator:extend() end
+
+---Abstract: no-args constructor must be implemented and will be called once per tree render.
+---Must set all fields.
+---
+function nvim_tree.api.decorator.UserDecorator:new() end
+
+---Abstract: optionally implement to set the node's icon
+---
+---@param node nvim_tree.api.Node
+---@return nvim_tree.api.HighlightedString? icon_node
+function nvim_tree.api.decorator.UserDecorator:icon_node(node) end
+
+---Abstract: optionally implement to provide icons and the highlight groups for your icon_placement.
+---
+---@param node nvim_tree.api.Node
+---@return nvim_tree.api.HighlightedString[]? icons
+function nvim_tree.api.decorator.UserDecorator:icons(node) end
+
+---Abstract: optionally implement to provide one highlight group to apply to your highlight_range.
+---
+---@param node nvim_tree.api.Node
+---@return string? highlight_group
+function nvim_tree.api.decorator.UserDecorator:highlight_group(node) end
+
+---Define a sign. This should be called in the constructor.
+---
+---@protected
+---@param icon nvim_tree.api.HighlightedString?
+function nvim_tree.api.decorator.UserDecorator:define_sign(icon) end
--- a/lua/nvim-tree/actions/node/buffer.lua
+++ b/lua/nvim-tree/actions/node/buffer.lua
@@ -0,0 +1,58 @@
+-- Copyright 2019 Yazdani Kiyan under MIT License
+local notify = require("nvim-tree.notify")
+
+local M = {}
+
+---@param node Node
+---@param opts ApiNodeDeleteWipeBufferOpts|nil
+---@return nil
+function M.delete(node, opts)
+  M.delete_buffer("delete", node.absolute_path, opts)
+end
+
+---@param node Node
+---@param opts ApiNodeDeleteWipeBufferOpts|nil
+---@return nil
+function M.wipe(node, opts)
+  M.delete_buffer("wipe", node.absolute_path, opts)
+end
+
+---@alias ApiNodeDeleteWipeBufferMode '"delete"'|'"wipe"'
+
+---@param mode ApiNodeDeleteWipeBufferMode
+---@param filename string
+---@param opts ApiNodeDeleteWipeBufferOpts|nil
+---@return nil
+function M.delete_buffer(mode, filename, opts)
+  if type(mode) ~= "string" then
+    mode = "delete"
+  end
+
+  local buf_fn = vim.cmd.bdelete
+  if mode == "wipe" then
+    buf_fn = vim.cmd.bwipe
+  end
+
+  opts = opts or { force = false }
+
+  local notify_node = notify.render_path(filename)
+
+  -- check if buffer for file at cursor exists and if it is loaded
+  local bufnr_at_filename = vim.fn.bufnr(filename)
+  if bufnr_at_filename == -1 or vim.fn.getbufinfo(bufnr_at_filename)[1].loaded == 0 then
+    notify.info("No loaded buffer coincides with " .. notify_node)
+    return
+  end
+
+  local force = opts.force
+  -- check if buffer is modified
+  local buf_modified = vim.fn.getbufinfo(bufnr_at_filename)[1].changed
+  if not force and buf_modified == 1 then
+    notify.error("Buffer for file " .. notify_node .. " is modified")
+    return
+  end
+
+  buf_fn({ filename, bang = force })
+end
+
+return M
--- a/lua/nvim-tree/actions/node/file-popup.lua
+++ b/lua/nvim-tree/actions/node/file-popup.lua
@@ -50,6 +50,7 @@ local function setup_window(node)
    file_path = node.absolute_path,
  }
  local bufnr = vim.api.nvim_create_buf(false, true)
+  vim.bo[bufnr].bufhidden = "wipe"
  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
  vim.api.nvim_win_set_buf(winnr, bufnr)
 end
--- a/lua/nvim-tree/actions/node/init.lua
+++ b/lua/nvim-tree/actions/node/init.lua
@@ -4,6 +4,7 @@ M.file_popup = require("nvim-tree.actions.node.file-popup")
 M.open_file = require("nvim-tree.actions.node.open-file")
 M.run_command = require("nvim-tree.actions.node.run-command")
 M.system_open = require("nvim-tree.actions.node.system-open")
+M.buffer = require("nvim-tree.actions.node.buffer")

 function M.setup(opts)
  require("nvim-tree.actions.node.system-open").setup(opts)
--- a/lua/nvim-tree/actions/node/open-file.lua
+++ b/lua/nvim-tree/actions/node/open-file.lua
@@ -80,6 +80,14 @@ local function pick_win_id()
  local win_map = {}
  local laststatus = vim.o.laststatus
  vim.o.laststatus = 2
+  local fillchars = vim.opt.fillchars:get()
+  local stl = fillchars.stl
+  local stlnc = fillchars.stlnc
+  fillchars.stl = nil
+  fillchars.stlnc = nil
+  vim.opt.fillchars = fillchars
+  fillchars.stl = stl
+  fillchars.stlnc = stlnc

  local tabpage = vim.api.nvim_get_current_tabpage()
  local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
@@ -179,6 +187,7 @@ local function pick_win_id()
  end

  vim.o.laststatus = laststatus
+  vim.opt.fillchars = fillchars

  if not vim.tbl_contains(vim.split(M.window_picker.chars, ""), resp) then
    return
@@ -235,9 +244,8 @@ end

 local function get_target_winid(mode)
  local target_winid
-  if not M.window_picker.enable or mode == "edit_no_picker" or mode == "preview_no_picker" then
+  if not M.window_picker.enable or string.find(mode, "no_picker") then
    target_winid = lib.target_winid
-
    -- first available window
    if not vim.tbl_contains(vim.api.nvim_tabpage_list_wins(0), target_winid) then
      target_winid = first_win_id()
@@ -280,6 +288,11 @@ local function open_in_new_window(filename, mode)
    return
  end

+  local position = string.find(mode, "no_picker")
+  if position then
+    mode = string.sub(mode, 0, position - 2)
+  end
+
  -- non-floating, non-nvim-tree windows
  local win_ids = vim.tbl_filter(function(id)
    local config = vim.api.nvim_win_get_config(id)
--- a/lua/nvim-tree/actions/root/change-dir.lua
+++ b/lua/nvim-tree/actions/root/change-dir.lua
@@ -25,7 +25,7 @@ end
 ---@param new_tabpage integer
 ---@return boolean
 local function is_window_event(new_tabpage)
-  local is_event_scope_window = vim.v.event.scope == "window" or vim.v.event.changed_window
+  local is_event_scope_window = vim.v.event.scope == "window" or vim.v.event.changed_window or false
  return is_event_scope_window and new_tabpage == M.current_tab
 end

--- a/lua/nvim-tree/api.lua
+++ b/lua/nvim-tree/api.lua
@@ -11,6 +11,7 @@ local notify = require("nvim-tree.notify")
 local DirectoryNode = require("nvim-tree.node.directory")
 local FileLinkNode = require("nvim-tree.node.file-link")
 local RootNode = require("nvim-tree.node.root")
+local UserDecorator = require("nvim-tree.renderer.decorator.user")

 local Api = {
  tree = {},
@@ -23,6 +24,7 @@ local Api = {
    },
    run = {},
    open = {},
+    buffer = {},
  },
  events = {},
  marks = {
@@ -39,6 +41,7 @@ local Api = {
  },
  commands = {},
  diagnostics = {},
+  decorator = {},
 }

 ---Print error when setup not called.
@@ -69,7 +72,7 @@ end

 ---Inject the node as the first argument if present otherwise do nothing.
 ---@param fn fun(node: Node, ...): any
---@return fun(node: Node, ...): any
+---@return fun(node: Node?, ...): any
 local function wrap_node(fn)
  return function(node, ...)
    node = node or wrap_explorer("get_node_at_cursor")()
@@ -80,8 +83,8 @@ local function wrap_node(fn)
 end

 ---Inject the node or nil as the first argument if absent.
---@param fn fun(node: Node, ...): any
---@return fun(node: Node, ...): any
+---@param fn fun(node: Node?, ...): any
+---@return fun(node: Node?, ...): any
 local function wrap_node_or_nil(fn)
  return function(node, ...)
    node = node or wrap_explorer("get_node_at_cursor")()
@@ -219,21 +222,46 @@ Api.fs.copy.absolute_path = wrap_node(wrap_explorer_member("clipboard", "copy_ab
 Api.fs.copy.filename = wrap_node(wrap_explorer_member("clipboard", "copy_filename"))
 Api.fs.copy.basename = wrap_node(wrap_explorer_member("clipboard", "copy_basename"))
 Api.fs.copy.relative_path = wrap_node(wrap_explorer_member("clipboard", "copy_path"))
+---
+---@class NodeEditOpts
+---@field quit_on_open boolean|nil default false
+---@field focus boolean|nil default true

 ---@param mode string
 ---@param node Node
-local function edit(mode, node)
+---@param edit_opts NodeEditOpts?
+local function edit(mode, node, edit_opts)
  local file_link = node:as(FileLinkNode)
  local path = file_link and file_link.link_to or node.absolute_path
+  local cur_tabpage = vim.api.nvim_get_current_tabpage()
+
  actions.node.open_file.fn(mode, path)
+
+  edit_opts = edit_opts or {}
+
+  local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
+  if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then
+    view.close(cur_tabpage)
+  end
+
+  local mode_unsupported_focus = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
+  local focus = edit_opts.focus == nil or edit_opts.focus == true
+  if not mode_unsupported_focus and not focus then
+    -- if mode == "tabnew" a new tab will be opened and we need to focus back to the previous tab
+    if mode == "tabnew" then
+      vim.cmd(":tabprev")
+    end
+    view.focus()
+  end
 end

 ---@param mode string
 ---@param toggle_group boolean?
---@return fun(node: Node)
+---@return fun(node: Node, edit_opts: NodeEditOpts?)
 local function open_or_expand_or_dir_up(mode, toggle_group)
  ---@param node Node
-  return function(node)
+  ---@param edit_opts NodeEditOpts?
+  return function(node, edit_opts)
    local root = node:as(RootNode)
    local dir = node:as(DirectoryNode)

@@ -242,7 +270,7 @@ local function open_or_expand_or_dir_up(mode, toggle_group)
    elseif dir then
      dir:expand_or_collapse(toggle_group)
    elseif not toggle_group then
-      edit(mode, node)
+      edit(mode, node, edit_opts)
    end
  end
 end
@@ -253,7 +281,9 @@ Api.node.open.tab_drop = wrap_node(open_or_expand_or_dir_up("tab_drop"))
 Api.node.open.replace_tree_buffer = wrap_node(open_or_expand_or_dir_up("edit_in_place"))
 Api.node.open.no_window_picker = wrap_node(open_or_expand_or_dir_up("edit_no_picker"))
 Api.node.open.vertical = wrap_node(open_or_expand_or_dir_up("vsplit"))
+Api.node.open.vertical_no_picker = wrap_node(open_or_expand_or_dir_up("vsplit_no_picker"))
 Api.node.open.horizontal = wrap_node(open_or_expand_or_dir_up("split"))
+Api.node.open.horizontal_no_picker = wrap_node(open_or_expand_or_dir_up("split_no_picker"))
 Api.node.open.tab = wrap_node(open_or_expand_or_dir_up("tabnew"))
 Api.node.open.toggle_group_empty = wrap_node(open_or_expand_or_dir_up("toggle_group_empty", true))
 Api.node.open.preview = wrap_node(open_or_expand_or_dir_up("preview"))
@@ -282,6 +312,16 @@ Api.node.navigate.diagnostics.prev_recursive = wrap_node(actions.moves.item.fn({
 Api.node.navigate.opened.next = wrap_node(actions.moves.item.fn({ where = "next", what = "opened" }))
 Api.node.navigate.opened.prev = wrap_node(actions.moves.item.fn({ where = "prev", what = "opened" }))

+---@class ApiNodeDeleteWipeBufferOpts
+---@field force boolean|nil default false
+
+Api.node.buffer.delete = wrap_node(function(node, opts)
+  actions.node.buffer.delete(node, opts)
+end)
+Api.node.buffer.wipe = wrap_node(function(node, opts)
+  actions.node.buffer.wipe(node, opts)
+end)
+
 Api.git.reload = wrap_explorer("reload_git")

 Api.events.subscribe = events.subscribe
@@ -311,4 +351,9 @@ Api.commands.get = wrap(function()
  return require("nvim-tree.commands").get()
 end)

+---Create a decorator class by calling :extend()
+---See :help nvim-tree-decorators
+---@type nvim_tree.api.decorator.UserDecorator
+Api.decorator.UserDecorator = UserDecorator --[[@as nvim_tree.api.decorator.UserDecorator]]
+
 return Api
--- a/lua/nvim-tree/appearance/hi-test.lua
+++ b/lua/nvim-tree/appearance/hi-test.lua
@@ -5,6 +5,8 @@ local Class = require("nvim-tree.classic")
 -- others with name and links less than this arbitrary value are short
 local SHORT_LEN = 50

+local namespace_hi_test_id = vim.api.nvim_create_namespace("NvimTreeHiTest")
+
 ---@class (exact) HighlightDisplay: Class for :NvimTreeHiTest
 ---@field group string nvim-tree highlight group name
 ---@field links string link chain to a concretely defined group
@@ -52,7 +54,12 @@ function HighlightDisplay:render(bufnr, fmt, l)
  local text = string.format(fmt, self.group, self.links, self.def)

  vim.api.nvim_buf_set_lines(bufnr, l, -1, true, { text })
-  vim.api.nvim_buf_add_highlight(bufnr, -1, self.group, l, 0, #self.group)
+
+  if vim.fn.has("nvim-0.11") == 1 and vim.hl and vim.hl.range then
+    vim.hl.range(bufnr, namespace_hi_test_id, self.group, { l, 0 }, { l, #self.group, }, {})
+  else
+    vim.api.nvim_buf_add_highlight(bufnr, -1, self.group, l, 0, #self.group) ---@diagnostic disable-line: deprecated
+  end

  return l + 1
 end
--- a/lua/nvim-tree/diagnostics.lua
+++ b/lua/nvim-tree/diagnostics.lua
@@ -17,7 +17,7 @@ local COC_SEVERITY_LEVELS = {
 }

 ---Absolute Node path to LSP severity level
---@alias NodeSeverities table<string, lsp.DiagnosticSeverity>
+---@alias NodeSeverities table<string, vim.diagnostic.Severity>

 ---@class DiagStatus
 ---@field value lsp.DiagnosticSeverity|nil
@@ -37,33 +37,6 @@ local function uniformize_path(path)
  return utils.canonical_path(path:gsub("\\", "/"))
 end

---Marshal severities from LSP. Does nothing when LSP disabled.
---@return NodeSeverities
-local function from_nvim_lsp()
-  local buffer_severity = {}
-
-  -- is_enabled is not present in all 0.10 builds/releases, see #2781
-  local is_enabled = false
-  if vim.fn.has("nvim-0.10") == 1 and type(vim.diagnostic.is_enabled) == "function" then
-    is_enabled = vim.diagnostic.is_enabled()
-  elseif type(vim.diagnostic.is_disabled) == "function" then ---@diagnostic disable-line: deprecated
-    is_enabled = not vim.diagnostic.is_disabled() ---@diagnostic disable-line: deprecated
-  end
-
-  if is_enabled then
-    for _, diagnostic in ipairs(vim.diagnostic.get(nil, { severity = M.severity })) do
-      if diagnostic.severity and diagnostic.bufnr and vim.api.nvim_buf_is_valid(diagnostic.bufnr) then
-        local bufname = uniformize_path(vim.api.nvim_buf_get_name(diagnostic.bufnr))
-        if not buffer_severity[bufname] or diagnostic.severity < buffer_severity[bufname] then
-          buffer_severity[bufname] = diagnostic.severity
-        end
-      end
-    end
-  end
-
-  return buffer_severity
-end
-
 ---Severity is within diagnostics.severity.min, diagnostics.severity.max
 ---@param severity lsp.DiagnosticSeverity
 ---@param config table
@@ -135,11 +108,8 @@ local function from_cache(node)
    for bufname, severity in pairs(NODE_SEVERITIES) do
      local node_contains_buf = vim.startswith(bufname, nodepath .. "/")
      if node_contains_buf then
-        if severity == M.severity.max then
+        if not max_severity or severity < max_severity then
          max_severity = severity
-          break
-        else
-          max_severity = math.min(max_severity or severity, severity)
        end
      end
    end
@@ -147,32 +117,73 @@ local function from_cache(node)
  return { value = max_severity, cache_version = NODE_SEVERITIES_VERSION }
 end

---Fired on DiagnosticChanged and CocDiagnosticChanged events:
+---Fired on DiagnosticChanged for a single buffer.
+---This will be called on set and reset of diagnostics.
+---On disabling LSP, a reset event will be sent for all buffers.
+---@param ev table standard event with data.diagnostics populated
+function M.update_lsp(ev)
+  if not M.enable or not ev or not ev.data or not ev.data.diagnostics then
+    return
+  end
+
+  local profile_event = log.profile_start("DiagnosticChanged event")
+
+  local diagnostics = vim.diagnostic.get(ev.buf)
+
+  -- use the buffer from the event, as ev.data.diagnostics will be empty on resolved diagnostics
+  local bufname = uniformize_path(vim.api.nvim_buf_get_name(ev.buf))
+
+  ---@type vim.diagnostic.Severity?
+  local new_severity = nil
+
+  -- most severe (lowest) severity in user range
+  for _, diagnostic in ipairs(diagnostics) do
+    if diagnostic.severity >= M.severity.max and diagnostic.severity <= M.severity.min then
+      if not new_severity or diagnostic.severity < new_severity then
+        new_severity = diagnostic.severity
+      end
+    end
+  end
+
+  -- record delta and schedule a redraw
+  if new_severity ~= NODE_SEVERITIES[bufname] then
+    NODE_SEVERITIES[bufname] = new_severity
+    NODE_SEVERITIES_VERSION = NODE_SEVERITIES_VERSION + 1
+
+    utils.debounce("DiagnosticChanged redraw", M.debounce_delay, function()
+      local profile_redraw = log.profile_start("DiagnosticChanged redraw")
+
+      local explorer = core.get_explorer()
+      if explorer then
+        explorer.renderer:draw()
+      end
+
+      log.profile_end(profile_redraw)
+    end)
+  end
+
+  log.profile_end(profile_event)
+end
+
+---Fired on CocDiagnosticChanged events:
 ---debounced retrieval, cache update, version increment and draw
-function M.update()
+function M.update_coc()
  if not M.enable then
    return
  end
-  utils.debounce("diagnostics", M.debounce_delay, function()
-    local profile = log.profile_start("diagnostics update")
-    if is_using_coc() then
-      NODE_SEVERITIES = from_coc()
-    else
-      NODE_SEVERITIES = from_nvim_lsp()
-    end
+  utils.debounce("CocDiagnosticChanged update", M.debounce_delay, function()
+    local profile = log.profile_start("CocDiagnosticChanged update")
+    NODE_SEVERITIES = from_coc()
    NODE_SEVERITIES_VERSION = NODE_SEVERITIES_VERSION + 1
    if log.enabled("diagnostics") then
      for bufname, severity in pairs(NODE_SEVERITIES) do
-        log.line("diagnostics", "Indexing bufname '%s' with severity %d", bufname, severity)
+        log.line("diagnostics", "COC Indexing bufname '%s' with severity %d", bufname, severity)
      end
    end
    log.profile_end(profile)

    local bufnr = view.get_bufnr()
-    local should_draw = bufnr
-      and vim.api.nvim_buf_is_valid(bufnr)
-      and vim.api.nvim_buf_is_loaded(bufnr)
-      and vim.api.nvim_get_option_value("buflisted", { buf = bufnr })
+    local should_draw = bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
    if should_draw then
      local explorer = core.get_explorer()
      if explorer then
--- a/lua/nvim-tree/events.lua
+++ b/lua/nvim-tree/events.lua
@@ -8,6 +8,7 @@ M.Event = {
  Ready = "Ready",
  WillRenameNode = "WillRenameNode",
  NodeRenamed = "NodeRenamed",
+  TreePreOpen = "TreePreOpen",
  TreeOpen = "TreeOpen",
  TreeClose = "TreeClose",
  WillCreateFile = "WillCreateFile",
@@ -91,6 +92,11 @@ function M._dispatch_folder_removed(folder_name)
  dispatch(M.Event.FolderRemoved, { folder_name = folder_name })
 end

+--@private
+function M._dispatch_on_tree_pre_open()
+  dispatch(M.Event.TreePreOpen, nil)
+end
+
 --@private
 function M._dispatch_on_tree_open()
  dispatch(M.Event.TreeOpen, nil)
--- a/lua/nvim-tree/explorer/init.lua
+++ b/lua/nvim-tree/explorer/init.lua
@@ -101,10 +101,19 @@ function Explorer:create_autocmds()
  vim.api.nvim_create_autocmd("BufReadPost", {
    group = self.augroup_id,
    callback = function(data)
-      if (self.filters.state.no_buffer or self.opts.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
+      -- only handle normal files
+      if vim.bo[data.buf].buftype ~= "" then
+        return
+      end
+
+      if self.filters.state.no_buffer then
+        -- full reload is required to update the filter state
        utils.debounce("Buf:filter_buffer_" .. self.uid_explorer, self.opts.view.debounce_delay, function()
          self:reload_explorer()
        end)
+      elseif self.opts.renderer.highlight_opened_files ~= "none" then
+        -- draw to update opened highlight
+        self.renderer:draw()
      end
    end,
  })
@@ -113,10 +122,21 @@ function Explorer:create_autocmds()
  vim.api.nvim_create_autocmd("BufUnload", {
    group = self.augroup_id,
    callback = function(data)
-      if (self.filters.state.no_buffer or self.opts.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
+      -- only handle normal files
+      if vim.bo[data.buf].buftype ~= "" then
+        return
+      end
+
+      if self.filters.state.no_buffer then
+        -- full reload is required to update the filter state
        utils.debounce("Buf:filter_buffer_" .. self.uid_explorer, self.opts.view.debounce_delay, function()
          self:reload_explorer()
        end)
+      elseif self.opts.renderer.highlight_opened_files ~= "none" then
+        -- draw to update opened highlight; must be delayed as the buffer is still loaded during BufUnload
+        vim.schedule(function()
+          self.renderer:draw()
+        end)
      end
    end,
  })
@@ -214,8 +234,9 @@ function Explorer:reload(node, project)
    end

    local abs = utils.path_join({ cwd, name })
-    ---@type uv.fs_stat.result|nil
-    local stat = vim.loop.fs_lstat(abs)
+
+    -- path incorrectly specified as an integer
+    local stat = vim.loop.fs_lstat(abs) ---@diagnostic disable-line param-type-mismatch

    local filter_reason = self.filters:should_filter_as_reason(abs, stat, filter_status)
    if filter_reason == FILTER_REASON.none then
@@ -373,8 +394,9 @@ function Explorer:populate_children(handle, cwd, node, project, parent)
    if Watcher.is_fs_event_capable(abs) then
      local profile = log.profile_start("populate_children %s", abs)

-      ---@type uv.fs_stat.result|nil
-      local stat = vim.loop.fs_lstat(abs)
+      -- path incorrectly specified as an integer
+      local stat = vim.loop.fs_lstat(abs) ---@diagnostic disable-line param-type-mismatch
+
      local filter_reason = parent.filters:should_filter_as_reason(abs, stat, filter_status)
      if filter_reason == FILTER_REASON.none and not nodes_by_path[abs] then
        local child = node_factory.create({
@@ -389,9 +411,9 @@ function Explorer:populate_children(handle, cwd, node, project, parent)
          nodes_by_path[child.absolute_path] = true
          child:update_git_status(node_ignored, project)
        end
-      else
+      elseif node.hidden_stats then
        for reason, value in pairs(FILTER_REASON) do
-          if filter_reason == value then
+          if filter_reason == value and type(node.hidden_stats[reason]) == "number" then
            node.hidden_stats[reason] = node.hidden_stats[reason] + 1
          end
        end
@@ -530,7 +552,7 @@ function Explorer:place_cursor_on_node()
 end

 ---Api.tree.get_nodes
---@return Node
+---@return nvim_tree.api.Node
 function Explorer:get_nodes()
  return self:clone()
 end
--- a/lua/nvim-tree/help.lua
+++ b/lua/nvim-tree/help.lua
@@ -11,6 +11,8 @@ local WIN_HL = table.concat({
  "CursorLine:NvimTreeCursorLine",
 }, ",")

+local namespace_help_id = vim.api.nvim_create_namespace("NvimTreeHelp")
+
 local M = {
  config = {},

@@ -82,8 +84,8 @@ end

 --- Compute all lines for the buffer
 ---@param map table keymap.get_keymap
---@return table strings of text
---@return table arrays of arguments 3-6 for nvim_buf_add_highlight()
+---@return string[] lines of text
+---@return HighlightRangeArgs[] hl_range_args for lines
 ---@return number maximum length of text
 local function compute(map)
  local head_lhs = "nvim-tree mappings"
@@ -130,10 +132,10 @@ local function compute(map)
  local width = #lines[1]

  -- header highlight, assume one character keys
-  local hl = {
-    { "NvimTreeFolderName", 0, 0,         #head_lhs },
-    { "NvimTreeFolderName", 0, width - 1, width },
-    { "NvimTreeFolderName", 1, width - 1, width },
+  local hl_range_args = {
+    { higroup = "NvimTreeFolderName", start = { 0, 0, },         finish = { 0, #head_lhs, }, },
+    { higroup = "NvimTreeFolderName", start = { 0, width - 1, }, finish = { 0, width, }, },
+    { higroup = "NvimTreeFolderName", start = { 1, width - 1, }, finish = { 1, width, }, },
  }

  -- mappings, left padded 1
@@ -145,10 +147,10 @@ local function compute(map)
    width = math.max(#line, width)

    -- highlight lhs
-    table.insert(hl, { "NvimTreeFolderName", i + 1, 1, #l.lhs + 1 })
+    table.insert(hl_range_args, { higroup = "NvimTreeFolderName", start = { i + 1, 1, }, finish = { i + 1, #l.lhs + 1, }, })
  end

-  return lines, hl, width
+  return lines, hl_range_args, width
 end

 --- close the window and delete the buffer, if they exist
@@ -172,7 +174,7 @@ local function open()
  local map = keymap.get_keymap()

  -- text and highlight
-  local lines, hl, width = compute(map)
+  local lines, hl_range_args, width = compute(map)

  -- create the buffer
  M.bufnr = vim.api.nvim_create_buf(false, true)
@@ -187,8 +189,12 @@ local function open()
  end

  -- highlight it
-  for _, h in ipairs(hl) do
-    vim.api.nvim_buf_add_highlight(M.bufnr, -1, h[1], h[2], h[3], h[4])
+  for _, args in ipairs(hl_range_args) do
+    if vim.fn.has("nvim-0.11") == 1 and vim.hl and vim.hl.range then
+      vim.hl.range(M.bufnr, namespace_help_id, args.higroup, args.start, args.finish, {})
+    else
+      vim.api.nvim_buf_add_highlight(M.bufnr, -1, args.higroup, args.start[1], args.start[2], args.finish[2]) ---@diagnostic disable-line: deprecated
+    end
  end

  -- open a very restricted window
--- a/lua/nvim-tree/lib.lua
+++ b/lua/nvim-tree/lib.lua
@@ -1,6 +1,5 @@
 local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
-local events = require("nvim-tree.events")
 local notify = require("nvim-tree.notify")

 ---@class LibOpenOpts
@@ -130,7 +129,6 @@ function M.open(opts)
    open_view_and_draw()
  end
  view.restore_tab_state()
-  events._dispatch_on_tree_open()
 end

 function M.setup(opts)
--- a/lua/nvim-tree/node/directory-link.lua
+++ b/lua/nvim-tree/node/directory-link.lua
@@ -73,9 +73,10 @@ function DirectoryLinkNode:highlighted_name()
 end

 ---Create a sanitized partial copy of a node, populating children recursively.
---@return DirectoryLinkNode cloned
-function DirectoryLinkNode:clone()
-  local clone = DirectoryNode.clone(self) --[[@as DirectoryLinkNode]]
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.DirectoryLinkNode cloned
+function DirectoryLinkNode:clone(api_nodes)
+  local clone = DirectoryNode.clone(self, api_nodes) --[[@as nvim_tree.api.DirectoryLinkNode]]

  clone.link_to = self.link_to
  clone.fs_stat_target = self.fs_stat_target
--- a/lua/nvim-tree/node/directory.lua
+++ b/lua/nvim-tree/node/directory.lua
@@ -271,18 +271,20 @@ function DirectoryNode:highlighted_name()
 end

 ---Create a sanitized partial copy of a node, populating children recursively.
---@return DirectoryNode cloned
-function DirectoryNode:clone()
-  local clone        = Node.clone(self) --[[@as DirectoryNode]]
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.DirectoryNode cloned
+function DirectoryNode:clone(api_nodes)
+  local clone        = Node.clone(self, api_nodes) --[[@as nvim_tree.api.DirectoryNode]]

  clone.has_children = self.has_children
-  clone.group_next   = nil
  clone.nodes        = {}
  clone.open         = self.open
-  clone.hidden_stats = nil

+  local clone_child
  for _, child in ipairs(self.nodes) do
-    table.insert(clone.nodes, child:clone())
+    clone_child = child:clone(api_nodes)
+    clone_child.parent = clone
+    table.insert(clone.nodes, clone_child)
  end

  return clone
--- a/lua/nvim-tree/node/file-link.lua
+++ b/lua/nvim-tree/node/file-link.lua
@@ -58,9 +58,10 @@ function FileLinkNode:highlighted_name()
 end

 ---Create a sanitized partial copy of a node
---@return FileLinkNode cloned
-function FileLinkNode:clone()
-  local clone = FileNode.clone(self) --[[@as FileLinkNode]]
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.FileLinkNode cloned
+function FileLinkNode:clone(api_nodes)
+  local clone = FileNode.clone(self, api_nodes) --[[@as nvim_tree.api.FileLinkNode]]

  clone.link_to = self.link_to
  clone.fs_stat_target = self.fs_stat_target
--- a/lua/nvim-tree/node/file.lua
+++ b/lua/nvim-tree/node/file.lua
@@ -94,9 +94,10 @@ function FileNode:highlighted_name()
 end

 ---Create a sanitized partial copy of a node
---@return FileNode cloned
-function FileNode:clone()
-  local clone = Node.clone(self) --[[@as FileNode]]
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.FileNode cloned
+function FileNode:clone(api_nodes)
+  local clone = Node.clone(self, api_nodes) --[[@as nvim_tree.api.FileNode]]

  clone.extension = self.extension

--- a/lua/nvim-tree/node/init.lua
+++ b/lua/nvim-tree/node/init.lua
@@ -2,6 +2,7 @@ local Class = require("nvim-tree.classic")

 ---Abstract Node class.
 ---@class (exact) Node: Class
+---@field uid_node number vim.loop.hrtime() at construction time
 ---@field type "file" | "directory" | "link" uv.fs_stat.result.type
 ---@field explorer Explorer
 ---@field absolute_path string
@@ -25,6 +26,7 @@ local Node = Class:extend()
 ---@protected
 ---@param args NodeArgs
 function Node:new(args)
+  self.uid_node      = vim.loop.hrtime()
  self.explorer      = args.explorer
  self.absolute_path = args.absolute_path
  self.executable    = false
@@ -112,21 +114,19 @@ end

 ---Highlighted name for the node
 ---Empty for base Node
---@return HighlightedString icon
+---@return HighlightedString name
 function Node:highlighted_name()
  return self:highlighted_name_empty()
 end

 ---Create a sanitized partial copy of a node, populating children recursively.
---@return Node cloned
-function Node:clone()
-  ---@type Explorer
-  local explorer_placeholder = nil
-
-  ---@type Node
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.Node cloned
+function Node:clone(api_nodes)
+  ---@type nvim_tree.api.Node
  local clone = {
+    uid_node      = self.uid_node,
    type          = self.type,
-    explorer      = explorer_placeholder,
    absolute_path = self.absolute_path,
    executable    = self.executable,
    fs_stat       = self.fs_stat,
@@ -134,10 +134,13 @@ function Node:clone()
    hidden        = self.hidden,
    name          = self.name,
    parent        = nil,
-    diag_status   = nil,
-    is_dot        = self.is_dot,
+    diag_severity = self.diag_status and self.diag_status.value or nil,
  }

+  if api_nodes then
+    api_nodes[self.uid_node] = clone
+  end
+
  return clone
 end

--- a/lua/nvim-tree/node/link.lua
+++ b/lua/nvim-tree/node/link.lua
@@ -2,7 +2,7 @@ local Class = require("nvim-tree.classic")

 ---@class (exact) LinkNode: Class
 ---@field link_to string
---@field protected fs_stat_target uv.fs_stat.result
+---@field fs_stat_target uv.fs_stat.result
 local LinkNode = Class:extend()

 ---@class (exact) LinkNodeArgs: NodeArgs
--- a/lua/nvim-tree/node/root.lua
+++ b/lua/nvim-tree/node/root.lua
@@ -22,4 +22,13 @@ function RootNode:destroy()
  DirectoryNode.destroy(self)
 end

+---Create a sanitized partial copy of a node, populating children recursively.
+---@param api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node to populate
+---@return nvim_tree.api.RootNode cloned
+function RootNode:clone(api_nodes)
+  local clone = DirectoryNode.clone(self, api_nodes) --[[@as nvim_tree.api.RootNode]]
+
+  return clone
+end
+
 return RootNode
--- a/lua/nvim-tree/renderer/builder.lua
+++ b/lua/nvim-tree/renderer/builder.lua
@@ -3,32 +3,39 @@ local utils = require("nvim-tree.utils")
 local view = require("nvim-tree.view")

 local Class = require("nvim-tree.classic")
+
 local DirectoryNode = require("nvim-tree.node.directory")

-local DecoratorBookmarks = require("nvim-tree.renderer.decorator.bookmarks")
-local DecoratorCopied = require("nvim-tree.renderer.decorator.copied")
-local DecoratorCut = require("nvim-tree.renderer.decorator.cut")
-local DecoratorDiagnostics = require("nvim-tree.renderer.decorator.diagnostics")
-local DecoratorGit = require("nvim-tree.renderer.decorator.git")
-local DecoratorModified = require("nvim-tree.renderer.decorator.modified")
-local DecoratorHidden = require("nvim-tree.renderer.decorator.hidden")
-local DecoratorOpened = require("nvim-tree.renderer.decorator.opened")
+local BookmarkDecorator = require("nvim-tree.renderer.decorator.bookmarks")
+local CopiedDecorator = require("nvim-tree.renderer.decorator.copied")
+local CutDecorator = require("nvim-tree.renderer.decorator.cut")
+local DiagnosticsDecorator = require("nvim-tree.renderer.decorator.diagnostics")
+local GitDecorator = require("nvim-tree.renderer.decorator.git")
+local HiddenDecorator = require("nvim-tree.renderer.decorator.hidden")
+local ModifiedDecorator = require("nvim-tree.renderer.decorator.modified")
+local OpenDecorator = require("nvim-tree.renderer.decorator.opened")
+local UserDecorator = require("nvim-tree.renderer.decorator.user")

 local pad = require("nvim-tree.renderer.components.padding")

---@class (exact) HighlightedString
---@field str string
---@field hl string[]
+---@alias HighlightedString nvim_tree.api.HighlightedString

---@class (exact) AddHighlightArgs
---@field group string[]
---@field line number
---@field col_start number
---@field col_end number
+-- Builtin Decorators
+---@type table<nvim_tree.api.decorator.Name, Decorator>
+local BUILTIN_DECORATORS = {
+  Git = GitDecorator,
+  Open = OpenDecorator,
+  Hidden = HiddenDecorator,
+  Modified = ModifiedDecorator,
+  Bookmark = BookmarkDecorator,
+  Diagnostics = DiagnosticsDecorator,
+  Copied = CopiedDecorator,
+  Cut = CutDecorator,
+}

 ---@class (exact) Builder
 ---@field lines string[] includes icons etc.
---@field hl_args AddHighlightArgs[] line highlights
+---@field hl_range_args HighlightRangeArgs[] highlights for lines
 ---@field signs string[] line signs
 ---@field extmarks table[] extra marks for right icon placement
 ---@field virtual_lines table[] virtual lines for hidden count display
@@ -39,6 +46,7 @@ local pad = require("nvim-tree.renderer.components.padding")
 ---@field private markers boolean[] indent markers
 ---@field private decorators Decorator[]
 ---@field private hidden_display fun(node: Node): string|nil
+---@field private api_nodes table<number, nvim_tree.api.Node>? optional map of uids to api node for user decorators
 local Builder = Class:extend()

 ---@class Builder
@@ -53,25 +61,37 @@ function Builder:new(args)
  self.explorer        = args.explorer
  self.index           = 0
  self.depth           = 0
-  self.hl_args         = {}
+  self.hl_range_args   = {}
  self.combined_groups = {}
  self.lines           = {}
  self.markers         = {}
  self.signs           = {}
  self.extmarks        = {}
  self.virtual_lines   = {}
-  self.decorators      = {
-    -- priority order
-    DecoratorCut({ explorer = args.explorer }),
-    DecoratorCopied({ explorer = args.explorer }),
-    DecoratorDiagnostics({ explorer = args.explorer }),
-    DecoratorBookmarks({ explorer = args.explorer }),
-    DecoratorModified({ explorer = args.explorer }),
-    DecoratorHidden({ explorer = args.explorer }),
-    DecoratorOpened({ explorer = args.explorer }),
-    DecoratorGit({ explorer = args.explorer })
-  }
+  self.decorators      = {}
  self.hidden_display  = Builder:setup_hidden_display_function(self.explorer.opts)
+
+  -- instantiate all the builtin and user decorator instances
+  local builtin, user
+  for _, d in ipairs(self.explorer.opts.renderer.decorators) do
+    ---@type Decorator
+    builtin = BUILTIN_DECORATORS[d]
+
+    ---@type UserDecorator
+    user = type(d) == "table" and type(d.as) == "function" and d:as(UserDecorator)
+
+    if builtin then
+      table.insert(self.decorators, builtin({ explorer = self.explorer }))
+    elseif user then
+      table.insert(self.decorators, user())
+
+      -- clone user nodes once
+      if not self.api_nodes then
+        self.api_nodes = {}
+        self.explorer:clone(self.api_nodes)
+      end
+    end
+  end
 end

 ---Insert ranged highlight groups into self.highlights
@@ -80,7 +100,9 @@ end
 ---@param start number
 ---@param end_ number|nil
 function Builder:insert_highlight(groups, start, end_)
-  table.insert(self.hl_args, { groups, self.index, start, end_ or -1 })
+  for _, higroup in ipairs(groups) do
+    table.insert(self.hl_range_args, { higroup = higroup, start = { self.index, start, }, finish = { self.index, end_ or -1, } })
+  end
 end

 ---@private
@@ -131,22 +153,25 @@ function Builder:format_line(indent_markers, arrows, icon, name, node)
    end
  end

+  -- use the api node for user decorators
+  local api_node = self.api_nodes and self.api_nodes[node.uid_node] --[[@as Node]]
+
  local line = { indent_markers, arrows }
  add_to_end(line, { icon })

-  for i = #self.decorators, 1, -1 do
-    add_to_end(line, self.decorators[i]:icons_before(node))
+  for _, d in ipairs(self.decorators) do
+    add_to_end(line, d:icons_before(not d:is(UserDecorator) and node or api_node))
  end

  add_to_end(line, { name })

-  for i = #self.decorators, 1, -1 do
-    add_to_end(line, self.decorators[i]:icons_after(node))
+  for _, d in ipairs(self.decorators) do
+    add_to_end(line, d:icons_after(not d:is(UserDecorator) and node or api_node))
  end

  local rights = {}
-  for i = #self.decorators, 1, -1 do
-    add_to_end(rights, self.decorators[i]:icons_right_align(node))
+  for _, d in ipairs(self.decorators) do
+    add_to_end(rights, d:icons_right_align(not d:is(UserDecorator) and node or api_node))
  end
  if #rights > 0 then
    self.extmarks[self.index] = rights
@@ -158,10 +183,14 @@ end
 ---@private
 ---@param node Node
 function Builder:build_signs(node)
+  -- use the api node for user decorators
+  local api_node = self.api_nodes and self.api_nodes[node.uid_node] --[[@as Node]]
+
  -- first in priority order
-  local sign_name
-  for _, d in ipairs(self.decorators) do
-    sign_name = d:sign_name(node)
+  local d, sign_name
+  for i = #self.decorators, 1, -1 do
+    d = self.decorators[i]
+    sign_name = d:sign_name(not d:is(UserDecorator) and node or api_node)
    if sign_name then
      self.signs[self.index] = sign_name
      break
@@ -197,43 +226,50 @@ function Builder:create_combined_group(groups)
  return combined_name
 end

---Calculate highlight group for icon and name. A combined highlight group will be created
---when there is more than one highlight.
+---Calculate decorated icon and name for a node.
+---A combined highlight group will be created when there is more than one highlight.
 ---A highlight group is always calculated and upserted for the case of highlights changing.
 ---@private
 ---@param node Node
---@return string|nil icon_hl_group
---@return string|nil name_hl_group
-function Builder:add_highlights(node)
-  -- result
-  local icon_hl_group, name_hl_group
+---@return HighlightedString icon
+---@return HighlightedString name
+function Builder:icon_name_decorated(node)
+  -- use the api node for user decorators
+  local api_node = self.api_nodes and self.api_nodes[node.uid_node] --[[@as Node]]

-  -- calculate all groups
+  -- base case
+  local icon = node:highlighted_icon()
+  local name = node:highlighted_name()
+
+  -- calculate node icon and all decorated highlight groups
  local icon_groups = {}
  local name_groups = {}
-  local d, icon, name
-  for i = #self.decorators, 1, -1 do
-    d = self.decorators[i]
-    icon, name = d:groups_icon_name(node)
-    table.insert(icon_groups, icon)
-    table.insert(name_groups, name)
+  local hl_icon, hl_name
+  for _, d in ipairs(self.decorators) do
+    -- maybe overridde icon
+    icon = d:icon_node((not d:is(UserDecorator) and node or api_node)) or icon
+
+    hl_icon, hl_name = d:highlight_group_icon_name((not d:is(UserDecorator) and node or api_node))
+
+    table.insert(icon_groups, hl_icon)
+    table.insert(name_groups, hl_name)
  end

-  -- one or many icon groups
+  -- add one or many icon groups
  if #icon_groups > 1 then
-    icon_hl_group = self:create_combined_group(icon_groups)
+    table.insert(icon.hl, self:create_combined_group(icon_groups))
  else
-    icon_hl_group = icon_groups[1]
+    table.insert(icon.hl, icon_groups[1])
  end

-  -- one or many name groups
+  -- add one or many name groups
  if #name_groups > 1 then
-    name_hl_group = self:create_combined_group(name_groups)
+    table.insert(name.hl, self:create_combined_group(name_groups))
  else
-    name_hl_group = name_groups[1]
+    table.insert(name.hl, name_groups[1])
  end

-  return icon_hl_group, name_hl_group
+  return icon, name
 end

 ---Insert node line into self.lines, calling Builder:build_lines for each directory
@@ -246,13 +282,8 @@ function Builder:build_line(node, idx, num_children)
  local indent_markers = pad.get_indent_markers(self.depth, idx, num_children, node, self.markers)
  local arrows = pad.get_arrows(node)

-  -- main components
-  local icon, name = node:highlighted_icon(), node:highlighted_name()
-
-  -- highighting
-  local icon_hl_group, name_hl_group = self:add_highlights(node)
-  table.insert(icon.hl, icon_hl_group)
-  table.insert(name.hl, name_hl_group)
+  -- decorated node icon and name
+  local icon, name = self:icon_name_decorated(node)

  local line = self:format_line(indent_markers, arrows, icon, name, node)
  table.insert(self.lines, self:unwrap_highlighted_strings(line))
--- a/lua/nvim-tree/renderer/components/full-name.lua
+++ b/lua/nvim-tree/renderer/components/full-name.lua
@@ -64,6 +64,7 @@ local function show()
    height    = 1,
    noautocmd = true,
    style     = "minimal",
+    border    = "none"
  })

  local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
@@ -79,9 +80,15 @@ local function show()
      ---@type vim.api.keyset.extmark_details
      local details = extmark[4]

-      vim.api.nvim_buf_add_highlight(0, ns_id, details.hl_group, 0, col, details.end_col)
+      if type(details) == "table" then
+        if vim.fn.has("nvim-0.11") == 1 and vim.hl and vim.hl.range then
+          vim.hl.range(0, ns_id, details.hl_group, { 0, col }, { 0, details.end_col, }, {})
+        else
+          vim.api.nvim_buf_add_highlight(0, ns_id, details.hl_group, 0, col, details.end_col) ---@diagnostic disable-line: deprecated
+        end
+      end
    end
-    vim.cmd([[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=hide ]])
+    vim.cmd([[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=wipe ]])
  end)
 end

--- a/lua/nvim-tree/renderer/decorator/bookmarks.lua
+++ b/lua/nvim-tree/renderer/decorator/bookmarks.lua
@@ -1,21 +1,21 @@
 local Decorator = require("nvim-tree.renderer.decorator")

---@class (exact) DecoratorBookmarks: Decorator
---@field icon HighlightedString?
-local DecoratorBookmarks = Decorator:extend()
+---@class (exact) BookmarkDecorator: Decorator
+---@field private explorer Explorer
+---@field private icon HighlightedString?
+local BookmarkDecorator = Decorator:extend()

---@class DecoratorBookmarks
---@overload fun(explorer: DecoratorArgs): DecoratorBookmarks
+---@class BookmarkDecorator
+---@overload fun(args: DecoratorArgs): BookmarkDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorBookmarks:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_bookmarks or "none",
-    icon_placement = args.explorer.opts.renderer.icons.bookmarks_placement or "none",
-  })
+function BookmarkDecorator:new(args)
+  self.explorer        = args.explorer
+
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_bookmarks or "none"
+  self.icon_placement  = self.explorer.opts.renderer.icons.bookmarks_placement or "none"

  if self.explorer.opts.renderer.icons.show.bookmarks then
    self.icon = {
@@ -28,8 +28,8 @@ end

 ---Bookmark icon: renderer.icons.show.bookmarks and node is marked
 ---@param node Node
---@return HighlightedString[]|nil icons
-function DecoratorBookmarks:calculate_icons(node)
+---@return HighlightedString[]? icons
+function BookmarkDecorator:icons(node)
  if self.explorer.marks:get(node) then
    return { self.icon }
  end
@@ -37,11 +37,11 @@ end

 ---Bookmark highlight: renderer.highlight_bookmarks and node is marked
 ---@param node Node
---@return string|nil group
-function DecoratorBookmarks:calculate_highlight(node)
-  if self.range ~= "none" and self.explorer.marks:get(node) then
+---@return string? highlight_group
+function BookmarkDecorator:highlight_group(node)
+  if self.highlight_range ~= "none" and self.explorer.marks:get(node) then
    return "NvimTreeBookmarkHL"
  end
 end

-return DecoratorBookmarks
+return BookmarkDecorator
--- a/lua/nvim-tree/renderer/decorator/copied.lua
+++ b/lua/nvim-tree/renderer/decorator/copied.lua
@@ -1,29 +1,29 @@
 local Decorator = require("nvim-tree.renderer.decorator")

---@class (exact) DecoratorCopied: Decorator
-local DecoratorCopied = Decorator:extend()
+---@class (exact) CopiedDecorator: Decorator
+---@field private explorer Explorer
+local CopiedDecorator = Decorator:extend()

---@class DecoratorCopied
---@overload fun(explorer: DecoratorArgs): DecoratorCopied
+---@class CopiedDecorator
+---@overload fun(args: DecoratorArgs): CopiedDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorCopied:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_clipboard or "none",
-    icon_placement = "none",
-  })
+function CopiedDecorator:new(args)
+  self.explorer   = args.explorer
+
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_clipboard or "none"
+  self.icon_placement  = "none"
 end

 ---Copied highlight: renderer.highlight_clipboard and node is copied
 ---@param node Node
---@return string|nil group
-function DecoratorCopied:calculate_highlight(node)
-  if self.range ~= "none" and self.explorer.clipboard:is_copied(node) then
+---@return string? highlight_group
+function CopiedDecorator:highlight_group(node)
+  if self.highlight_range ~= "none" and self.explorer.clipboard:is_copied(node) then
    return "NvimTreeCopiedHL"
  end
 end

-return DecoratorCopied
+return CopiedDecorator
--- a/lua/nvim-tree/renderer/decorator/cut.lua
+++ b/lua/nvim-tree/renderer/decorator/cut.lua
@@ -1,29 +1,29 @@
 local Decorator = require("nvim-tree.renderer.decorator")

---@class (exact) DecoratorCut: Decorator
-local DecoratorCut = Decorator:extend()
+---@class (exact) CutDecorator: Decorator
+---@field private explorer Explorer
+local CutDecorator = Decorator:extend()

---@class DecoratorCut
---@overload fun(explorer: DecoratorArgs): DecoratorCut
+---@class CutDecorator
+---@overload fun(args: DecoratorArgs): CutDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorCut:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_clipboard or "none",
-    icon_placement = "none",
-  })
+function CutDecorator:new(args)
+  self.explorer        = args.explorer
+
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_clipboard or "none"
+  self.icon_placement  = "none"
 end

 ---Cut highlight: renderer.highlight_clipboard and node is cut
 ---@param node Node
---@return string|nil group
-function DecoratorCut:calculate_highlight(node)
-  if self.range ~= "none" and self.explorer.clipboard:is_cut(node) then
+---@return string? highlight_group
+function CutDecorator:highlight_group(node)
+  if self.highlight_range ~= "none" and self.explorer.clipboard:is_cut(node) then
    return "NvimTreeCutHL"
  end
 end

-return DecoratorCut
+return CutDecorator
--- a/lua/nvim-tree/renderer/decorator/diagnostics.lua
+++ b/lua/nvim-tree/renderer/decorator/diagnostics.lua
@@ -30,58 +30,54 @@ local ICON_KEYS = {
  ["hint"] = vim.diagnostic.severity.HINT,
 }

---@class (exact) DecoratorDiagnostics: Decorator
---@field icons HighlightedString[]?
-local DecoratorDiagnostics = Decorator:extend()
+---@class (exact) DiagnosticsDecorator: Decorator
+---@field private explorer Explorer
+---@field private diag_icons HighlightedString[]?
+local DiagnosticsDecorator = Decorator:extend()

---@class DecoratorDiagnostics
---@overload fun(explorer: DecoratorArgs): DecoratorDiagnostics
+---@class DiagnosticsDecorator
+---@overload fun(args: DecoratorArgs): DiagnosticsDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorDiagnostics:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_diagnostics or "none",
-    icon_placement = args.explorer.opts.renderer.icons.diagnostics_placement or "none",
-  })
+function DiagnosticsDecorator:new(args)
+  self.explorer        = args.explorer

-  if not self.enabled then
-    return
-  end
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_diagnostics or "none"
+  self.icon_placement  = self.explorer.opts.renderer.icons.diagnostics_placement or "none"

  if self.explorer.opts.renderer.icons.show.diagnostics then
-    self.icons = {}
+    self.diag_icons = {}
    for name, sev in pairs(ICON_KEYS) do
-      self.icons[sev] = {
+      self.diag_icons[sev] = {
        str = self.explorer.opts.diagnostics.icons[name],
        hl = { HG_ICON[sev] },
      }
-      self:define_sign(self.icons[sev])
+      self:define_sign(self.diag_icons[sev])
    end
  end
 end

 ---Diagnostic icon: diagnostics.enable, renderer.icons.show.diagnostics and node has status
 ---@param node Node
---@return HighlightedString[]|nil icons
-function DecoratorDiagnostics:calculate_icons(node)
-  if node and self.enabled and self.icons then
+---@return HighlightedString[]? icons
+function DiagnosticsDecorator:icons(node)
+  if node and self.diag_icons then
    local diag_status = diagnostics.get_diag_status(node)
    local diag_value = diag_status and diag_status.value

    if diag_value then
-      return { self.icons[diag_value] }
+      return { self.diag_icons[diag_value] }
    end
  end
 end

 ---Diagnostic highlight: diagnostics.enable, renderer.highlight_diagnostics and node has status
 ---@param node Node
---@return string|nil group
-function DecoratorDiagnostics:calculate_highlight(node)
-  if not node or not self.enabled or self.range == "none" then
+---@return string? highlight_group
+function DiagnosticsDecorator:highlight_group(node)
+  if self.highlight_range == "none" then
    return nil
  end

@@ -106,4 +102,4 @@ function DecoratorDiagnostics:calculate_highlight(node)
  end
 end

-return DecoratorDiagnostics
+return DiagnosticsDecorator
--- a/lua/nvim-tree/renderer/decorator/git.lua
+++ b/lua/nvim-tree/renderer/decorator/git.lua
@@ -3,7 +3,7 @@ local notify = require("nvim-tree.notify")
 local Decorator = require("nvim-tree.renderer.decorator")
 local DirectoryNode = require("nvim-tree.node.directory")

---@class (exact) GitHighlightedString: HighlightedString
+---@class (exact) GitHighlightedString: nvim_tree.api.HighlightedString
 ---@field ord number decreasing priority

 ---@alias GitStatusStrings "deleted" | "ignored" | "renamed" | "staged" | "unmerged" | "unstaged" | "untracked"
@@ -12,31 +12,31 @@ local DirectoryNode = require("nvim-tree.node.directory")
 ---@alias GitIconsByXY table<GitXY, GitHighlightedString[]> porcelain status
 ---@alias GitGlyphsByStatus table<GitStatusStrings, string> from opts

---@class (exact) DecoratorGit: Decorator
---@field file_hl_by_xy table<GitXY, string>?
---@field folder_hl_by_xy table<GitXY, string>?
---@field icons_by_status GitIconsByStatus?
---@field icons_by_xy GitIconsByXY?
-local DecoratorGit = Decorator:extend()
+---@class (exact) GitDecorator: Decorator
+---@field private explorer Explorer
+---@field private file_hl_by_xy table<GitXY, string>?
+---@field private folder_hl_by_xy table<GitXY, string>?
+---@field private icons_by_status GitIconsByStatus?
+---@field private icons_by_xy GitIconsByXY?
+local GitDecorator = Decorator:extend()

---@class DecoratorGit
---@overload fun(explorer: DecoratorArgs): DecoratorGit
+---@class GitDecorator
+---@overload fun(args: DecoratorArgs): GitDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorGit:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = args.explorer.opts.git.enable,
-    hl_pos         = args.explorer.opts.renderer.highlight_git or "none",
-    icon_placement = args.explorer.opts.renderer.icons.git_placement or "none",
-  })
+function GitDecorator:new(args)
+  self.explorer        = args.explorer
+
+  self.enabled         = self.explorer.opts.git.enable
+  self.highlight_range = self.explorer.opts.renderer.highlight_git or "none"
+  self.icon_placement  = self.explorer.opts.renderer.icons.git_placement or "none"

  if not self.enabled then
    return
  end

-  if self.range ~= "none" then
+  if self.highlight_range ~= "none" then
    self:build_file_folder_hl_by_xy()
  end

@@ -51,7 +51,7 @@ function DecoratorGit:new(args)
 end

 ---@param glyphs GitGlyphsByStatus
-function DecoratorGit:build_icons_by_status(glyphs)
+function GitDecorator:build_icons_by_status(glyphs)
  self.icons_by_status           = {}
  self.icons_by_status.staged    = { str = glyphs.staged, hl = { "NvimTreeGitStagedIcon" }, ord = 1 }
  self.icons_by_status.unstaged  = { str = glyphs.unstaged, hl = { "NvimTreeGitDirtyIcon" }, ord = 2 }
@@ -63,7 +63,7 @@ function DecoratorGit:build_icons_by_status(glyphs)
 end

 ---@param icons GitIconsByXY
-function DecoratorGit:build_icons_by_xy(icons)
+function GitDecorator:build_icons_by_xy(icons)
  self.icons_by_xy = {
    ["M "] = { icons.staged },
    [" M"] = { icons.unstaged },
@@ -100,7 +100,7 @@ function DecoratorGit:build_icons_by_xy(icons)
  }
 end

-function DecoratorGit:build_file_folder_hl_by_xy()
+function GitDecorator:build_file_folder_hl_by_xy()
  self.file_hl_by_xy = {
    ["M "] = "NvimTreeGitFileStagedHL",
    ["C "] = "NvimTreeGitFileStagedHL",
@@ -142,9 +142,9 @@ end

 ---Git icons: git.enable, renderer.icons.show.git and node has status
 ---@param node Node
---@return HighlightedString[]|nil modified icon
-function DecoratorGit:calculate_icons(node)
-  if not node or not self.enabled or not self.icons_by_xy then
+---@return HighlightedString[]? icons
+function GitDecorator:icons(node)
+  if not self.icons_by_xy then
    return nil
  end

@@ -159,7 +159,7 @@ function DecoratorGit:calculate_icons(node)
  for _, s in pairs(git_xy) do
    local icons = self.icons_by_xy[s]
    if not icons then
-      if self.range == "none" then
+      if self.highlight_range == "none" then
        notify.warn(string.format("Unrecognized git state '%s'", git_xy))
      end
      return nil
@@ -190,12 +190,12 @@ end
 ---Get the first icon as the sign if appropriate
 ---@param node Node
 ---@return string|nil name
-function DecoratorGit:sign_name(node)
+function GitDecorator:sign_name(node)
  if self.icon_placement ~= "signcolumn" then
    return
  end

-  local icons = self:calculate_icons(node)
+  local icons = self:icons(node)
  if icons and #icons > 0 then
    return icons[1].hl[1]
  end
@@ -203,9 +203,9 @@ end

 ---Git highlight: git.enable, renderer.highlight_git and node has status
 ---@param node Node
---@return string|nil group
-function DecoratorGit:calculate_highlight(node)
-  if not node or not self.enabled or self.range == "none" then
+---@return string? highlight_group
+function GitDecorator:highlight_group(node)
+  if self.highlight_range == "none" then
    return nil
  end

@@ -221,4 +221,4 @@ function DecoratorGit:calculate_highlight(node)
  end
 end

-return DecoratorGit
+return GitDecorator
--- a/lua/nvim-tree/renderer/decorator/hidden.lua
+++ b/lua/nvim-tree/renderer/decorator/hidden.lua
@@ -1,22 +1,22 @@
 local Decorator = require("nvim-tree.renderer.decorator")
 local DirectoryNode = require("nvim-tree.node.directory")

---@class (exact) DecoratorHidden: Decorator
---@field icon HighlightedString?
-local DecoratorHidden = Decorator:extend()
+---@class (exact) HiddenDecorator: Decorator
+---@field private explorer Explorer
+---@field private icon HighlightedString?
+local HiddenDecorator = Decorator:extend()

---@class DecoratorHidden
---@overload fun(explorer: DecoratorArgs): DecoratorHidden
+---@class HiddenDecorator
+---@overload fun(args: DecoratorArgs): HiddenDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorHidden:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_hidden or "none",
-    icon_placement = args.explorer.opts.renderer.icons.hidden_placement or "none",
-  })
+function HiddenDecorator:new(args)
+  self.explorer        = args.explorer
+
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_hidden or "none"
+  self.icon_placement  = self.explorer.opts.renderer.icons.hidden_placement or "none"

  if self.explorer.opts.renderer.icons.show.hidden then
    self.icon = {
@@ -29,18 +29,18 @@ end

 ---Hidden icon: renderer.icons.show.hidden and node starts with `.` (dotfile).
 ---@param node Node
---@return HighlightedString[]|nil icons
-function DecoratorHidden:calculate_icons(node)
-  if self.enabled and node:is_dotfile() then
+---@return HighlightedString[]? icons
+function HiddenDecorator:icons(node)
+  if node:is_dotfile() then
    return { self.icon }
  end
 end

 ---Hidden highlight: renderer.highlight_hidden and node starts with `.` (dotfile).
 ---@param node Node
---@return string|nil group
-function DecoratorHidden:calculate_highlight(node)
-  if not self.enabled or self.range == "none" or not node:is_dotfile() then
+---@return string? highlight_group
+function HiddenDecorator:highlight_group(node)
+  if self.highlight_range == "none" or not node:is_dotfile() then
    return nil
  end

@@ -51,4 +51,4 @@ function DecoratorHidden:calculate_highlight(node)
  end
 end

-return DecoratorHidden
+return HiddenDecorator
--- a/lua/nvim-tree/renderer/decorator/init.lua
+++ b/lua/nvim-tree/renderer/decorator/init.lua
@@ -1,48 +1,52 @@
 local Class = require("nvim-tree.classic")

---@alias DecoratorRange "none" | "icon" | "name" | "all"
---@alias DecoratorIconPlacement "none" | "before" | "after" | "signcolumn" | "right_align"
-
 ---Abstract Decorator
---Uses the factory pattern to instantiate child instances.
 ---@class (exact) Decorator: Class
---@field protected explorer Explorer
 ---@field protected enabled boolean
---@field protected range DecoratorRange
---@field protected icon_placement DecoratorIconPlacement
+---@field protected highlight_range nvim_tree.api.decorator.HighlightRange
+---@field protected icon_placement nvim_tree.api.decorator.IconPlacement
 local Decorator = Class:extend()

 ---@class (exact) DecoratorArgs
 ---@field explorer Explorer

---@class (exact) AbstractDecoratorArgs: DecoratorArgs
---@field enabled boolean
---@field hl_pos DecoratorRange
---@field icon_placement DecoratorIconPlacement
-
---@protected
---@param args AbstractDecoratorArgs
-function Decorator:new(args)
-  self.explorer       = args.explorer
-  self.enabled        = args.enabled
-  self.range          = args.hl_pos
-  self.icon_placement = args.icon_placement
+---Abstract icon override, optionally implemented
+---@param node Node
+---@return HighlightedString? icon_node
+function Decorator:icon_node(node)
+  return self:nop(node)
 end

---Maybe highlight groups
+---Abstract icons, optionally implemented
+---@protected
 ---@param node Node
---@return string|nil icon highlight group
---@return string|nil name highlight group
-function Decorator:groups_icon_name(node)
+---@return HighlightedString[]? icons
+function Decorator:icons(node)
+  self:nop(node)
+end
+
+---Abstract highlight group, optionally implemented
+---@protected
+---@param node Node
+---@return string? highlight_group
+function Decorator:highlight_group(node)
+  self:nop(node)
+end
+
+---Maybe highlight groups for icon and name
+---@param node Node
+---@return string? icon highlight group
+---@return string? name highlight group
+function Decorator:highlight_group_icon_name(node)
  local icon_hl, name_hl

-  if self.enabled and self.range ~= "none" then
-    local hl = self:calculate_highlight(node)
+  if self.enabled and self.highlight_range ~= "none" then
+    local hl = self:highlight_group(node)

-    if self.range == "all" or self.range == "icon" then
+    if self.highlight_range == "all" or self.highlight_range == "icon" then
      icon_hl = hl
    end
-    if self.range == "all" or self.range == "name" then
+    if self.highlight_range == "all" or self.highlight_range == "name" then
      name_hl = hl
    end
  end
@@ -52,13 +56,13 @@ end

 ---Maybe icon sign
 ---@param node Node
---@return string|nil name
+---@return string? name
 function Decorator:sign_name(node)
  if not self.enabled or self.icon_placement ~= "signcolumn" then
    return
  end

-  local icons = self:calculate_icons(node)
+  local icons = self:icons(node)
  if icons and #icons > 0 then
    return icons[1].hl[1]
  end
@@ -66,56 +70,40 @@ end

 ---Icons when "before"
 ---@param node Node
---@return HighlightedString[]|nil icons
+---@return HighlightedString[]? icons
 function Decorator:icons_before(node)
  if not self.enabled or self.icon_placement ~= "before" then
    return
  end

-  return self:calculate_icons(node)
+  return self:icons(node)
 end

 ---Icons when "after"
 ---@param node Node
---@return HighlightedString[]|nil icons
+---@return HighlightedString[]? icons
 function Decorator:icons_after(node)
  if not self.enabled or self.icon_placement ~= "after" then
    return
  end

-  return self:calculate_icons(node)
+  return self:icons(node)
 end

 ---Icons when "right_align"
 ---@param node Node
---@return HighlightedString[]|nil icons
+---@return HighlightedString[]? icons
 function Decorator:icons_right_align(node)
  if not self.enabled or self.icon_placement ~= "right_align" then
    return
  end

-  return self:calculate_icons(node)
-end
-
---Maybe icons, optionally implemented
---@protected
---@param _ Node
---@return HighlightedString[]|nil icons
-function Decorator:calculate_icons(_)
-  return nil
-end
-
---Maybe highlight group, optionally implemented
---@protected
---@param _ Node
---@return string|nil group
-function Decorator:calculate_highlight(_)
-  return nil
+  return self:icons(node)
 end

 ---Define a sign
 ---@protected
---@param icon HighlightedString|nil
+---@param icon HighlightedString?
 function Decorator:define_sign(icon)
  if icon and #icon.hl > 0 then
    local name = icon.hl[1]
--- a/lua/nvim-tree/renderer/decorator/modified.lua
+++ b/lua/nvim-tree/renderer/decorator/modified.lua
@@ -3,26 +3,22 @@ local buffers = require("nvim-tree.buffers")
 local Decorator = require("nvim-tree.renderer.decorator")
 local DirectoryNode = require("nvim-tree.node.directory")

---@class (exact) DecoratorModified: Decorator
---@field icon HighlightedString?
-local DecoratorModified = Decorator:extend()
+---@class (exact) ModifiedDecorator: Decorator
+---@field private explorer Explorer
+---@field private icon HighlightedString?
+local ModifiedDecorator = Decorator:extend()

---@class DecoratorModified
---@overload fun(explorer: DecoratorArgs): DecoratorModified
+---@class ModifiedDecorator
+---@overload fun(args: DecoratorArgs): ModifiedDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorModified:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_modified or "none",
-    icon_placement = args.explorer.opts.renderer.icons.modified_placement or "none",
-  })
+function ModifiedDecorator:new(args)
+  self.explorer        = args.explorer

-  if not self.enabled then
-    return
-  end
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_modified or "none"
+  self.icon_placement  = self.explorer.opts.renderer.icons.modified_placement or "none"

  if self.explorer.opts.renderer.icons.show.modified then
    self.icon = {
@@ -35,18 +31,18 @@ end

 ---Modified icon: modified.enable, renderer.icons.show.modified and node is modified
 ---@param node Node
---@return HighlightedString[]|nil icons
-function DecoratorModified:calculate_icons(node)
-  if self.enabled and buffers.is_modified(node) then
+---@return HighlightedString[]? icons
+function ModifiedDecorator:icons(node)
+  if buffers.is_modified(node) then
    return { self.icon }
  end
 end

 ---Modified highlight: modified.enable, renderer.highlight_modified and node is modified
 ---@param node Node
---@return string|nil group
-function DecoratorModified:calculate_highlight(node)
-  if not self.enabled or self.range == "none" or not buffers.is_modified(node) then
+---@return string? highlight_group
+function ModifiedDecorator:highlight_group(node)
+  if self.highlight_range == "none" or not buffers.is_modified(node) then
    return nil
  end

@@ -57,4 +53,4 @@ function DecoratorModified:calculate_highlight(node)
  end
 end

-return DecoratorModified
+return ModifiedDecorator
--- a/lua/nvim-tree/renderer/decorator/opened.lua
+++ b/lua/nvim-tree/renderer/decorator/opened.lua
@@ -2,31 +2,31 @@ local buffers = require("nvim-tree.buffers")

 local Decorator = require("nvim-tree.renderer.decorator")

---@class (exact) DecoratorOpened: Decorator
---@field icon HighlightedString|nil
-local DecoratorOpened = Decorator:extend()
+---@class (exact) OpenDecorator: Decorator
+---@field private explorer Explorer
+---@field private icon HighlightedString|nil
+local OpenDecorator = Decorator:extend()

---@class DecoratorOpened
---@overload fun(explorer: DecoratorArgs): DecoratorOpened
+---@class OpenDecorator
+---@overload fun(args: DecoratorArgs): OpenDecorator

 ---@protected
 ---@param args DecoratorArgs
-function DecoratorOpened:new(args)
-  Decorator.new(self, {
-    explorer       = args.explorer,
-    enabled        = true,
-    hl_pos         = args.explorer.opts.renderer.highlight_opened_files or "none",
-    icon_placement = "none",
-  })
+function OpenDecorator:new(args)
+  self.explorer        = args.explorer
+
+  self.enabled         = true
+  self.highlight_range = self.explorer.opts.renderer.highlight_opened_files or "none"
+  self.icon_placement  = "none"
 end

 ---Opened highlight: renderer.highlight_opened_files and node has an open buffer
 ---@param node Node
---@return string|nil group
-function DecoratorOpened:calculate_highlight(node)
-  if self.range ~= "none" and buffers.is_opened(node) then
+---@return string? highlight_group
+function OpenDecorator:highlight_group(node)
+  if self.highlight_range ~= "none" and buffers.is_opened(node) then
    return "NvimTreeOpenedHL"
  end
 end

-return DecoratorOpened
+return OpenDecorator
--- a/lua/nvim-tree/renderer/decorator/user.lua
+++ b/lua/nvim-tree/renderer/decorator/user.lua
@@ -0,0 +1,7 @@
+local Decorator = require("nvim-tree.renderer.decorator")
+
+---Exposed as nvim_tree.api.decorator.UserDecorator
+---@class (exact) UserDecorator: Decorator
+local UserDecorator = Decorator:extend()
+
+return UserDecorator
--- a/lua/nvim-tree/renderer/init.lua
+++ b/lua/nvim-tree/renderer/init.lua
@@ -11,6 +11,8 @@ local namespace_highlights_id = vim.api.nvim_create_namespace("NvimTreeHighlight
 local namespace_extmarks_id = vim.api.nvim_create_namespace("NvimTreeExtmarks")
 local namespace_virtual_lines_id = vim.api.nvim_create_namespace("NvimTreeVirtualLines")

+---@alias HighlightRangeArgs { higroup:string, start:integer[], finish:integer[] } named arguments for vim.hl.range
+
 ---@class (exact) Renderer: Class
 ---@field explorer Explorer
 local Renderer = Class:extend()
@@ -30,11 +32,11 @@ end
 ---@private
 ---@param bufnr number
 ---@param lines string[]
---@param hl_args AddHighlightArgs[]
+---@param hl_range_args HighlightRangeArgs[]
 ---@param signs string[]
 ---@param extmarks table[] extra marks for right icon placement
 ---@param virtual_lines table[] virtual lines for hidden count display
-function Renderer:_draw(bufnr, lines, hl_args, signs, extmarks, virtual_lines)
+function Renderer:_draw(bufnr, lines, hl_range_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
@@ -42,7 +44,7 @@ function Renderer:_draw(bufnr, lines, hl_args, signs, extmarks, virtual_lines)
  end

  vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-  self:render_hl(bufnr, hl_args)
+  self:render_hl(bufnr, hl_range_args)

  if vim.fn.has("nvim-0.10") == 1 then
    vim.api.nvim_set_option_value("modifiable", false, { buf = bufnr })
@@ -77,16 +79,18 @@ function Renderer:_draw(bufnr, lines, hl_args, signs, extmarks, virtual_lines)
 end

 ---@private
-function Renderer:render_hl(bufnr, hl)
+---@param bufnr integer
+---@param hl_range_args HighlightRangeArgs[]
+function Renderer:render_hl(bufnr, hl_range_args)
  if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
    return
  end
  vim.api.nvim_buf_clear_namespace(bufnr, namespace_highlights_id, 0, -1)
-  for _, data in ipairs(hl) do
-    if type(data[1]) == "table" then
-      for _, group in ipairs(data[1]) do
-        vim.api.nvim_buf_add_highlight(bufnr, namespace_highlights_id, group, data[2], data[3], data[4])
-      end
+  for _, args in ipairs(hl_range_args) do
+    if vim.fn.has("nvim-0.11") == 1 and vim.hl and vim.hl.range then
+      vim.hl.range(bufnr, namespace_highlights_id, args.higroup, args.start, args.finish, {})
+    else
+      vim.api.nvim_buf_add_highlight(bufnr, namespace_highlights_id, args.higroup, args.start[1], args.start[2], args.finish[2]) ---@diagnostic disable-line: deprecated
    end
  end
 end
@@ -103,7 +107,7 @@ function Renderer:draw()

  local builder = Builder(self.explorer):build()

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

  if cursor and #builder.lines >= cursor[1] then
    vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -119,7 +119,7 @@ local function get_size(size)
  if type(size) == "number" then
    return size
  elseif type(size) == "function" then
-    return size()
+    return get_size(size())
  end
  local size_as_number = tonumber(size:sub(0, -2))
  local percent_as_decimal = size_as_number / 100
@@ -164,8 +164,10 @@ local function set_window_options_and_buffer()
    local eventignore = vim.api.nvim_get_option("eventignore") ---@diagnostic disable-line: deprecated
    vim.api.nvim_set_option("eventignore", "all") ---@diagnostic disable-line: deprecated

+    -- #3009 vim.api.nvim_win_set_option does not set local scope without explicit winid.
+    -- Revert to opt_local instead of propagating it through for just the 0.10 path.
    for k, v in pairs(M.View.winopts) do
-      vim.api.nvim_win_set_option(0, k, v) ---@diagnostic disable-line: deprecated
+      vim.opt_local[k] = v
    end

    vim.api.nvim_set_option("eventignore", eventignore) ---@diagnostic disable-line: deprecated
@@ -252,7 +254,6 @@ local function close(tabpage)
          return
        end
      end
-      events._dispatch_on_tree_close()
      return
    end
  end
@@ -268,9 +269,12 @@ function M.close_all_tabs()
  end
 end

-function M.close()
+---@param tabpage integer|nil
+function M.close(tabpage)
  if M.View.tab.sync.close then
    M.close_all_tabs()
+  elseif tabpage then
+    close(tabpage)
  else
    M.close_this_tab_only()
  end
@@ -284,6 +288,7 @@ function M.open(options)

  local profile = log.profile_start("view open")

+  events._dispatch_on_tree_pre_open()
  create_buffer()
  open_window()
  M.resize()
@@ -319,8 +324,19 @@ local function grow()
    max_width = get_width(M.View.max_width) - padding
  end

-  for _, l in pairs(lines) do
+  local ns_id = vim.api.nvim_get_namespaces()["NvimTreeExtmarks"]
+  for line_nr, l in pairs(lines) do
    local count = vim.fn.strchars(l)
+    -- also add space for right-aligned icons
+    local extmarks = vim.api.nvim_buf_get_extmarks(M.get_bufnr(), ns_id, { line_nr, 0 }, { line_nr, -1 }, { details = true })
+    for _, extmark in ipairs(extmarks) do
+      local virt_texts = extmark[4].virt_text
+      if virt_texts then
+        for _, virt_text in ipairs(virt_texts) do
+          count = count + vim.fn.strchars(virt_text[1])
+        end
+      end
+    end
    if resizing_width < count then
      resizing_width = count
    end
@@ -398,6 +414,7 @@ end
 ---@param opts OpenInWinOpts|nil
 function M.open_in_win(opts)
  opts = opts or { hijack_current_buf = true, resize = true }
+  events._dispatch_on_tree_pre_open()
  if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then
    vim.api.nvim_set_current_win(opts.winid)
  end
@@ -409,6 +426,7 @@ function M.open_in_win(opts)
    M.reposition_window()
    M.resize()
  end
+  events._dispatch_on_tree_open()
 end

 function M.abandon_current_window()
--- a/lua/nvim-tree/watcher.lua
+++ b/lua/nvim-tree/watcher.lua
@@ -4,6 +4,8 @@ local utils = require("nvim-tree.utils")

 local Class = require("nvim-tree.classic")

+local MESSAGE_EMFILE = "fs.inotify.max_user_watches exceeded, see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting"
+
 local FS_EVENT_FLAGS = {
  -- inotify or equivalent will be used; fallback to stat has not yet been implemented
  stat = false,
@@ -75,6 +77,18 @@ function Event:start()
  local event_cb = vim.schedule_wrap(function(err, filename)
    if err then
      log.line("watcher", "event_cb '%s' '%s' FAIL : %s", self.path, filename, err)
+
+      -- do nothing if watchers have already been disabled
+      if not M.config.filesystem_watchers.enable then
+        return
+      end
+
+      -- EMFILE is catastrophic
+      if name == "EMFILE" then
+        M.disable_watchers(MESSAGE_EMFILE)
+        return
+      end
+
      local message = string.format("File system watcher failed (%s) for path %s, halting watcher.", err, self.path)
      if err == "EPERM" and (utils.is_windows or utils.is_wsl) then
        -- on directory removal windows will cascade the filesystem events out of order
@@ -94,7 +108,7 @@ function Event:start()
  rc, _, name = self.fs_event:start(self.path, FS_EVENT_FLAGS, event_cb)
  if rc ~= 0 then
    if name == "EMFILE" then
-      M.disable_watchers("fs.inotify.max_user_watches exceeded, see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting")
+      M.disable_watchers(MESSAGE_EMFILE)
    else
      notify.warn(string.format("Could not start the fs_event watcher for path %s : %s", self.path, name))
    end
--- a/scripts/luals-check.sh
+++ b/scripts/luals-check.sh
@@ -4,6 +4,8 @@
 # luals-out/check.json will be produced on any issues, returning 1.
 # Outputs only check.json to stdout, all other messages to stderr, to allow jq etc.
 # $VIMRUNTIME specifies neovim runtime path, defaults to "/usr/share/nvim/runtime" if unset.
+#
+# Call with codestyle-check param to enable only codestyle-check

 if [ -z "${VIMRUNTIME}" ]; then
 	export VIMRUNTIME="/usr/share/nvim/runtime"
@@ -17,11 +19,24 @@ FILE_LUARC="${DIR_OUT}/luarc.json"
 rm -rf "${DIR_OUT}"
 mkdir "${DIR_OUT}"

-# Uncomment runtime.version for strict neovim baseline 5.1
-# It is not set normally, to prevent luals loading 5.1 and 5.x, resulting in both versions being chosen on vim.lsp.buf.definition()  
-cat "${PWD}/.luarc.json" | sed -E 's/.luals-check-only//g' > "${FILE_LUARC}"
+case "${1}" in
+	"codestyle-check")
+		jq \
+			'.diagnostics.neededFileStatus[] = "None" | .diagnostics.neededFileStatus."codestyle-check" = "Any"' \
+			"${PWD}/.luarc.json" > "${FILE_LUARC}"

-# execute inside lua to prevent luals itself from being checked
+		;;
+	*)
+		# Add runtime.version for strict neovim baseline 5.1
+		# It is not set normally, to prevent luals loading 5.1 and 5.x, resulting in both versions being chosen on vim.lsp.buf.definition
+		jq \
+			'."runtime.version" = "Lua 5.1"' \
+			"${PWD}/.luarc.json" > "${FILE_LUARC}"
+
+		;;
+esac
+
+# execute inside lua directory to prevent luals itself from being checked
 OUT=$(lua-language-server --check="${DIR_SRC}" --configpath="${FILE_LUARC}" --checklevel=Information --logpath="${DIR_OUT}" --loglevel=error)
 RC=$?
Author	SHA1	Message	Date
github-actions[bot]	be5b788f2d	chore(master): release nvim-tree 1.12.0 (#3099 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-04-21 12:04:41 +10:00
Alexander Courtis	64bb47f868	ci: simplify luarocks release tag pattern as it was not firing	2025-04-21 08:59:56 +10:00
Devansh Sharma	c24c0470d9	feat: add TreePreOpen event (#3105 ) * feat: Add `TreePreOpen` and `TreePreClose` events * docs: Update docs for `TreePreOpen` and `TreePreClose` events * chore: remove `TreePreClose` event and update dispatch of `TreePreOpen` --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-04-21 08:39:48 +10:00
Devansh Sharma	3a63717d3d	fix: reliably dispatch exactly one TreeOpen and TreeClose events (#3107 ) * fix: correctly handle `TreeOpen` and `TreeClose` event dispatch * fix: lint issues	2025-04-20 09:49:28 +10:00
Alexander Courtis	5bea2b3752	fix(#3101 ): when renderer.highlight_opened_files = "none" do not reload on BufUnload and BufReadPost (#3102 ) * fix(#3101): fix bad reference to renderer.highlight_opened_files during BufUnload and BufReadPost * fix(#3101): only redraw renderer.highlight_opened_files during BufUnload and BufReadPost * fix(#3101): only redraw renderer.highlight_opened_files during BufUnload and BufReadPost * fix(#3101): only redraw renderer.highlight_opened_files during BufUnload and BufReadPost	2025-04-11 12:48:34 +10:00
Šimon Mandlík	c3c1935942	fix: explicitly set `border` to `"none"` in full name float (#3094 )	2025-04-04 17:29:38 +11:00
Alexander Courtis	44d9b58f11	chore: use builtin EmmyLuaCodeStyle for style checking (#3084 ) * chore: sync EmmyLuaCodeStyle settings between .editorconfig and .luarc.json * chore: lua-language-server 3.11.0 -> 3.13.9 * chore: fix incorrect definition of vim.loop.fs_lstat * chore: add codestyle-check option to luals-check.sh * chore: use luals for style check * chore: use luals for style check * Revert "chore: use luals for style check" This reverts commit `e5fde80fab`. * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check * chore: use luals for style check	2025-03-23 12:46:17 +11:00
dependabot[bot]	c09ff35de5	chore(deps): bump leafo/gh-actions-lua from 10 to 11 (#3069 ) Bumps [leafo/gh-actions-lua](https://github.com/leafo/gh-actions-lua) from 10 to 11. - [Release notes](https://github.com/leafo/gh-actions-lua/releases) - [Commits](https://github.com/leafo/gh-actions-lua/compare/v10...v11) --- updated-dependencies: - dependency-name: leafo/gh-actions-lua dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-03-01 11:07:35 +11:00
github-actions[bot]	6709463b2d	chore(master): release nvim-tree 1.11.0 (#3051 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-02-22 12:31:19 +11:00
Šimon Mandlík	b69914325a	fix: window picker: hide fillchars: stl and stlnc (#3066 ) fix: stl and stlnc fillchars are hidden in window picker Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-02-22 11:32:52 +11:00
Gabriel Crispino	3281f331f7	feat(#1984 ): add quit_on_open and focus opts to various api.node.open functions (#3054 ) * feat: add quit_on_open opt to api.node.open.edit * fix: fix missing @param annotation * feat: add focus opt to api.node.open.edit * fix: fix focus == false behaviour on api.node.open.tab command * fix: add optional tabpage integer parameter to view.close if tabpage is not nil, then the function closes the tabpage in this specific tabpage * fix: fix quit_on_open == true behaviour on api.node.open.tab command * fix: add check to not use new opts for certain edit modes * fix: add docs for new opts --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-02-22 11:09:49 +11:00
Hendrik Ziegler	80523101f0	fix: arithmetic on nil value error on first git project open (#3064 ) * fixed error message when opening new git repo * defensive nil + type check --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-02-10 08:06:02 +11:00
Alexander Courtis	70825f23db	fix(#3059 ): test for presence of new 0.11 API vim.hl.range (#3060 )	2025-02-03 15:42:22 +11:00
Alexander Courtis	d05881f65f	docs: tidy readme contributing	2025-01-27 11:33:37 +11:00
Gabriel Crispino	fee1da8897	feat(#3037 ): add API node.buffer.delete, node.buffer.wipe (#3040 ) * feat(mappings): add key map to close file buffer * feat: implement Api.node.buffer.delete * feat: implement Api.node.buffer.wipe * refactor: add util fn for common delete ops on bufs * fix: minor fixes * refactor: fix lint issues * fix: undo unintended ApiTreeToggleOpts change * fix: change error message level to info * fix: remove unused opts * refactor: merge delete-buffer and wipe-buffer into single buffer file * refactor: make wipe and delete fns take a node instead of a file path * docs: update help with new API commands * remove refactored utils.lua * remove unused static setup * tweak doc --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-01-25 12:47:34 +11:00
Alexander Courtis	db7403243d	chore: resolve deprecated in 0.11 (#3053 ) * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11 * chore: resolve deprecated in 0.11	2025-01-24 11:57:18 +11:00
𝐍𝐆𝐏𝐎𝐍𝐆	fca0b67c0b	fix(#3045 ): wipe scratch buffers for full name and show info popups (#3050 )	2025-01-18 10:28:06 +11:00
github-actions[bot]	d529a99f88	chore(master): release nvim-tree 1.10.0 (#3021 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-01-13 15:41:35 +11:00
phanium	39bc630816	fix: hijack directory "BufEnter", "BufNewFile" events are nested (#3044 ) Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-01-13 15:39:10 +11:00
Lev Yuvenskiy	aae01853dd	fix(#3041 ): use vim.diagnostic.get for updating diagnostics (#3042 ) * fix(#3041): use vim.diagnostic.get for updating diagnostics * fix(#3041): remove unnecessary @type --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2025-01-13 15:15:48 +11:00
fdgdgerg	68fc4c20f5	feat(api): add node.open.vertical_no_picker, node.open.horizontal_no_picker (#3031 ) * test * add splits with no window pickers removed the 1 buffer per file limitation test test2 * no-picker for splits * help vertical/horizontal_no_picker * revert whitespace changes --------- Co-authored-by: JoeDaBu <joegbu@gmail.com> Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-12-22 09:35:48 +11:00
Šimon Mandlík	f7b76cd1a7	fix(#3015 ): dynamic width no longer truncates on right_align icons (#3022 )	2024-12-14 08:54:18 +11:00
Alexander Courtis	c3d9b1779f	docs: notify users with a fs.inotify.max_user_watches message on EMFILE event (#3028 ) * docs: notify users with a fs.inotify.max_user_watches message on EMFILE event * type safety for newly created vim.v.event type	2024-12-13 10:39:46 +11:00
ShyRobin	db8d7ac1f5	fix(#3018 ): error when focusing nvim-tree when in terminal mode (#3019 ) fix: Can't re-enter normal mode from terminal mode Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-12-08 12:05:33 +11:00
Jie Liu	6b4be1dc0c	fix: view.width functions may return strings (#3020 ) * Fix get_size() function when size is a function return string * update view.width help --------- Co-authored-by: Alexander Courtis <alex@courtis.org>	2024-12-08 11:45:32 +11:00
github-actions[bot]	375e38673b	chore(master): release nvim-tree 1.9.0 (#2999 ) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-12-07 16:04:32 +11:00
Alexander Courtis	7a4ff1a516	feat(#2948 ): add custom decorators, :help nvim-tree-decorators (#2996 ) * feat(#2948): add UserDecorator, proof of concept * feat(#2948): add UserDecorator, proof of concept * feat(#2948): add UserDecorator, proof of concept * feat(#2948): add UserDecorator * feat(#2948): add UserDecorator * feat(#2948): add UserDecorator * feat(#2948): add Decorator node icon override * feat(#2948): add nvim_tree.api.* node classes * feat(#2948): extract _meta following nvim pattern * feat(#2948): extract _meta following nvim pattern * feat(#2948): add decorator registry and order * feat(#2948): add decorator registry and order * feat(#2948): tidy * feat(#2948): document API * feat(#2948): document API * feat(#2948): document API * feat(#2948): pass api nodes to user decorators * feat(#2948): document API * feat(#2948): use renderer.decorators to define order and register * feat(#2948): tidy decorator args and complete documentation * feat(#2948): decorator classes specified by prefix rather than suffix * feat(#2948): improve doc * feat(#2948): improve doc * feat(#2948): improve doc * feat(#2948): additional user decorator safety * feat(#2948): create nvim_tree.api.decorator.UserDecorator class in API, add :extend * feat(#2948): improve doc	2024-12-07 16:03:29 +11:00
Alexander Courtis	ca7c4c33ca	fix(#3009 ): nvim < 0.10 apply view options locally (#3010 )	2024-11-24 17:00:58 +11:00
Alexander Courtis	1f3ffd6af1	fix(#2954 ): more efficient LSP updates, increase diagnostics.debounce_delay from 50ms to 500ms (#3007 ) * fix(#2954): use LSP diagnostic data deltas from events instead of a full query * fix(#2954): use LSP diagnostic data deltas from events instead of a full query	2024-11-22 10:12:47 +11:00
devxpain	f7c65e11d6	fix(api): correct argument types in `wrap_node` and `wrap_node_or_nil` (#3006 ) The `wrap_node` and `wrap_node_or_nil` functions now correctly accept `Node?` to handle nil values, resolving a warning about incorrect argument counts in `api.tree.change_root_to_node()`.	2024-11-18 10:00:19 +11:00
des-b	28eac2801b	fix(#2990 ): Do not check if buffer is buflisted in diagnostics.update() (#2998 ) This ensures that LSP diagnostics of files which are not manually opened by users are rendered by nvim-tree diagnostic indicators. However when users attach an LSP to nvim-tree this will bring back flashing as attempted to fix in #2980. Fixing this should probably done by checking data passed via diagnostic events (DiagnosticChanged and CocDiagnosticChanged). Signed-off-by: des-b <66919647+des-b@users.noreply.github.com>	2024-11-11 08:57:06 +11:00