chore(master): release nvim-tree 1.0.0 (#2670)

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

.github/workflows/ci.yml

@@ -2,11 +2,7 @@ name: CI
 
 on:
   pull_request:
-    branches:
+  workflow_dispatch:
-      - '*'
-  push:
-    branches:
-      - master
 
 permissions:
   contents: read
@@ -14,31 +10,69 @@ permissions:
 jobs:
   lint:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        lua_version: [ 5.1 ]
+
     steps:
       - uses: actions/checkout@v4
 
       - uses: leafo/gh-actions-lua@v10
         with:
-          luaVersion: "5.1"
+          luaVersion: ${{ matrix.lua_version }}
 
       - uses: leafo/gh-actions-luarocks@v4
 
-      - name: luacheck
+      - run: luarocks install luacheck 1.1.1
-        run: |
+
-          luarocks install luacheck 1.1.1
+      - run: make lint
-          luacheck lua
 
   style:
     runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        stylua_version: [ 0.19.1 ]
+
     steps:
       - uses: actions/checkout@v4
 
       - name: stylua
-        uses: JohnnyMorganz/stylua-action@v3
+        uses: JohnnyMorganz/stylua-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          version: "0.19"
+          version: ${{ matrix.stylua_version }}
           args: --check lua
 
-      - name: doc-comments
+      - run: make style-doc
-        run: ./scripts/doc-comments.sh
+
+  check:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        nvim_version: [ stable, nightly ]
+        luals_version: [ 3.7.3 ]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: rhysd/action-setup-vim@v1
+        with:
+          neovim: true
+          version: ${{ matrix.nvim_version }}
+
+      - name: install luals
+        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
+
+      - 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 help-check

.github/workflows/release-please.yml

@@ -2,6 +2,8 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
+
 name: release-please
 permissions:
   contents: write

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

@@ -6,6 +6,8 @@ on:
       - reopened
       - edited
       - synchronize
+  workflow_dispatch:
+
 jobs:
   semantic-pr-subject:
     runs-on: ubuntu-latest

.gitignore

@@ -0,0 +1,2 @@
+/luals-out/
+/luals/

.hooks/pre-commit.sh

@@ -1,4 +1,3 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
-stylua . --check || exit 1
+make
-luacheck . || exit 1

.luarc.json

@@ -1,7 +1,14 @@
 {
   "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
   "runtime.version" : "Lua 5.1",
+  "workspace": {
+    "library": [
+      "$VIMRUNTIME/lua/vim/lsp",
+      "${3rd}/luv/library"
+    ]
+  },
   "diagnostics": {
+    "libraryFiles": "Disable",
     "globals": [
       "vim"
     ],

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.99.0"
+  ".": "1.0.0"
 }

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [1.0.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v0.100.0...nvim-tree-v1.0.0) (2024-02-18)
+
+
+### Features
+
+* **#2654:** filters.custom may be a function ([#2655](https://github.com/nvim-tree/nvim-tree.lua/issues/2655)) ([4a87b8b](https://github.com/nvim-tree/nvim-tree.lua/commit/4a87b8b46b4a30107971871df3cb7f4c30fdd5d0))
+
+
+### Miscellaneous Chores
+
+* release 1.0.0 ([#2678](https://github.com/nvim-tree/nvim-tree.lua/issues/2678)) ([d16246a](https://github.com/nvim-tree/nvim-tree.lua/commit/d16246a7575538f77e9246520449b99333c469f7))
+
+## [0.100.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v0.99.0...nvim-tree-v0.100.0) (2024-02-11)
+
+
+### Features
+
+* **#1389:** api: recursive node navigation for git and diagnostics ([#2525](https://github.com/nvim-tree/nvim-tree.lua/issues/2525)) ([5d13cc8](https://github.com/nvim-tree/nvim-tree.lua/commit/5d13cc8205bce4963866f73c50f6fdc18a515ffe))
+* **#2415:** add :NvimTreeHiTest ([#2664](https://github.com/nvim-tree/nvim-tree.lua/issues/2664)) ([b278fc2](https://github.com/nvim-tree/nvim-tree.lua/commit/b278fc25ae0fc95e4808eb5618f07fc2522fd2b3))
+* **#2415:** colour and highlight overhaul, see :help nvim-tree-highlight-overhaul ([#2455](https://github.com/nvim-tree/nvim-tree.lua/issues/2455)) ([e9c5abe](https://github.com/nvim-tree/nvim-tree.lua/commit/e9c5abe073a973f54d3ca10bfe30f253569f4405))
+* add node.open.toggle_group_empty, default mapping L ([#2647](https://github.com/nvim-tree/nvim-tree.lua/issues/2647)) ([8cbb1db](https://github.com/nvim-tree/nvim-tree.lua/commit/8cbb1db8e90b62fc56f379992e622e9f919792ce))
+
+
+### Bug Fixes
+
+* **#2415:** disambiguate highlight groups, see :help nvim-tree-highlight-overhaul ([#2639](https://github.com/nvim-tree/nvim-tree.lua/issues/2639)) ([d9cb432](https://github.com/nvim-tree/nvim-tree.lua/commit/d9cb432d2c8d8fa9267ddbd7535d76fe4df89360))
+* **#2415:** fix NvimTreeIndentMarker highlight group: FileIcon->FolderIcon ([e9ac136](https://github.com/nvim-tree/nvim-tree.lua/commit/e9ac136a3ab996aa8e4253253521dcf2cb66b81b))
+* **#2415:** highlight help header and mappings ([#2669](https://github.com/nvim-tree/nvim-tree.lua/issues/2669)) ([39e6fef](https://github.com/nvim-tree/nvim-tree.lua/commit/39e6fef85ac3bb29532b877aa7c9c34911c661af))
+* **#2415:** nvim 0.8 highlight overhaul support, limited to only show highest highlight precedence ([#2642](https://github.com/nvim-tree/nvim-tree.lua/issues/2642)) ([f39f7b6](https://github.com/nvim-tree/nvim-tree.lua/commit/f39f7b6fcd3865ac2146de4cb4045286308f2935))
+* **#2415:** NvimTreeIndentMarker highlight group: FileIcon->FolderIcon ([#2656](https://github.com/nvim-tree/nvim-tree.lua/issues/2656)) ([e9ac136](https://github.com/nvim-tree/nvim-tree.lua/commit/e9ac136a3ab996aa8e4253253521dcf2cb66b81b))
+* **#2624:** open file from docked floating window ([#2627](https://github.com/nvim-tree/nvim-tree.lua/issues/2627)) ([f24afa2](https://github.com/nvim-tree/nvim-tree.lua/commit/f24afa2cef551122b8bd53bb2e4a7df42343ce2e))
+* **#2632:** occasional error stack when locating nvim-tree window ([#2633](https://github.com/nvim-tree/nvim-tree.lua/issues/2633)) ([48b1d86](https://github.com/nvim-tree/nvim-tree.lua/commit/48b1d8638fa3726236ae22e0e48a74ac8ea6592a))
+* **#2637:** show buffer modified icons and highlights ([#2638](https://github.com/nvim-tree/nvim-tree.lua/issues/2638)) ([7bdb220](https://github.com/nvim-tree/nvim-tree.lua/commit/7bdb220d0fe604a77361e92cdbc7af1b8a412126))
+* **#2643:** correctly apply linked highlight groups in tree window ([#2653](https://github.com/nvim-tree/nvim-tree.lua/issues/2653)) ([fbee8a6](https://github.com/nvim-tree/nvim-tree.lua/commit/fbee8a69a46f558d29ab84e96301425b0501c668))
+* allow highlight overrides for DEFAULT_DEFS: NvimTreeFolderIcon, NvimTreeWindowPicker ([#2636](https://github.com/nvim-tree/nvim-tree.lua/issues/2636)) ([74525ac](https://github.com/nvim-tree/nvim-tree.lua/commit/74525ac04760bf0d9fec2bf51474d2b05f36048e))
+* bad column offset when using full_name ([#2629](https://github.com/nvim-tree/nvim-tree.lua/issues/2629)) ([75ff64e](https://github.com/nvim-tree/nvim-tree.lua/commit/75ff64e6663fc3b23c72dca32b2f838acefe7c8a))
+* passing nil as window handle in view.get_winnr ([48b1d86](https://github.com/nvim-tree/nvim-tree.lua/commit/48b1d8638fa3726236ae22e0e48a74ac8ea6592a))
+
 ## 0.99.0 (2024-01-01)
 
 

CONTRIBUTING.md

@@ -4,31 +4,76 @@ Thank you for contributing.
 
 See [Development](https://github.com/nvim-tree/nvim-tree.lua/wiki/Development) for environment setup, tips and tools.
 
-## Styling and formatting
+# Tools
 
-Code is formatted using luacheck, and linted using stylua.
+Following are used during CI and strongly recommended during local development.
-You can install these with:
 
-```bash
+Lint: [luacheck](https://github.com/lunarmodules/luacheck/)
-luarocks install luacheck
+
-cargo install stylua
+Style: [StyLua](https://github.com/JohnnyMorganz/StyLua)
+
+Language server: [luals](https://luals.github.io)
+
+You can install them via you OS package manager e.g. `pacman`, `brew` or other via other package managers such as `cargo` or `luarocks`
+
+# Quality
+
+The following quality checks are mandatory and are performed during CI. They run on the entire `lua` directory and return 1 on any failure.
+
+You can run them all via `make` or `make all`
+
+You can setup git hooks to run all checks by running `scripts/setup-hooks.sh`
+
+## lint
+
+1. Runs luacheck quietly using `.luacheck` settings
+
+```sh
+make lint
 ```
 
-You can setup the git hooks by running `scripts/setup-hooks.sh`.
+## style
 
-## Adding new actions
+1. Runs stylua using `.stylua.toml` settings
+1. Runs `scripts/doc-comments.sh` to validate annotated documentation
+
+```sh
+make style
+```
+
+You can automatically fix stylua issues via:
+
+```sh
+make style-fix
+```
+
+## check
+
+1. Runs the checks that the LSP lua language server runs inside nvim using `.luarc.json` via `scripts/luals-check.sh`
+
+```sh
+make check
+```
+
+Assumes `$VIMRUNTIME` is `/usr/share/nvim/runtime`. Adjust as necessary e.g.
+
+```sh
+VIMRUNTIME="/my/path/to/runtime" make check
+```
+
+# Adding New Actions
 
 To add a new action, add a file in `actions/name-of-the-action.lua`. You should export a `setup` function if some configuration is needed.
-Once you did, you should run the `scripts/update-help.sh`.
 
-## Documentation
+Once you did, you should run `make help-update`
+
+# Documentation
 
 When adding new options, you should declare the defaults in the main `nvim-tree.lua` file.
-Once you did, you should run the `scripts/update-help.sh`.
 
 Documentation for options should also be added to `nvim-tree-opts` in `doc/nvim-tree-lua.txt`
 
-## Pull Request
+# Pull Request
 
 Please reference any issues in the description e.g. "resolves #1234".
 

Makefile

@@ -0,0 +1,47 @@
+all: lint style check
+
+#
+# mandatory checks
+#
+lint: luacheck
+
+style: stylua style-doc
+
+check: luals
+
+#
+# subtasks
+#
+luacheck:
+	luacheck -q lua
+
+stylua:
+	stylua lua --check
+
+style-doc:
+	scripts/doc-comments.sh
+
+luals:
+	scripts/luals-check.sh
+
+#
+# fixes
+#
+style-fix:
+	stylua lua
+
+#
+# utility
+#
+help-update:
+	scripts/help-update.sh
+
+#
+# CI
+#
+help-check: help-update
+	git diff --exit-code doc/nvim-tree-lua.txt
+
+
+.PHONY: all lint style check luacheck stylua style-doc luals style-fix help-update help-check
+

README.md

@@ -38,6 +38,8 @@ Please install via your preferred package manager. See [Installation](https://gi
 
 `nvim-tree/nvim-tree.lua`
 
+Major or minor versions may be specified via tags: `v<MAJOR>` e.g. `v1` or `v<MAJOR>.<MINOR>` e.g. `v1.23`
+
 `nvim-tree/nvim-web-devicons` optional, for file icons
 
 Disabling [netrw](https://neovim.io/doc/user/pi_netrw.html) is strongly advised, see [:help nvim-tree-netrw](doc/nvim-tree-lua.txt)
@@ -53,7 +55,7 @@ Setup the plugin in your `init.lua`
 vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 
--- set termguicolors to enable highlight groups
+-- optionally enable 24-bit colour
 vim.opt.termguicolors = true
 
 -- empty setup using defaults

doc/nvim-tree-lua.txt

@@ -10,6 +10,7 @@ CONTENTS                                                           *nvim-tree*
   2.1  Quickstart: Setup                        |nvim-tree-quickstart-setup|
   2.2  Quickstart: Help                         |nvim-tree-quickstart-help|
   2.3  Quickstart: Custom Mappings              |nvim-tree-quickstart-custom-mappings|
+  2.4  Quickstart: Highlight                    |nvim-tree-quickstart-highlight|
   3. Commands                                 |nvim-tree-commands|
   4. Setup                                    |nvim-tree-setup|
   5. Opts                                     |nvim-tree-opts|
@@ -43,9 +44,12 @@ CONTENTS                                                           *nvim-tree*
   6.7  API Marks                                |nvim-tree-api.marks|
   6.8  API Config                               |nvim-tree-api.config|
   6.9  API Commands                             |nvim-tree-api.commands|
+  6.10 API Diagnostics                          |nvim-tree-api.diagnostics|
   7. Mappings                                 |nvim-tree-mappings|
   7.1  Mappings: Default                        |nvim-tree-mappings-default|
   8. Highlight                                |nvim-tree-highlight|
+  8.1  Highlight Default                        |nvim-tree-highlight-default|
+  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|
@@ -113,7 +117,7 @@ Setup the plugin in your `init.lua` >
   vim.g.loaded_netrw = 1
   vim.g.loaded_netrwPlugin = 1
 
-  -- set termguicolors to enable highlight groups
+  -- optionally enable 24-bit colour
   vim.opt.termguicolors = true
 
   -- empty setup using defaults
@@ -179,6 +183,7 @@ Show the mappings:  `g?`
 `I`               Toggle Filter: Git Ignore  |nvim-tree-api.tree.toggle_gitignore_filter()|
 `J`               Last Sibling               |nvim-tree-api.node.navigate.sibling.last()|
 `K`               First Sibling              |nvim-tree-api.node.navigate.sibling.first()|
+`L`               Toggle Group Empty         |nvim-tree-api.node.open.toggle_group_empty()|
 `M`               Toggle Filter: No Bookmark |nvim-tree-api.tree.toggle_no_bookmark_filter()|
 `m`               Toggle Bookmark            |nvim-tree-api.marks.toggle()|
 `o`               Open                       |nvim-tree-api.node.open.edit()|
@@ -227,6 +232,16 @@ via |nvim-tree.on_attach| e.g. >
     ---
   }
 <
+==============================================================================
+ 2.4 QUICKSTART: HIGHLIGHT                    *nvim-tree-quickstart-highlight*
+
+Run |:NvimTreeHiTest| to show all the highlights that nvim-tree uses.
+
+They can be customised before or after setup is called and will be immediately
+applied at runtime.
+
+See |nvim-tree-highlight| for details.
+
 ==============================================================================
  3. COMMANDS                                              *nvim-tree-commands*
 
@@ -321,6 +336,14 @@ via |nvim-tree.on_attach| e.g. >
 
     Calls: `api.tree.collapse_all(true)`
 
+*:NvimTreeHiTest*
+
+    Show nvim-tree highlight groups similar to `:so $VIMRUNTIME/syntax/hitest.vim`
+
+    See |nvim-tree-api.diagnostics.hi_test()|
+
+    Calls: `api.diagnostics.hi_test()`
+
 ==============================================================================
  4. SETUP                                                    *nvim-tree-setup*
 
@@ -387,8 +410,8 @@ Following is the default configuration. See |nvim-tree-opts| for details.
         indent_width = 2,
         special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
         symlink_destination = true,
-        highlight_git = false,
+        highlight_git = "none",
-        highlight_diagnostics = false,
+        highlight_diagnostics = "none",
         highlight_opened_files = "none",
         highlight_modified = "none",
         highlight_bookmarks = "none",
@@ -789,8 +812,9 @@ Use nvim-tree in a floating window.
 ==============================================================================
  5.3 OPTS: RENDERER                                  *nvim-tree-opts-renderer*
 
-Highlight precedence:
+Highlight precedence, additive:
-  clipboard > diagnostics > bookmarked > modified > opened > git
+  git < opened < modified < bookmarked < diagnostics < copied < cut
+Neovim <= 0.8 will only show the highest.
 
 *nvim-tree.renderer.add_trailing*
 Appends a trailing slash to folder names.
@@ -832,18 +856,20 @@ Whether to show the destination of the symlink.
   Type: `boolean`, Default: `true`
 
 *nvim-tree.renderer.highlight_git*
-Enable highlight for git attributes using `NvimTreeGit*` highlight groups.
+Enable highlight for git attributes using `NvimTreeGit*HL` highlight groups.
 Requires |nvim-tree.git.enable|
-  Type: `boolean`, Default: `false`
+Value can be `"none"`, `"icon"`, `"name"` or `"all"`.
+  Type: `string`, Default: `"none"`
 
 *nvim-tree.renderer.highlight_diagnostics*
-Enable highlight for diagnostics using `LspDiagnosticsError*Text` highlight groups.
+Enable highlight for diagnostics using `NvimTreeDiagnostic*HL` highlight groups.
 Requires |nvim-tree.diagnostics.enable|
-  Type: `boolean`, Default: `false`
+Value can be `"none"`, `"icon"`, `"name"` or `"all"`.
+  Type: `string`, Default: `"none"`
 
 *nvim-tree.renderer.highlight_opened_files*
 Highlight icons and/or names for |bufloaded()| files using the
-`NvimTreeOpenedFile` highlight group.
+`NvimTreeOpenedHL` highlight group.
 See |nvim-tree-api.navigate.opened.next()| and |nvim-tree-api.navigate.opened.prev()|
 Value can be `"none"`, `"icon"`, `"name"` or `"all"`.
   Type: `string`, Default: `"none"`
@@ -892,8 +918,8 @@ Configuration options for tree indent markers.
 *nvim-tree.renderer.icons*
 Configuration options for icons.
 
-Icon sign column precedence:
+Icon order and sign column precedence:
-  diagnostics > modified > git > bookmarked
+  git < modified < bookmarked < diagnostics
 
     *nvim-tree.renderer.icons.web_devicons*
     Configure optional plugin `"nvim-tree/nvim-web-devicons"`
@@ -907,7 +933,7 @@ Icon sign column precedence:
               Type: `boolean`, Default: `true`
 
             *nvim-tree.renderer.icons.web_devicons.file.color*
-            Use icon colors for files.
+            Use icon colors for files. Overrides highlight groups.
               Type: `boolean`, Default: `true`
 
         *nvim-tree.renderer.icons.web_devicons.folder*
@@ -919,7 +945,7 @@ Icon sign column precedence:
               Type: `boolean`, Default: `false`
 
             *nvim-tree.renderer.icons.web_devicons.folder.color*
-            Use icon colors for folders.
+            Use icon colors for folders. Overrides highlight groups.
               Type: `boolean`, Default: `true`
 
     *nvim-tree.renderer.icons.git_placement*
@@ -1236,7 +1262,7 @@ Enabling this is not useful as there is no means yet to persist bookmarks.
 Custom list of vim regex for file/directory names that will not be shown.
 Backslashes must be escaped e.g. "^\\.git". See |string-match|.
 Toggle via |nvim-tree-api.tree.toggle_custom_filter()|, default `U`
-  Type: {string}, Default: `{}`
+  Type: {string} | `function(absolute_path)`, Default: `{}`
 
 *nvim-tree.filters.exclude*
 List of directories or files to exclude from filtering: always show them.
@@ -1843,6 +1869,12 @@ node.open.vertical()                      *nvim-tree-api.node.open.vertical()*
 node.open.horizontal()                  *nvim-tree-api.node.open.horizontal()*
     |nvim-tree-api.node.edit()|, file will be opened in a new horizontal split.
 
+                                *nvim-tree-api.node.open.toggle_group_empty()*
+node.open.toggle_group_empty()
+    Toggle |nvim-tree.renderer.group_empty| for a specific folder.
+    Does nothing on files.
+    Needs |nvim-tree.renderer.group_empty| set.
+
 node.open.drop()                              *nvim-tree-api.node.open.drop()*
     Switch to window with selected file if it exists.
     Open file otherwise.
@@ -1875,6 +1907,12 @@ node.open.preview_no_picker()    *nvim-tree-api.node.open.preview_no_picker()*
 node.navigate.git.next()              *nvim-tree-api.node.navigate.git.next()*
     Navigate to the next item showing git status.
 
+                            *nvim-tree-api.node.navigate.git.next_recursive()*
+node.navigate.git.next_recursive()
+    Alternative to |nvim-tree-api.node.navigate.git.next()| that navigates to
+    the next file showing git status, recursively.
+    Needs |nvim-tree.git.show_on_dirs| set.
+
                       *nvim-tree-api.node.navigate.git.next_skip_gitignored()*
 node.navigate.git.next_skip_gitignored()
     Same as |node.navigate.git.next()|, but skips gitignored files.
@@ -1882,6 +1920,12 @@ node.navigate.git.next_skip_gitignored()
 node.navigate.git.prev()              *nvim-tree-api.node.navigate.git.prev()*
     Navigate to the previous item showing git status.
 
+                      *nvim-tree-api.node.navigate.git.prev_recursive()*
+node.navigate.git.prev_recursive()
+    Alternative to |nvim-tree-api.node.navigate.git.prev()| that navigates to
+    the previous file showing git status, recursively.
+    Needs |nvim-tree.git.show_on_dirs| set.
+
                       *nvim-tree-api.node.navigate.git.prev_skip_gitignored()*
 node.navigate.git.prev_skip_gitignored()
     Same as |node.navigate.git.prev()|, but skips gitignored files.
@@ -1890,10 +1934,22 @@ node.navigate.git.prev_skip_gitignored()
 node.navigate.diagnostics.next()
     Navigate to the next item showing diagnostic status.
 
+                    *nvim-tree-api.node.navigate.diagnostics.next_recursive()*
+node.navigate.diagnostics.next_recursive()
+    Alternative to |nvim-tree-api.node.navigate.diagnostics.next()| that
+    navigates to the next file showing diagnostic status, recursively.
+    Needs |nvim-tree.diagnostics.show_on_dirs| set.
+
                               *nvim-tree-api.node.navigate.diagnostics.prev()*
 node.navigate.diagnostics.prev()
     Navigate to the next item showing diagnostic status.
 
+                    *nvim-tree-api.node.navigate.diagnostics.prev_recursive()*
+node.navigate.diagnostics.prev_recursive()
+    Alternative to |nvim-tree-api.node.navigate.diagnostics.prev()| that
+    navigates to the previous file showing diagnostic status, recursively.
+    Needs |nvim-tree.diagnostics.show_on_dirs| set.
+
                                    *nvim-tree-api.node.navigate.opened.next()*
 node.navigate.opened.next()
     Navigate to the next |bufloaded()| item.
@@ -2041,7 +2097,7 @@ config.mappings.get_keymap_default()
         (table) as per |nvim_buf_get_keymap()|
 
 ==============================================================================
- 6.8 API COMMANDS                                     *nvim-tree-api.commands*
+ 6.9 API COMMANDS                                     *nvim-tree-api.commands*
 
 commands.get()                                  *nvim-tree-api.commands.get()*
     Retrieve all commands, see |nvim-tree-commands|
@@ -2052,6 +2108,15 @@ commands.get()                                  *nvim-tree-api.commands.get()*
         • {command} (function)
         • {opts}    (table)
 
+==============================================================================
+ 6.10 DIAGNOSTICS                                  *nvim-tree-api.diagnostics*
+
+diagnostics.hi_test()                    *nvim-tree-api.diagnostics.hi_test()*
+    Open a new buffer displaying all nvim-tree highlight groups, their link
+    chain and concrete definition.
+
+    Similar to `:so $VIMRUNTIME/syntax/hitest.vim` as per |:highlight|
+
 ==============================================================================
  7. MAPPINGS                                              *nvim-tree-mappings*
 
@@ -2167,6 +2232,7 @@ You are encouraged to copy these to your own |nvim-tree.on_attach| function.
   vim.keymap.set('n', 'I',       api.tree.toggle_gitignore_filter,    opts('Toggle Filter: Git Ignore'))
   vim.keymap.set('n', 'J',       api.node.navigate.sibling.last,      opts('Last Sibling'))
   vim.keymap.set('n', 'K',       api.node.navigate.sibling.first,     opts('First Sibling'))
+  vim.keymap.set('n', 'L',       api.node.open.toggle_group_empty,    opts('Toggle Group Empty'))
   vim.keymap.set('n', 'M',       api.tree.toggle_no_bookmark_filter,  opts('Toggle Filter: No Bookmark'))
   vim.keymap.set('n', 'm',       api.marks.toggle,                    opts('Toggle Bookmark'))
   vim.keymap.set('n', 'o',       api.node.open.edit,                  opts('Open'))
@@ -2213,42 +2279,32 @@ groups.
 Example |:highlight| >
     :hi NvimTreeSymlink guifg=blue gui=bold,underline
 <
-You should have 'termguicolors' enabled, otherwise, colors will not be
+It is recommended to enable 'termguicolors' for the more pleasant 24-bit
-applied.
+colours.
 
-To view the active highlight groups run `:so $VIMRUNTIME/syntax/hitest.vim`
+To view the nvim-tree highlight groups run |:NvimTreeHiTest|
+
+To view all active highlight groups run `:so $VIMRUNTIME/syntax/hitest.vim`
 as per |:highlight|
 
-Default linked group follows name.
+The `*HL` groups are additive as per |nvim-tree-opts-renderer| precedence.
+Only present attributes will clobber each other.
+In this example a modified, opened file will have magenta text, with cyan
+undercurl: >
+    :hi NvimTreeOpenedHL       guifg=magenta guisp=red  gui=underline
+    :hi NvimTreeModifiedFileHL               guisp=cyan gui=undercurl
+<
+To prevent usage of a highlight:
+- Before setup: link the group to `Normal` e.g.
+    `:hi NvimTreeExecFile Normal`
+- After setup: link it to `NONE`, to override the default link e.g.
+    `:hi! link NvimTreeExecFile NONE`
+
+==============================================================================
+ 8.1 HIGHLIGHT DEFAULT                           *nvim-tree-highlight-default*
+
+|:highlight-link| `default` or |:highlight-default| define the groups on setup:
 
-File Text: >
-    NvimTreeSymlink
-    NvimTreeExecFile
-    NvimTreeOpenedFile
-    NvimTreeModifiedFile
-    NvimTreeSpecialFile
-    NvimTreeImageFile
-<
-Folder Text: >
-    NvimTreeFolderName          Directory
-    NvimTreeEmptyFolderName     Directory
-    NvimTreeOpenedFolderName    Directory
-    NvimTreeSymlinkFolderName   Directory
-    NvimTreeRootFolder
-<
-Icon: >
-    NvimTreeFileIcon
-    NvimTreeOpenedFileIcon      NvimTreeOpenedFile
-    NvimTreeSymlinkIcon
-    NvimTreeFolderIcon
-    NvimTreeOpenedFolderIcon    NvimTreeFolderIcon
-    NvimTreeClosedFolderIcon    NvimTreeFolderIcon
-    NvimTreeFolderArrowClosed   NvimTreeIndentMarker
-    NvimTreeFolderArrowOpen     NvimTreeIndentMarker
-<
-Indent: >
-    NvimTreeIndentMarker
-<
 Standard: >
     NvimTreeNormal              Normal
     NvimTreeNormalFloat         NormalFloat
@@ -2267,67 +2323,172 @@ Standard: >
     NvimTreeStatusLine          StatusLine
     NvimTreeStatusLineNC        StatusLineNC
 <
+File Text: >
+    NvimTreeExecFile            SpellCap
+    NvimTreeImageFile           SpellCap
+    NvimTreeSpecialFile         SpellCap
+    NvimTreeSymlink             SpellCap
+<
+Folder Text: >
+    NvimTreeRootFolder          Title
+    NvimTreeFolderName          Directory
+    NvimTreeEmptyFolderName     Directory
+    NvimTreeOpenedFolderName    Directory
+    NvimTreeSymlinkFolderName   Directory
+<
+File Icons: >
+    NvimTreeFileIcon            NvimTreeNormal
+    NvimTreeSymlinkIcon         NvimTreeNormal
+<
+Folder Icons: >
+    NvimTreeFolderIcon          guifg=#8094b4 ctermfg=Blue
+    NvimTreeOpenedFolderIcon    NvimTreeFolderIcon
+    NvimTreeClosedFolderIcon    NvimTreeFolderIcon
+    NvimTreeFolderArrowClosed   NvimTreeIndentMarker
+    NvimTreeFolderArrowOpen     NvimTreeIndentMarker
+<
+Indent: >
+    NvimTreeIndentMarker        NvimTreeFileIcon
+<
+Picker: >
+    NvimTreeWindowPicker        guifg=#ededed guibg=#4493c8 gui=bold ctermfg=White ctermbg=Cyan
+<
+Live Filter: >
+    NvimTreeLiveFilterPrefix    PreProc
+    NvimTreeLiveFilterValue     ModeMsg
+<
 Clipboard: >
     NvimTreeCopiedHL            SpellRare
     NvimTreeCutHL               SpellBad
 <
-Bookmark Icon: >
+Bookmarks: >
-    NvimTreeBookmark
+    NvimTreeBookmarkIcon        NvimTreeFolderIcon
-<
-Bookmark Highlight: >
     NvimTreeBookmarkHL          SpellLocal
 <
-Picker: >
+Modified: >
-    NvimTreeWindowPicker
+    NvimTreeModifiedIcon        Type
+    NvimTreeModifiedFileHL      NvimTreeModifiedIcon
+    NvimTreeModifiedFolderHL    NvimTreeModifiedIcon
 <
-Live Filter: >
+Opened: >
-    NvimTreeLiveFilterPrefix
+    NvimTreeOpenedHL            Special
-    NvimTreeLiveFilterValue
 <
 Git Icon: >
-    NvimTreeGitDirty
+    NvimTreeGitDeletedIcon      Statement
-    NvimTreeGitStaged
+    NvimTreeGitDirtyIcon        Statement
-    NvimTreeGitMerge
+    NvimTreeGitIgnoredIcon      Comment
-    NvimTreeGitRenamed
+    NvimTreeGitMergeIcon        Constant
-    NvimTreeGitNew
+    NvimTreeGitNewIcon          PreProc
-    NvimTreeGitDeleted
+    NvimTreeGitRenamedIcon      PreProc
-    NvimTreeGitIgnored                  Comment
+    NvimTreeGitStagedIcon       Constant
 <
-Git File Text: >
+Git File File Highlight: >
-    NvimTreeFileDirty                   NvimTreeGitDirty
+    NvimTreeGitFileDeletedHL    NvimTreeGitDeletedIcon
-    NvimTreeFileStaged                  NvimTreeGitStaged
+    NvimTreeGitFileDirtyHL      NvimTreeGitDirtyIcon
-    NvimTreeFileMerge                   NvimTreeGitMerge
+    NvimTreeGitFileIgnoredHL    NvimTreeGitIgnoredIcon
-    NvimTreeFileRenamed                 NvimTreeGitRenamed
+    NvimTreeGitFileMergeHL      NvimTreeGitMergeIcon
-    NvimTreeFileNew                     NvimTreeGitNew
+    NvimTreeGitFileNewHL        NvimTreeGitNewIcon
-    NvimTreeFileDeleted                 NvimTreeGitDeleted
+    NvimTreeGitFileRenamedHL    NvimTreeGitRenamedIcon
-    NvimTreeFileIgnored                 NvimTreeGitIgnored
+    NvimTreeGitFileStagedHL     NvimTreeGitStagedIcon
 <
-Git Folder Text: >
+Git Folder Folder Highlight: >
-    NvimTreeFolderDirty                 NvimTreeFileDirty
+    NvimTreeGitFolderDeletedHL  NvimTreeGitFileDeletedHL
-    NvimTreeFolderStaged                NvimTreeFileStaged
+    NvimTreeGitFolderDirtyHL    NvimTreeGitFileDirtyHL
-    NvimTreeFolderMerge                 NvimTreeFileMerge
+    NvimTreeGitFolderIgnoredHL  NvimTreeGitFileIgnoredHL
-    NvimTreeFolderRenamed               NvimTreeFileRenamed
+    NvimTreeGitFolderMergeHL    NvimTreeGitFileMergeHL
-    NvimTreeFolderNew                   NvimTreeFileNew
+    NvimTreeGitFolderNewHL      NvimTreeGitFileNewHL
-    NvimTreeFolderDeleted               NvimTreeFileDeleted
+    NvimTreeGitFolderRenamedHL  NvimTreeGitFileRenamedHL
-    NvimTreeFolderIgnored               NvimTreeFileIgnored
+    NvimTreeGitFolderStagedHL   NvimTreeGitFileStagedHL
 <
 Diagnostics Icon: >
-    NvimTreeLspDiagnosticsError             DiagnosticError
+    NvimTreeDiagnosticErrorIcon         DiagnosticError
-    NvimTreeLspDiagnosticsWarning           DiagnosticWarn
+    NvimTreeDiagnosticWarnIcon          DiagnosticWarn
-    NvimTreeLspDiagnosticsInformation       DiagnosticInfo
+    NvimTreeDiagnosticInfoIcon          DiagnosticInfo
-    NvimTreeLspDiagnosticsHint              DiagnosticHint
+    NvimTreeDiagnosticHintIcon          DiagnosticHint
 <
-Diagnostics File Text: >
+Diagnostics File Highlight: >
-    NvimTreeLspDiagnosticsErrorText         NvimTreeLspDiagnosticsError
+    NvimTreeDiagnosticErrorFileHL       DiagnosticUnderlineError
-    NvimTreeLspDiagnosticsWarningText       NvimTreeLspDiagnosticsWarning
+    NvimTreeDiagnosticWarnFileHL        DiagnosticUnderlineWarn
-    NvimTreeLspDiagnosticsInfoText          NvimTreeLspDiagnosticsInformation
+    NvimTreeDiagnosticInfoFileHL        DiagnosticUnderlineInfo
-    NvimTreeLspDiagnosticsHintText          NvimTreeLspDiagnosticsHint
+    NvimTreeDiagnosticHintFileHL        DiagnosticUnderlineHint
 <
-Diagnostics Folder Text: >
+Diagnostics Folder Highlight: >
-    NvimTreeLspDiagnosticsErrorFolderText   NvimTreeLspDiagnosticsErrorText
+    NvimTreeDiagnosticErrorFolderHL     NvimTreeDiagnosticErrorFileHL
-    NvimTreeLspDiagnosticsWarningFolderText NvimTreeLspDiagnosticsWarningText
+    NvimTreeDiagnosticWarnFolderHL      NvimTreeDiagnosticWarnFileHL
-    NvimTreeLspDiagnosticsInfoFolderText    NvimTreeLspDiagnosticsInfoText
+    NvimTreeDiagnosticInfoFolderHL      NvimTreeDiagnosticInfoFileHL
-    NvimTreeLspDiagnosticsHintFolderText    NvimTreeLspDiagnosticsHintText
+    NvimTreeDiagnosticHintFolderHL      NvimTreeDiagnosticHintFileHL
+<
+==============================================================================
+ 8.1 HIGHLIGHT OVERHAUL                         *nvim-tree-highlight-overhaul*
+
+2024-01-20: significant highlighting changes, some breaking:
+
+- Full cterm support.
+- Standard vim highlight groups such |DiagnosticUnderlineError| are now the
+  defaults.
+- Highlight groups named consistently.
+- All `highlight_xxx` e.g. |nvim-tree.renderer.highlight_git| are granular,
+  allowing  `"none"`, `"icon"`, `"name"` or `"all"`
+- `highlight_xxx` has highlight groups for both File and Folder
+- `highlight_xxx` is additive instead of overwriting. See
+  |nvim-tree-opts-renderer| for precedence.
+
+2024-01-29: disambiguate default highlights sharing groups:
+
+- NvimTreeRootFolder   PreProc   -> Title
+- NvimTreeModified*    Constant  -> Type
+- NvimTreeOpenedHL     Constant  -> Special
+- NvimTreeBookmarkIcon Constant  -> NvimTreeFolderIcon
+- NvimTreeExecFile     Constant  -> SpellCap
+- NvimTreeImageFile    PreProc   -> SpellCap
+- NvimTreeSpecialFile  PreProc   -> SpellCap
+- NvimTreeSymlink      Statement -> SpellCap
+
+Legacy highlight group are still obeyed when they are defined and the current
+highlight group is not, hard linking as follows: >
+
+    NvimTreeModifiedIcon        NvimTreeModifiedFile
+    NvimTreeOpenedHL            NvimTreeOpenedFile
+    NvimTreeBookmarkIcon        NvimTreeBookmark
+
+    NvimTreeGitDeletedIcon      NvimTreeGitDeleted
+    NvimTreeGitDirtyIcon        NvimTreeGitDirty
+    NvimTreeGitIgnoredIcon      NvimTreeGitIgnored
+    NvimTreeGitMergeIcon        NvimTreeGitMerge
+    NvimTreeGitNewIcon          NvimTreeGitNew
+    NvimTreeGitRenamedIcon      NvimTreeGitRenamed
+    NvimTreeGitStagedIcon       NvimTreeGitStaged
+
+    NvimTreeGitFileDeletedHL    NvimTreeFileDeleted
+    NvimTreeGitFileDirtyHL      NvimTreeFileDirty
+    NvimTreeGitFileIgnoredHL    NvimTreeFileIgnored
+    NvimTreeGitFileMergeHL      NvimTreeFileMerge
+    NvimTreeGitFileNewHL        NvimTreeFileNew
+    NvimTreeGitFileRenamedHL    NvimTreeFileRenamed
+    NvimTreeGitFileStagedHL     NvimTreeFileStaged
+
+    NvimTreeGitFolderDeletedHL  NvimTreeFolderDeleted
+    NvimTreeGitFolderDirtyHL    NvimTreeFolderDirty
+    NvimTreeGitFolderIgnoredHL  NvimTreeFolderIgnored
+    NvimTreeGitFolderMergeHL    NvimTreeFolderMerge
+    NvimTreeGitFolderNewHL      NvimTreeFolderNew
+    NvimTreeGitFolderRenamedHL  NvimTreeFolderRenamed
+    NvimTreeGitFolderStagedHL   NvimTreeFolderStaged
+
+    NvimTreeLspDiagnosticsError                 NvimTreeDiagnosticErrorIcon
+    NvimTreeLspDiagnosticsWarning               NvimTreeDiagnosticWarnIcon
+    NvimTreeLspDiagnosticsInformation           NvimTreeDiagnosticInfoIcon
+    NvimTreeLspDiagnosticsHint                  NvimTreeDiagnosticHintIcon
+
+    NvimTreeLspDiagnosticsErrorText             NvimTreeDiagnosticErrorFileHL
+    NvimTreeLspDiagnosticsWarningText           NvimTreeDiagnosticWarnFileHL
+    NvimTreeLspDiagnosticsInformationText       NvimTreeDiagnosticInfoFileHL
+    NvimTreeLspDiagnosticsHintText              NvimTreeDiagnosticHintFileHL
+
+    NvimTreeLspDiagnosticsErrorFolderText       NvimTreeDiagnosticErrorFolderHL 
+    NvimTreeLspDiagnosticsWarningFolderText     NvimTreeDiagnosticWarnFolderHL
+    NvimTreeLspDiagnosticsInformationFolderText NvimTreeDiagnosticInfoFolderHL
+    NvimTreeLspDiagnosticsHintFolderText        NvimTreeDiagnosticHintFolderHL
 <
 ==============================================================================
  9. EVENTS                                                  *nvim-tree-events*

lua/nvim-tree.lua

@@ -1,6 +1,6 @@
 local lib = require "nvim-tree.lib"
 local log = require "nvim-tree.log"
-local colors = require "nvim-tree.colors"
+local appearance = require "nvim-tree.appearance"
 local renderer = require "nvim-tree.renderer"
 local view = require "nvim-tree.view"
 local commands = require "nvim-tree.commands"
@@ -10,7 +10,7 @@ local legacy = require "nvim-tree.legacy"
 local core = require "nvim-tree.core"
 local git = require "nvim-tree.git"
 local filters = require "nvim-tree.explorer.filters"
-local modified = require "nvim-tree.modified"
+local buffers = require "nvim-tree.buffers"
 local events = require "nvim-tree.events"
 local notify = require "nvim-tree.notify"
 
@@ -104,12 +104,6 @@ function M.open_on_directory()
   actions.root.change_dir.force_dirchange(bufname, true)
 end
 
-function M.reset_highlight()
-  colors.setup()
-  view.reset_winhl()
-  renderer.render_hl(view.get_bufnr())
-end
-
 function M.place_cursor_on_node()
   local search = vim.fn.searchcount()
   if search and search.exact_match == 1 then
@@ -168,8 +162,14 @@ local function setup_autocommands(opts)
     vim.api.nvim_create_autocmd(name, vim.tbl_extend("force", default_opts, custom_opts))
   end
 
-  -- reset highlights when colorscheme is changed
+  -- reset and draw (highlights) when colorscheme is changed
-  create_nvim_tree_autocmd("ColorScheme", { callback = M.reset_highlight })
+  create_nvim_tree_autocmd("ColorScheme", {
+    callback = function()
+      appearance.setup()
+      view.reset_winhl()
+      renderer.draw()
+    end,
+  })
 
   -- prevent new opened file from opening in the same window as nvim-tree
   create_nvim_tree_autocmd("BufWipeout", {
@@ -210,7 +210,7 @@ local function setup_autocommands(opts)
       -- update opened file buffers
       if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
         utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
-          actions.reloaders.reload_explorer(nil, data.buf)
+          actions.reloaders.reload_explorer()
         end)
       end
     end,
@@ -314,7 +314,7 @@ local function setup_autocommands(opts)
     create_nvim_tree_autocmd({ "BufModifiedSet", "BufWritePost" }, {
       callback = function()
         utils.debounce("Buf:modified", opts.view.debounce_delay, function()
-          modified.reload()
+          buffers.reload_modified()
           actions.reloaders.reload_explorer()
         end)
       end,
@@ -386,8 +386,8 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     indent_width = 2,
     special_files = { "Cargo.toml", "Makefile", "README.md", "readme.md" },
     symlink_destination = true,
-    highlight_git = false,
+    highlight_git = "none",
-    highlight_diagnostics = false,
+    highlight_diagnostics = "none",
     highlight_opened_files = "none",
     highlight_modified = "none",
     highlight_bookmarks = "none",
@@ -623,6 +623,9 @@ local ACCEPTED_TYPES = {
     group_empty = { "boolean", "function" },
     root_folder_label = { "function", "string", "boolean" },
   },
+  filters = {
+    custom = { "function" },
+  },
   actions = {
     open_file = {
       window_picker = {
@@ -641,9 +644,11 @@ local ACCEPTED_STRINGS = {
     signcolumn = { "yes", "no", "auto" },
   },
   renderer = {
+    highlight_git = { "none", "icon", "name", "all" },
     highlight_opened_files = { "none", "icon", "name", "all" },
     highlight_modified = { "none", "icon", "name", "all" },
     highlight_bookmarks = { "none", "icon", "name", "all" },
+    highlight_diagnostics = { "none", "icon", "name", "all" },
     highlight_clipboard = { "none", "icon", "name", "all" },
     icons = {
       git_placement = { "before", "after", "signcolumn" },
@@ -786,7 +791,7 @@ function M.setup(conf)
 
   require("nvim-tree.actions").setup(opts)
   require("nvim-tree.keymap").setup(opts)
-  require("nvim-tree.colors").setup()
+  require("nvim-tree.appearance").setup()
   require("nvim-tree.diagnostics").setup(opts)
   require("nvim-tree.explorer").setup(opts)
   require("nvim-tree.git").setup(opts)
@@ -796,7 +801,7 @@ function M.setup(conf)
   require("nvim-tree.renderer").setup(opts)
   require("nvim-tree.live-filter").setup(opts)
   require("nvim-tree.marks").setup(opts)
-  require("nvim-tree.modified").setup(opts)
+  require("nvim-tree.buffers").setup(opts)
   require("nvim-tree.help").setup(opts)
   require("nvim-tree.watcher").setup(opts)
   if M.config.renderer.icons.show.file and pcall(require, "nvim-web-devicons") then

lua/nvim-tree/actions/fs/copy-paste.lua

@@ -7,8 +7,6 @@ local notify = require "nvim-tree.notify"
 local renderer = require "nvim-tree.renderer"
 local reloaders = require "nvim-tree.actions.reloaders"
 
-local HL_POSITION = require("nvim-tree.enum").HL_POSITION
-
 local find_file = require("nvim-tree.actions.finders.find-file").fn
 
 local M = {
@@ -317,34 +315,23 @@ function M.copy_absolute_path(node)
   copy_to_clipboard(content)
 end
 
---- Clipboard text highlight group and position when highlight_clipboard.
+---Node is cut. Will not be copied.
 ---@param node Node
----@return HL_POSITION position none when clipboard empty
+---@return boolean
----@return string|nil group only when node present in clipboard
+function M.is_cut(node)
-function M.get_highlight(node)
+  return vim.tbl_contains(clipboard.cut, node)
-  if M.hl_pos == HL_POSITION.none then
+end
-    return HL_POSITION.none, nil
-  end
 
-  for _, n in ipairs(clipboard.cut) do
+---Node is copied. Will not be cut.
-    if node == n then
+---@param node Node
-      return M.hl_pos, "NvimTreeCutHL"
+---@return boolean
-    end
+function M.is_copied(node)
-  end
+  return vim.tbl_contains(clipboard.copy, node)
-
-  for _, n in ipairs(clipboard.copy) do
-    if node == n then
-      return M.hl_pos, "NvimTreeCopiedHL"
-    end
-  end
-
-  return HL_POSITION.none, nil
 end
 
 function M.setup(opts)
   M.config.filesystem_watchers = opts.filesystem_watchers
   M.config.actions = opts.actions
-  M.hl_pos = HL_POSITION[opts.renderer.highlight_clipboard] or HL_POSITION.none
 end
 
 return M

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

@@ -6,39 +6,47 @@ local explorer_node = require "nvim-tree.explorer.node"
 local diagnostics = require "nvim-tree.diagnostics"
 
 local M = {}
+local MAX_DEPTH = 100
 
----@class NavigationItemOpts
+---Return the status of the node or nil if no status, depending on the type of
----@field where string
+---status.
----@field what string
+---@param node table node to inspect
+---@param what string type of status
+---@param skip_gitignored boolean default false
+---@return boolean
+local function status_is_valid(node, what, skip_gitignored)
+  if what == "git" then
+    local git_status = explorer_node.get_git_status(node)
+    return git_status ~= nil and (not skip_gitignored or git_status[1] ~= "!!")
+  elseif what == "diag" then
+    local diag_status = diagnostics.get_diag_status(node)
+    return diag_status ~= nil and diag_status.value ~= nil
+  elseif what == "opened" then
+    return vim.fn.bufloaded(node.absolute_path) ~= 0
+  end
 
----@param opts NavigationItemOpts
+  return false
----@return fun()
+end
-function M.fn(opts)
+
-  return function()
+---Move to the next node that has a valid status. If none found, don't move.
+---@param where string where to move (forwards or backwards)
+---@param what string type of status
+---@param skip_gitignored boolean default false
+local function move(where, what, skip_gitignored)
   local node_cur = lib.get_node_at_cursor()
   local first_node_line = core.get_nodes_starting_line()
   local nodes_by_line = utils.get_nodes_by_line(core.get_explorer().nodes, first_node_line)
   local iter_start, iter_end, iter_step, cur, first, nex
 
-    if opts.where == "next" then
+  if where == "next" then
     iter_start, iter_end, iter_step = first_node_line, #nodes_by_line, 1
-    elseif opts.where == "prev" then
+  elseif where == "prev" then
     iter_start, iter_end, iter_step = #nodes_by_line, first_node_line, -1
   end
 
   for line = iter_start, iter_end, iter_step do
     local node = nodes_by_line[line]
-      local valid = false
+    local valid = status_is_valid(node, what, skip_gitignored)
-
-      if opts.what == "git" then
-        local git_status = explorer_node.get_git_status(node)
-        valid = git_status ~= nil and (not opts.skip_gitignored or git_status[1] ~= "!!")
-      elseif opts.what == "diag" then
-        local diag_status = diagnostics.get_diag_status(node)
-        valid = diag_status ~= nil and diag_status.value ~= nil
-      elseif opts.what == "opened" then
-        valid = vim.fn.bufloaded(node.absolute_path) ~= 0
-      end
 
     if not first and valid then
       first = line
@@ -57,6 +65,173 @@ function M.fn(opts)
   elseif vim.o.wrapscan and first then
     view.set_cursor { first, 0 }
   end
+end
+
+local function expand_node(node)
+  if not node.open then
+    -- Expand the node.
+    -- Should never collapse since we checked open.
+    lib.expand_or_collapse(node)
+  end
+end
+
+--- Move to the next node recursively.
+---@param what string type of status
+---@param skip_gitignored boolean default false
+local function move_next_recursive(what, skip_gitignored)
+  -- If the current node:
+  -- * is a directory
+  -- * and is not the root node
+  -- * and has a git/diag status
+  -- * and is not opened
+  -- expand it.
+  local node_init = lib.get_node_at_cursor()
+  if not node_init then
+    return
+  end
+  local valid = false
+  if node_init.name ~= ".." then -- root node cannot have a status
+    valid = status_is_valid(node_init, what, skip_gitignored)
+  end
+  if node_init.nodes ~= nil and valid and not node_init.open then
+    lib.expand_or_collapse(node_init)
+  end
+
+  move("next", what, skip_gitignored)
+
+  local node_cur = lib.get_node_at_cursor()
+  if not node_cur then
+    return
+  end
+
+  -- If we haven't moved at all at this point, return.
+  if node_init == node_cur then
+    return
+  end
+
+  -- i is used to limit iterations.
+  local i = 0
+  local is_dir = node_cur.nodes ~= nil
+  while is_dir and i < MAX_DEPTH do
+    expand_node(node_cur)
+
+    move("next", what, skip_gitignored)
+
+    -- Save current node.
+    node_cur = lib.get_node_at_cursor()
+    -- Update is_dir.
+    if node_cur then
+      is_dir = node_cur.nodes ~= nil
+    else
+      is_dir = false
+    end
+
+    i = i + 1
+  end
+end
+
+--- Move to the previous node recursively.
+---
+--- move_prev_recursive:
+---
+--- 1) Save current as node_init.
+--  2) Call a non-recursive prev.
+--- 3) If current node is node_init's parent, call move_prev_recursive.
+--- 4) Else:
+--- 4.1) If current node is nil, is node_init (we didn't move), or is a file, return.
+--- 4.2) The current file is a directory, expand it.
+--- 4.3) Find node_init in current window, and move to it (if not found, return).
+---      If node_init is the root node (name = ".."), directly move to position 1.
+--- 4.4) Call a non-recursive prev.
+--- 4.5) Save the current node and start back from 4.1.
+---
+---@param what string type of status
+---@param skip_gitignored boolean default false
+local function move_prev_recursive(what, skip_gitignored)
+  local node_init, node_cur
+
+  -- 1)
+  node_init = lib.get_node_at_cursor()
+  if node_init == nil then
+    return
+  end
+
+  -- 2)
+  move("prev", what, skip_gitignored)
+
+  node_cur = lib.get_node_at_cursor()
+  if node_cur == node_init.parent then
+    -- 3)
+    move_prev_recursive(what, skip_gitignored)
+  else
+    -- i is used to limit iterations.
+    local i = 0
+    while i < MAX_DEPTH do
+      -- 4.1)
+      if
+        node_cur == nil
+        or node_cur == node_init -- we didn't move
+        or not node_cur.nodes -- node is a file
+      then
+        return
+      end
+
+      -- 4.2)
+      local node_dir = node_cur
+      expand_node(node_dir)
+
+      -- 4.3)
+      if node_init.name == ".." then -- root node
+        view.set_cursor { 1, 0 } -- move to root node (position 1)
+      else
+        local node_init_line = utils.find_node_line(node_init)
+        if node_init_line < 0 then
+          return
+        end
+        view.set_cursor { node_init_line, 0 }
+      end
+
+      -- 4.4)
+      move("prev", what, skip_gitignored)
+
+      -- 4.5)
+      node_cur = lib.get_node_at_cursor()
+
+      i = i + 1
+    end
+  end
+end
+
+---@class NavigationItemOpts
+---@field where string
+---@field what string
+
+---@param opts NavigationItemOpts
+---@return fun()
+function M.fn(opts)
+  return function()
+    local recurse = false
+    local skip_gitignored = false
+
+    -- recurse only valid for git and diag moves.
+    if (opts.what == "git" or opts.what == "diag") and opts.recurse ~= nil then
+      recurse = opts.recurse
+    end
+
+    if opts.skip_gitignored ~= nil then
+      skip_gitignored = opts.skip_gitignored
+    end
+
+    if not recurse then
+      move(opts.where, opts.what, skip_gitignored)
+      return
+    end
+
+    if opts.where == "next" then
+      move_next_recursive(opts.what, skip_gitignored)
+    elseif opts.where == "prev" then
+      move_prev_recursive(opts.what, skip_gitignored)
+    end
   end
 end
 

lua/nvim-tree/actions/reloaders.lua

@@ -10,13 +10,12 @@ local M = {}
 
 ---@param node Explorer|nil
 ---@param projects table
----@param unloaded_bufnr number|nil
+local function refresh_nodes(node, projects)
-local function refresh_nodes(node, projects, unloaded_bufnr)
   Iterator.builder({ node })
     :applier(function(n)
       if n.nodes then
         local toplevel = git.get_toplevel(n.cwd or n.link_to or n.absolute_path)
-        explorer_module.reload(n, projects[toplevel] or {}, unloaded_bufnr)
+        explorer_module.reload(n, projects[toplevel] or {})
       end
     end)
     :recursor(function(n)
@@ -43,18 +42,16 @@ function M.reload_node_status(parent_node, projects)
 end
 
 local event_running = false
----@param _ table|nil unused node passed by action
+function M.reload_explorer()
----@param unloaded_bufnr number|nil optional bufnr recently unloaded via BufUnload event
-function M.reload_explorer(_, unloaded_bufnr)
   if event_running or not core.get_explorer() or vim.v.exiting ~= vim.NIL then
     return
   end
   event_running = true
 
   local projects = git.reload()
-  refresh_nodes(core.get_explorer(), projects, unloaded_bufnr)
+  refresh_nodes(core.get_explorer(), projects)
   if view.is_visible() then
-    renderer.draw(unloaded_bufnr)
+    renderer.draw()
   end
   event_running = false
 end

lua/nvim-tree/api.lua

@@ -2,6 +2,7 @@ local lib = require "nvim-tree.lib"
 local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local actions = require "nvim-tree.actions"
+local appearance_diagnostics = require "nvim-tree.appearance.diagnostics"
 local events = require "nvim-tree.events"
 local help = require "nvim-tree.help"
 local live_filter = require "nvim-tree.live-filter"
@@ -39,6 +40,7 @@ local Api = {
     mappings = {},
   },
   commands = {},
+  diagnostics = {},
 }
 
 --- Do nothing when setup not called.
@@ -175,13 +177,13 @@ end
 
 ---@param mode string
 ---@return fun(node: table)
-local function open_or_expand_or_dir_up(mode)
+local function open_or_expand_or_dir_up(mode, toggle_group)
   return function(node)
     if node.name == ".." then
       actions.root.change_dir.fn ".."
     elseif node.nodes then
-      lib.expand_or_collapse(node)
+      lib.expand_or_collapse(node, toggle_group)
-    else
+    elseif not toggle_group then
       edit(mode, node)
     end
   end
@@ -195,6 +197,7 @@ Api.node.open.no_window_picker = wrap_node(open_or_expand_or_dir_up "edit_no_pic
 Api.node.open.vertical = wrap_node(open_or_expand_or_dir_up "vsplit")
 Api.node.open.horizontal = wrap_node(open_or_expand_or_dir_up "split")
 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")
 Api.node.open.preview_no_picker = wrap_node(open_or_expand_or_dir_up "preview_no_picker")
 
@@ -210,10 +213,14 @@ Api.node.navigate.parent = wrap_node(actions.moves.parent.fn(false))
 Api.node.navigate.parent_close = wrap_node(actions.moves.parent.fn(true))
 Api.node.navigate.git.next = wrap_node(actions.moves.item.fn { where = "next", what = "git" })
 Api.node.navigate.git.next_skip_gitignored = wrap_node(actions.moves.item.fn { where = "next", what = "git", skip_gitignored = true })
+Api.node.navigate.git.next_recursive = wrap_node(actions.moves.item.fn { where = "next", what = "git", recurse = true })
 Api.node.navigate.git.prev = wrap_node(actions.moves.item.fn { where = "prev", what = "git" })
 Api.node.navigate.git.prev_skip_gitignored = wrap_node(actions.moves.item.fn { where = "prev", what = "git", skip_gitignored = true })
+Api.node.navigate.git.prev_recursive = wrap_node(actions.moves.item.fn { where = "prev", what = "git", recurse = true })
 Api.node.navigate.diagnostics.next = wrap_node(actions.moves.item.fn { where = "next", what = "diag" })
+Api.node.navigate.diagnostics.next_recursive = wrap_node(actions.moves.item.fn { where = "next", what = "diag", recurse = true })
 Api.node.navigate.diagnostics.prev = wrap_node(actions.moves.item.fn { where = "prev", what = "diag" })
+Api.node.navigate.diagnostics.prev_recursive = wrap_node(actions.moves.item.fn { where = "prev", what = "diag", recurse = true })
 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" })
 
@@ -240,6 +247,8 @@ Api.config.mappings.get_keymap = wrap(keymap.get_keymap)
 Api.config.mappings.get_keymap_default = wrap(keymap.get_keymap_default)
 Api.config.mappings.default_on_attach = keymap.default_on_attach
 
+Api.diagnostics.hi_test = wrap(appearance_diagnostics.hi_test)
+
 Api.commands.get = wrap(function()
   return require("nvim-tree.commands").get()
 end)

lua/nvim-tree/appearance/diagnostics.lua

@@ -0,0 +1,80 @@
+local appearance = require "nvim-tree.appearance"
+
+local M = {}
+
+---@class HighlightDisplay for :NvimTreeHiTest
+---@field group string nvim-tree highlight group name
+---@field links string link chain to a concretely defined group
+---@field def string :hi concrete definition after following any links
+local HighlightDisplay = {}
+
+---@param group string nvim-tree highlight group
+---@return HighlightDisplay
+function HighlightDisplay:new(group)
+  local o = {}
+  setmetatable(o, self)
+  self.__index = self
+
+  o.group = group
+  local concrete = o.group
+
+  -- maybe follow links
+  local links = {}
+  local link = vim.api.nvim_get_hl(0, { name = o.group }).link
+  while link do
+    table.insert(links, link)
+    concrete = link
+    link = vim.api.nvim_get_hl(0, { name = link }).link
+  end
+  o.links = table.concat(links, " ")
+
+  -- concrete definition
+  local ok, res = pcall(vim.api.nvim_cmd, { cmd = "highlight", args = { concrete } }, { output = true })
+  if ok and type(res) == "string" then
+    o.def = res:gsub(".*xxx *", "")
+  else
+    o.def = ""
+  end
+
+  return o
+end
+
+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)
+end
+
+---Run a test similar to :so $VIMRUNTIME/syntax/hitest.vim
+---Display all nvim-tree highlight groups, their link chain and actual definition
+function M.hi_test()
+  local displays = {}
+  local max_group_len = 0
+  local max_links_len = 0
+
+  -- build all highlight groups, name only
+  for _, highlight_group in ipairs(appearance.HIGHLIGHT_GROUPS) do
+    local display = HighlightDisplay:new(highlight_group.group)
+    table.insert(displays, display)
+    max_group_len = math.max(max_group_len, #display.group)
+    max_links_len = math.max(max_links_len, #display.links)
+  end
+
+  -- create a buffer
+  local bufnr = vim.api.nvim_create_buf(false, true)
+
+  -- render and highlight
+  local l = 0
+  local fmt = string.format("%%-%d.%ds %%-%d.%ds %%s", max_group_len, max_group_len, max_links_len, max_links_len)
+  for _, display in ipairs(displays) do
+    display:render(bufnr, fmt, l)
+    l = l + 1
+  end
+
+  -- finalise and focus the buffer
+  vim.api.nvim_buf_set_option(bufnr, "modifiable", false)
+  vim.cmd.buffer(bufnr)
+end
+
+return M

lua/nvim-tree/appearance/init.lua

@@ -0,0 +1,202 @@
+local M = {}
+
+-- All highlight groups: linked or directly defined.
+-- Please add new groups to help and preserve order.
+-- Please avoid directly defined groups to preserve accessibility for TUI.
+M.HIGHLIGHT_GROUPS = {
+
+  -- Standard
+  { group = "NvimTreeNormal", link = "Normal" },
+  { group = "NvimTreeNormalFloat", link = "NormalFloat" },
+  { group = "NvimTreeNormalNC", link = "NvimTreeNormal" },
+
+  { group = "NvimTreeLineNr", link = "LineNr" },
+  { group = "NvimTreeWinSeparator", link = "WinSeparator" },
+  { group = "NvimTreeEndOfBuffer", link = "EndOfBuffer" },
+  { group = "NvimTreePopup", link = "Normal" },
+  { group = "NvimTreeSignColumn", link = "NvimTreeNormal" },
+
+  { group = "NvimTreeCursorColumn", link = "CursorColumn" },
+  { group = "NvimTreeCursorLine", link = "CursorLine" },
+  { group = "NvimTreeCursorLineNr", link = "CursorLineNr" },
+
+  { group = "NvimTreeStatusLine", link = "StatusLine" },
+  { group = "NvimTreeStatusLineNC", link = "StatusLineNC" },
+
+  -- File Text
+  { group = "NvimTreeExecFile", link = "SpellCap" },
+  { group = "NvimTreeImageFile", link = "SpellCap" },
+  { group = "NvimTreeSpecialFile", link = "SpellCap" },
+  { group = "NvimTreeSymlink", link = "SpellCap" },
+
+  -- Folder Text
+  { group = "NvimTreeRootFolder", link = "Title" },
+  { group = "NvimTreeFolderName", link = "Directory" },
+  { group = "NvimTreeEmptyFolderName", link = "Directory" },
+  { group = "NvimTreeOpenedFolderName", link = "Directory" },
+  { group = "NvimTreeSymlinkFolderName", link = "Directory" },
+
+  -- File Icons
+  { group = "NvimTreeFileIcon", link = "NvimTreeNormal" },
+  { group = "NvimTreeSymlinkIcon", link = "NvimTreeNormal" },
+
+  -- Folder Icons
+  { group = "NvimTreeFolderIcon", def = "guifg=#8094b4 ctermfg=Blue" },
+  { group = "NvimTreeOpenedFolderIcon", link = "NvimTreeFolderIcon" },
+  { group = "NvimTreeClosedFolderIcon", link = "NvimTreeFolderIcon" },
+  { group = "NvimTreeFolderArrowClosed", link = "NvimTreeIndentMarker" },
+  { group = "NvimTreeFolderArrowOpen", link = "NvimTreeIndentMarker" },
+
+  -- Indent
+  { group = "NvimTreeIndentMarker", link = "NvimTreeFolderIcon" },
+
+  -- Picker
+  { group = "NvimTreeWindowPicker", def = "guifg=#ededed guibg=#4493c8 gui=bold ctermfg=White ctermbg=Cyan" },
+
+  -- LiveFilter
+  { group = "NvimTreeLiveFilterPrefix", link = "PreProc" },
+  { group = "NvimTreeLiveFilterValue", link = "ModeMsg" },
+
+  -- Clipboard
+  { group = "NvimTreeCutHL", link = "SpellBad" },
+  { group = "NvimTreeCopiedHL", link = "SpellRare" },
+
+  -- Bookmark
+  { group = "NvimTreeBookmarkIcon", link = "NvimTreeFolderIcon" },
+  { group = "NvimTreeBookmarkHL", link = "SpellLocal" },
+
+  -- Modified
+  { group = "NvimTreeModifiedIcon", link = "Type" },
+  { group = "NvimTreeModifiedFileHL", link = "NvimTreeModifiedIcon" },
+  { group = "NvimTreeModifiedFolderHL", link = "NvimTreeModifiedFileHL" },
+
+  -- Opened
+  { group = "NvimTreeOpenedHL", link = "Special" },
+
+  -- Git Icon
+  { group = "NvimTreeGitDeletedIcon", link = "Statement" },
+  { group = "NvimTreeGitDirtyIcon", link = "Statement" },
+  { group = "NvimTreeGitIgnoredIcon", link = "Comment" },
+  { group = "NvimTreeGitMergeIcon", link = "Constant" },
+  { group = "NvimTreeGitNewIcon", link = "PreProc" },
+  { group = "NvimTreeGitRenamedIcon", link = "PreProc" },
+  { group = "NvimTreeGitStagedIcon", link = "Constant" },
+
+  -- Git File Highlight
+  { group = "NvimTreeGitFileDeletedHL", link = "NvimTreeGitDeletedIcon" },
+  { group = "NvimTreeGitFileDirtyHL", link = "NvimTreeGitDirtyIcon" },
+  { group = "NvimTreeGitFileIgnoredHL", link = "NvimTreeGitIgnoredIcon" },
+  { group = "NvimTreeGitFileMergeHL", link = "NvimTreeGitMergeIcon" },
+  { group = "NvimTreeGitFileNewHL", link = "NvimTreeGitNewIcon" },
+  { group = "NvimTreeGitFileRenamedHL", link = "NvimTreeGitRenamedIcon" },
+  { group = "NvimTreeGitFileStagedHL", link = "NvimTreeGitStagedIcon" },
+
+  -- Git Folder Highlight
+  { group = "NvimTreeGitFolderDeletedHL", link = "NvimTreeGitFileDeletedHL" },
+  { group = "NvimTreeGitFolderDirtyHL", link = "NvimTreeGitFileDirtyHL" },
+  { group = "NvimTreeGitFolderIgnoredHL", link = "NvimTreeGitFileIgnoredHL" },
+  { group = "NvimTreeGitFolderMergeHL", link = "NvimTreeGitFileMergeHL" },
+  { group = "NvimTreeGitFolderNewHL", link = "NvimTreeGitFileNewHL" },
+  { group = "NvimTreeGitFolderRenamedHL", link = "NvimTreeGitFileRenamedHL" },
+  { group = "NvimTreeGitFolderStagedHL", link = "NvimTreeGitFileStagedHL" },
+
+  -- Diagnostics Icon
+  { group = "NvimTreeDiagnosticErrorIcon", link = "DiagnosticError" },
+  { group = "NvimTreeDiagnosticWarnIcon", link = "DiagnosticWarn" },
+  { group = "NvimTreeDiagnosticInfoIcon", link = "DiagnosticInfo" },
+  { group = "NvimTreeDiagnosticHintIcon", link = "DiagnosticHint" },
+
+  -- Diagnostics File Highlight
+  { group = "NvimTreeDiagnosticErrorFileHL", link = "DiagnosticUnderlineError" },
+  { group = "NvimTreeDiagnosticWarnFileHL", link = "DiagnosticUnderlineWarn" },
+  { group = "NvimTreeDiagnosticInfoFileHL", link = "DiagnosticUnderlineInfo" },
+  { group = "NvimTreeDiagnosticHintFileHL", link = "DiagnosticUnderlineHint" },
+
+  -- Diagnostics Folder Highlight
+  { group = "NvimTreeDiagnosticErrorFolderHL", link = "NvimTreeDiagnosticErrorFileHL" },
+  { group = "NvimTreeDiagnosticWarnFolderHL", link = "NvimTreeDiagnosticWarnFileHL" },
+  { group = "NvimTreeDiagnosticInfoFolderHL", link = "NvimTreeDiagnosticInfoFileHL" },
+  { group = "NvimTreeDiagnosticHintFolderHL", link = "NvimTreeDiagnosticHintFileHL" },
+}
+
+-- nvim-tree highlight groups to legacy
+M.LEGACY_LINKS = {
+  NvimTreeModifiedIcon = "NvimTreeModifiedFile",
+
+  NvimTreeOpenedHL = "NvimTreeOpenedFile",
+
+  NvimTreeBookmarkIcon = "NvimTreeBookmark",
+
+  NvimTreeGitDeletedIcon = "NvimTreeGitDeleted",
+  NvimTreeGitDirtyIcon = "NvimTreeGitDirty",
+  NvimTreeGitIgnoredIcon = "NvimTreeGitIgnored",
+  NvimTreeGitMergeIcon = "NvimTreeGitMerge",
+  NvimTreeGitNewIcon = "NvimTreeGitNew",
+  NvimTreeGitRenamedIcon = "NvimTreeGitRenamed",
+  NvimTreeGitStagedIcon = "NvimTreeGitStaged",
+
+  NvimTreeGitFileDeletedHL = "NvimTreeFileDeleted",
+  NvimTreeGitFileDirtyHL = "NvimTreeFileDirty",
+  NvimTreeGitFileIgnoredHL = "NvimTreeFileIgnored",
+  NvimTreeGitFileMergeHL = "NvimTreeFileMerge",
+  NvimTreeGitFileNewHL = "NvimTreeFileNew",
+  NvimTreeGitFileRenamedHL = "NvimTreeFileRenamed",
+  NvimTreeGitFileStagedHL = "NvimTreeFileStaged",
+
+  NvimTreeGitFolderDeletedHL = "NvimTreeFolderDeleted",
+  NvimTreeGitFolderDirtyHL = "NvimTreeFolderDirty",
+  NvimTreeGitFolderIgnoredHL = "NvimTreeFolderIgnored",
+  NvimTreeGitFolderMergeHL = "NvimTreeFolderMerge",
+  NvimTreeGitFolderNewHL = "NvimTreeFolderNew",
+  NvimTreeGitFolderRenamedHL = "NvimTreeFolderRenamed",
+  NvimTreeGitFolderStagedHL = "NvimTreeFolderStaged",
+
+  NvimTreeDiagnosticErrorIcon = "NvimTreeLspDiagnosticsError",
+  NvimTreeDiagnosticWarnIcon = "NvimTreeLspDiagnosticsWarning",
+  NvimTreeDiagnosticInfoIcon = "NvimTreeLspDiagnosticsInformation",
+  NvimTreeDiagnosticHintIcon = "NvimTreeLspDiagnosticsHint",
+
+  NvimTreeDiagnosticErrorFileHL = "NvimTreeLspDiagnosticsErrorText",
+  NvimTreeDiagnosticWarnFileHL = "NvimTreeLspDiagnosticsWarningText",
+  NvimTreeDiagnosticInfoFileHL = "NvimTreeLspDiagnosticsInformationText",
+  NvimTreeDiagnosticHintFileHL = "NvimTreeLspDiagnosticsHintText",
+
+  NvimTreeDiagnosticErrorFolderHL = "NvimTreeLspDiagnosticsErrorFolderText",
+  NvimTreeDiagnosticWarnFolderHL = "NvimTreeLspDiagnosticsWarningFolderText",
+  NvimTreeDiagnosticInfoFolderHL = "NvimTreeLspDiagnosticsInformationFolderText",
+  NvimTreeDiagnosticHintFolderHL = "NvimTreeLspDiagnosticsHintFolderText",
+}
+
+function M.setup()
+  -- non-linked
+  for _, g in ipairs(M.HIGHLIGHT_GROUPS) do
+    if g.def then
+      vim.api.nvim_command("hi def " .. g.group .. " " .. g.def)
+    end
+  end
+
+  -- hard link override when legacy only is present
+  for from, to in pairs(M.LEGACY_LINKS) do
+    local hl_from
+    local hl_to
+    if vim.fn.has "nvim-0.9" == 1 then
+      hl_from = vim.api.nvim_get_hl(0, { name = from })
+      hl_to = vim.api.nvim_get_hl(0, { name = to })
+    else
+      hl_from = vim.api.nvim__get_hl_defs(0)[from] or {}
+      hl_to = vim.api.nvim__get_hl_defs(0)[to] or {}
+    end
+    if vim.tbl_isempty(hl_from) and not vim.tbl_isempty(hl_to) then
+      vim.api.nvim_command("hi link " .. from .. " " .. to)
+    end
+  end
+
+  -- default links
+  for _, g in ipairs(M.HIGHLIGHT_GROUPS) do
+    if g.link then
+      vim.api.nvim_command("hi def link " .. g.group .. " " .. g.link)
+    end
+  end
+end
+
+return M

lua/nvim-tree/buffers.lua

@@ -1,40 +1,50 @@
 local M = {}
 
 ---@type table<string, boolean> record of which file is modified
-M._record = {}
+M._modified = {}
 
----refresh M.record
+---refresh M._modified
-function M.reload()
+function M.reload_modified()
-  M._record = {}
+  M._modified = {}
   local bufs = vim.fn.getbufinfo { bufmodified = true, buflisted = true }
   for _, buf in pairs(bufs) do
     local path = buf.name
     if path ~= "" then -- not a [No Name] buffer
       -- mark all the parent as modified as well
       while
-        M._record[path] ~= true
+        M._modified[path] ~= true
         -- no need to keep going if already recorded
         -- This also prevents an infinite loop
       do
-        M._record[path] = true
+        M._modified[path] = true
         path = vim.fn.fnamemodify(path, ":h")
       end
     end
   end
 end
 
----@param node Node
+---@param node table
 ---@return boolean
 function M.is_modified(node)
-  return M.config.enable
+  return node
-    and M._record[node.absolute_path]
+    and M.config.modified.enable
-    and (not node.nodes or M.config.show_on_dirs)
+    and M._modified[node.absolute_path]
-    and (not node.open or M.config.show_on_open_dirs)
+    and (not node.nodes or M.config.modified.show_on_dirs)
+    and (not node.open or M.config.modified.show_on_open_dirs)
+end
+
+---A buffer exists for the node's absolute path
+---@param node table
+---@return boolean
+function M.is_opened(node)
+  return node and vim.fn.bufloaded(node.absolute_path) > 0
 end
 
 ---@param opts table
 function M.setup(opts)
-  M.config = opts.modified
+  M.config = {
+    modified = opts.modified,
+  }
 end
 
 return M

lua/nvim-tree/colors.lua

@@ -1,130 +0,0 @@
-local M = {}
-
-local function get_color_from_hl(hl_name, fallback)
-  local id = vim.api.nvim_get_hl_id_by_name(hl_name)
-  if not id then
-    return fallback
-  end
-
-  local foreground = vim.fn.synIDattr(vim.fn.synIDtrans(id), "fg")
-  if not foreground or foreground == "" then
-    return fallback
-  end
-
-  return foreground
-end
-
-local function get_colors()
-  return {
-    red = vim.g.terminal_color_1 or get_color_from_hl("Keyword", "Red"),
-    green = vim.g.terminal_color_2 or get_color_from_hl("Character", "Green"),
-    yellow = vim.g.terminal_color_3 or get_color_from_hl("PreProc", "Yellow"),
-    blue = vim.g.terminal_color_4 or get_color_from_hl("Include", "Blue"),
-    purple = vim.g.terminal_color_5 or get_color_from_hl("Define", "Purple"),
-    cyan = vim.g.terminal_color_6 or get_color_from_hl("Conditional", "Cyan"),
-    dark_red = vim.g.terminal_color_9 or get_color_from_hl("Keyword", "DarkRed"),
-    orange = vim.g.terminal_color_11 or get_color_from_hl("Number", "Orange"),
-  }
-end
-
-local function get_hl_groups()
-  local colors = get_colors()
-
-  return {
-    IndentMarker = { fg = "#8094b4" },
-    Symlink = { gui = "bold", fg = colors.cyan },
-    FolderIcon = { fg = "#8094b4" },
-    RootFolder = { fg = colors.purple },
-
-    ExecFile = { gui = "bold", fg = colors.green },
-    SpecialFile = { gui = "bold,underline", fg = colors.yellow },
-    ImageFile = { gui = "bold", fg = colors.purple },
-    OpenedFile = { gui = "bold", fg = colors.green },
-    ModifiedFile = { fg = colors.green },
-
-    GitDirty = { fg = colors.dark_red },
-    GitDeleted = { fg = colors.dark_red },
-    GitStaged = { fg = colors.green },
-    GitMerge = { fg = colors.orange },
-    GitRenamed = { fg = colors.purple },
-    GitNew = { fg = colors.yellow },
-
-    WindowPicker = { gui = "bold", fg = "#ededed", bg = "#4493c8" },
-    LiveFilterPrefix = { gui = "bold", fg = colors.purple },
-    LiveFilterValue = { gui = "bold", fg = "#fff" },
-
-    Bookmark = { fg = colors.green },
-  }
-end
-
-local function get_links()
-  return {
-    FolderName = "Directory",
-    EmptyFolderName = "Directory",
-    OpenedFolderName = "Directory",
-    SymlinkFolderName = "Directory",
-    OpenedFolderIcon = "NvimTreeFolderIcon",
-    ClosedFolderIcon = "NvimTreeFolderIcon",
-    OpenedFileIcon = "NvimTreeOpenedFile",
-    Normal = "Normal",
-    NormalFloat = "NormalFloat",
-    NormalNC = "NvimTreeNormal",
-    EndOfBuffer = "EndOfBuffer",
-    CursorLineNr = "CursorLineNr",
-    LineNr = "LineNr",
-    CursorLine = "CursorLine",
-    WinSeparator = "WinSeparator",
-    CursorColumn = "CursorColumn",
-    FileDirty = "NvimTreeGitDirty",
-    FileNew = "NvimTreeGitNew",
-    FileRenamed = "NvimTreeGitRenamed",
-    FileMerge = "NvimTreeGitMerge",
-    FileStaged = "NvimTreeGitStaged",
-    FileDeleted = "NvimTreeGitDeleted",
-    FileIgnored = "NvimTreeGitIgnored",
-    FolderDirty = "NvimTreeFileDirty",
-    FolderNew = "NvimTreeFileNew",
-    FolderRenamed = "NvimTreeFileRenamed",
-    FolderMerge = "NvimTreeFileMerge",
-    FolderStaged = "NvimTreeFileStaged",
-    FolderDeleted = "NvimTreeFileDeleted",
-    FolderIgnored = "NvimTreeFileIgnored",
-    LspDiagnosticsError = "DiagnosticError",
-    LspDiagnosticsWarning = "DiagnosticWarn",
-    LspDiagnosticsInformation = "DiagnosticInfo",
-    LspDiagnosticsHint = "DiagnosticHint",
-    LspDiagnosticsErrorText = "NvimTreeLspDiagnosticsError",
-    LspDiagnosticsWarningText = "NvimTreeLspDiagnosticsWarning",
-    LspDiagnosticsInformationText = "NvimTreeLspDiagnosticsInformation",
-    LspDiagnosticsHintText = "NvimTreeLspDiagnosticsHintFile",
-    LspDiagnosticsErrorFolderText = "NvimTreeLspDiagnosticsErrorText",
-    LspDiagnosticsWarningFolderText = "NvimTreeLspDiagnosticsWarningText",
-    LspDiagnosticsInformationFolderText = "NvimTreeLspDiagnosticsInformationText",
-    LspDiagnosticsHintFolderText = "NvimTreeLspDiagnosticsHintFileText",
-    Popup = "Normal",
-    GitIgnored = "Comment",
-    StatusLine = "StatusLine",
-    StatusLineNC = "StatusLineNC",
-    SignColumn = "NvimTreeNormal",
-    CutHL = "SpellBad",
-    CopiedHL = "SpellRare",
-    BookmarkHL = "SpellLocal",
-  }
-end
-
-function M.setup()
-  local highlight_groups = get_hl_groups()
-  for k, d in pairs(highlight_groups) do
-    local gui = d.gui and " gui=" .. d.gui or ""
-    local fg = d.fg and " guifg=" .. d.fg or ""
-    local bg = d.bg and " guibg=" .. d.bg or ""
-    vim.api.nvim_command("hi def NvimTree" .. k .. gui .. fg .. bg)
-  end
-
-  local links = get_links()
-  for k, d in pairs(links) do
-    vim.api.nvim_command("hi def link NvimTree" .. k .. " " .. d)
-  end
-end
-
-return M

lua/nvim-tree/commands.lua

@@ -134,6 +134,13 @@ local CMDS = {
       api.tree.collapse_all(true)
     end,
   },
+  {
+    name = "NvimTreeHiTest",
+    opts = {
+      desc = "nvim-tree: highlight test",
+    },
+    command = api.diagnostics.hi_test,
+  },
 }
 
 function M.get()

lua/nvim-tree/diagnostics.lua

@@ -4,9 +4,6 @@ local log = require "nvim-tree.log"
 
 local M = {}
 
----TODO add "$VIMRUNTIME" to "workspace.library" and use the @enum instead of this integer
----@alias lsp.DiagnosticSeverity integer
-
 ---COC severity level strings to LSP severity levels
 ---@enum COC_SEVERITY_LEVELS
 local COC_SEVERITY_LEVELS = {

lua/nvim-tree/enum.lua

@@ -12,9 +12,10 @@ M.HL_POSITION = {
 ---Setup options for "*_placement"
 ---@enum ICON_PLACEMENT
 M.ICON_PLACEMENT = {
-  signcolumn = 0,
+  none = 0,
-  before = 1,
+  signcolumn = 1,
-  after = 2,
+  before = 2,
+  after = 3,
 }
 
 return M

lua/nvim-tree/explorer/filters.lua

@@ -4,6 +4,7 @@ local marks = require "nvim-tree.marks"
 local M = {
   ignore_list = {},
   exclude_list = {},
+  custom_function = nil,
 }
 
 ---@param path string
@@ -47,16 +48,15 @@ end
 ---Check if the given path has no listed buffer
 ---@param path string Absolute path
 ---@param bufinfo table vim.fn.getbufinfo { buflisted = 1 }
----@param unloaded_bufnr number optional bufnr recently unloaded via BufUnload event
 ---@return boolean
-local function buf(path, bufinfo, unloaded_bufnr)
+local function buf(path, bufinfo)
   if not M.config.filter_no_buffer or type(bufinfo) ~= "table" then
     return false
   end
 
   -- filter files with no open buffer and directories containing no open buffers
   for _, b in ipairs(bufinfo) do
-    if b.name == path or b.name:find(path .. "/", 1, true) and b.bufnr ~= unloaded_bufnr then
+    if b.name == path or b.name:find(path .. "/", 1, true) then
       return false
     end
   end
@@ -85,6 +85,11 @@ local function custom(path)
 
   local basename = utils.path_basename(path)
 
+  -- filter user's custom function
+  if M.custom_function and M.custom_function(path) then
+    return true
+  end
+
   -- filter custom regexes
   local relpath = utils.path_relative(path, vim.loop.cwd())
   for pat, _ in pairs(M.ignore_list) do
@@ -105,16 +110,13 @@ end
 
 ---Prepare arguments for should_filter. This is done prior to should_filter for efficiency reasons.
 ---@param git_status table|nil optional results of git.load_project_status(...)
----@param unloaded_bufnr number|nil optional bufnr recently unloaded via BufUnload event
 ---@return table
 --- git_status: reference
---- unloaded_bufnr: copy
 --- bufinfo: empty unless no_buffer set: vim.fn.getbufinfo { buflisted = 1 }
 --- bookmarks: absolute paths to boolean
-function M.prepare(git_status, unloaded_bufnr)
+function M.prepare(git_status)
   local status = {
     git_status = git_status or {},
-    unloaded_bufnr = unloaded_bufnr,
     bufinfo = {},
     bookmarks = {},
   }
@@ -140,11 +142,7 @@ function M.should_filter(path, status)
     return false
   end
 
-  return git(path, status.git_status)
+  return git(path, status.git_status) or buf(path, status.bufinfo) or dotfile(path) or custom(path) or bookmark(path, status.bookmarks)
-    or buf(path, status.bufinfo, status.unloaded_bufnr)
-    or dotfile(path)
-    or custom(path)
-    or bookmark(path, status.bookmarks)
 end
 
 function M.setup(opts)
@@ -161,11 +159,15 @@ function M.setup(opts)
   M.exclude_list = opts.filters.exclude
 
   local custom_filter = opts.filters.custom
+  if type(custom_filter) == "function" then
+    M.custom_function = custom_filter
+  else
     if custom_filter and #custom_filter > 0 then
       for _, filter_name in pairs(custom_filter) do
         M.ignore_list[filter_name] = true
       end
     end
+  end
 end
 
 return M

lua/nvim-tree/explorer/reload.lua

@@ -69,8 +69,7 @@ end
 
 ---@param node Node
 ---@param git_status table
----@param unloaded_bufnr number|nil
+function M.reload(node, git_status)
-function M.reload(node, git_status, unloaded_bufnr)
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if not handle then
@@ -79,7 +78,7 @@ function M.reload(node, git_status, unloaded_bufnr)
 
   local profile = log.profile_start("reload %s", node.absolute_path)
 
-  local filter_status = filters.prepare(git_status, unloaded_bufnr)
+  local filter_status = filters.prepare(git_status)
 
   if node.group_next then
     node.nodes = { node.group_next }

lua/nvim-tree/git/runner.lua

@@ -2,11 +2,6 @@ local log = require "nvim-tree.log"
 local utils = require "nvim-tree.utils"
 local notify = require "nvim-tree.notify"
 
--- TODO add "${3rd}/luv/library" to "workspace.library"
----@class uv.uv_handle_t: table
----@class uv.uv_stream_t: uv.uv_handle_t
----@class uv.uv_pipe_t: uv.uv_stream_t
-
 ---@class Runner
 local Runner = {}
 Runner.__index = Runner

lua/nvim-tree/help.lua

@@ -119,14 +119,20 @@ local function compute()
   -- increase desc if lines are shorter than the header
   max_desc = math.max(max_desc, #head_lhs + #head_rhs1 - max_lhs)
 
-  -- header, not padded
+  -- header text, not padded
-  local hl = { { "NvimTreeRootFolder", 0, 0, #head_lhs } }
   local lines = {
     head_lhs .. string.rep(" ", max_desc + max_lhs - #head_lhs - #head_rhs1 + 2) .. head_rhs1,
     string.rep(" ", max_desc + max_lhs - #head_rhs2 + 2) .. head_rhs2,
   }
   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 },
+  }
+
   -- mappings, left padded 1
   local fmt = string.format(" %%-%ds %%-%ds", max_lhs, max_desc)
   for i, l in ipairs(mappings) do

lua/nvim-tree/keymap.lua

@@ -72,6 +72,7 @@ function M.default_on_attach(bufnr)
   vim.keymap.set('n', 'I',       api.tree.toggle_gitignore_filter,    opts('Toggle Filter: Git Ignore'))
   vim.keymap.set('n', 'J',       api.node.navigate.sibling.last,      opts('Last Sibling'))
   vim.keymap.set('n', 'K',       api.node.navigate.sibling.first,     opts('First Sibling'))
+  vim.keymap.set('n', 'L',       api.node.open.toggle_group_empty,    opts('Toggle Group Empty'))
   vim.keymap.set('n', 'M',       api.tree.toggle_no_bookmark_filter,  opts('Toggle Filter: No Bookmark'))
   vim.keymap.set('n', 'm',       api.marks.toggle,                    opts('Toggle Bookmark'))
   vim.keymap.set('n', 'o',       api.node.open.edit,                  opts('Open'))

lua/nvim-tree/legacy.lua

@@ -41,6 +41,16 @@ local function refactored(opts)
 
   -- 2023/08/26
   utils.move_missing_val(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
+
+  -- 2023/10/08
+  if type(opts.renderer) == "table" and type(opts.renderer.highlight_diagnostics) == "boolean" then
+    opts.renderer.highlight_diagnostics = opts.renderer.highlight_diagnostics and "name" or "none"
+  end
+
+  -- 2023/10/21
+  if type(opts.renderer) == "table" and type(opts.renderer.highlight_git) == "boolean" then
+    opts.renderer.highlight_git = opts.renderer.highlight_git and "name" or "none"
+  end
 end
 
 local function deprecated(opts)

lua/nvim-tree/lib.lua

@@ -3,6 +3,7 @@ local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
+local explorer_node = require "nvim-tree.explorer.node"
 
 ---@class LibOpenOpts
 ---@field path string|nil path
@@ -24,7 +25,7 @@ function M.get_node_at_cursor()
     return
   end
 
-  local cursor = vim.api.nvim_win_get_cursor(view.get_winnr())
+  local cursor = vim.api.nvim_win_get_cursor(winnr)
   local line = cursor[1]
 
   if line == 1 and view.is_root_folder_visible(core.get_cwd()) then
@@ -86,6 +87,34 @@ function M.get_last_group_node(node)
   return node
 end
 
+---Group empty folders
+-- Recursively group nodes
+---@param node Node
+---@return Node[]
+function M.group_empty_folders(node)
+  local is_root = not node.parent
+  local child_folder_only = explorer_node.has_one_child_folder(node) and node.nodes[1]
+  if M.group_empty and not is_root and child_folder_only then
+    node.group_next = child_folder_only
+    local ns = M.group_empty_folders(child_folder_only)
+    node.nodes = ns or {}
+    return ns
+  end
+  return node.nodes
+end
+
+---Ungroup empty folders
+-- If a node is grouped, ungroup it: put node.group_next to the node.nodes and set node.group_next to nil
+---@param node Node
+function M.ungroup_empty_folders(node)
+  local cur = node
+  while cur and cur.group_next do
+    cur.nodes = { cur.group_next }
+    cur.group_next = nil
+    cur = cur.nodes[1]
+  end
+end
+
 ---@param node Node
 ---@return Node[]
 function M.get_all_nodes_in_group(node)
@@ -98,8 +127,21 @@ function M.get_all_nodes_in_group(node)
   return nodes
 end
 
+-- Toggle group empty folders
+---@param head_node Node
+local function toggle_group_folders(head_node)
+  local is_grouped = head_node.group_next ~= nil
+
+  if is_grouped then
+    M.ungroup_empty_folders(head_node)
+  else
+    M.group_empty_folders(head_node)
+  end
+end
+
 ---@param node Node
-function M.expand_or_collapse(node)
+function M.expand_or_collapse(node, toggle_group)
+  toggle_group = toggle_group or false
   if node.has_children then
     node.has_children = false
   end
@@ -108,9 +150,20 @@ function M.expand_or_collapse(node)
     core.get_explorer():expand(node)
   end
 
-  local open = not M.get_last_group_node(node).open
+  local head_node = utils.get_parent_of_group(node)
-  for _, n in ipairs(M.get_all_nodes_in_group(node)) do
+  if toggle_group then
-    n.open = open
+    toggle_group_folders(head_node)
+  end
+
+  local open = M.get_last_group_node(node).open
+  local next_open
+  if toggle_group then
+    next_open = open
+  else
+    next_open = not open
+  end
+  for _, n in ipairs(M.get_all_nodes_in_group(head_node)) do
+    n.open = next_open
   end
 
   renderer.draw()
@@ -213,6 +266,7 @@ function M.setup(opts)
   M.hijack_directories = opts.hijack_directories
   M.respect_buf_cwd = opts.respect_buf_cwd
   M.select_prompts = opts.select_prompts
+  M.group_empty = opts.renderer.group_empty
 end
 
 return M

lua/nvim-tree/marks/init.lua

@@ -45,7 +45,7 @@ end
 ---@param node Node|MinimalNode
 ---@return table|nil
 function M.get_mark(node)
-  return NvimTreeMarks[node.absolute_path]
+  return node and NvimTreeMarks[node.absolute_path]
 end
 
 ---@return table

lua/nvim-tree/node.lua

@@ -1,9 +1,5 @@
 ---@meta
 
--- TODO add "${3rd}/luv/library" to "workspace.library"
----@class uv.uv_req_t: table
----@class uv.uv_fs_t: uv.uv_req_t
-
 ---@class ParentNode
 ---@field name string
 

lua/nvim-tree/renderer/builder.lua

@@ -1,136 +1,92 @@
-local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
+local live_filter = require "nvim-tree.live-filter"
 local notify = require "nvim-tree.notify"
+local utils = require "nvim-tree.utils"
+local view = require "nvim-tree.view"
+
+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 DecoratorOpened = require "nvim-tree.renderer.decorator.opened"
 
-local git = require "nvim-tree.renderer.components.git"
 local pad = require "nvim-tree.renderer.components.padding"
 local icons = require "nvim-tree.renderer.components.icons"
-local modified = require "nvim-tree.renderer.components.modified"
-local diagnostics = require "nvim-tree.renderer.components.diagnostics"
-local bookmarks = require "nvim-tree.renderer.components.bookmarks"
 
-local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local M = {
+  opts = {},
+  decorators = {},
+  picture_map = {
+    jpg = true,
+    jpeg = true,
+    png = true,
+    gif = true,
+    webp = true,
+    jxl = true,
+  },
+}
 
+---@class HighlightedString
+---@field str string
+---@field hl string[]
+
+---@class AddHighlightArgs
+---@field group string[]
+---@field line number
+---@field col_start number
+---@field col_end number
+
+---@class Builder
+---@field lines string[] includes icons etc.
+---@field hl_args AddHighlightArgs[] line highlights
+---@field signs string[] line signs
+---@field private root_cwd string absolute path
+---@field private index number
+---@field private depth number
+---@field private combined_groups table<string, boolean> combined group names
+---@field private markers boolean[] indent markers
 local Builder = {}
-Builder.__index = Builder
 
-local DEFAULT_ROOT_FOLDER_LABEL = ":~:s?$?/..?"
+---@return Builder
-
+function Builder:new()
-function Builder.new(root_cwd)
+  local o = {
-  return setmetatable({
+    root_cwd = core.get_cwd(),
     index = 0,
     depth = 0,
-    highlights = {},
+    hl_args = {},
+    combined_groups = {},
     lines = {},
     markers = {},
     signs = {},
-    root_cwd = root_cwd,
+  }
-  }, Builder)
+  setmetatable(o, self)
+  self.__index = self
+
+  return o
 end
 
-function Builder:configure_root_label(root_folder_label)
+---Insert ranged highlight groups into self.highlights
-  self.root_folder_label = root_folder_label or DEFAULT_ROOT_FOLDER_LABEL
+---@private
-  return self
+---@param groups string[]
+---@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 })
 end
 
-function Builder:configure_trailing_slash(with_trailing)
+---@private
-  self.trailing_slash = with_trailing and "/" or ""
+function Builder:get_folder_name(node)
-  return self
-end
-
-function Builder:configure_special_files(special_files)
-  self.special_files = special_files
-  return self
-end
-
-function Builder:configure_picture_map(picture_map)
-  self.picture_map = picture_map
-  return self
-end
-
-function Builder:configure_filter(filter, prefix)
-  self.filter_prefix = prefix
-  self.filter = filter
-  return self
-end
-
-function Builder:configure_opened_file_highlighting(highlight_opened_files)
-  self.highlight_opened_files = highlight_opened_files
-  return self
-end
-
-function Builder:configure_modified_highlighting(highlight_modified)
-  self.highlight_modified = highlight_modified
-  return self
-end
-
-function Builder:configure_icon_padding(padding)
-  self.icon_padding = padding or " "
-  return self
-end
-
-function Builder:configure_git_icons_placement(where)
-  if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
-    where = "before" -- default before
-  end
-  self.git_placement = where
-  return self
-end
-
-function Builder:configure_diagnostics_icon_placement(where)
-  if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
-    where = "before" -- default before
-  end
-  self.diagnostics_placement = where
-  return self
-end
-
-function Builder:configure_bookmark_icon_placement(where)
-  if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
-    where = "before" -- default before
-  end
-  self.bookmarks_placement = where
-  return self
-end
-
-function Builder:configure_modified_placement(where)
-  if where ~= "after" and where ~= "before" and where ~= "signcolumn" then
-    where = "after" -- default after
-  end
-  self.modified_placement = where
-  return self
-end
-
-function Builder:configure_symlink_destination(show)
-  self.symlink_destination = show
-  return self
-end
-
-function Builder:configure_group_name_modifier(group_name_modifier)
-  if type(group_name_modifier) == "function" then
-    self.group_name_modifier = group_name_modifier
-  end
-  return self
-end
-
-function Builder:_insert_highlight(group, start, end_)
-  table.insert(self.highlights, { group, self.index, start, end_ or -1 })
-end
-
-function Builder:_insert_line(line)
-  table.insert(self.lines, line)
-end
-
-function Builder:_get_folder_name(node)
   local name = node.name
   local next = node.group_next
   while next do
-    name = name .. "/" .. next.name
+    name = string.format("%s/%s", name, next.name)
     next = next.group_next
   end
 
-  if node.group_next and self.group_name_modifier then
+  if node.group_next and type(M.opts.renderer.group_empty) == "function" then
-    local new_name = self.group_name_modifier(name)
+    local new_name = M.opts.renderer.group_empty(name)
     if type(new_name) == "string" then
       name = new_name
     else
@@ -138,16 +94,13 @@ function Builder:_get_folder_name(node)
     end
   end
 
-  return name .. self.trailing_slash
+  return string.format("%s%s", name, M.opts.renderer.add_trailing and "/" or "")
 end
 
----@class HighlightedString
+---@private
----@field str string
----@field hl string[]
-
 ---@param highlighted_strings HighlightedString[]
 ---@return string
-function Builder:_unwrap_highlighted_strings(highlighted_strings)
+function Builder:unwrap_highlighted_strings(highlighted_strings)
   if not highlighted_strings then
     return ""
   end
@@ -156,21 +109,22 @@ function Builder:_unwrap_highlighted_strings(highlighted_strings)
   for _, v in ipairs(highlighted_strings) do
     if #v.str > 0 then
       if v.hl and type(v.hl) == "table" then
-        self:_insert_highlight(v.hl, #string, #string + #v.str)
+        self:insert_highlight(v.hl, #string, #string + #v.str)
       end
-      string = string .. v.str
+      string = string.format("%s%s", string, v.str)
     end
   end
   return string
 end
 
+---@private
 ---@param node table
 ---@return HighlightedString icon
 ---@return HighlightedString name
-function Builder:_build_folder(node)
+function Builder:build_folder(node)
   local has_children = #node.nodes ~= 0 or node.has_children
   local icon, icon_hl = icons.get_folder_icon(node, has_children)
-  local foldername = self:_get_folder_name(node)
+  local foldername = self:get_folder_name(node)
 
   if #icon > 0 and icon_hl == nil then
     if node.open then
@@ -181,12 +135,14 @@ function Builder:_build_folder(node)
   end
 
   local foldername_hl = "NvimTreeFolderName"
-  if node.link_to and self.symlink_destination then
+  if node.link_to and M.opts.renderer.symlink_destination then
     local arrow = icons.i.symlink_arrow
-    local link_to = utils.path_relative(node.link_to, core.get_cwd())
+    local link_to = utils.path_relative(node.link_to, self.root_cwd)
-    foldername = foldername .. arrow .. link_to
+    foldername = string.format("%s%s%s", foldername, arrow, link_to)
     foldername_hl = "NvimTreeSymlinkFolderName"
-  elseif vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
+  elseif
+    vim.tbl_contains(M.opts.renderer.special_files, node.absolute_path) or vim.tbl_contains(M.opts.renderer.special_files, node.name)
+  then
     foldername_hl = "NvimTreeSpecialFolderName"
   elseif node.open then
     foldername_hl = "NvimTreeOpenedFolderName"
@@ -197,174 +153,56 @@ function Builder:_build_folder(node)
   return { str = icon, hl = { icon_hl } }, { str = foldername, hl = { foldername_hl } }
 end
 
+---@private
 ---@param node table
 ---@return HighlightedString icon
 ---@return HighlightedString name
-function Builder:_build_symlink(node)
+function Builder:build_symlink(node)
   local icon = icons.i.symlink
   local arrow = icons.i.symlink_arrow
   local symlink_formatted = node.name
-  if self.symlink_destination then
+  if M.opts.renderer.symlink_destination then
-    local link_to = utils.path_relative(node.link_to, core.get_cwd())
+    local link_to = utils.path_relative(node.link_to, self.root_cwd)
-    symlink_formatted = symlink_formatted .. arrow .. link_to
+    symlink_formatted = string.format("%s%s%s", symlink_formatted, arrow, link_to)
   end
 
   return { str = icon, hl = { "NvimTreeSymlinkIcon" } }, { str = symlink_formatted, hl = { "NvimTreeSymlink" } }
 end
 
----@param node table
+---@private
----@return HighlightedString icon
-function Builder:_build_file_icon(node)
-  local icon, hl_group = icons.get_file_icon(node.name, node.extension)
-  return { str = icon, hl = { hl_group } }
-end
-
 ---@param node table
 ---@return HighlightedString icon
 ---@return HighlightedString name
-function Builder:_build_file(node)
+function Builder:build_file(node)
-  local icon = self:_build_file_icon(node)
-
   local hl
-  if vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
+  if vim.tbl_contains(M.opts.renderer.special_files, node.absolute_path) or vim.tbl_contains(M.opts.renderer.special_files, node.name) then
     hl = "NvimTreeSpecialFile"
   elseif node.executable then
     hl = "NvimTreeExecFile"
-  elseif self.picture_map[node.extension] then
+  elseif M.picture_map[node.extension] then
     hl = "NvimTreeImageFile"
   end
 
-  return icon, { str = node.name, hl = { hl } }
+  local icon, hl_group = icons.get_file_icon(node.name, node.extension)
-end
+  return { str = icon, hl = { hl_group } }, { str = node.name, hl = { hl } }
-
----@param node table
----@return HighlightedString[]|nil icon
-function Builder:_get_git_icons(node)
-  local git_icons = git.get_icons(node)
-  if git_icons and #git_icons > 0 and self.git_placement == "signcolumn" then
-    table.insert(self.signs, {
-      sign = git_icons[1].hl[1],
-      lnum = self.index + 1,
-      priority = 1,
-    })
-    git_icons = nil
-  end
-  return git_icons
-end
-
----@param node table
----@return HighlightedString[]|nil icon
-function Builder:_get_diagnostics_icon(node)
-  local diagnostics_icon = diagnostics.get_icon(node)
-  if diagnostics_icon and self.diagnostics_placement == "signcolumn" then
-    table.insert(self.signs, {
-      sign = diagnostics_icon.hl[1],
-      lnum = self.index + 1,
-      priority = 2,
-    })
-    diagnostics_icon = nil
-  end
-  return diagnostics_icon
-end
-
----@param node table
----@return HighlightedString|nil icon
-function Builder:_get_modified_icon(node)
-  local modified_icon = modified.get_icon(node)
-  if modified_icon and self.modified_placement == "signcolumn" then
-    table.insert(self.signs, {
-      sign = modified_icon.hl[1],
-      lnum = self.index + 1,
-      priority = 3,
-    })
-    modified_icon = nil
-  end
-  return modified_icon
-end
-
----@param node table
----@return HighlightedString[]|nil icon
-function Builder:_get_bookmark_icon(node)
-  local bookmark_icon = bookmarks.get_icon(node)
-  if bookmark_icon and self.bookmarks_placement == "signcolumn" then
-    table.insert(self.signs, {
-      sign = bookmark_icon.hl[1],
-      lnum = self.index + 1,
-      priority = 4,
-    })
-    bookmark_icon = nil
-  end
-  return bookmark_icon
-end
-
----@param node table
----@return string|nil icon_hl
----@return string|nil name_hl
-function Builder:_get_highlight_override(node, unloaded_bufnr)
-  local name_hl, icon_hl
-
-  -- git
-  local git_highlight = git.get_highlight(node)
-  if git_highlight then
-    name_hl = git_highlight
-  end
-
-  -- opened file
-  if self.highlight_opened_files and vim.fn.bufloaded(node.absolute_path) > 0 and vim.fn.bufnr(node.absolute_path) ~= unloaded_bufnr then
-    if self.highlight_opened_files == "all" or self.highlight_opened_files == "name" then
-      name_hl = "NvimTreeOpenedFile"
-    end
-    if self.highlight_opened_files == "all" or self.highlight_opened_files == "icon" then
-      icon_hl = "NvimTreeOpenedFileIcon"
-    end
-  end
-
-  -- modified file
-  local modified_highlight = modified.get_highlight(node)
-  if modified_highlight then
-    if self.highlight_modified == "all" or self.highlight_modified == "name" then
-      name_hl = modified_highlight
-    end
-    if self.highlight_modified == "all" or self.highlight_modified == "icon" then
-      icon_hl = modified_highlight
-    end
-  end
-
-  return icon_hl, name_hl
-end
-
----Append optional highlighting to icon or name.
----@param node table
----@param get_hl fun(node: table): HL_POSITION, string
----@param icon_hl string[] icons to append to
----@param name_hl string[] names to append to
-function Builder:_append_highlight(node, get_hl, icon_hl, name_hl)
-  local pos, hl = get_hl(node)
-  if pos ~= HL_POSITION.none and hl then
-    if pos == HL_POSITION.all or pos == HL_POSITION.icon then
-      table.insert(icon_hl, hl)
-    end
-    if pos == HL_POSITION.all or pos == HL_POSITION.name then
-      table.insert(name_hl, hl)
-    end
-  end
 end
 
+---@private
 ---@param indent_markers HighlightedString[]
 ---@param arrows HighlightedString[]|nil
 ---@param icon HighlightedString
 ---@param name HighlightedString
----@param git_icons HighlightedString[]|nil
+---@param node table
----@param diagnostics_icon HighlightedString|nil
----@param modified_icon HighlightedString|nil
----@param bookmark_icon HighlightedString|nil
 ---@return HighlightedString[]
-function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
+function Builder:format_line(indent_markers, arrows, icon, name, node)
   local added_len = 0
   local function add_to_end(t1, t2)
+    if not t2 then
+      return
+    end
     for _, v in ipairs(t2) do
       if added_len > 0 then
-        table.insert(t1, { str = self.icon_padding })
+        table.insert(t1, { str = M.opts.renderer.icons.padding })
       end
       table.insert(t1, v)
     end
@@ -379,78 +217,134 @@ function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, dia
 
   local line = { indent_markers, arrows }
   add_to_end(line, { icon })
-  if git_icons and self.git_placement == "before" then
+
-    add_to_end(line, git_icons)
+  for i = #M.decorators, 1, -1 do
-  end
+    add_to_end(line, M.decorators[i]:icons_before(node))
-  if modified_icon and self.modified_placement == "before" then
-    add_to_end(line, { modified_icon })
-  end
-  if diagnostics_icon and self.diagnostics_placement == "before" then
-    add_to_end(line, { diagnostics_icon })
-  end
-  if bookmark_icon and self.bookmarks_placement == "before" then
-    add_to_end(line, { bookmark_icon })
   end
 
   add_to_end(line, { name })
 
-  if git_icons and self.git_placement == "after" then
+  for i = #M.decorators, 1, -1 do
-    add_to_end(line, git_icons)
+    add_to_end(line, M.decorators[i]:icons_after(node))
-  end
-  if modified_icon and self.modified_placement == "after" then
-    add_to_end(line, { modified_icon })
-  end
-  if diagnostics_icon and self.diagnostics_placement == "after" then
-    add_to_end(line, { diagnostics_icon })
-  end
-  if bookmark_icon and self.bookmarks_placement == "after" then
-    add_to_end(line, { bookmark_icon })
   end
 
   return line
 end
 
-function Builder:_build_line(node, idx, num_children, unloaded_bufnr)
+---@private
-  local copy_paste = require "nvim-tree.actions.fs.copy-paste"
+---@param node Node
+function Builder:build_signs(node)
+  -- first in priority order
+  local sign_name
+  for _, d in ipairs(M.decorators) do
+    sign_name = d:sign_name(node)
+    if sign_name then
+      self.signs[self.index] = sign_name
+      break
+    end
+  end
+end
 
+---Create a highlight group for groups with later groups overriding previous.
+---Combined group name is less than the 200 byte limit of highlight group names
+---@private
+---@param groups string[] highlight group names
+---@return string group_name "NvimTreeCombinedHL" .. sha256
+function Builder:create_combined_group(groups)
+  local combined_name = string.format("NvimTreeCombinedHL%s", vim.fn.sha256(table.concat(groups)))
+
+  -- only create if necessary
+  if not self.combined_groups[combined_name] then
+    self.combined_groups[combined_name] = true
+    local combined_hl = {}
+
+    -- build the highlight, overriding values
+    for _, group in ipairs(groups) do
+      local hl = vim.api.nvim_get_hl(0, { name = group, link = false })
+      combined_hl = vim.tbl_extend("force", combined_hl, hl)
+    end
+
+    -- add highlights to the global namespace
+    vim.api.nvim_set_hl(0, combined_name, combined_hl)
+
+    table.insert(self.combined_groups, combined_name)
+  end
+
+  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.
+---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
+
+  -- calculate all groups
+  local icon_groups = {}
+  local name_groups = {}
+  local d, icon, name
+  for i = #M.decorators, 1, -1 do
+    d = M.decorators[i]
+    icon, name = d:groups_icon_name(node)
+    table.insert(icon_groups, icon)
+    table.insert(name_groups, name)
+  end
+
+  -- one or many icon groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
+  if #icon_groups > 1 then
+    if vim.fn.has "nvim-0.9" == 1 then
+      icon_hl_group = self:create_combined_group(icon_groups)
+    else
+      icon_hl_group = icon_groups[#icon_groups]
+    end
+  else
+    icon_hl_group = icon_groups[1]
+  end
+
+  -- one or many name groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
+  if #name_groups > 1 then
+    if vim.fn.has "nvim-0.9" == 1 then
+      name_hl_group = self:create_combined_group(name_groups)
+    else
+      name_hl_group = name_groups[#name_groups]
+    end
+  else
+    name_hl_group = name_groups[1]
+  end
+
+  return icon_hl_group, name_hl_group
+end
+
+---@private
+function Builder:build_line(node, idx, num_children)
   -- various components
   local indent_markers = pad.get_indent_markers(self.depth, idx, num_children, node, self.markers)
   local arrows = pad.get_arrows(node)
 
-  -- adds icons to signcolumn
-  local bookmark_icon = self:_get_bookmark_icon(node)
-  local git_icons = self:_get_git_icons(node)
-  local modified_icon = self:_get_modified_icon(node)
-  local diagnostics_icon = self:_get_diagnostics_icon(node)
-
   -- main components
   local is_folder = node.nodes ~= nil
   local is_symlink = node.link_to ~= nil
   local icon, name
   if is_folder then
-    icon, name = self:_build_folder(node)
+    icon, name = self:build_folder(node)
   elseif is_symlink then
-    icon, name = self:_build_symlink(node)
+    icon, name = self:build_symlink(node)
   else
-    icon, name = self:_build_file(node)
+    icon, name = self:build_file(node)
   end
 
-  -- highlight override
+  -- highighting
-  local icon_hl_override, name_hl_override = self:_get_highlight_override(node, unloaded_bufnr)
+  local icon_hl_group, name_hl_group = self:add_highlights(node)
-  if icon_hl_override then
+  table.insert(icon.hl, icon_hl_group)
-    icon.hl = { icon_hl_override }
+  table.insert(name.hl, name_hl_group)
-  end
-  if name_hl_override then
-    name.hl = { name_hl_override }
-  end
 
-  -- extra highighting
+  local line = self:format_line(indent_markers, arrows, icon, name, node)
-  self:_append_highlight(node, bookmarks.get_highlight, icon.hl, name.hl)
+  table.insert(self.lines, self:unwrap_highlighted_strings(line))
-  self:_append_highlight(node, diagnostics.get_highlight, icon.hl, name.hl)
-  self:_append_highlight(node, copy_paste.get_highlight, icon.hl, name.hl)
-
-  local line = self:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
-  self:_insert_line(self:_unwrap_highlighted_strings(line))
 
   self.index = self.index + 1
 
@@ -458,13 +352,14 @@ function Builder:_build_line(node, idx, num_children, unloaded_bufnr)
 
   if node.open then
     self.depth = self.depth + 1
-    self:build(node, unloaded_bufnr)
+    self:build_lines(node)
     self.depth = self.depth - 1
   end
 end
 
-function Builder:_get_nodes_number(nodes)
+---@private
-  if not self.filter then
+function Builder:get_nodes_number(nodes)
+  if not live_filter.filter then
     return #nodes
   end
 
@@ -477,53 +372,77 @@ function Builder:_get_nodes_number(nodes)
   return i
 end
 
-function Builder:build(tree, unloaded_bufnr)
+---@private
-  local num_children = self:_get_nodes_number(tree.nodes)
+function Builder:build_lines(node)
+  if not node then
+    node = core.get_explorer()
+  end
+  local num_children = self:get_nodes_number(node.nodes)
   local idx = 1
-  for _, node in ipairs(tree.nodes) do
+  for _, n in ipairs(node.nodes) do
-    if not node.hidden then
+    if not n.hidden then
-      self:_build_line(node, idx, num_children, unloaded_bufnr)
+      self:build_signs(n)
+      self:build_line(n, idx, num_children)
       idx = idx + 1
     end
   end
-
-  return self
 end
 
-local function format_root_name(root_cwd, root_label)
+---@private
+---@param root_label function|string
+---@return string
+function Builder:format_root_name(root_label)
   if type(root_label) == "function" then
-    local label = root_label(root_cwd)
+    local label = root_label(self.root_cwd)
     if type(label) == "string" then
       return label
     else
-      root_label = DEFAULT_ROOT_FOLDER_LABEL
+      return "???"
     end
   end
-  return utils.path_remove_trailing(vim.fn.fnamemodify(root_cwd, root_label))
+  return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
 end
 
-function Builder:build_header(show_header)
+---@private
-  if show_header then
+function Builder:build_header()
-    local root_name = format_root_name(self.root_cwd, self.root_folder_label)
+  if view.is_root_folder_visible(core.get_cwd()) then
-    self:_insert_line(root_name)
+    local root_name = self:format_root_name(M.opts.renderer.root_folder_label)
-    self:_insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
+    table.insert(self.lines, root_name)
+    self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
     self.index = 1
   end
 
-  if self.filter then
+  if live_filter.filter then
-    local filter_line = self.filter_prefix .. "/" .. self.filter .. "/"
+    local filter_line = string.format("%s/%s/", M.opts.live_filter.prefix, live_filter.filter)
-    self:_insert_line(filter_line)
+    table.insert(self.lines, filter_line)
-    local prefix_length = string.len(self.filter_prefix)
+    local prefix_length = string.len(M.opts.live_filter.prefix)
-    self:_insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
+    self:insert_highlight({ "NvimTreeLiveFilterPrefix" }, 0, prefix_length)
-    self:_insert_highlight({ "NvimTreeLiveFilterValue" }, prefix_length, string.len(filter_line))
+    self:insert_highlight({ "NvimTreeLiveFilterValue" }, prefix_length, string.len(filter_line))
     self.index = self.index + 1
   end
+end
 
+---Build all lines with highlights and signs
+---@return Builder
+function Builder:build()
+  self:build_header()
+  self:build_lines()
   return self
 end
 
-function Builder:unwrap()
+function Builder.setup(opts)
-  return self.lines, self.highlights, self.signs
+  M.opts = opts
+
+  -- priority order
+  M.decorators = {
+    DecoratorCut:new(opts),
+    DecoratorCopied:new(opts),
+    DecoratorDiagnostics:new(opts),
+    DecoratorBookmarks:new(opts),
+    DecoratorModified:new(opts),
+    DecoratorOpened:new(opts),
+    DecoratorGit:new(opts),
+  }
 end
 
 return Builder

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

@@ -1,51 +0,0 @@
-local marks = require "nvim-tree.marks"
-
-local HL_POSITION = require("nvim-tree.enum").HL_POSITION
-
-local M = {
-  ICON = {},
-  hl_pos = HL_POSITION.none,
-}
-
----Bookmark highlight group and position when highlight_bookmark.
----@param node table
----@return HL_POSITION position none when clipboard empty
----@return string|nil group only when node present in clipboard
-function M.get_highlight(node)
-  if M.hl_pos == HL_POSITION.none then
-    return HL_POSITION.none, nil
-  end
-
-  local mark = marks.get_mark(node)
-  if mark then
-    return M.hl_pos, "NvimTreeBookmarkHL"
-  else
-    return HL_POSITION.none, nil
-  end
-end
-
----bookmark icon if marked
----@param node table
----@return HighlightedString|nil bookmark icon
-function M.get_icon(node)
-  if M.config.renderer.icons.show.bookmarks and marks.get_mark(node) then
-    return M.ICON
-  end
-end
-
-function M.setup(opts)
-  M.config = {
-    renderer = opts.renderer,
-  }
-
-  M.hl_pos = HL_POSITION[opts.renderer.highlight_bookmarks] or HL_POSITION.none
-
-  M.ICON = {
-    str = opts.renderer.icons.glyphs.bookmark,
-    hl = { "NvimTreeBookmark" },
-  }
-
-  vim.fn.sign_define(M.ICON.hl[1], { text = M.ICON.str, texthl = M.ICON.hl[1] })
-end
-
-return M

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

@@ -2,18 +2,23 @@ local HL_POSITION = require("nvim-tree.enum").HL_POSITION
 local diagnostics = require "nvim-tree.diagnostics"
 
 local M = {
-  HS_FILE = {},
+  -- highlight strings for the icons
-  HS_FOLDER = {},
+  HS_ICON = {},
-  ICON = {},
+
-  hl_pos = HL_POSITION.none,
+  -- highlight groups for HL
+  HG_FILE = {},
+  HG_FOLDER = {},
+
+  -- position for HL
+  HL_POS = HL_POSITION.none,
 }
 
----Diagnostics text highlight group when highlight_diagnostics.
+---Diagnostics highlight group and position when highlight_diagnostics.
 ---@param node table
 ---@return HL_POSITION position none when no status
 ---@return string|nil group only when status
 function M.get_highlight(node)
-  if not node or M.hl_pos == HL_POSITION.none then
+  if not node or M.HL_POS == HL_POSITION.none then
     return HL_POSITION.none, nil
   end
 
@@ -26,7 +31,7 @@ function M.get_highlight(node)
   end
 
   if group then
-    return M.hl_pos, group
+    return M.HL_POS, group
   else
     return HL_POSITION.none, nil
   end
@@ -49,40 +54,38 @@ function M.setup(opts)
   }
 
   if opts.diagnostics.enable and opts.renderer.highlight_diagnostics then
-    -- TODO add a HL_POSITION
+    M.HL_POS = HL_POSITION[opts.renderer.highlight_diagnostics]
-    -- M.hl_pos = HL_POSITION[opts.renderer.highlight_diagnostics]
-    M.hl_pos = HL_POSITION.name
   end
 
-  M.HS_FILE[vim.diagnostic.severity.ERROR] = "NvimTreeLspDiagnosticsErrorText"
+  M.HG_FILE[vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFileHL"
-  M.HS_FILE[vim.diagnostic.severity.WARN] = "NvimTreeLspDiagnosticsWarningText"
+  M.HG_FILE[vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarningFileHL"
-  M.HS_FILE[vim.diagnostic.severity.INFO] = "NvimTreeLspDiagnosticsInfoText"
+  M.HG_FILE[vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFileHL"
-  M.HS_FILE[vim.diagnostic.severity.HINT] = "NvimTreeLspDiagnosticsHintText"
+  M.HG_FILE[vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFileHL"
 
-  M.HS_FOLDER[vim.diagnostic.severity.ERROR] = "NvimTreeLspDiagnosticsErrorFolderText"
+  M.HG_FOLDER[vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFolderHL"
-  M.HS_FOLDER[vim.diagnostic.severity.WARN] = "NvimTreeLspDiagnosticsWarningFolderText"
+  M.HG_FOLDER[vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarningFolderHL"
-  M.HS_FOLDER[vim.diagnostic.severity.INFO] = "NvimTreeLspDiagnosticsInfoFolderText"
+  M.HG_FOLDER[vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFolderHL"
-  M.HS_FOLDER[vim.diagnostic.severity.HINT] = "NvimTreeLspDiagnosticsHintFolderText"
+  M.HG_FOLDER[vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFolderHL"
 
-  M.ICON[vim.diagnostic.severity.ERROR] = {
+  M.HS_ICON[vim.diagnostic.severity.ERROR] = {
     str = M.config.diagnostics.icons.error,
-    hl = { "NvimTreeLspDiagnosticsError" },
+    hl = { "NvimTreeDiagnosticErrorIcon" },
   }
 
-  M.ICON[vim.diagnostic.severity.WARN] = {
+  M.HS_ICON[vim.diagnostic.severity.WARN] = {
     str = M.config.diagnostics.icons.warning,
-    hl = { "NvimTreeLspDiagnosticsWarning" },
+    hl = { "NvimTreeDiagnosticWarningIcon" },
   }
-  M.ICON[vim.diagnostic.severity.INFO] = {
+  M.HS_ICON[vim.diagnostic.severity.INFO] = {
     str = M.config.diagnostics.icons.info,
-    hl = { "NvimTreeLspDiagnosticsInformation" },
+    hl = { "NvimTreeDiagnosticInfoIcon" },
   }
-  M.ICON[vim.diagnostic.severity.HINT] = {
+  M.HS_ICON[vim.diagnostic.severity.HINT] = {
     str = M.config.diagnostics.icons.hint,
-    hl = { "NvimTreeLspDiagnosticsHint" },
+    hl = { "NvimTreeDiagnosticHintIcon" },
   }
 
-  for _, i in ipairs(M.ICON) do
+  for _, i in ipairs(M.HS_ICON) do
     vim.fn.sign_define(i.hl[1], { text = i.str, texthl = i.hl[1] })
   end
 end

lua/nvim-tree/renderer/components/full-name.lua

@@ -57,9 +57,9 @@ local function show()
   end
 
   M.popup_win = vim.api.nvim_open_win(vim.api.nvim_create_buf(false, false), false, {
-    relative = "cursor",
+    relative = "win",
     row = 0,
-    col = 1 - vim.fn.getcursorcharpos()[3],
+    bufpos = { vim.api.nvim_win_get_cursor(0)[1] - 1, 0 },
     width = math.min(text_width, vim.o.columns - 2),
     height = 1,
     noautocmd = true,

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

@@ -1,191 +0,0 @@
-local notify = require "nvim-tree.notify"
-local explorer_node = require "nvim-tree.explorer.node"
-
-local M = {}
-
-local function build_icons_table(i)
-  local icons = {
-    staged = { str = i.staged, hl = { "NvimTreeGitStaged" }, ord = 1 },
-    unstaged = { str = i.unstaged, hl = { "NvimTreeGitDirty" }, ord = 2 },
-    renamed = { str = i.renamed, hl = { "NvimTreeGitRenamed" }, ord = 3 },
-    deleted = { str = i.deleted, hl = { "NvimTreeGitDeleted" }, ord = 4 },
-    unmerged = { str = i.unmerged, hl = { "NvimTreeGitMerge" }, ord = 5 },
-    untracked = { str = i.untracked, hl = { "NvimTreeGitNew" }, ord = 6 },
-    ignored = { str = i.ignored, hl = { "NvimTreeGitIgnored" }, ord = 7 },
-  }
-  return {
-    ["M "] = { icons.staged },
-    [" M"] = { icons.unstaged },
-    ["C "] = { icons.staged },
-    [" C"] = { icons.unstaged },
-    ["CM"] = { icons.unstaged },
-    [" T"] = { icons.unstaged },
-    ["T "] = { icons.staged },
-    ["TM"] = { icons.staged, icons.unstaged },
-    ["MM"] = { icons.staged, icons.unstaged },
-    ["MD"] = { icons.staged },
-    ["A "] = { icons.staged },
-    ["AD"] = { icons.staged },
-    [" A"] = { icons.untracked },
-    -- not sure about this one
-    ["AA"] = { icons.unmerged, icons.untracked },
-    ["AU"] = { icons.unmerged, icons.untracked },
-    ["AM"] = { icons.staged, icons.unstaged },
-    ["??"] = { icons.untracked },
-    ["R "] = { icons.renamed },
-    [" R"] = { icons.renamed },
-    ["RM"] = { icons.unstaged, icons.renamed },
-    ["UU"] = { icons.unmerged },
-    ["UD"] = { icons.unmerged },
-    ["UA"] = { icons.unmerged },
-    [" D"] = { icons.deleted },
-    ["D "] = { icons.deleted },
-    ["DA"] = { icons.unstaged },
-    ["RD"] = { icons.deleted },
-    ["DD"] = { icons.deleted },
-    ["DU"] = { icons.deleted, icons.unmerged },
-    ["!!"] = { icons.ignored },
-    dirty = { icons.unstaged },
-  }
-end
-
-local function build_hl_table()
-  local file = {
-    ["M "] = "NvimTreeFileStaged",
-    ["C "] = "NvimTreeFileStaged",
-    ["AA"] = "NvimTreeFileStaged",
-    ["AD"] = "NvimTreeFileStaged",
-    ["MD"] = "NvimTreeFileStaged",
-    ["T "] = "NvimTreeFileStaged",
-    ["TT"] = "NvimTreeFileStaged",
-    [" M"] = "NvimTreeFileDirty",
-    ["CM"] = "NvimTreeFileDirty",
-    [" C"] = "NvimTreeFileDirty",
-    [" T"] = "NvimTreeFileDirty",
-    ["MM"] = "NvimTreeFileDirty",
-    ["AM"] = "NvimTreeFileDirty",
-    dirty = "NvimTreeFileDirty",
-    ["A "] = "NvimTreeFileStaged",
-    ["??"] = "NvimTreeFileNew",
-    ["AU"] = "NvimTreeFileMerge",
-    ["UU"] = "NvimTreeFileMerge",
-    ["UD"] = "NvimTreeFileMerge",
-    ["DU"] = "NvimTreeFileMerge",
-    ["UA"] = "NvimTreeFileMerge",
-    [" D"] = "NvimTreeFileDeleted",
-    ["DD"] = "NvimTreeFileDeleted",
-    ["RD"] = "NvimTreeFileDeleted",
-    ["D "] = "NvimTreeFileDeleted",
-    ["R "] = "NvimTreeFileRenamed",
-    ["RM"] = "NvimTreeFileRenamed",
-    [" R"] = "NvimTreeFileRenamed",
-    ["!!"] = "NvimTreeFileIgnored",
-    [" A"] = "none",
-  }
-
-  local folder = {}
-  for k, v in pairs(file) do
-    folder[k] = v:gsub("File", "Folder")
-  end
-
-  return file, folder
-end
-
-local function nil_() end
-
-local function warn_status(git_status)
-  notify.warn(string.format("Unrecognized git state '%s'", git_status))
-end
-
----@param node table
----@return HighlightedString[]|nil
-local function get_icons_(node)
-  local git_status = explorer_node.get_git_status(node)
-  if git_status == nil then
-    return nil
-  end
-
-  local inserted = {}
-  local iconss = {}
-
-  for _, s in pairs(git_status) do
-    local icons = M.git_icons[s]
-    if not icons then
-      if not M.config.highlight_git then
-        warn_status(s)
-      end
-      return nil
-    end
-
-    for _, icon in pairs(icons) do
-      if #icon.str > 0 then
-        if not inserted[icon] then
-          table.insert(iconss, icon)
-          inserted[icon] = true
-        end
-      end
-    end
-  end
-
-  if #iconss == 0 then
-    return nil
-  end
-
-  -- sort icons so it looks slightly better
-  table.sort(iconss, function(a, b)
-    return a.ord < b.ord
-  end)
-
-  return iconss
-end
-
-function M.setup_signs(i)
-  vim.fn.sign_define("NvimTreeGitDirty", { text = i.unstaged, texthl = "NvimTreeGitDirty" })
-  vim.fn.sign_define("NvimTreeGitStaged", { text = i.staged, texthl = "NvimTreeGitStaged" })
-  vim.fn.sign_define("NvimTreeGitMerge", { text = i.unmerged, texthl = "NvimTreeGitMerge" })
-  vim.fn.sign_define("NvimTreeGitRenamed", { text = i.renamed, texthl = "NvimTreeGitRenamed" })
-  vim.fn.sign_define("NvimTreeGitNew", { text = i.untracked, texthl = "NvimTreeGitNew" })
-  vim.fn.sign_define("NvimTreeGitDeleted", { text = i.deleted, texthl = "NvimTreeGitDeleted" })
-  vim.fn.sign_define("NvimTreeGitIgnored", { text = i.ignored, texthl = "NvimTreeGitIgnored" })
-end
-
-local function get_highlight_(node)
-  local git_status = explorer_node.get_git_status(node)
-  if git_status == nil then
-    return
-  end
-
-  if node.nodes then
-    return M.folder_hl[git_status[1]]
-  else
-    return M.file_hl[git_status[1]]
-  end
-end
-
-function M.setup(opts)
-  M.config = opts.renderer
-
-  M.git_icons = build_icons_table(opts.renderer.icons.glyphs.git)
-
-  M.file_hl, M.folder_hl = build_hl_table()
-
-  if opts.renderer.icons.git_placement == "signcolumn" then
-    M.setup_signs(opts.renderer.icons.glyphs.git)
-  end
-
-  if opts.renderer.icons.show.git then
-    M.get_icons = get_icons_
-  else
-    M.get_icons = nil_
-  end
-
-  if opts.renderer.highlight_git then
-    M.get_highlight = get_highlight_
-  else
-    M.get_highlight = nil_
-  end
-
-  M.git_show_on_open_dirs = opts.git.show_on_open_dirs
-end
-
-return M

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

@@ -1,41 +0,0 @@
-local modified = require "nvim-tree.modified"
-
-local M = {}
-
-local HIGHLIGHT = "NvimTreeModifiedFile"
-
----return modified icon if node is modified, otherwise return empty string
----@param node table
----@return HighlightedString|nil modified icon
-function M.get_icon(node)
-  if not modified.is_modified(node) or not M.show_icon then
-    return nil
-  end
-
-  return { str = M.icon, hl = { HIGHLIGHT } }
-end
-
-function M.setup_signs()
-  vim.fn.sign_define(HIGHLIGHT, { text = M.icon, texthl = HIGHLIGHT })
-end
-
----@param node table
----@return string|nil
-function M.get_highlight(node)
-  if not modified.is_modified(node) then
-    return nil
-  end
-
-  return HIGHLIGHT
-end
-
-function M.setup(opts)
-  M.icon = opts.renderer.icons.glyphs.modified
-  M.show_icon = opts.renderer.icons.show.modified
-
-  if opts.renderer.icons.modified_placement == "signcolumn" then
-    M.setup_signs()
-  end
-end
-
-return M

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

@@ -0,0 +1,51 @@
+local marks = require "nvim-tree.marks"
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorBookmarks: Decorator
+---@field icon HighlightedString
+local DecoratorBookmarks = Decorator:new()
+
+---@param opts table
+---@return DecoratorBookmarks
+function DecoratorBookmarks:new(opts)
+  local o = Decorator.new(self, {
+    enabled = true,
+    hl_pos = HL_POSITION[opts.renderer.highlight_bookmarks] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT[opts.renderer.icons.bookmarks_placement] or ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorBookmarks
+
+  if opts.renderer.icons.show.bookmarks then
+    o.icon = {
+      str = opts.renderer.icons.glyphs.bookmark,
+      hl = { "NvimTreeBookmarkIcon" },
+    }
+    o:define_sign(o.icon)
+  end
+
+  return o
+end
+
+---Bookmark icon: renderer.icons.show.bookmarks and node is marked
+---@param node Node
+---@return HighlightedString[]|nil icons
+function DecoratorBookmarks:calculate_icons(node)
+  if marks.get_mark(node) then
+    return { self.icon }
+  end
+end
+
+---Bookmark highlight: renderer.highlight_bookmarks and node is marked
+---@param node Node
+---@return string|nil group
+function DecoratorBookmarks:calculate_highlight(node)
+  if self.hl_pos ~= HL_POSITION.none and marks.get_mark(node) then
+    return "NvimTreeBookmarkHL"
+  end
+end
+
+return DecoratorBookmarks

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

@@ -0,0 +1,38 @@
+local copy_paste
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorCopied: Decorator
+---@field enabled boolean
+---@field icon HighlightedString|nil
+local DecoratorCopied = Decorator:new()
+
+---@param opts table
+---@return DecoratorCopied
+function DecoratorCopied:new(opts)
+  local o = Decorator.new(self, {
+    enabled = true,
+    hl_pos = HL_POSITION[opts.renderer.highlight_clipboard] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorCopied
+
+  -- cyclic
+  copy_paste = copy_paste or require "nvim-tree.actions.fs.copy-paste"
+
+  return o
+end
+
+---Copied highlight: renderer.highlight_clipboard and node is copied
+---@param node Node
+---@return string|nil group
+function DecoratorCopied:calculate_highlight(node)
+  if self.hl_pos ~= HL_POSITION.none and copy_paste.is_copied(node) then
+    return "NvimTreeCopiedHL"
+  end
+end
+
+return DecoratorCopied

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

@@ -0,0 +1,38 @@
+local copy_paste
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorCut: Decorator
+---@field enabled boolean
+---@field icon HighlightedString|nil
+local DecoratorCut = Decorator:new()
+
+---@param opts table
+---@return DecoratorCut
+function DecoratorCut:new(opts)
+  local o = Decorator.new(self, {
+    enabled = true,
+    hl_pos = HL_POSITION[opts.renderer.highlight_clipboard] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorCut
+
+  -- cyclic
+  copy_paste = copy_paste or require "nvim-tree.actions.fs.copy-paste"
+
+  return o
+end
+
+---Cut highlight: renderer.highlight_clipboard and node is cut
+---@param node Node
+---@return string|nil group
+function DecoratorCut:calculate_highlight(node)
+  if self.hl_pos ~= HL_POSITION.none and copy_paste.is_cut(node) then
+    return "NvimTreeCutHL"
+  end
+end
+
+return DecoratorCut

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

@@ -0,0 +1,110 @@
+local diagnostics = require "nvim-tree.diagnostics"
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+-- highlight groups by severity
+local HG_ICON = {
+  [vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorIcon",
+  [vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnIcon",
+  [vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoIcon",
+  [vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintIcon",
+}
+local HG_FILE = {
+  [vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFileHL",
+  [vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnFileHL",
+  [vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFileHL",
+  [vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFileHL",
+}
+local HG_FOLDER = {
+  [vim.diagnostic.severity.ERROR] = "NvimTreeDiagnosticErrorFolderHL",
+  [vim.diagnostic.severity.WARN] = "NvimTreeDiagnosticWarnFolderHL",
+  [vim.diagnostic.severity.INFO] = "NvimTreeDiagnosticInfoFolderHL",
+  [vim.diagnostic.severity.HINT] = "NvimTreeDiagnosticHintFolderHL",
+}
+-- opts.diagnostics.icons.
+local ICON_KEYS = {
+  ["error"] = vim.diagnostic.severity.ERROR,
+  ["warning"] = vim.diagnostic.severity.WARN,
+  ["info"] = vim.diagnostic.severity.INFO,
+  ["hint"] = vim.diagnostic.severity.HINT,
+}
+
+---@class DecoratorDiagnostics: Decorator
+---@field icons HighlightedString[]
+local DecoratorDiagnostics = Decorator:new()
+
+---@param opts table
+---@return DecoratorDiagnostics
+function DecoratorDiagnostics:new(opts)
+  local o = Decorator.new(self, {
+    enabled = opts.diagnostics.enable,
+    hl_pos = HL_POSITION[opts.renderer.highlight_diagnostics] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT[opts.renderer.icons.diagnostics_placement] or ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorDiagnostics
+
+  if not o.enabled then
+    return o
+  end
+
+  if opts.renderer.icons.show.diagnostics then
+    o.icons = {}
+    for name, sev in pairs(ICON_KEYS) do
+      o.icons[sev] = {
+        str = opts.diagnostics.icons[name],
+        hl = { HG_ICON[sev] },
+      }
+      o:define_sign(o.icons[sev])
+    end
+  end
+
+  return o
+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
+    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] }
+    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.hl_pos == HL_POSITION.none then
+    return nil
+  end
+
+  local diag_status = diagnostics.get_diag_status(node)
+  local diag_value = diag_status and diag_status.value
+
+  if not diag_value then
+    return nil
+  end
+
+  local group
+  if node.nodes then
+    group = HG_FOLDER[diag_value]
+  else
+    group = HG_FILE[diag_value]
+  end
+
+  if group then
+    return group
+  else
+    return nil
+  end
+end
+
+return DecoratorDiagnostics

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

@@ -0,0 +1,221 @@
+local notify = require "nvim-tree.notify"
+local explorer_node = require "nvim-tree.explorer.node"
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class HighlightedStringGit: HighlightedString
+---@field ord number decreasing priority
+
+---@class DecoratorGit: Decorator
+---@field file_hl table<string, string> by porcelain status e.g. "AM"
+---@field folder_hl table<string, string> by porcelain status
+---@field icons_by_status HighlightedStringGit[] by human status
+---@field icons_by_xy table<string, HighlightedStringGit[]> by porcelain status
+local DecoratorGit = Decorator:new()
+
+---@param opts table
+---@return DecoratorGit
+function DecoratorGit:new(opts)
+  local o = Decorator.new(self, {
+    enabled = opts.git.enable,
+    hl_pos = HL_POSITION[opts.renderer.highlight_git] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT[opts.renderer.icons.git_placement] or ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorGit
+
+  if not o.enabled then
+    return o
+  end
+
+  if o.hl_pos ~= HL_POSITION.none then
+    o:build_hl_table()
+  end
+
+  if opts.renderer.icons.show.git then
+    o:build_icons_by_status(opts.renderer.icons.glyphs.git)
+    o:build_icons_by_xy(o.icons_by_status)
+
+    for _, icon in pairs(o.icons_by_status) do
+      self:define_sign(icon)
+    end
+  end
+
+  return o
+end
+
+---@param glyphs table<string, string> user glyps
+function DecoratorGit:build_icons_by_status(glyphs)
+  self.icons_by_status = {
+    staged = { str = glyphs.staged, hl = { "NvimTreeGitStagedIcon" }, ord = 1 },
+    unstaged = { str = glyphs.unstaged, hl = { "NvimTreeGitDirtyIcon" }, ord = 2 },
+    renamed = { str = glyphs.renamed, hl = { "NvimTreeGitRenamedIcon" }, ord = 3 },
+    deleted = { str = glyphs.deleted, hl = { "NvimTreeGitDeletedIcon" }, ord = 4 },
+    unmerged = { str = glyphs.unmerged, hl = { "NvimTreeGitMergeIcon" }, ord = 5 },
+    untracked = { str = glyphs.untracked, hl = { "NvimTreeGitNewIcon" }, ord = 6 },
+    ignored = { str = glyphs.ignored, hl = { "NvimTreeGitIgnoredIcon" }, ord = 7 },
+  }
+end
+
+---@param icons HighlightedStringGit[]
+function DecoratorGit:build_icons_by_xy(icons)
+  self.icons_by_xy = {
+    ["M "] = { icons.staged },
+    [" M"] = { icons.unstaged },
+    ["C "] = { icons.staged },
+    [" C"] = { icons.unstaged },
+    ["CM"] = { icons.unstaged },
+    [" T"] = { icons.unstaged },
+    ["T "] = { icons.staged },
+    ["TM"] = { icons.staged, icons.unstaged },
+    ["MM"] = { icons.staged, icons.unstaged },
+    ["MD"] = { icons.staged },
+    ["A "] = { icons.staged },
+    ["AD"] = { icons.staged },
+    [" A"] = { icons.untracked },
+    -- not sure about this one
+    ["AA"] = { icons.unmerged, icons.untracked },
+    ["AU"] = { icons.unmerged, icons.untracked },
+    ["AM"] = { icons.staged, icons.unstaged },
+    ["??"] = { icons.untracked },
+    ["R "] = { icons.renamed },
+    [" R"] = { icons.renamed },
+    ["RM"] = { icons.unstaged, icons.renamed },
+    ["UU"] = { icons.unmerged },
+    ["UD"] = { icons.unmerged },
+    ["UA"] = { icons.unmerged },
+    [" D"] = { icons.deleted },
+    ["D "] = { icons.deleted },
+    ["DA"] = { icons.unstaged },
+    ["RD"] = { icons.deleted },
+    ["DD"] = { icons.deleted },
+    ["DU"] = { icons.deleted, icons.unmerged },
+    ["!!"] = { icons.ignored },
+    dirty = { icons.unstaged },
+  }
+end
+
+function DecoratorGit:build_hl_table()
+  self.file_hl = {
+    ["M "] = "NvimTreeGitFileStagedHL",
+    ["C "] = "NvimTreeGitFileStagedHL",
+    ["AA"] = "NvimTreeGitFileStagedHL",
+    ["AD"] = "NvimTreeGitFileStagedHL",
+    ["MD"] = "NvimTreeGitFileStagedHL",
+    ["T "] = "NvimTreeGitFileStagedHL",
+    ["TT"] = "NvimTreeGitFileStagedHL",
+    [" M"] = "NvimTreeGitFileDirtyHL",
+    ["CM"] = "NvimTreeGitFileDirtyHL",
+    [" C"] = "NvimTreeGitFileDirtyHL",
+    [" T"] = "NvimTreeGitFileDirtyHL",
+    ["MM"] = "NvimTreeGitFileDirtyHL",
+    ["AM"] = "NvimTreeGitFileDirtyHL",
+    dirty = "NvimTreeGitFileDirtyHL",
+    ["A "] = "NvimTreeGitFileStagedHL",
+    ["??"] = "NvimTreeGitFileNewHL",
+    ["AU"] = "NvimTreeGitFileMergeHL",
+    ["UU"] = "NvimTreeGitFileMergeHL",
+    ["UD"] = "NvimTreeGitFileMergeHL",
+    ["DU"] = "NvimTreeGitFileMergeHL",
+    ["UA"] = "NvimTreeGitFileMergeHL",
+    [" D"] = "NvimTreeGitFileDeletedHL",
+    ["DD"] = "NvimTreeGitFileDeletedHL",
+    ["RD"] = "NvimTreeGitFileDeletedHL",
+    ["D "] = "NvimTreeGitFileDeletedHL",
+    ["R "] = "NvimTreeGitFileRenamedHL",
+    ["RM"] = "NvimTreeGitFileRenamedHL",
+    [" R"] = "NvimTreeGitFileRenamedHL",
+    ["!!"] = "NvimTreeGitFileIgnoredHL",
+    [" A"] = "none",
+  }
+
+  self.folder_hl = {}
+  for k, v in pairs(self.file_hl) do
+    self.folder_hl[k] = v:gsub("File", "Folder")
+  end
+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 nil
+  end
+
+  local git_status = explorer_node.get_git_status(node)
+  if git_status == nil then
+    return nil
+  end
+
+  local inserted = {}
+  local iconss = {}
+
+  for _, s in pairs(git_status) do
+    local icons = self.icons_by_xy[s]
+    if not icons then
+      if self.hl_pos == HL_POSITION.none then
+        notify.warn(string.format("Unrecognized git state '%s'", git_status))
+      end
+      return nil
+    end
+
+    for _, icon in pairs(icons) do
+      if #icon.str > 0 then
+        if not inserted[icon] then
+          table.insert(iconss, icon)
+          inserted[icon] = true
+        end
+      end
+    end
+  end
+
+  if #iconss == 0 then
+    return nil
+  end
+
+  -- sort icons so it looks slightly better
+  table.sort(iconss, function(a, b)
+    return a.ord < b.ord
+  end)
+
+  return iconss
+end
+
+---Get the first icon as the sign if appropriate
+---@param node Node
+---@return string|nil name
+function DecoratorGit:sign_name(node)
+  if self.icon_placement ~= ICON_PLACEMENT.signcolumn then
+    return
+  end
+
+  local icons = self:calculate_icons(node)
+  if icons and #icons > 0 then
+    return icons[1].hl[1]
+  end
+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.hl_pos == HL_POSITION.none then
+    return nil
+  end
+
+  local git_status = explorer_node.get_git_status(node)
+  if not git_status then
+    return nil
+  end
+
+  if node.nodes then
+    return self.folder_hl[git_status[1]]
+  else
+    return self.file_hl[git_status[1]]
+  end
+end
+
+return DecoratorGit

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

@@ -0,0 +1,122 @@
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+---@class Decorator
+---@field protected enabled boolean
+---@field protected hl_pos HL_POSITION
+---@field protected icon_placement ICON_PLACEMENT
+local Decorator = {}
+
+---@param o Decorator|nil
+---@return Decorator
+function Decorator:new(o)
+  o = o or {}
+  setmetatable(o, self)
+  self.__index = self
+
+  return o
+end
+
+---Maybe highlight groups
+---@param node Node
+---@return string|nil icon highlight group
+---@return string|nil name highlight group
+function Decorator:groups_icon_name(node)
+  local icon_hl, name_hl
+
+  if self.enabled and self.hl_pos ~= HL_POSITION.none then
+    local hl = self:calculate_highlight(node)
+
+    if self.hl_pos == HL_POSITION.all or self.hl_pos == HL_POSITION.icon then
+      icon_hl = hl
+    end
+    if self.hl_pos == HL_POSITION.all or self.hl_pos == HL_POSITION.name then
+      name_hl = hl
+    end
+  end
+
+  return icon_hl, name_hl
+end
+
+---Maybe icon sign
+---@param node Node
+---@return string|nil name
+function Decorator:sign_name(node)
+  if not self.enabled or self.icon_placement ~= ICON_PLACEMENT.signcolumn then
+    return
+  end
+
+  local icons = self:calculate_icons(node)
+  if icons and #icons > 0 then
+    return icons[1].hl[1]
+  end
+end
+
+---Icons when ICON_PLACEMENT.before
+---@param node Node
+---@return HighlightedString[]|nil icons
+function Decorator:icons_before(node)
+  if not self.enabled or self.icon_placement ~= ICON_PLACEMENT.before then
+    return
+  end
+
+  return self:calculate_icons(node)
+end
+
+---Icons when ICON_PLACEMENT.after
+---@param node Node
+---@return HighlightedString[]|nil icons
+function Decorator:icons_after(node)
+  if not self.enabled or self.icon_placement ~= ICON_PLACEMENT.after 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
+end
+
+---Define a sign
+---@protected
+---@param icon HighlightedString|nil
+function Decorator:define_sign(icon)
+  if icon and #icon.hl > 0 then
+    local name = icon.hl[1]
+
+    if not vim.tbl_isempty(vim.fn.sign_getdefined(name)) then
+      vim.fn.sign_undefine(name)
+    end
+
+    -- don't use sign if not defined
+    if #icon.str < 1 then
+      self.icon_placement = ICON_PLACEMENT.none
+      return
+    end
+
+    -- byte index of the next character, allowing for wide
+    local bi = vim.fn.byteidx(icon.str, 1)
+
+    -- first (wide) character, falls back to empty string
+    local text = string.sub(icon.str, 1, bi)
+    vim.fn.sign_define(name, {
+      text = text,
+      texthl = name,
+    })
+  end
+end
+
+return Decorator

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

@@ -0,0 +1,61 @@
+local buffers = require "nvim-tree.buffers"
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorModified: Decorator
+---@field icon HighlightedString|nil
+local DecoratorModified = Decorator:new()
+
+---@param opts table
+---@return DecoratorModified
+function DecoratorModified:new(opts)
+  local o = Decorator.new(self, {
+    enabled = opts.modified.enable,
+    hl_pos = HL_POSITION[opts.renderer.highlight_modified] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT[opts.renderer.icons.modified_placement] or ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorModified
+
+  if not o.enabled then
+    return o
+  end
+
+  if opts.renderer.icons.show.modified then
+    o.icon = {
+      str = opts.renderer.icons.glyphs.modified,
+      hl = { "NvimTreeModifiedIcon" },
+    }
+    o:define_sign(o.icon)
+  end
+
+  return o
+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 { 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.hl_pos == HL_POSITION.none or not buffers.is_modified(node) then
+    return nil
+  end
+
+  if node.nodes then
+    return "NvimTreeModifiedFolderHL"
+  else
+    return "NvimTreeModifiedFileHL"
+  end
+end
+
+return DecoratorModified

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

@@ -0,0 +1,35 @@
+local buffers = require "nvim-tree.buffers"
+
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorOpened: Decorator
+---@field enabled boolean
+---@field icon HighlightedString|nil
+local DecoratorOpened = Decorator:new()
+
+---@param opts table
+---@return DecoratorOpened
+function DecoratorOpened:new(opts)
+  local o = Decorator.new(self, {
+    enabled = true,
+    hl_pos = HL_POSITION[opts.renderer.highlight_opened_files] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorOpened
+
+  return o
+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.hl_pos ~= HL_POSITION.none and buffers.is_opened(node) then
+    return "NvimTreeOpenedHL"
+  end
+end
+
+return DecoratorOpened

lua/nvim-tree/renderer/init.lua

@@ -2,33 +2,30 @@ local core = require "nvim-tree.core"
 local log = require "nvim-tree.log"
 local view = require "nvim-tree.view"
 local events = require "nvim-tree.events"
-local modified = require "nvim-tree.renderer.components.modified"
 
 local _padding = require "nvim-tree.renderer.components.padding"
 local icon_component = require "nvim-tree.renderer.components.icons"
 local full_name = require "nvim-tree.renderer.components.full-name"
-local git = require "nvim-tree.renderer.components.git"
-local diagnostics = require "nvim-tree.renderer.components.diagnostics"
 local Builder = require "nvim-tree.renderer.builder"
-local live_filter = require "nvim-tree.live-filter"
-local bookmarks = require "nvim-tree.renderer.components.bookmarks"
 
-local M = {
+local M = {}
-  last_highlights = {},
-}
 
 local SIGN_GROUP = "NvimTreeRendererSigns"
 
 local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
 
-local function _draw(bufnr, lines, hl, signs)
+---@param bufnr number
+---@param lines string[]
+---@param hl_args AddHighlightArgs[]
+---@param signs string[]
+local function _draw(bufnr, lines, hl_args, signs)
   vim.api.nvim_buf_set_option(bufnr, "modifiable", true)
   vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
-  M.render_hl(bufnr, hl)
+  M.render_hl(bufnr, hl_args)
   vim.api.nvim_buf_set_option(bufnr, "modifiable", false)
   vim.fn.sign_unplace(SIGN_GROUP)
-  for _, sign in pairs(signs) do
+  for i, sign_name in pairs(signs) do
-    vim.fn.sign_place(0, SIGN_GROUP, sign.sign, bufnr, { lnum = sign.lnum, priority = sign.priority })
+    vim.fn.sign_place(0, SIGN_GROUP, sign_name, bufnr, { lnum = i + 1 })
   end
 end
 
@@ -37,7 +34,7 @@ function M.render_hl(bufnr, hl)
     return
   end
   vim.api.nvim_buf_clear_namespace(bufnr, namespace_id, 0, -1)
-  for _, data in ipairs(hl or M.last_highlights) do
+  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_id, group, data[2], data[3], data[4])
@@ -46,16 +43,7 @@ function M.render_hl(bufnr, hl)
   end
 end
 
-local picture_map = {
+function M.draw()
-  jpg = true,
-  jpeg = true,
-  png = true,
-  gif = true,
-  webp = true,
-  jxl = true,
-}
-
-function M.draw(unloaded_bufnr)
   local bufnr = view.get_bufnr()
   if not core.get_explorer() or not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
     return
@@ -66,30 +54,11 @@ function M.draw(unloaded_bufnr)
   local cursor = vim.api.nvim_win_get_cursor(view.get_winnr())
   icon_component.reset_config()
 
-  local lines, hl, signs = Builder.new(core.get_cwd())
+  local builder = Builder:new():build()
-    :configure_root_label(M.config.root_folder_label)
-    :configure_trailing_slash(M.config.add_trailing)
-    :configure_special_files(M.config.special_files)
-    :configure_picture_map(picture_map)
-    :configure_opened_file_highlighting(M.config.highlight_opened_files)
-    :configure_modified_highlighting(M.config.highlight_modified)
-    :configure_icon_padding(M.config.icons.padding)
-    :configure_git_icons_placement(M.config.icons.git_placement)
-    :configure_diagnostics_icon_placement(M.config.icons.diagnostics_placement)
-    :configure_bookmark_icon_placement(M.config.icons.bookmarks_placement)
-    :configure_modified_placement(M.config.icons.modified_placement)
-    :configure_symlink_destination(M.config.symlink_destination)
-    :configure_filter(live_filter.filter, live_filter.prefix)
-    :configure_group_name_modifier(M.config.group_empty)
-    :build_header(view.is_root_folder_visible(core.get_cwd()))
-    :build(core.get_explorer(), unloaded_bufnr)
-    :unwrap()
 
-  _draw(bufnr, lines, hl, signs)
+  _draw(bufnr, builder.lines, builder.hl_args, builder.signs)
 
-  M.last_highlights = hl
+  if cursor and #builder.lines >= cursor[1] then
-
-  if cursor and #lines >= cursor[1] then
     vim.api.nvim_win_set_cursor(view.get_winnr(), cursor)
   end
 
@@ -102,15 +71,12 @@ end
 
 function M.setup(opts)
   M.config = opts.renderer
-  M.config.modified = opts.modified
 
   _padding.setup(opts)
   full_name.setup(opts)
-  git.setup(opts)
-  modified.setup(opts)
-  diagnostics.setup(opts)
-  bookmarks.setup(opts)
   icon_component.setup(opts)
+
+  Builder.setup(opts)
 end
 
 return M

lua/nvim-tree/utils.lua

@@ -116,6 +116,28 @@ function M.find_node(nodes, fn)
   return node, i
 end
 
+-- Find the line number of a node.
+-- Return -1 is node is nil or not found.
+---@param node Node|nil
+---@return integer
+function M.find_node_line(node)
+  if not node then
+    return -1
+  end
+
+  local first_node_line = require("nvim-tree.core").get_nodes_starting_line()
+  local nodes_by_line = M.get_nodes_by_line(require("nvim-tree.core").get_explorer().nodes, first_node_line)
+  local iter_start, iter_end = first_node_line, #nodes_by_line
+
+  for line = iter_start, iter_end, 1 do
+    if nodes_by_line[line] == node then
+      return line
+    end
+  end
+
+  return -1
+end
+
 -- get the node in the tree state depending on the absolute path of the node
 -- (grouped or hidden too)
 ---@param path string

lua/nvim-tree/view.lua

@@ -473,7 +473,7 @@ end
 function M.get_winnr(tabpage)
   tabpage = tabpage or vim.api.nvim_get_current_tabpage()
   local tabinfo = M.View.tabpages[tabpage]
-  if tabinfo ~= nil then
+  if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
     return tabinfo.winnr
   end
 end

scripts/help-update.sh

@@ -2,7 +2,7 @@
 
 # run after changing nvim-tree.lua DEFAULT_OPTS or keymap.lua M.default_on_attach
 # scrapes and updates nvim-tree-lua.txt
-# run from repository root: scripts/update-help.sh
+# run from repository root: scripts/help-update.sh  OR  make help-update
 
 
 #
@@ -38,7 +38,7 @@ sed -i -e "/${begin}/,/${end}/{ /${begin}/{p; r /tmp/DEFAULT_ON_ATTACH.lua
 # help human
 echo > /tmp/DEFAULT_ON_ATTACH.help
 sed -E "s/^ *vim.keymap.set\('n', '(.*)',.*api(.*),.*opts\('(.*)'.*$/'\`\1\`' '\3' '|nvim-tree-api\2()|'/g
-" /tmp/DEFAULT_ON_ATTACH.lua | while read line
+" /tmp/DEFAULT_ON_ATTACH.lua | while read -r line
 do
 	eval "printf '%-17.17s %-26.26s %s\n' ${line}" >> /tmp/DEFAULT_ON_ATTACH.help
 done

scripts/luals-check.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Performs a lua-language-server check on all files.
+# 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.
+
+if [ -z "${VIMRUNTIME}" ]; then
+	export VIMRUNTIME="/usr/share/nvim/runtime"
+fi
+
+DIR_SRC="lua"
+DIR_OUT="luals-out"
+
+# clear output
+rm -rf "${DIR_OUT}"
+mkdir "${DIR_OUT}"
+
+# execute inside lua to prevent luals itself from being checked
+OUT=$(lua-language-server --check="${DIR_SRC}" --configpath="${PWD}/.luarc.json" --checklevel=Information --logpath="${DIR_OUT}" --loglevel=error)
+RC=$?
+
+echo "${OUT}" >&2
+
+if [ $RC -ne 0 ]; then
+	echo "failed with RC=$RC"
+	exit $RC
+fi
+
+# any output is a fail
+case "${OUT}" in
+	*Diagnosis\ complete*)
+		if [ -f "${DIR_OUT}/check.json" ]; then
+			cat "${DIR_OUT}/check.json"
+			exit 1
+		else
+			exit 0
+		fi
+		;;
+	*)
+		exit 1
+		;;
+esac
+