refactor(#2826): multi instance nvim-tree.view

Co-authored-by: Alexander Courtis <alex@courtis.org>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -59,9 +59,9 @@ body:
 
         If not provided it is very unlikely that the nvim-tree team will be able to address your issue.
 
-        See [wiki: Clean Room Replication](https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting#clean-room-replication) for instructions.
+        See [wiki: Clean Room Replication](https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting#clean-room-replication) for instructions and paste the contents of your `/tmp/nvt-min.lua` here.
 
-        Please paste the contents of your `/tmp/nvt-min.lua` here."
+        Please do NOT post a configuration that uses other plugin managers such as lazy, see [wiki: Lazy Loading](https://github.com/nvim-tree/nvim-tree.lua/wiki/Installation#lazy-loading)"
       render: lua
     validations:
       required: true

.github/workflows/ci.yml

@@ -2,11 +2,9 @@ name: CI
 
 on:
   pull_request:
-    branches:
-      - '*'
   push:
-    branches:
+    branches: [master]
-      - master
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -14,31 +12,81 @@ permissions:
 jobs:
   lint:
     runs-on: ubuntu-latest
+
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.lua_version }}-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
+
+    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
+
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.stylua_version }}-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
+
+    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
+
+    concurrency:
+      group: ${{ github.workflow }}-${{ matrix.nvim_version }}-${{ matrix.luals_version }}-${{ github.head_ref || github.ref_name }}
+      cancel-in-progress: true
+
+    strategy:
+      matrix:
+        nvim_version: [ stable, nightly ]
+        luals_version: [ 3.9.1 ]
+
+    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/luarocks-release.yml

@@ -0,0 +1,37 @@
+name: Luarocks Release
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+jobs:
+  luarocks-upload:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: LuaRocks Upload
+        uses: nvim-neorocks/luarocks-tag-release@v7
+        env:
+          LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
+        with:
+          summary: A File Explorer For Neovim
+          detailed_description: |
+            Automatic updates
+
+            File type icons
+
+            Git integration
+
+            Diagnostics integration - LSP and COC
+
+            (Live) filtering
+
+            Cut, copy, paste, rename, delete, create etc.
+
+            Highly customisable
+
+            Rich API
+          license: "GPL-3.0"
+          labels: neovim
+          dependencies: |
+            nvim-web-devicons

.github/workflows/release-please.yml

@@ -2,6 +2,10 @@ on:
   push:
     branches:
       - master
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
 name: release-please
 permissions:
   contents: write
@@ -21,9 +25,13 @@ jobs:
           git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
           git tag -d       v${{ steps.release.outputs.major }}                                                                       || true
           git tag -d       v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}                                    || true
+          git tag -d       v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true
           git push origin :v${{ steps.release.outputs.major }}                                                                       || true
           git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}                                    || true
+          git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true
           git tag -a       v${{ steps.release.outputs.major }}                                                                       -m "Release v${{ steps.release.outputs.major }}"
           git tag -a       v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}                                    -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
+          git tag -a       v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}"
           git push origin  v${{ steps.release.outputs.major }}
           git push origin  v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
+          git push origin  v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}

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

@@ -6,10 +6,14 @@ on:
       - reopened
       - edited
       - synchronize
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
 jobs:
   semantic-pr-subject:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5.4.0
+      - uses: amannn/action-semantic-pull-request@v5.5.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -0,0 +1,4 @@
+/luals-out/
+/luals/
+# backup vim files
+*~

.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,10 +1,15 @@
 {
   "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
   "runtime.version": "Lua 5.1",
+  "workspace": {
+    "library": [
+      "$VIMRUNTIME/lua/vim",
+      "${3rd}/luv/library"
+    ]
+  },
   "diagnostics": {
-    "globals": [
+    "libraryFiles": "Disable",
-      "vim"
+    "globals": [],
-    ],
     "neededFileStatus": {
       "ambiguity-1": "Any",
       "assign-type-mismatch": "Any",
@@ -26,11 +31,19 @@
       "duplicate-index": "Any",
       "duplicate-set-field": "Any",
       "empty-block": "Any",
+      "global-element": "Any",
       "global-in-nil-env": "Any",
+      "incomplete-signature-doc": "None",
+      "inject-field": "Any",
+      "invisible": "Any",
       "lowercase-global": "Any",
+      "missing-fields": "Any",
+      "missing-global-doc": "Any",
+      "missing-local-export-doc": "None",
       "missing-parameter": "Any",
       "missing-return": "Any",
       "missing-return-value": "Any",
+      "name-style-check": "None",
       "need-check-nil": "Any",
       "newfield-call": "Any",
       "newline-call": "Any",
@@ -63,4 +76,3 @@
     }
   }
 }
-

.release-please-manifest.json

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

CHANGELOG.md

@@ -1,5 +1,141 @@
 # Changelog
 
+## [1.5.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.4.0...nvim-tree-v1.5.0) (2024-07-11)
+
+
+### Features
+
+* **#2127:** add experimental.actions.open_file.relative_path to open files with a relative path rather than absolute ([#2805](https://github.com/nvim-tree/nvim-tree.lua/issues/2805)) ([869c064](https://github.com/nvim-tree/nvim-tree.lua/commit/869c064721a6c2091f22c3541e8f0ff958361771))
+* **#2598:** add api.tree.resize ([#2811](https://github.com/nvim-tree/nvim-tree.lua/issues/2811)) ([2ede0de](https://github.com/nvim-tree/nvim-tree.lua/commit/2ede0de67b47e89e2b4cb488ea3f58b8f5a8c90a))
+* **#2799:** `filesystem_watchers.ignore_dirs` and `git.disable_for_dirs` may be functions ([#2800](https://github.com/nvim-tree/nvim-tree.lua/issues/2800)) ([8b2c5c6](https://github.com/nvim-tree/nvim-tree.lua/commit/8b2c5c678be4b49dff6a2df794877000113fd77b))
+* **#2799:** filesystem_watchers.ignore_dirs and git.disable_for_dirs may be functions ([8b2c5c6](https://github.com/nvim-tree/nvim-tree.lua/commit/8b2c5c678be4b49dff6a2df794877000113fd77b))
+
+
+### Bug Fixes
+
+* **#2813:** macos: enable file renaming with changed capitalization ([#2814](https://github.com/nvim-tree/nvim-tree.lua/issues/2814)) ([abfd1d1](https://github.com/nvim-tree/nvim-tree.lua/commit/abfd1d1b6772540364743531cc0331e08a0027a9))
+* **#2819:** experimental.actions.open_file.relative_path issue following change directory ([#2820](https://github.com/nvim-tree/nvim-tree.lua/issues/2820)) ([12a9a99](https://github.com/nvim-tree/nvim-tree.lua/commit/12a9a995a455d2c2466e47140663275365a5d2fc))
+
+## [1.4.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.3...nvim-tree-v1.4.0) (2024-06-09)
+
+### Notice
+
+* Neovim 0.9 is now the minimum supported version; please upgrade to neovim release version 0.9 or 0.10.
+
+### Reverts
+
+* **#2781:** "refactor: replace deprecated use of vim.diagnostic.is_disabled()" ([#2784](https://github.com/nvim-tree/nvim-tree.lua/issues/2784)) ([517e4fb](https://github.com/nvim-tree/nvim-tree.lua/commit/517e4fbb9ef3c0986da7047f44b4b91a2400f93c))
+
+
+### Miscellaneous Chores
+
+* release 1.4.0 ([1cac800](https://github.com/nvim-tree/nvim-tree.lua/commit/1cac8005df6da484c97499247754afa59fef92db))
+
+## [1.3.3](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.2...nvim-tree-v1.3.3) (2024-05-14)
+
+
+### Bug Fixes
+
+* nil access exception with git integration when changing branches ([#2774](https://github.com/nvim-tree/nvim-tree.lua/issues/2774)) ([340d3a9](https://github.com/nvim-tree/nvim-tree.lua/commit/340d3a9795e06bdd1814228de398cd510f9bfbb0))
+
+## [1.3.2](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.1...nvim-tree-v1.3.2) (2024-05-12)
+
+
+### Bug Fixes
+
+* **#2758:** use nvim-webdevicons default file icon, not renderer.icons.glyphs.default, as per :help ([#2759](https://github.com/nvim-tree/nvim-tree.lua/issues/2759)) ([347e1eb](https://github.com/nvim-tree/nvim-tree.lua/commit/347e1eb35264677f66a79466bb5e3d111968e12c))
+* **#2758:** use nvim-webdevicons default for default files ([347e1eb](https://github.com/nvim-tree/nvim-tree.lua/commit/347e1eb35264677f66a79466bb5e3d111968e12c))
+* **#925:** handle newlines in file names ([#2754](https://github.com/nvim-tree/nvim-tree.lua/issues/2754)) ([64f61e4](https://github.com/nvim-tree/nvim-tree.lua/commit/64f61e4c913047a045ff90bd188dd3b54ee443cf))
+
+## [1.3.1](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.0...nvim-tree-v1.3.1) (2024-04-25)
+
+
+### Bug Fixes
+
+* **#2535:** TextYankPost event sends vim.v.event ([#2734](https://github.com/nvim-tree/nvim-tree.lua/issues/2734)) ([d8d3a15](https://github.com/nvim-tree/nvim-tree.lua/commit/d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77))
+* **#2733:** escape trash path ([#2735](https://github.com/nvim-tree/nvim-tree.lua/issues/2735)) ([81eb8d5](https://github.com/nvim-tree/nvim-tree.lua/commit/81eb8d519233c105f30dc0a278607e62b20502fd))
+
+## [1.3.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.2.0...nvim-tree-v1.3.0) (2024-03-30)
+
+
+### Features
+
+* add update_focused_file.exclude  ([#2673](https://github.com/nvim-tree/nvim-tree.lua/issues/2673)) ([e20966a](https://github.com/nvim-tree/nvim-tree.lua/commit/e20966ae558524f8d6f93dc37f5d2a8605f893e2))
+
+
+### Bug Fixes
+
+* **#2658:** change SpellCap groups to reduce confusion: ExecFile->Question, ImageFile->Question, SpecialFile->Title, Symlink->Underlined; add all other highlight groups to :NvimTreeHiTest ([#2732](https://github.com/nvim-tree/nvim-tree.lua/issues/2732)) ([0aca092](https://github.com/nvim-tree/nvim-tree.lua/commit/0aca0920f44b12a8383134bcb52da9faec123608))
+* bookmark filter shows marked directory children ([#2719](https://github.com/nvim-tree/nvim-tree.lua/issues/2719)) ([2d97059](https://github.com/nvim-tree/nvim-tree.lua/commit/2d97059661c83787372c8c003e743c984ba3ac50))
+
+## [1.2.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.1.1...nvim-tree-v1.2.0) (2024-03-24)
+
+
+### Features
+
+* add api.tree.toggle_enable_filters ([#2706](https://github.com/nvim-tree/nvim-tree.lua/issues/2706)) ([f7c09bd](https://github.com/nvim-tree/nvim-tree.lua/commit/f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3))
+
+## [1.1.1](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.1.0...nvim-tree-v1.1.1) (2024-03-15)
+
+
+### Bug Fixes
+
+* **#2395:** marks.bulk.move defaults to directory at cursor ([#2688](https://github.com/nvim-tree/nvim-tree.lua/issues/2688)) ([cfea5bd](https://github.com/nvim-tree/nvim-tree.lua/commit/cfea5bd0806aab41bef6014c6cf5a510910ddbdb))
+* **#2705:** change NvimTreeWindowPicker cterm background from Cyan to more visible DarkBlue ([#2708](https://github.com/nvim-tree/nvim-tree.lua/issues/2708)) ([1fd9c98](https://github.com/nvim-tree/nvim-tree.lua/commit/1fd9c98960463d2d5d400916c0633b2df016941d))
+* bookmark filter should include parent directory ([#2704](https://github.com/nvim-tree/nvim-tree.lua/issues/2704)) ([76b9810](https://github.com/nvim-tree/nvim-tree.lua/commit/76b98109f62caa12b2f1dff472060b2233ea2e90))
+
+## [1.1.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.0.0...nvim-tree-v1.1.0) (2024-03-14)
+
+
+### Features
+
+* **#2630:** file renames can now create directories ([#2657](https://github.com/nvim-tree/nvim-tree.lua/issues/2657)) ([efafd73](https://github.com/nvim-tree/nvim-tree.lua/commit/efafd73efa9bc8c26282aed563ba0f01c7465b06))
+* add api.fs.copy.basename, default mapping ge ([#2698](https://github.com/nvim-tree/nvim-tree.lua/issues/2698)) ([8f2a50f](https://github.com/nvim-tree/nvim-tree.lua/commit/8f2a50f1cd0c64003042364cf317c8788eaa6c8c))
+
+
+### Bug Fixes
+
+* **#2695:** git toplevel guard against missing paths ([#2696](https://github.com/nvim-tree/nvim-tree.lua/issues/2696)) ([3c4267e](https://github.com/nvim-tree/nvim-tree.lua/commit/3c4267eb5045fa86b67fe40c0c63d31efc801e77))
+* searchcount exception on invalid search regex ([#2693](https://github.com/nvim-tree/nvim-tree.lua/issues/2693)) ([041dbd1](https://github.com/nvim-tree/nvim-tree.lua/commit/041dbd18f440207ad161503a384e7c82d575db66))
+
+## [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,35 +4,117 @@ 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
+```
+
+If `lua-language-server` is not available or `--check` doesn't function (e.g. Arch Linux 3.9.1-1) you can manually install it as per `ci.yml` e.g.
+
+```sh
+mkdir luals
+curl -L "https://github.com/LuaLS/lua-language-server/releases/download/3.9.1/lua-language-server-3.9.1-linux-x64.tar.gz" | tar zx --directory luals
+
+PATH="luals/bin:${PATH}" 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
+
+## Opts
 
 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
+## API
 
-Please reference any issues in the description e.g. "resolves #1234".
+When adding or changing API please update :help nvim-tree-api
+
+# Pull Request
+
+Please reference any issues in the description e.g. "resolves #1234", which will be closed upon merge.
 
 Please check "allow edits by maintainers" to allow nvim-tree developers to make small changes such as documentation tweaks.
 
-A test case to reproduce the issue is required. A ["Clean Room" Replication](https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting#clean-room-replication) is preferred.
+## Subject
 
+The merge commit message will be the subject of the PR.
+
+A [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0) subject will be validated by the Semantic Pull Request Subject CI job. Reference the issue to be used in the release notes e.g.
+
+`fix(#2395): marks.bulk.move defaults to directory at cursor`
+
+Available types:
+* feat: A new feature
+* fix: A bug fix
+* docs: Documentation only changes
+* style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
+* refactor: A code change that neither fixes a bug nor adds a feature
+* perf: A code change that improves performance
+* test: Adding missing tests or correcting existing tests
+* build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
+* ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
+* chore: Other changes that don't modify src or test files
+* revert: Reverts a previous commit
+
+If in doubt, look at previous commits.
+
+See also [The Conventional Commits ultimate cheatsheet](https://gist.github.com/gabrielecanepa/fa6cca1a8ae96f77896fe70ddee65527)

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

@@ -24,11 +24,11 @@
 
 Take a look at the [wiki](https://github.com/nvim-tree/nvim-tree.lua/wiki) for Showcases, Tips, Recipes and more.
 
-Community support: [matrix](https://matrix.to/#/#nvim-tree:matrix.org)
+Questions and general support: [Discussions](https://github.com/nvim-tree/nvim-tree.lua/discussions)
 
 ## Requirements
 
-[neovim >=0.8.0](https://github.com/neovim/neovim/wiki/Installing-Neovim)
+[neovim >=0.9.0](https://github.com/neovim/neovim/wiki/Installing-Neovim)
 
 [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons) is optional and used to display file icons. It requires a [patched font](https://www.nerdfonts.com/). Your terminal emulator must be configured to use that font, usually "Hack Nerd Font"
 
@@ -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
@@ -110,6 +112,23 @@ require("nvim-tree").setup {
 }
 ```
 
+### 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. e.g.
+
+```lua
+vim.cmd([[
+    :hi      NvimTreeExecFile    guifg=#ffa0a0
+    :hi      NvimTreeSpecialFile guifg=#ff80ff gui=underline
+    :hi      NvimTreeSymlink     guifg=Yellow  gui=italic
+    :hi link NvimTreeImageFile   Title
+]])
+```
+See [:help nvim-tree-highlight](doc/nvim-tree-lua.txt) for details.
+
 ## Commands
 
 See [:help nvim-tree-commands](doc/nvim-tree-lua.txt)

lua/nvim-tree.lua

@@ -1,17 +1,14 @@
 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"
 local utils = require "nvim-tree.utils"
 local actions = require "nvim-tree.actions"
 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 buffers = require "nvim-tree.buffers"
-local modified = require "nvim-tree.modified"
-local events = require "nvim-tree.events"
 local notify = require "nvim-tree.notify"
 
 local _config = {}
@@ -26,8 +23,15 @@ local M = {
 function M.change_root(path, bufnr)
   -- skip if current file is in ignore_list
   if type(bufnr) == "number" then
-    local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") or ""
+    local ft
-    for _, value in pairs(_config.update_focused_file.ignore_list) do
+
+    if vim.fn.has "nvim-0.10" == 1 then
+      ft = vim.api.nvim_get_option_value("filetype", { buf = bufnr }) or ""
+    else
+      ft = vim.api.nvim_buf_get_option(bufnr, "filetype") or "" ---@diagnostic disable-line: deprecated
+    end
+
+    for _, value in pairs(_config.update_focused_file.update_root.ignore_list) do
       if utils.str_find(path, value) or utils.str_find(ft, value) then
         return
       end
@@ -76,21 +80,36 @@ function M.change_root(path, bufnr)
 end
 
 function M.tab_enter()
-  if view.is_visible { any_tabpage = true } then
+  local explorer = core.get_explorer();
+  if not explorer then
+    return
+  end
+  if explorer.view:is_visible { any_tabpage = true } then
     local bufname = vim.api.nvim_buf_get_name(0)
-    local ft = vim.api.nvim_buf_get_option(0, "ft")
+
+    local ft
+    if vim.fn.has "nvim-0.10" == 1 then
+      ft = vim.api.nvim_get_option_value("filetype", { buf = 0 }) or ""
+    else
+      ft = vim.api.nvim_buf_get_option(0, "ft") ---@diagnostic disable-line: deprecated
+    end
+
     for _, filter in ipairs(M.config.tab.sync.ignore) do
       if bufname:match(filter) ~= nil or ft:match(filter) ~= nil then
         return
       end
     end
-    view.open { focus_tree = false }
+    explorer.view:open { focus_tree = false }
     renderer.draw()
   end
 end
 
 function M.open_on_directory()
-  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
+  local explorer = core.get_explorer();
+  if not explorer then
+    return
+  end
+  local should_proceed = _config.hijack_directories.auto_open or explorer.view:is_visible()
   if not should_proceed then
     return
   end
@@ -104,15 +123,9 @@ 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()
+  local ok, search = pcall(vim.fn.searchcount)
-  if search and search.exact_match == 1 then
+  if ok and search and search.exact_match == 1 then
     return
   end
 
@@ -155,7 +168,7 @@ function M.change_dir(name)
     actions.root.change_dir.fn(name)
   end
 
-  if _config.update_focused_file.enable then
+  if _config.update_focused_file.update_root.enable then
     actions.tree.find_file.fn()
   end
 end
@@ -168,8 +181,18 @@ 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()
+      local explorer = core.get_explorer();
+      if not explorer then
+        return
+      end
+      appearance.setup()
+      explorer.view:reset_winhl()
+      renderer.draw()
+    end,
+  })
 
   -- prevent new opened file from opening in the same window as nvim-tree
   create_nvim_tree_autocmd("BufWipeout", {
@@ -178,10 +201,14 @@ local function setup_autocommands(opts)
       if not utils.is_nvim_tree_buf(0) then
         return
       end
+      local explorer = core.get_explorer();
+      if not explorer then
+        return
+      end
       if opts.actions.open_file.eject then
-        view._prevent_buffer_override()
+        explorer.view:_prevent_buffer_override()
       else
-        view.abandon_current_window()
+        explorer.view:abandon_current_window()
       end
     end,
   })
@@ -197,7 +224,13 @@ local function setup_autocommands(opts)
   create_nvim_tree_autocmd("BufReadPost", {
     callback = function(data)
       -- update opened file buffers
-      if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
+      local explorer = core.get_explorer()
+      if not explorer then
+        return
+      end
+      if
+        (explorer.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()
         end)
@@ -208,9 +241,15 @@ local function setup_autocommands(opts)
   create_nvim_tree_autocmd("BufUnload", {
     callback = function(data)
       -- update opened file buffers
-      if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
+      local explorer = core.get_explorer()
+      if not explorer then
+        return
+      end
+      if
+        (explorer.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,
@@ -247,7 +286,11 @@ local function setup_autocommands(opts)
   end
   if opts.update_focused_file.enable then
     create_nvim_tree_autocmd("BufEnter", {
-      callback = function()
+      callback = function(event)
+        local exclude = opts.update_focused_file.exclude
+        if type(exclude) == "function" and exclude(event) then
+          return
+        end
         utils.debounce("BufEnter:find_file", opts.view.debounce_delay, function()
           actions.tree.find_file.fn()
         end)
@@ -303,8 +346,12 @@ local function setup_autocommands(opts)
     create_nvim_tree_autocmd("WinLeave", {
       pattern = "NvimTree_*",
       callback = function()
+        local explorer = core.get_explorer()
+        if not explorer then
+          return
+        end
         if utils.is_nvim_tree_buf(0) then
-          view.close()
+          explorer.view:close()
         end
       end,
     })
@@ -314,27 +361,12 @@ 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,
     })
   end
-
-  -- TODO #1545 remove similar check from view.resize
-  if vim.fn.has "nvim-0.9" == 1 then
-    create_nvim_tree_autocmd("WinResized", {
-      callback = function()
-        if vim.v.event and vim.v.event.windows then
-          for _, winid in ipairs(vim.v.event.windows) do
-            if vim.api.nvim_win_is_valid(winid) and utils.is_nvim_tree_buf(vim.api.nvim_win_get_buf(winid)) then
-              events._dispatch_on_tree_resize(vim.api.nvim_win_get_width(winid))
-            end
-          end
-        end
-      end,
-    })
-  end
 end
 
 local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
@@ -386,10 +418,11 @@ 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_hidden = "none",
     highlight_bookmarks = "none",
     highlight_clipboard = "name",
     indent_markers = {
@@ -416,6 +449,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
       },
       git_placement = "before",
       modified_placement = "after",
+      hidden_placement = "after",
       diagnostics_placement = "signcolumn",
       bookmarks_placement = "signcolumn",
       padding = " ",
@@ -426,6 +460,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
         folder_arrow = true,
         git = true,
         modified = true,
+        hidden = false,
         diagnostics = true,
         bookmarks = true,
       },
@@ -434,6 +469,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
         symlink = "",
         bookmark = "󰆤",
         modified = "●",
+        hidden = "󰜌",
         folder = {
           arrow_closed = "",
           arrow_open = "",
@@ -462,9 +498,12 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
   },
   update_focused_file = {
     enable = false,
-    update_root = false,
+    update_root = {
+      enable = false,
       ignore_list = {},
     },
+    exclude = false,
+  },
   system_open = {
     cmd = "",
     args = {},
@@ -499,6 +538,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     show_on_open_dirs = true,
   },
   filters = {
+    enable = true,
     git_ignored = true,
     dotfiles = false,
     git_clean = false,
@@ -578,7 +618,13 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
       default_yes = false,
     },
   },
-  experimental = {},
+  experimental = {
+    actions = {
+      open_file = {
+        relative_path = false,
+      },
+    },
+  },
   log = {
     enable = false,
     truncate = false,
@@ -623,6 +669,18 @@ local ACCEPTED_TYPES = {
     group_empty = { "boolean", "function" },
     root_folder_label = { "function", "string", "boolean" },
   },
+  update_focused_file = {
+    exclude = { "function" },
+  },
+  git = {
+    disable_for_dirs = { "function" },
+  },
+  filters = {
+    custom = { "function" },
+  },
+  filesystem_watchers = {
+    ignore_dirs = { "function" },
+  },
   actions = {
     open_file = {
       window_picker = {
@@ -641,15 +699,19 @@ 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_hidden = { "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" },
+      git_placement = { "before", "after", "signcolumn", "right_align" },
-      modified_placement = { "before", "after", "signcolumn" },
+      modified_placement = { "before", "after", "signcolumn", "right_align" },
-      diagnostics_placement = { "before", "after", "signcolumn" },
+      hidden_placement = { "before", "after", "signcolumn", "right_align" },
-      bookmarks_placement = { "before", "after", "signcolumn" },
+      diagnostics_placement = { "before", "after", "signcolumn", "right_align" },
+      bookmarks_placement = { "before", "after", "signcolumn", "right_align" },
     },
   },
   help = {
@@ -740,8 +802,12 @@ end
 
 function M.purge_all_state()
   require("nvim-tree.watcher").purge_watchers()
-  view.close_all_tabs()
+  local explorer = core.get_explorer()
-  view.abandon_all_windows()
+  if not explorer then
+    return
+  end
+  explorer.view:close_all_tabs()
+  explorer.view:abandon_all_windows()
   if core.get_explorer() ~= nil then
     git.purge_state()
     core.reset_explorer()
@@ -750,8 +816,8 @@ end
 
 ---@param conf table|nil
 function M.setup(conf)
-  if vim.fn.has "nvim-0.8" == 0 then
+  if vim.fn.has "nvim-0.9" == 0 then
-    notify.warn "nvim-tree.lua requires Neovim 0.8 or higher"
+    notify.warn "nvim-tree.lua requires Neovim 0.9 or higher"
     return
   end
 
@@ -786,17 +852,15 @@ 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)
   require("nvim-tree.git.utils").setup(opts)
-  require("nvim-tree.view").setup(opts)
   require("nvim-tree.lib").setup(opts)
   require("nvim-tree.renderer").setup(opts)
-  require("nvim-tree.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/finders/find-file.lua

@@ -1,5 +1,4 @@
 local log = require "nvim-tree.log"
-local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local renderer = require "nvim-tree.renderer"
 local reload = require "nvim-tree.explorer.reload"
@@ -13,7 +12,8 @@ local running = {}
 ---Find a path in the tree, expand it and focus it
 ---@param path string relative or absolute
 function M.fn(path)
-  if not core.get_explorer() or not view.is_visible() then
+  local explorer = core.get_explorer()
+  if not explorer or not explorer.view:is_visible() then
     return
   end
 
@@ -75,9 +75,9 @@ function M.fn(path)
     end)
     :iterate()
 
-  if found and view.is_visible() then
+  if found and explorer.view:is_visible() then
     renderer.draw()
-    view.set_cursor { line, 0 }
+    explorer.view:set_cursor { line, 0 }
   end
 
   running[path_real] = false

lua/nvim-tree/actions/finders/search-node.lua

@@ -1,5 +1,4 @@
 local core = require "nvim-tree.core"
-local filters = require "nvim-tree.explorer.filters"
 local find_file = require("nvim-tree.actions.finders.find-file").fn
 
 local M = {}
@@ -9,6 +8,11 @@ local M = {}
 ---@return string|nil
 local function search(search_dir, input_path)
   local realpaths_searched = {}
+  local explorer = core.get_explorer()
+
+  if not explorer then
+    return
+  end
 
   if not search_dir then
     return
@@ -19,7 +23,7 @@ local function search(search_dir, input_path)
   local function iter(dir)
     local realpath, path, name, stat, handle, _
 
-    local filter_status = filters.prepare()
+    local filter_status = explorer.filters:prepare()
 
     handle, _ = vim.loop.fs_scandir(dir)
     if not handle then
@@ -36,12 +40,13 @@ local function search(search_dir, input_path)
     while name do
       path = dir .. "/" .. name
 
+      ---@type uv.fs_stat.result|nil
       stat, _ = vim.loop.fs_stat(path)
       if not stat then
         break
       end
 
-      if not filters.should_filter(path, filter_status) then
+      if not explorer.filters:should_filter(path, stat, filter_status) then
         if string.find(path, "/" .. input_path .. "$") then
           return path
         end
@@ -68,8 +73,15 @@ function M.fn()
 
   -- temporarily set &path
   local bufnr = vim.api.nvim_get_current_buf()
-  local path_existed, path_opt = pcall(vim.api.nvim_buf_get_option, bufnr, "path")
+
-  vim.api.nvim_buf_set_option(bufnr, "path", core.get_cwd() .. "/**")
+  local path_existed, path_opt
+  if vim.fn.has "nvim-0.10" == 1 then
+    path_existed, path_opt = pcall(vim.api.nvim_get_option_value, "path", { buf = bufnr })
+    vim.api.nvim_set_option_value("path", core.get_cwd() .. "/**", { buf = bufnr })
+  else
+    path_existed, path_opt = pcall(vim.api.nvim_buf_get_option, bufnr, "path") ---@diagnostic disable-line: deprecated
+    vim.api.nvim_buf_set_option(bufnr, "path", core.get_cwd() .. "/**") ---@diagnostic disable-line: deprecated
+  end
 
   vim.ui.input({ prompt = "Search: ", completion = "file_in_path" }, function(input_path)
     if not input_path or input_path == "" then
@@ -77,9 +89,17 @@ function M.fn()
     end
     -- reset &path
     if path_existed then
-      vim.api.nvim_buf_set_option(bufnr, "path", path_opt)
+      if vim.fn.has "nvim-0.10" == 1 then
+        vim.api.nvim_set_option_value("path", path_opt, { buf = bufnr })
       else
-      vim.api.nvim_buf_set_option(bufnr, "path", nil)
+        vim.api.nvim_buf_set_option(bufnr, "path", path_opt) ---@diagnostic disable-line: deprecated
+      end
+    else
+      if vim.fn.has "nvim-0.10" == 1 then
+        vim.api.nvim_set_option_value("path", nil, { buf = bufnr })
+      else
+        vim.api.nvim_buf_set_option(bufnr, "path", nil) ---@diagnostic disable-line: deprecated
+      end
     end
 
     -- strip trailing slash

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 = {
@@ -278,17 +276,24 @@ end
 ---@param content string
 local function copy_to_clipboard(content)
   local clipboard_name
+  local reg
   if M.config.actions.use_system_clipboard == true then
-    vim.fn.setreg("+", content)
-    vim.fn.setreg('"', content)
     clipboard_name = "system"
+    reg = "+"
   else
-    vim.fn.setreg('"', content)
-    vim.fn.setreg("1", content)
     clipboard_name = "neovim"
+    reg = "1"
   end
 
-  vim.api.nvim_exec_autocmds("TextYankPost", {})
+  -- manually firing TextYankPost does not set vim.v.event
+  -- workaround: create a scratch buffer with the clipboard contents and send a yank command
+  local temp_buf = vim.api.nvim_create_buf(false, true)
+  vim.api.nvim_buf_set_text(temp_buf, 0, 0, 0, 0, { content })
+  vim.api.nvim_buf_call(temp_buf, function()
+    vim.cmd(string.format('normal! "%sy$', reg))
+  end)
+  vim.api.nvim_buf_delete(temp_buf, {})
+
   notify.info(string.format("Copied %s to %s clipboard!", content, clipboard_name))
 end
 
@@ -297,6 +302,12 @@ function M.copy_filename(node)
   copy_to_clipboard(node.name)
 end
 
+---@param node Node
+function M.copy_basename(node)
+  local basename = vim.fn.fnamemodify(node.name, ":r")
+  copy_to_clipboard(basename)
+end
+
 ---@param node Node
 function M.copy_path(node)
   local absolute_path = node.absolute_path
@@ -317,34 +328,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
-    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/fs/create-file.lua

@@ -12,7 +12,7 @@ local M = {}
 local function create_and_notify(file)
   events._dispatch_will_create_file(file)
   local ok, fd = pcall(vim.loop.fs_open, file, "w", 420)
-  if not ok then
+  if not ok or type(fd) ~= "number" then
     notify.error("Couldn't create file " .. notify.render_path(file))
     return
   end

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

@@ -1,6 +1,5 @@
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
-local view = require "nvim-tree.view"
 local lib = require "nvim-tree.lib"
 local notify = require "nvim-tree.notify"
 
@@ -10,10 +9,14 @@ local M = {
 
 ---@param windows integer[]
 local function close_windows(windows)
+  local explorer = require "nvim-tree.core".get_explorer()
+  if not explorer then
+    return
+  end
   -- Prevent from closing when the win count equals 1 or 2,
   -- where the win to remove could be the last opened.
   -- For details see #2503.
-  if view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if explorer.view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
     return
   end
 
@@ -26,16 +29,20 @@ end
 
 ---@param absolute_path string
 local function clear_buffer(absolute_path)
+  local explorer = require "nvim-tree.core".get_explorer()
+  if not explorer then
+    return
+  end
   local bufs = vim.fn.getbufinfo { bufloaded = 1, buflisted = 1 }
   for _, buf in pairs(bufs) do
     if buf.name == absolute_path then
       local tree_winnr = vim.api.nvim_get_current_win()
-      if buf.hidden == 0 and (#bufs > 1 or view.View.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or explorer.view.View.float.enable) then
         vim.api.nvim_set_current_win(buf.windows[1])
         vim.cmd ":bn"
       end
       vim.api.nvim_buf_delete(buf.bufnr, { force = true })
-      if not view.View.float.quit_on_focus_loss then
+      if not explorer.view.View.float.quit_on_focus_loss then
         vim.api.nvim_set_current_win(tree_winnr)
       end
       if M.config.actions.remove_file.close_window then
@@ -49,9 +56,9 @@ end
 ---@param cwd string
 ---@return boolean|nil
 local function remove_dir(cwd)
-  local handle = vim.loop.fs_scandir(cwd)
+  local handle, err = vim.loop.fs_scandir(cwd)
-  if type(handle) == "string" then
+  if not handle then
-    notify.error(handle)
+    notify.error(err)
     return
   end
 

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

@@ -9,6 +9,16 @@ local M = {
   config = {},
 }
 
+---@param iter function iterable
+---@return integer
+local function get_num_nodes(iter)
+  local i = 0
+  for _ in iter do
+    i = i + 1
+  end
+  return i
+end
+
 local ALLOWED_MODIFIERS = {
   [":p"] = true,
   [":p:h"] = true,
@@ -20,27 +30,70 @@ local function err_fmt(from, to, reason)
   return string.format("Cannot rename %s -> %s: %s", from, to, reason)
 end
 
+local function rename_file_exists(node, to)
+  if not utils.is_macos then
+    return utils.file_exists(to)
+  end
+
+  if string.lower(node) == string.lower(to) then
+    return false
+  end
+
+  return utils.file_exists(to)
+end
+
 ---@param node Node
 ---@param to string
 function M.rename(node, to)
   local notify_from = notify.render_path(node.absolute_path)
   local notify_to = notify.render_path(to)
 
-  if utils.file_exists(to) then
+  if rename_file_exists(notify_from, notify_to) then
     notify.warn(err_fmt(notify_from, notify_to, "file already exists"))
     return
   end
 
+  -- create a folder for each path element if the folder does not exist
+  local idx = 0
+  local path_to_create = ""
+
+  local num_nodes = get_num_nodes(utils.path_split(utils.path_remove_trailing(to)))
+  local is_error = false
+  for path in utils.path_split(to) do
+    idx = idx + 1
+
+    local p = utils.path_remove_trailing(path)
+    if #path_to_create == 0 and vim.fn.has "win32" == 1 then
+      path_to_create = utils.path_join { p, path_to_create }
+    else
+      path_to_create = utils.path_join { path_to_create, p }
+    end
+
+    if idx == num_nodes then
       events._dispatch_will_rename_node(node.absolute_path, to)
       local success, err = vim.loop.fs_rename(node.absolute_path, to)
+
       if not success then
         notify.warn(err_fmt(notify_from, notify_to, err))
         return
       end
+    elseif not rename_file_exists(notify_from, path_to_create) then
+      local success = vim.loop.fs_mkdir(path_to_create, 493)
+      if not success then
+        notify.error("Could not create folder " .. notify.render_path(path_to_create))
+        is_error = true
+        break
+      end
+      is_error = false
+    end
+  end
+
+  if not is_error then
     notify.info(string.format("%s -> %s", notify_from, notify_to))
     utils.rename_loaded_buffers(node.absolute_path, to)
     events._dispatch_node_renamed(node.absolute_path, to)
   end
+end
 
 ---@param default_modifier string|nil
 ---@return fun(node: Node, modifier: string)

lua/nvim-tree/actions/fs/trash.lua

@@ -42,7 +42,7 @@ function M.remove(node)
   -- trashes a path (file or folder)
   local function trash_path(on_exit)
     local need_sync_wait = utils.is_windows
-    local job = vim.fn.jobstart(M.config.trash.cmd .. ' "' .. node.absolute_path .. '"', {
+    local job = vim.fn.jobstart(M.config.trash.cmd .. " " .. vim.fn.shellescape(node.absolute_path), {
       detach = not need_sync_wait,
       on_exit = on_exit,
       on_stderr = on_stderr,

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

@@ -1,44 +1,51 @@
 local utils = require "nvim-tree.utils"
-local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
 local explorer_node = require "nvim-tree.explorer.node"
 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
@@ -52,10 +59,187 @@ function M.fn(opts)
     end
   end
 
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
   if nex then
-      view.set_cursor { nex, 0 }
+    explorer.view:set_cursor { nex, 0 }
   elseif vim.o.wrapscan and first then
-      view.set_cursor { first, 0 }
+    explorer.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
+        local explorer = core.get_explorer()
+        if explorer then
+          explorer.view:set_cursor { 1, 0 } -- move to root node (position 1)
+        end
+      else
+        local node_init_line = utils.find_node_line(node_init)
+        if node_init_line < 0 then
+          return
+        end
+        local explorer = core.get_explorer()
+        if explorer then
+          explorer.view:set_cursor { node_init_line, 0 } -- move to root node (position 1)
+        end
+      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/moves/parent.lua

@@ -1,5 +1,4 @@
 local renderer = require "nvim-tree.renderer"
-local view = require "nvim-tree.view"
 local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
@@ -21,14 +20,20 @@ function M.fn(should_close)
     local parent = utils.get_parent_of_group(node).parent
 
     if not parent or not parent.parent then
-      return view.set_cursor { 1, 0 }
+      local explorer = core.get_explorer()
+      if explorer then
+        return explorer.view:set_cursor { 1, 0 }
+      end
     end
 
     local _, line = utils.find_node(core.get_explorer().nodes, function(n)
       return n.absolute_path == parent.absolute_path
     end)
 
-    view.set_cursor { line + 1, 0 }
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.view:set_cursor { line + 1, 0 }
+    end
     if should_close then
       parent.open = false
       renderer.draw()

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

@@ -6,6 +6,14 @@ local M = {}
 ---@return table
 local function get_formatted_lines(node)
   local stats = node.fs_stat
+  if stats == nil then
+    return {
+      "",
+      "  Can't retrieve file information",
+      "",
+    }
+  end
+
   local fpath = " fullpath: " .. node.absolute_path
   local created_at = " created:  " .. os.date("%x %X", stats.birthtime.sec)
   local modified_at = " modified: " .. os.date("%x %X", stats.mtime.sec)
@@ -48,7 +56,7 @@ end
 
 function M.close_popup()
   if current_popup ~= nil then
-    vim.api.nvim_win_close(current_popup.winnr, { force = true })
+    vim.api.nvim_win_close(current_popup.winnr, true)
     vim.cmd "augroup NvimTreeRemoveFilePopup | au! CursorMoved | augroup END"
 
     current_popup = nil

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

@@ -2,7 +2,6 @@
 local lib = require "nvim-tree.lib"
 local notify = require "nvim-tree.notify"
 local utils = require "nvim-tree.utils"
-local view = require "nvim-tree.view"
 
 local M = {}
 
@@ -19,21 +18,29 @@ end
 ---Get all windows in the current tabpage that aren't NvimTree.
 ---@return table with valid win_ids
 local function usable_win_ids()
+  local explorer = require "nvim-tree.core".get_explorer()
+
   local tabpage = vim.api.nvim_get_current_tabpage()
   local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = view.get_winnr(tabpage)
+  local tree_winid = explorer and explorer.view:get_winnr(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)
     for option, v in pairs(M.window_picker.exclude) do
-      local ok, option_value = pcall(vim.api.nvim_buf_get_option, bufid, option)
+      local ok, option_value
+      if vim.fn.has "nvim-0.10" == 1 then
+        ok, option_value = pcall(vim.api.nvim_get_option_value, option, { buf = bufid })
+      else
+        ok, option_value = pcall(vim.api.nvim_buf_get_option, bufid, option) ---@diagnostic disable-line: deprecated
+      end
+
       if ok and vim.tbl_contains(v, option_value) then
         return false
       end
     end
 
     local win_config = vim.api.nvim_win_get_config(id)
-    return id ~= tree_winid and win_config.focusable and not win_config.external
+    return id ~= tree_winid and win_config.focusable and not win_config.external or false
   end, win_ids)
 end
 
@@ -83,8 +90,15 @@ local function pick_win_id()
 
   if laststatus == 3 then
     for _, win_id in ipairs(not_selectable) do
-      local ok_status, statusline = pcall(vim.api.nvim_win_get_option, win_id, "statusline")
+      local ok_status, statusline, ok_hl, winhl
-      local ok_hl, winhl = pcall(vim.api.nvim_win_get_option, win_id, "winhl")
+
+      if vim.fn.has "nvim-0.10" == 1 then
+        ok_status, statusline = pcall(vim.api.nvim_get_option_value, "statusline", { win = win_id })
+        ok_hl, winhl = pcall(vim.api.nvim_get_option_value, "winhl", { win = win_id })
+      else
+        ok_status, statusline = pcall(vim.api.nvim_win_get_option, win_id, "statusline") ---@diagnostic disable-line: deprecated
+        ok_hl, winhl = pcall(vim.api.nvim_win_get_option, win_id, "winhl") ---@diagnostic disable-line: deprecated
+      end
 
       win_opts[win_id] = {
         statusline = ok_status and statusline or "",
@@ -92,15 +106,26 @@ local function pick_win_id()
       }
 
       -- Clear statusline for windows not selectable
-      vim.api.nvim_win_set_option(win_id, "statusline", " ")
+      if vim.fn.has "nvim-0.10" == 1 then
+        vim.api.nvim_set_option_value("statusline", " ", { win = win_id })
+      else
+        vim.api.nvim_win_set_option(win_id, "statusline", " ") ---@diagnostic disable-line: deprecated
+      end
     end
   end
 
   -- Setup UI
   for _, id in ipairs(selectable) do
     local char = M.window_picker.chars:sub(i, i)
-    local ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline")
+
-    local ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl")
+    local ok_status, statusline, ok_hl, winhl
+    if vim.fn.has "nvim-0.10" == 1 then
+      ok_status, statusline = pcall(vim.api.nvim_get_option_value, "statusline", { win = id })
+      ok_hl, winhl = pcall(vim.api.nvim_get_option_value, "winhl", { win = id })
+    else
+      ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline") ---@diagnostic disable-line: deprecated
+      ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl") ---@diagnostic disable-line: deprecated
+    end
 
     win_opts[id] = {
       statusline = ok_status and statusline or "",
@@ -108,8 +133,13 @@ local function pick_win_id()
     }
     win_map[char] = id
 
-    vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=")
+    if vim.fn.has "nvim-0.10" == 1 then
-    vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker")
+      vim.api.nvim_set_option_value("statusline", "%=" .. char .. "%=", { win = id })
+      vim.api.nvim_set_option_value("winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker", { win = id })
+    else
+      vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=") ---@diagnostic disable-line: deprecated
+      vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker") ---@diagnostic disable-line: deprecated
+    end
 
     i = i + 1
     if i > #M.window_picker.chars then
@@ -128,14 +158,22 @@ local function pick_win_id()
   -- Restore window options
   for _, id in ipairs(selectable) do
     for opt, value in pairs(win_opts[id]) do
-      vim.api.nvim_win_set_option(id, opt, value)
+      if vim.fn.has "nvim-0.10" == 1 then
+        vim.api.nvim_set_option_value(opt, value, { win = id })
+      else
+        vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
+      end
     end
   end
 
   if laststatus == 3 then
     for _, id in ipairs(not_selectable) do
       for opt, value in pairs(win_opts[id]) do
-        vim.api.nvim_win_set_option(id, opt, value)
+        if vim.fn.has "nvim-0.10" == 1 then
+          vim.api.nvim_set_option_value(opt, value, { win = id })
+        else
+          vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
+        end
       end
     end
   end
@@ -151,21 +189,39 @@ end
 
 local function open_file_in_tab(filename)
   if M.quit_on_open then
-    view.close()
+    local explorer = require "nvim-tree.core".get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
+  end
+  if M.relative_path then
+    filename = utils.path_relative(filename, vim.fn.getcwd())
   end
   vim.cmd("tabe " .. vim.fn.fnameescape(filename))
 end
 
 local function drop(filename)
   if M.quit_on_open then
-    view.close()
+    local explorer = require"nvim-tree.core".get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
+  end
+  if M.relative_path then
+    filename = utils.path_relative(filename, vim.fn.getcwd())
   end
   vim.cmd("drop " .. vim.fn.fnameescape(filename))
 end
 
 local function tab_drop(filename)
   if M.quit_on_open then
-    view.close()
+    local explorer = require"nvim-tree.core".get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
+  end
+  if M.relative_path then
+    filename = utils.path_relative(filename, vim.fn.getcwd())
   end
   vim.cmd("tab :drop " .. vim.fn.fnameescape(filename))
 end
@@ -183,7 +239,10 @@ local function on_preview(buf_loaded)
       once = true,
     })
   end
-  view.focus()
+  local explorer = require"nvim-tree.core".get_explorer()
+  if explorer then
+    explorer.view:focus()
+  end
 end
 
 local function get_target_winid(mode)
@@ -241,7 +300,8 @@ local function open_in_new_window(filename, mode)
   end, vim.api.nvim_list_wins())
 
   local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one
-  local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright"
+  local explorer = require"nvim-tree.core".get_explorer()
+  local new_window_side = (explorer and view.View.side == "right") and "aboveleft" or "belowright"
 
   -- Target is invalid: create new window
   if not vim.tbl_contains(win_ids, target_winid) then
@@ -258,26 +318,22 @@ local function open_in_new_window(filename, mode)
     -- If `hidden` is not enabled, check if buffer in target window is
     -- modified, and create new split if it is.
     local target_bufid = vim.api.nvim_win_get_buf(target_winid)
-    if vim.api.nvim_buf_get_option(target_bufid, "modified") then
+
+    local modified
+    if vim.fn.has "nvim-0.10" == 1 then
+      modified = vim.api.nvim_get_option_value("modified", { buf = target_bufid })
+    else
+      modified = vim.api.nvim_buf_get_option(target_bufid, "modified") ---@diagnostic disable-line: deprecated
+    end
+
+    if modified then
       if not mode:match "split$" then
         mode = "vsplit"
       end
     end
   end
 
-  local fname = vim.fn.fnameescape(filename)
+  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.view.View.float.enable then
-  fname = utils.escape_special_chars(fname)
-
-  local cmd
-  if create_new_window then
-    cmd = string.format("%s vsplit %s", new_window_side, fname)
-  elseif mode:match "split$" then
-    cmd = string.format("%s %s", mode, fname)
-  else
-    cmd = string.format("edit %s", fname)
-  end
-
-  if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
     -- ignore "WinLeave" autocmd on preview
     -- because the registered "WinLeave"
     -- will kill the floating window immediately
@@ -286,7 +342,24 @@ local function open_in_new_window(filename, mode)
     set_current_win_no_autocmd(target_winid, { "BufEnter" })
   end
 
-  pcall(vim.cmd, cmd)
+  local fname
+  if M.relative_path then
+    fname = utils.escape_special_chars(vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd())))
+  else
+    fname = utils.escape_special_chars(vim.fn.fnameescape(filename))
+  end
+
+  local command
+  if create_new_window then
+    -- generated from vim.api.nvim_parse_cmd("belowright vsplit foo", {})
+    command = { cmd = "vsplit", mods = { split = new_window_side }, args = { fname } }
+  elseif mode:match "split$" then
+    command = { cmd = mode, args = { fname } }
+  else
+    command = { cmd = "edit", args = { fname } }
+  end
+
+  pcall(vim.api.nvim_cmd, command, { output = false })
   lib.set_target_win()
 end
 
@@ -300,7 +373,13 @@ local function is_already_loaded(filename)
 end
 
 local function edit_in_current_buf(filename)
-  require("nvim-tree.view").abandon_current_window()
+  local explorer = require"nvim-tree.core".get_explorer()
+  if explorer then
+    explorer.view:abandon_current_window()
+  end
+  if M.relative_path then
+    filename = utils.path_relative(filename, vim.fn.getcwd())
+  end
   vim.cmd("keepalt keepjumps edit " .. vim.fn.fnameescape(filename))
 end
 
@@ -342,7 +421,10 @@ function M.fn(mode, filename)
   end
 
   if M.resize_window then
-    view.resize()
+    local explorer = require"nvim-tree.core".get_explorer()
+    if explorer then
+      explorer.view:resize()
+    end
   end
 
   if mode == "preview" or mode == "preview_no_picker" then
@@ -350,13 +432,17 @@ function M.fn(mode, filename)
   end
 
   if M.quit_on_open then
-    view.close()
+    local explorer = require"nvim-tree.core".get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
   end
 end
 
 function M.setup(opts)
   M.quit_on_open = opts.actions.open_file.quit_on_open
   M.resize_window = opts.actions.open_file.resize_window
+  M.relative_path = opts.experimental.actions.open_file.relative_path
   if opts.actions.open_file.window_picker.chars then
     opts.actions.open_file.window_picker.chars = tostring(opts.actions.open_file.window_picker.chars):upper()
   end

lua/nvim-tree/actions/reloaders.lua

@@ -1,5 +1,4 @@
 local git = require "nvim-tree.git"
-local view = require "nvim-tree.view"
 local renderer = require "nvim-tree.renderer"
 local explorer_module = require "nvim-tree.explorer"
 local core = require "nvim-tree.core"
@@ -10,13 +9,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 +41,17 @@ 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
+  local explorer = core.get_explorer()
-function M.reload_explorer(_, unloaded_bufnr)
+  if event_running or not explorer or vim.v.exiting ~= vim.NIL then
-  if event_running or not core.get_explorer() or vim.v.exiting ~= vim.NIL then
     return
   end
   event_running = true
 
   local projects = git.reload()
-  refresh_nodes(core.get_explorer(), projects, unloaded_bufnr)
+  refresh_nodes(core.get_explorer(), projects)
-  if view.is_visible() then
+  if explorer.view:is_visible() then
-    renderer.draw(unloaded_bufnr)
+    renderer.draw()
   end
   event_running = false
 end

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

@@ -1,6 +1,5 @@
 local core = require "nvim-tree.core"
 local lib = require "nvim-tree.lib"
-local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"
 
 local M = {}
@@ -24,27 +23,29 @@ function M.fn(opts)
   local bufnr, path
 
   -- (optional) buffer number and path
-  if type(opts.buf) == "nil" then
+  local opts_buf = opts.buf
+  if type(opts_buf) == "nil" then
     bufnr = vim.api.nvim_get_current_buf()
     path = vim.api.nvim_buf_get_name(bufnr)
-  elseif type(opts.buf) == "number" then
+  elseif type(opts_buf) == "number" then
-    if not vim.api.nvim_buf_is_valid(opts.buf) then
+    if not vim.api.nvim_buf_is_valid(opts_buf) then
       return
     end
-    bufnr = tonumber(opts.buf)
+    bufnr = opts_buf
     path = vim.api.nvim_buf_get_name(bufnr)
-  elseif type(opts.buf) == "string" then
+  elseif type(opts_buf) == "string" then
     bufnr = nil
-    path = tostring(opts.buf)
+    path = tostring(opts_buf)
   else
     return
   end
 
-  if view.is_visible() then
+  local explorer = core.get_explorer()
+  if explorer and explorer.view:is_visible() then
     -- focus
     if opts.focus then
       lib.set_target_win()
-      view.focus()
+      explorer.view:focus()
     end
   elseif opts.open then
     -- open
@@ -55,7 +56,7 @@ function M.fn(opts)
   end
 
   -- update root
-  if opts.update_root or M.config.update_focused_file.update_root then
+  if opts.update_root or M.config.update_focused_file.update_root.enable then
     require("nvim-tree").change_root(path, bufnr)
   end
 

lua/nvim-tree/actions/tree/init.lua

@@ -4,12 +4,14 @@ M.find_file = require "nvim-tree.actions.tree.find-file"
 M.modifiers = require "nvim-tree.actions.tree.modifiers"
 M.open = require "nvim-tree.actions.tree.open"
 M.toggle = require "nvim-tree.actions.tree.toggle"
+M.resize = require "nvim-tree.actions.tree.resize"
 
 function M.setup(opts)
   M.find_file.setup(opts)
   M.modifiers.setup(opts)
   M.open.setup(opts)
   M.toggle.setup(opts)
+  M.resize.setup(opts)
 end
 
 return M

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

@@ -1,8 +1,7 @@
 local lib = require "nvim-tree.lib"
 local utils = require "nvim-tree.utils"
-local filters = require "nvim-tree.explorer.filters"
 local reloaders = require "nvim-tree.actions.reloaders"
-
+local core = require "nvim-tree.core"
 local M = {}
 
 local function reload()
@@ -11,34 +10,56 @@ local function reload()
   utils.focus_node_or_parent(node)
 end
 
-function M.custom()
+local function wrap_explorer(fn)
-  filters.config.filter_custom = not filters.config.filter_custom
+  return function(...)
+    local explorer = core.get_explorer()
+    if explorer then
+      return fn(explorer, ...)
+    end
+  end
+end
+
+local function custom(explorer)
+  explorer.filters.config.filter_custom = not explorer.filters.config.filter_custom
   reload()
 end
 
-function M.git_ignored()
+local function git_ignored(explorer)
-  filters.config.filter_git_ignored = not filters.config.filter_git_ignored
+  explorer.filters.config.filter_git_ignored = not explorer.filters.config.filter_git_ignored
   reload()
 end
 
-function M.git_clean()
+local function git_clean(explorer)
-  filters.config.filter_git_clean = not filters.config.filter_git_clean
+  explorer.filters.config.filter_git_clean = not explorer.filters.config.filter_git_clean
   reload()
 end
 
-function M.no_buffer()
+local function no_buffer(explorer)
-  filters.config.filter_no_buffer = not filters.config.filter_no_buffer
+  explorer.filters.config.filter_no_buffer = not explorer.filters.config.filter_no_buffer
   reload()
 end
 
-function M.no_bookmark()
+local function no_bookmark(explorer)
-  filters.config.filter_no_bookmark = not filters.config.filter_no_bookmark
+  explorer.filters.config.filter_no_bookmark = not explorer.filters.config.filter_no_bookmark
   reload()
 end
 
-function M.dotfiles()
+local function dotfiles(explorer)
-  filters.config.filter_dotfiles = not filters.config.filter_dotfiles
+  explorer.filters.config.filter_dotfiles = not explorer.filters.config.filter_dotfiles
   reload()
 end
 
+local function enable(explorer)
+  explorer.filters.config.enable = not explorer.filters.config.enable
+  reload()
+end
+
+M.custom = wrap_explorer(custom)
+M.git_ignored = wrap_explorer(git_ignored)
+M.git_clean = wrap_explorer(git_clean)
+M.no_buffer = wrap_explorer(no_buffer)
+M.no_bookmark = wrap_explorer(no_bookmark)
+M.dotfiles = wrap_explorer(dotfiles)
+M.enable = wrap_explorer(enable)
+
 return M

lua/nvim-tree/actions/tree/open.lua

@@ -1,5 +1,4 @@
 local lib = require "nvim-tree.lib"
-local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"
 
 local M = {}
@@ -23,10 +22,11 @@ function M.fn(opts)
     opts.path = nil
   end
 
-  if view.is_visible() then
+  local explorer = require"nvim-tree.core".get_explorer()
+  if explorer and explorer.view:is_visible() then
     -- focus
     lib.set_target_win()
-    view.focus()
+    explorer.view:focus()
   else
     -- open
     lib.open {

lua/nvim-tree/actions/tree/resize.lua

@@ -0,0 +1,55 @@
+
+local M = {}
+
+---Resize the tree, persisting the new size.
+---@param opts ApiTreeResizeOpts|nil
+function M.fn(opts)
+  local explorer = require"nvim-tree.core".get_explorer()
+  if not explorer then
+    return
+  end
+
+  if opts == nil then
+    -- reset to config values
+    explorer.view:configure_width()
+    explorer.view:resize()
+    return
+  end
+
+  local options = opts or {}
+  local width_cfg = options.width
+
+  if width_cfg ~= nil then
+    explorer.view:configure_width(width_cfg)
+    explorer.view:resize()
+    return
+  end
+
+  if not explorer.view:is_width_determined() then
+    -- {absolute} and {relative} do nothing when {width} is a function.
+    return
+  end
+
+  local absolute = options.absolute
+  if type(absolute) == "number" then
+    explorer.view:resize(absolute)
+    return
+  end
+
+  local relative = options.relative
+  if type(relative) == "number" then
+    local relative_size = tostring(relative)
+    if relative > 0 then
+      relative_size = "+" .. relative_size
+    end
+
+    explorer.view:resize(relative_size)
+    return
+  end
+end
+
+function M.setup(opts)
+  M.config = opts or {}
+end
+
+return M

lua/nvim-tree/actions/tree/toggle.lua

@@ -1,5 +1,4 @@
 local lib = require "nvim-tree.lib"
-local view = require "nvim-tree.view"
 local finders_find_file = require "nvim-tree.actions.finders.find-file"
 
 local M = {}
@@ -40,9 +39,14 @@ function M.fn(opts, no_focus, cwd, bang)
     opts.path = nil
   end
 
-  if view.is_visible() then
+  local explorer = require"nvim-tree.core".get_explorer()
+  if not explorer then
+    return
+  end
+
+  if explorer.view:is_visible() then
     -- close
-    view.close()
+    explorer.view:close()
   else
     -- open
     lib.open {

lua/nvim-tree/api.lua

@@ -1,11 +1,10 @@
 local lib = require "nvim-tree.lib"
-local view = require "nvim-tree.view"
+local core = require "nvim-tree.core"
 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"
-local marks = require "nvim-tree.marks"
 local marks_navigation = require "nvim-tree.marks.navigation"
 local marks_bulk_delete = require "nvim-tree.marks.bulk-delete"
 local marks_bulk_trash = require "nvim-tree.marks.bulk-trash"
@@ -39,11 +38,13 @@ local Api = {
     mappings = {},
   },
   commands = {},
+  diagnostics = {},
 }
 
---- Do nothing when setup not called.
+--- Print error when setup not called.
 --- f function to invoke
 ---@param f function
+---@return fun(...) : any
 local function wrap(f)
   return function(...)
     if vim.g.NvimTreeSetup == 1 then
@@ -54,13 +55,13 @@ local function wrap(f)
   end
 end
 
----Inject the node as the first argument if absent.
+---Inject the node as the first argument if present otherwise do nothing.
 ---@param fn function function to invoke
 local function wrap_node(fn)
   return function(node, ...)
     node = node or lib.get_node_at_cursor()
     if node then
-      fn(node, ...)
+      return fn(node, ...)
     end
   end
 end
@@ -70,10 +71,36 @@ end
 local function wrap_node_or_nil(fn)
   return function(node, ...)
     node = node or lib.get_node_at_cursor()
-    fn(node, ...)
+    return fn(node, ...)
   end
 end
 
+---Inject the explorer as the first argument if present otherwise do nothing.
+---@param fn function function to invoke
+---@return fun(...) : any
+local function wrap_explorer(fn)
+  return function(...)
+    local explorer = core.get_explorer()
+    if explorer then
+      return fn(explorer, ...)
+    end
+  end
+end
+
+---Invoke a member's method on the singleton explorer.
+---Print error when setup not called.
+---@param explorer_member string explorer member name
+---@param member_method string method name to invoke on member
+---@return fun(...) : any
+local function wrap_explorer_member(explorer_member, member_method)
+  return wrap(function(...)
+    local explorer = core.get_explorer()
+    if explorer then
+      return explorer[explorer_member][member_method](explorer[explorer_member], ...)
+    end
+  end)
+end
+
 ---@class ApiTreeOpenOpts
 ---@field path string|nil path
 ---@field current_window boolean|nil default false
@@ -93,11 +120,18 @@ Api.tree.focus = Api.tree.open
 ---@field focus boolean|nil default true
 
 Api.tree.toggle = wrap(actions.tree.toggle.fn)
-Api.tree.close = wrap(view.close)
+Api.tree.close = wrap_explorer_member("view", "close")
-Api.tree.close_in_this_tab = wrap(view.close_this_tab_only)
+Api.tree.close_in_this_tab = wrap_explorer_member("view", "close_this_tab_only")
-Api.tree.close_in_all_tabs = wrap(view.close_all_tabs)
+Api.tree.close_in_all_tabs = wrap_explorer_member("view", "close_all_tabs")
 Api.tree.reload = wrap(actions.reloaders.reload_explorer)
 
+---@class ApiTreeResizeOpts
+---@field width string|function|number|table|nil
+---@field absolute number|nil
+---@field relative number|nil
+
+Api.tree.resize = wrap(actions.tree.resize.fn)
+
 Api.tree.change_root = wrap(function(...)
   require("nvim-tree").change_dir(...)
 end)
@@ -126,6 +160,7 @@ Api.tree.find_file = wrap(actions.tree.find_file.fn)
 Api.tree.search_node = wrap(actions.finders.search_node.fn)
 Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse_all.fn)
 Api.tree.expand_all = wrap_node(actions.tree.modifiers.expand_all.fn)
+Api.tree.toggle_enable_filters = wrap(actions.tree.modifiers.toggles.enable)
 Api.tree.toggle_gitignore_filter = wrap(actions.tree.modifiers.toggles.git_ignored)
 Api.tree.toggle_git_clean_filter = wrap(actions.tree.modifiers.toggles.git_clean)
 Api.tree.toggle_no_buffer_filter = wrap(actions.tree.modifiers.toggles.no_buffer)
@@ -139,12 +174,12 @@ Api.tree.is_tree_buf = wrap(utils.is_nvim_tree_buf)
 ---@field tabpage number|nil
 ---@field any_tabpage boolean|nil default false
 
-Api.tree.is_visible = wrap(view.is_visible)
+Api.tree.is_visible = wrap_explorer_member("view", "is_visible")
 
 ---@class ApiTreeWinIdOpts
 ---@field tabpage number|nil default nil
 
-Api.tree.winid = wrap(view.winid)
+Api.tree.winid = wrap_explorer_member("view", "winid")
 
 Api.fs.create = wrap_node_or_nil(actions.fs.create_file.fn)
 Api.fs.remove = wrap_node(actions.fs.remove_file.fn)
@@ -161,6 +196,7 @@ Api.fs.print_clipboard = wrap(actions.fs.copy_paste.print_clipboard)
 Api.fs.copy.node = wrap_node(actions.fs.copy_paste.copy)
 Api.fs.copy.absolute_path = wrap_node(actions.fs.copy_paste.copy_absolute_path)
 Api.fs.copy.filename = wrap_node(actions.fs.copy_paste.copy_filename)
+Api.fs.copy.basename = wrap_node(actions.fs.copy_paste.copy_basename)
 Api.fs.copy.relative_path = wrap_node(actions.fs.copy_paste.copy_path)
 
 ---@param mode string
@@ -175,13 +211,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 +231,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 +247,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" })
 
@@ -222,16 +263,16 @@ Api.git.reload = wrap(actions.reloaders.reload_git)
 Api.events.subscribe = events.subscribe
 Api.events.Event = events.Event
 
-Api.live_filter.start = wrap(live_filter.start_filtering)
+Api.live_filter.start = wrap_explorer_member("live_filter", "start_filtering")
-Api.live_filter.clear = wrap(live_filter.clear_filter)
+Api.live_filter.clear = wrap_explorer_member("live_filter", "clear_filter")
 
-Api.marks.get = wrap_node(marks.get_mark)
+Api.marks.get = wrap_node(wrap_explorer_member("marks", "get_mark"))
-Api.marks.list = wrap(marks.get_marks)
+Api.marks.list = wrap_explorer_member("marks", "get_marks")
-Api.marks.toggle = wrap_node(marks.toggle_mark)
+Api.marks.toggle = wrap_node(wrap_explorer_member("marks", "toggle_mark"))
-Api.marks.clear = wrap(marks.clear_marks)
+Api.marks.clear = wrap_explorer_member("marks", "clear_marks")
-Api.marks.bulk.delete = wrap(marks_bulk_delete.bulk_delete)
+Api.marks.bulk.delete = wrap_explorer(marks_bulk_delete.bulk_delete)
-Api.marks.bulk.trash = wrap(marks_bulk_trash.bulk_trash)
+Api.marks.bulk.trash = wrap_explorer(marks_bulk_trash.bulk_trash)
-Api.marks.bulk.move = wrap(marks_bulk_move.bulk_move)
+Api.marks.bulk.move = wrap_explorer(marks_bulk_move.bulk_move)
 Api.marks.navigate.next = wrap(marks_navigation.next)
 Api.marks.navigate.prev = wrap(marks_navigation.prev)
 Api.marks.navigate.select = wrap(marks_navigation.select)
@@ -240,6 +281,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,141 @@
+local appearance = require "nvim-tree.appearance"
+
+-- others with name and links less than this arbitrary value are short
+local SHORT_LEN = 50
+
+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 name
+---@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
+
+---Render one group.
+---@param bufnr number to render in
+---@param fmt string format string for group, links, def
+---@param l number line number to render at
+---@return number l next line number
+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)
+
+  return l + 1
+end
+
+---Render many groups.
+---@param header string before with underline line
+---@param displays HighlightDisplay[] highlight group
+---@param bufnr number to render in
+---@param l number line number to start at
+---@return number l next line number
+local function render_displays(header, displays, bufnr, l)
+  local max_group_len = 0
+  local max_links_len = 0
+
+  -- build all highlight groups, using name only
+  for _, display in ipairs(displays) do
+    max_group_len = math.max(max_group_len, #display.group)
+    max_links_len = math.max(max_links_len, #display.links)
+  end
+
+  -- header
+  vim.api.nvim_buf_set_lines(bufnr, l, -1, true, { header, (header:gsub(".", "-")) })
+  l = l + 2
+
+  -- render and highlight
+  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
+    l = display:render(bufnr, fmt, l)
+  end
+
+  return l
+end
+
+---Run a test similar to :so $VIMRUNTIME/syntax/hitest.vim
+---Display all nvim-tree and neovim highlight groups, their link chain and actual definition
+function M.hi_test()
+  -- create a buffer
+  local bufnr = vim.api.nvim_create_buf(false, true)
+
+  local l = 0
+
+  -- nvim-tree groups, ordered
+  local displays = {}
+  for _, highlight_group in ipairs(appearance.HIGHLIGHT_GROUPS) do
+    local display = HighlightDisplay:new(highlight_group.group)
+    table.insert(displays, display)
+  end
+  l = render_displays("nvim-tree", displays, bufnr, l)
+
+  vim.api.nvim_buf_set_lines(bufnr, l, -1, true, { "" })
+  l = l + 1
+
+  -- built in groups, ordered opaquely by nvim
+  local displays_short, displays_long = {}, {}
+  local ok, out = pcall(vim.api.nvim_cmd, { cmd = "highlight" }, { output = true })
+  if ok then
+    for group in string.gmatch(out, "(%w*)%s+xxx") do
+      if group:find("NvimTree", 1, true) ~= 1 then
+        local display = HighlightDisplay:new(group)
+        if #display.group + #display.links > SHORT_LEN then
+          table.insert(displays_long, display)
+        else
+          table.insert(displays_short, display)
+        end
+      end
+    end
+  end
+
+  -- short ones first
+  l = render_displays("other, short", displays_short, bufnr, l)
+  vim.api.nvim_buf_set_lines(bufnr, l, -1, true, { "" })
+  l = l + 1
+
+  -- long
+  render_displays("other, long", displays_long, bufnr, l)
+
+  -- finalise and focus the buffer
+  if vim.fn.has "nvim-0.10" == 1 then
+    vim.api.nvim_set_option_value("modifiable", false, { buf = bufnr })
+  else
+    vim.api.nvim_buf_set_option(bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
+  end
+
+  vim.cmd.buffer(bufnr)
+end
+
+return M

lua/nvim-tree/appearance/init.lua

@@ -0,0 +1,206 @@
+local M = {}
+
+---@class HighlightGroup
+---@field group string
+---@field link string|nil
+---@field def string|nil
+
+---@type HighlightGroup[]
+-- 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 = "Question" },
+  { group = "NvimTreeImageFile", link = "Question" },
+  { group = "NvimTreeSpecialFile", link = "Title" },
+  { group = "NvimTreeSymlink", link = "Underlined" },
+
+  -- 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=DarkBlue" },
+
+  -- 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" },
+
+  -- Hidden
+  { group = "NvimTreeHiddenIcon", link = "Conceal" },
+  { group = "NvimTreeHiddenFileHL", link = "NvimTreeHiddenIcon" },
+  { group = "NvimTreeHiddenFolderHL", link = "NvimTreeHiddenFileHL" },
+
+  -- 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 = vim.api.nvim_get_hl(0, { name = from })
+    local hl_to = vim.api.nvim_get_hl(0, { name = to })
+    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

@@ -0,0 +1,50 @@
+local M = {}
+
+---@type table<string, boolean> record of which file is modified
+M._modified = {}
+
+---refresh M._modified
+function M.reload_modified()
+  M._modified = {}
+  local bufs = vim.fn.getbufinfo { bufmodified = 1, buflisted = 1 }
+  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._modified[path] ~= true
+        -- no need to keep going if already recorded
+        -- This also prevents an infinite loop
+      do
+        M._modified[path] = true
+        path = vim.fn.fnamemodify(path, ":h")
+      end
+    end
+  end
+end
+
+---@param node table
+---@return boolean
+function M.is_modified(node)
+  return node
+    and M.config.modified.enable
+    and M._modified[node.absolute_path]
+    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 = {
+    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

@@ -1,5 +1,4 @@
 local api = require "nvim-tree.api"
-local view = require "nvim-tree.view"
 
 local M = {}
 
@@ -111,7 +110,11 @@ local CMDS = {
       bar = true,
     },
     command = function(c)
-      view.resize(c.args)
+      local explorer = require "nvim-tree.core".get_explorer();
+      if not explorer then
+        return
+      end
+      explorer.view:resize(c.args)
     end,
   },
   {
@@ -134,6 +137,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/core.lua

@@ -1,7 +1,5 @@
 local events = require "nvim-tree.events"
 local explorer = require "nvim-tree.explorer"
-local live_filter = require "nvim-tree.live-filter"
-local view = require "nvim-tree.view"
 local log = require "nvim-tree.log"
 
 local M = {}
@@ -42,10 +40,10 @@ end
 ---@return integer
 function M.get_nodes_starting_line()
   local offset = 1
-  if view.is_root_folder_visible(M.get_cwd()) then
+  if TreeExplorer and TreeExplorer.view:is_root_folder_visible(M.get_cwd()) then
     offset = offset + 1
   end
-  if live_filter.filter then
+  if TreeExplorer and TreeExplorer.live_filter.filter then
     return offset + 1
   end
   return offset

lua/nvim-tree/diagnostics.lua

@@ -1,12 +1,8 @@
 local utils = require "nvim-tree.utils"
-local view = require "nvim-tree.view"
 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 = {
@@ -42,19 +38,21 @@ end
 local function from_nvim_lsp()
   local buffer_severity = {}
 
-  local is_disabled = false
+  -- is_enabled is not present in all 0.10 builds/releases, see #2781
-  if vim.fn.has "nvim-0.9" == 1 then
+  local is_enabled = false
-    is_disabled = vim.diagnostic.is_disabled()
+  if vim.fn.has "nvim-0.10" == 1 and type(vim.diagnostic.is_enabled) == "function" then
+    is_enabled = vim.diagnostic.is_enabled()
+  elseif type(vim.diagnostic.is_disabled) == "function" then ---@diagnostic disable-line: deprecated
+    is_enabled = not vim.diagnostic.is_disabled() ---@diagnostic disable-line: deprecated
   end
 
-  if not is_disabled then
+  if is_enabled then
     for _, diagnostic in ipairs(vim.diagnostic.get(nil, { severity = M.severity })) do
-      local buf = diagnostic.bufnr
+      if diagnostic.severity and diagnostic.bufnr and vim.api.nvim_buf_is_valid(diagnostic.bufnr) then
-      if vim.api.nvim_buf_is_valid(buf) then
+        local bufname = uniformize_path(vim.api.nvim_buf_get_name(diagnostic.bufnr))
-        local bufname = uniformize_path(vim.api.nvim_buf_get_name(buf))
+        if not buffer_severity[bufname] or diagnostic.severity < buffer_severity[bufname] then
-        local severity = diagnostic.severity
+          buffer_severity[bufname] = diagnostic.severity
-        local highest_severity = buffer_severity[bufname] or severity
+        end
-        buffer_severity[bufname] = math.min(highest_severity, severity)
       end
     end
   end
@@ -165,7 +163,9 @@ function M.update()
       end
     end
     log.profile_end(profile)
-    if view.is_buf_valid(view.get_bufnr()) then
+    local explorer = require "nvim-tree.core".get_explorer()
+
+    if explorer and explorer.view:is_buf_valid(explorer.view:get_bufnr()) then
       require("nvim-tree.renderer").draw()
     end
   end)

lua/nvim-tree/enum.lua

@@ -12,9 +12,11 @@ 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,
+  right_align = 4,
 }
 
 return M

lua/nvim-tree/explorer/explore.lua

@@ -2,30 +2,21 @@ local utils = require "nvim-tree.utils"
 local builders = require "nvim-tree.explorer.node-builders"
 local explorer_node = require "nvim-tree.explorer.node"
 local git = require "nvim-tree.git"
-local sorters = require "nvim-tree.explorer.sorters"
-local filters = require "nvim-tree.explorer.filters"
-local live_filter = require "nvim-tree.live-filter"
 local log = require "nvim-tree.log"
 
 local Watcher = require "nvim-tree.watcher"
 
 local M = {}
 
----@param type_ string|nil
----@param cwd string
----@return any
-local function get_type_from(type_, cwd)
-  return type_ or (vim.loop.fs_stat(cwd) or {}).type
-end
-
 ---@param handle uv.uv_fs_t
 ---@param cwd string
 ---@param node Node
 ---@param git_status table
-local function populate_children(handle, cwd, node, git_status)
+---@param parent Explorer
+local function populate_children(handle, cwd, node, git_status, parent)
   local node_ignored = explorer_node.is_git_ignored(node)
   local nodes_by_path = utils.bool_record(node.nodes, "absolute_path")
-  local filter_status = filters.prepare(git_status)
+  local filter_status = parent.filters:prepare(git_status)
   while true do
     local name, t = vim.loop.fs_scandir_next(handle)
     if not name then
@@ -33,18 +24,19 @@ local function populate_children(handle, cwd, node, git_status)
     end
 
     local abs = utils.path_join { cwd, name }
-
     local profile = log.profile_start("explore populate_children %s", abs)
 
-    t = get_type_from(t, abs)
+    ---@type uv.fs_stat.result|nil
-    if not filters.should_filter(abs, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
+    local stat = vim.loop.fs_stat(abs)
+
+    if not parent.filters:should_filter(abs, stat, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
       local child = nil
       if t == "directory" and vim.loop.fs_access(abs, "R") then
-        child = builders.folder(node, abs, name)
+        child = builders.folder(node, abs, name, stat)
       elseif t == "file" then
-        child = builders.file(node, abs, name)
+        child = builders.file(node, abs, name, stat)
       elseif t == "link" then
-        local link = builders.link(node, abs, name)
+        local link = builders.link(node, abs, name, stat)
         if link.link_to ~= nil then
           child = link
         end
@@ -62,8 +54,9 @@ end
 
 ---@param node Node
 ---@param status table
+---@param parent Explorer
 ---@return Node[]|nil
-function M.explore(node, status)
+function M.explore(node, status, parent)
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if not handle then
@@ -72,7 +65,7 @@ function M.explore(node, status)
 
   local profile = log.profile_start("explore init %s", node.absolute_path)
 
-  populate_children(handle, cwd, node, status)
+  populate_children(handle, cwd, node, status, parent)
 
   local is_root = not node.parent
   local child_folder_only = explorer_node.has_one_child_folder(node) and node.nodes[1]
@@ -80,15 +73,15 @@ function M.explore(node, status)
     local child_cwd = child_folder_only.link_to or child_folder_only.absolute_path
     local child_status = git.load_project_status(child_cwd)
     node.group_next = child_folder_only
-    local ns = M.explore(child_folder_only, child_status)
+    local ns = M.explore(child_folder_only, child_status, parent)
     node.nodes = ns or {}
 
     log.profile_end(profile)
     return ns
   end
 
-  sorters.sort(node.nodes)
+  parent.sorters:sort(node.nodes)
-  live_filter.apply_filter(node)
+  parent.live_filter:apply_filter(node)
 
   log.profile_end(profile)
   return node.nodes

lua/nvim-tree/explorer/filters.lua

@@ -1,15 +1,52 @@
 local utils = require "nvim-tree.utils"
-local marks = require "nvim-tree.marks"
 
-local M = {
+---@class Filters to handle all opts.filters and related API
+---@field config table hydrated user opts.filters
+---@field private explorer Explorer
+---@field private exclude_list string[] filters.exclude
+---@field private ignore_list string[] filters.custom string table
+---@field private custom_function (fun(absolute_path: string): boolean)|nil filters.custom function
+local Filters = {}
+
+---@param opts table user options
+---@param explorer Explorer
+---@return Filters
+function Filters:new(opts, explorer)
+  local o = {
+    explorer = explorer,
     ignore_list = {},
-  exclude_list = {},
+    exclude_list = opts.filters.exclude,
+    custom_function = nil,
+    config = {
+      enable = opts.filters.enable,
+      filter_custom = true,
+      filter_dotfiles = opts.filters.dotfiles,
+      filter_git_ignored = opts.filters.git_ignored,
+      filter_git_clean = opts.filters.git_clean,
+      filter_no_buffer = opts.filters.no_buffer,
+      filter_no_bookmark = opts.filters.no_bookmark,
+    },
   }
 
+  local custom_filter = opts.filters.custom
+  if type(custom_filter) == "function" then
+    o.custom_function = custom_filter
+  else
+    if custom_filter and #custom_filter > 0 then
+      for _, filter_name in pairs(custom_filter) do
+        o.ignore_list[filter_name] = true
+      end
+    end
+  end
+  setmetatable(o, self)
+  self.__index = self
+  return o
+end
+
 ---@param path string
 ---@return boolean
-local function is_excluded(path)
+local function is_excluded(self, path)
-  for _, node in ipairs(M.exclude_list) do
+  for _, node in ipairs(self.exclude_list) do
     if path:match(node) then
       return true
     end
@@ -21,7 +58,7 @@ end
 ---@param path string Absolute path
 ---@param git_status table from prepare
 ---@return boolean
-local function git(path, git_status)
+local function git(self, path, git_status)
   if type(git_status) ~= "table" or type(git_status.files) ~= "table" or type(git_status.dirs) ~= "table" then
     return false
   end
@@ -32,12 +69,12 @@ local function git(path, git_status)
   status = status or git_status.dirs.indirect[path] and git_status.dirs.indirect[path][1]
 
   -- filter ignored; overrides clean as they are effectively dirty
-  if M.config.filter_git_ignored and status == "!!" then
+  if self.config.filter_git_ignored and status == "!!" then
     return true
   end
 
   -- filter clean
-  if M.config.filter_git_clean and not status then
+  if self.config.filter_git_clean and not status then
     return true
   end
 
@@ -47,16 +84,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(self, path, bufinfo)
-  if not M.config.filter_no_buffer or type(bufinfo) ~= "table" then
+  if not self.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
@@ -66,28 +102,63 @@ end
 
 ---@param path string
 ---@return boolean
-local function dotfile(path)
+local function dotfile(self, path)
-  return M.config.filter_dotfiles and utils.path_basename(path):sub(1, 1) == "."
+  return self.config.filter_dotfiles and utils.path_basename(path):sub(1, 1) == "."
 end
 
 ---@param path string
----@param bookmarks table<string, boolean> absolute paths bookmarked
+---@param path_type string|nil filetype of path
-local function bookmark(path, bookmarks)
+---@param bookmarks table<string, string|nil> path, filetype table of bookmarked files
-  return M.config.filter_no_bookmark and not bookmarks[path]
+local function bookmark(self, path, path_type, bookmarks)
+  if not self.config.filter_no_bookmark then
+    return false
+  end
+  -- if bookmark is empty, we should see a empty filetree
+  if next(bookmarks) == nil then
+    return true
+  end
+
+  local mark_parent = utils.path_add_trailing(path)
+  for mark, mark_type in pairs(bookmarks) do
+    if path == mark then
+      return false
+    end
+
+    if path_type == "directory" then
+      -- check if path is mark's parent
+      if vim.fn.stridx(mark, mark_parent) == 0 then
+        return false
+      end
+    end
+    if mark_type == "directory" then
+      -- check if mark is path's parent
+      local path_parent = utils.path_add_trailing(mark)
+      if vim.fn.stridx(path, path_parent) == 0 then
+        return false
+      end
+    end
+  end
+
+  return true
 end
 
 ---@param path string
 ---@return boolean
-local function custom(path)
+local function custom(self, path)
-  if not M.config.filter_custom then
+  if not self.config.filter_custom then
     return false
   end
 
   local basename = utils.path_basename(path)
 
+  -- filter user's custom function
+  if self.custom_function and self.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
+  for pat, _ in pairs(self.ignore_list) do
     if vim.fn.match(relpath, pat) ~= -1 or vim.fn.match(basename, pat) ~= -1 then
       return true
     end
@@ -95,7 +166,7 @@ local function custom(path)
 
   local idx = path:match ".+()%.[^.]+$"
   if idx then
-    if M.ignore_list["*" .. string.sub(path, idx)] == true then
+    if self.ignore_list["*" .. string.sub(path, idx)] == true then
       return true
     end
   end
@@ -105,26 +176,26 @@ 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 Filters:prepare(git_status)
   local status = {
     git_status = git_status or {},
-    unloaded_bufnr = unloaded_bufnr,
     bufinfo = {},
     bookmarks = {},
   }
 
-  if M.config.filter_no_buffer then
+  if self.config.filter_no_buffer then
     status.bufinfo = vim.fn.getbufinfo { buflisted = 1 }
   end
 
-  for _, node in pairs(marks.get_marks()) do
+  local explorer = require("nvim-tree.core").get_explorer()
-    status.bookmarks[node.absolute_path] = true
+  if explorer then
+    for _, node in pairs(explorer.marks:get_marks()) do
+      status.bookmarks[node.absolute_path] = node.type
+    end
   end
 
   return status
@@ -132,40 +203,24 @@ end
 
 ---Check if the given path should be filtered.
 ---@param path string Absolute path
+---@param fs_stat uv.fs_stat.result|nil fs_stat of file
 ---@param status table from prepare
 ---@return boolean
-function M.should_filter(path, status)
+function Filters:should_filter(path, fs_stat, status)
-  -- exclusions override all filters
+  if not self.config.enable then
-  if is_excluded(path) then
     return false
   end
 
-  return git(path, status.git_status)
+  -- exclusions override all filters
-    or buf(path, status.bufinfo, status.unloaded_bufnr)
+  if is_excluded(self, path) then
-    or dotfile(path)
+    return false
-    or custom(path)
-    or bookmark(path, status.bookmarks)
   end
 
-function M.setup(opts)
+  return git(self, path, status.git_status)
-  M.config = {
+    or buf(self, path, status.bufinfo)
-    filter_custom = true,
+    or dotfile(self, path)
-    filter_dotfiles = opts.filters.dotfiles,
+    or custom(self, path)
-    filter_git_ignored = opts.filters.git_ignored,
+    or bookmark(self, path, fs_stat and fs_stat.type, status.bookmarks)
-    filter_git_clean = opts.filters.git_clean,
-    filter_no_buffer = opts.filters.no_buffer,
-    filter_no_bookmark = opts.filters.no_bookmark,
-  }
-
-  M.ignore_list = {}
-  M.exclude_list = opts.filters.exclude
-
-  local custom_filter = opts.filters.custom
-  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
 
-return M
+return Filters

lua/nvim-tree/explorer/init.lua

@@ -1,6 +1,12 @@
 local git = require "nvim-tree.git"
+local notify = require "nvim-tree.notify"
 local watch = require "nvim-tree.explorer.watch"
 local explorer_node = require "nvim-tree.explorer.node"
+local Filters = require "nvim-tree.explorer.filters"
+local Marks = require "nvim-tree.marks"
+local LiveFilter = require "nvim-tree.explorer.live-filter"
+local Sorters = require "nvim-tree.explorer.sorters"
+local View = require "nvim-tree.explorer.view"
 
 local M = {}
 
@@ -11,22 +17,41 @@ M.reload = require("nvim-tree.explorer.reload").reload
 ---@field absolute_path string
 ---@field nodes Node[]
 ---@field open boolean
+---@field filters Filters
+---@field live_filter LiveFilter
+---@field sorters Sorter
+---@field marks Marks
 
 local Explorer = {}
 Explorer.__index = Explorer
 
----@param cwd string|nil
+---@param path string|nil
----@return Explorer
+---@return Explorer|nil
-function Explorer.new(cwd)
+function Explorer.new(path)
-  cwd = vim.loop.fs_realpath(cwd or vim.loop.cwd())
+  local err
+
+  if path then
+    path, err = vim.loop.fs_realpath(path)
+  else
+    path, err = vim.loop.cwd()
+  end
+  if not path then
+    notify.error(err)
+    return
+  end
 
   ---@class Explorer
   local explorer = setmetatable({
-    absolute_path = cwd,
+    absolute_path = path,
     nodes = {},
     open = true,
+    marks = Marks:new(),
+    sorters = Sorters:new(M.config),
+    view = View:new(M.config),
   }, Explorer)
   explorer.watcher = watch.create_watcher(explorer)
+  explorer.filters = Filters:new(M.config, explorer)
+  explorer.live_filter = LiveFilter:new(M.config, explorer)
   explorer:_load(explorer)
   return explorer
 end
@@ -36,7 +61,7 @@ end
 function Explorer:_load(node)
   local cwd = node.link_to or node.absolute_path
   local git_status = git.load_project_status(cwd)
-  M.explore(node, git_status)
+  M.explore(node, git_status, self)
 end
 
 ---@param node Node
@@ -57,10 +82,9 @@ function Explorer:destroy()
 end
 
 function M.setup(opts)
+  M.config = opts
   require("nvim-tree.explorer.node").setup(opts)
   require("nvim-tree.explorer.explore").setup(opts)
-  require("nvim-tree.explorer.filters").setup(opts)
-  require("nvim-tree.explorer.sorters").setup(opts)
   require("nvim-tree.explorer.reload").setup(opts)
   require("nvim-tree.explorer.watch").setup(opts)
 end

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

@@ -0,0 +1,213 @@
+local utils = require "nvim-tree.utils"
+local Iterator = require "nvim-tree.iterators.node-iterator"
+
+---@class LiveFilter
+---@field explorer Explorer
+---@field prefix string
+---@field always_show_folders boolean
+---@field filter string
+local LiveFilter = {}
+
+---@param opts table
+---@param explorer Explorer
+function LiveFilter:new(opts, explorer)
+  local o = {
+    explorer = explorer,
+    prefix = opts.live_filter.prefix,
+    always_show_folders = opts.live_filter.always_show_folders,
+    filter = nil,
+  }
+  setmetatable(o, self)
+  self.__index = self
+  return o
+end
+
+local function redraw()
+  require("nvim-tree.renderer").draw()
+end
+
+---@param node_ Node|nil
+local function reset_filter(self, node_)
+  node_ = node_ or self.explorer
+
+  if node_ == nil then
+    return
+  end
+
+  Iterator.builder(node_.nodes)
+    :hidden()
+    :applier(function(node)
+      node.hidden = false
+    end)
+    :iterate()
+end
+
+local overlay_bufnr = 0
+local overlay_winnr = 0
+
+local function remove_overlay(self)
+  if self.explorer.view.View.float.enable and self.explorer.view.View.float.quit_on_focus_loss then
+    -- return to normal nvim-tree float behaviour when filter window is closed
+    vim.api.nvim_create_autocmd("WinLeave", {
+      pattern = "NvimTree_*",
+      group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
+      callback = function()
+        if utils.is_nvim_tree_buf(0) then
+          self.explorer.view:close()
+        end
+      end,
+    })
+  end
+
+  vim.api.nvim_win_close(overlay_winnr, true)
+  vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
+  overlay_bufnr = 0
+  overlay_winnr = 0
+
+  if self.filter == "" then
+    self:clear_filter()
+  end
+end
+
+---@param node Node
+---@return boolean
+local function matches(self, node)
+  if not self.explorer.filters.config.enable then
+    return true
+  end
+
+  local path = node.absolute_path
+  local name = vim.fn.fnamemodify(path, ":t")
+  return vim.regex(self.filter):match_str(name) ~= nil
+end
+
+---@param node_ Node|nil
+function LiveFilter:apply_filter(node_)
+  if not self.filter or self.filter == "" then
+    reset_filter(self, node_)
+    return
+  end
+
+  -- TODO(kiyan): this iterator cannot yet be refactored with the Iterator module
+  -- since the node mapper is based on its children
+  local function iterate(node)
+    local filtered_nodes = 0
+    local nodes = node.group_next and { node.group_next } or node.nodes
+
+    if nodes then
+      for _, n in pairs(nodes) do
+        iterate(n)
+        if n.hidden then
+          filtered_nodes = filtered_nodes + 1
+        end
+      end
+    end
+
+    local has_nodes = nodes and (self.always_show_folders or #nodes > filtered_nodes)
+    local ok, is_match = pcall(matches, self, node)
+    node.hidden = not (has_nodes or (ok and is_match))
+  end
+
+  iterate(node_ or self.explorer)
+end
+
+local function record_char(self)
+  vim.schedule(function()
+    self.filter = vim.api.nvim_buf_get_lines(overlay_bufnr, 0, -1, false)[1]
+    self:apply_filter()
+    redraw()
+  end)
+end
+
+local function configure_buffer_overlay(self)
+  overlay_bufnr = vim.api.nvim_create_buf(false, true)
+
+  vim.api.nvim_buf_attach(overlay_bufnr, true, {
+    on_lines = function()
+      return record_char(self)
+    end,
+  })
+
+  vim.api.nvim_create_autocmd("InsertLeave", {
+    callback = function()
+      return remove_overlay(self)
+    end,
+    once = true,
+  })
+
+  vim.api.nvim_buf_set_keymap(overlay_bufnr, "i", "<CR>", "<cmd>stopinsert<CR>", {})
+end
+
+---@return integer
+local function calculate_overlay_win_width(self)
+  local wininfo = vim.fn.getwininfo(self.explorer.view:get_winnr())[1]
+
+  if wininfo then
+    return wininfo.width - wininfo.textoff - #self.prefix
+  end
+
+  return 20
+end
+
+local function create_overlay(self)
+  if self.explorer.view.View.float.enable then
+    -- don't close nvim-tree float when focus is changed to filter window
+    vim.api.nvim_clear_autocmds {
+      event = "WinLeave",
+      pattern = "NvimTree_*",
+      group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
+    }
+  end
+
+  configure_buffer_overlay(self)
+  overlay_winnr = vim.api.nvim_open_win(overlay_bufnr, true, {
+    col = 1,
+    row = 0,
+    relative = "cursor",
+    width = calculate_overlay_win_width(self),
+    height = 1,
+    border = "none",
+    style = "minimal",
+  })
+
+  if vim.fn.has "nvim-0.10" == 1 then
+    vim.api.nvim_set_option_value("modifiable", true, { buf = overlay_bufnr })
+  else
+    vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
+  end
+
+  vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { self.filter })
+  vim.cmd "startinsert"
+  vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #self.filter + 1 })
+end
+
+function LiveFilter:start_filtering()
+  self.explorer.view.View.live_filter.prev_focused_node = require("nvim-tree.lib").get_node_at_cursor()
+  self.filter = self.filter or ""
+
+  redraw()
+  local row = require("nvim-tree.core").get_nodes_starting_line() - 1
+  local col = #self.prefix > 0 and #self.prefix - 1 or 1
+  self.explorer.view:set_cursor { row, col }
+  -- needs scheduling to let the cursor move before initializing the window
+  vim.schedule(function()
+    return create_overlay(self)
+  end)
+end
+
+function LiveFilter:clear_filter()
+  local node = require("nvim-tree.lib").get_node_at_cursor()
+  local last_node = self.explorer.view.View.live_filter.prev_focused_node
+
+  self.filter = nil
+  reset_filter(self)
+  redraw()
+
+  if node then
+    utils.focus_file(node.absolute_path)
+  elseif last_node then
+    utils.focus_file(last_node.absolute_path)
+  end
+end
+
+return LiveFilter

lua/nvim-tree/explorer/node-builders.lua

@@ -6,15 +6,16 @@ local M = {}
 ---@param parent Node
 ---@param absolute_path string
 ---@param name string
+---@param fs_stat uv.fs_stat.result|nil
 ---@return Node
-function M.folder(parent, absolute_path, name)
+function M.folder(parent, absolute_path, name, fs_stat)
   local handle = vim.loop.fs_scandir(absolute_path)
   local has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
 
   local node = {
     type = "directory",
     absolute_path = absolute_path,
-    fs_stat = vim.loop.fs_stat(absolute_path),
+    fs_stat = fs_stat,
     group_next = nil, -- If node is grouped, this points to the next child dir/link node
     has_children = has_children,
     name = name,
@@ -43,8 +44,9 @@ end
 ---@param parent Node
 ---@param absolute_path string
 ---@param name string
+---@param fs_stat uv.fs_stat.result|nil
 ---@return Node
-function M.file(parent, absolute_path, name)
+function M.file(parent, absolute_path, name, fs_stat)
   local ext = string.match(name, ".?[^.]+%.(.*)") or ""
 
   return {
@@ -52,7 +54,7 @@ function M.file(parent, absolute_path, name)
     absolute_path = absolute_path,
     executable = M.is_executable(absolute_path),
     extension = ext,
-    fs_stat = vim.loop.fs_stat(absolute_path),
+    fs_stat = fs_stat,
     name = name,
     parent = parent,
   }
@@ -66,15 +68,16 @@ end
 ---@param parent Node
 ---@param absolute_path string
 ---@param name string
+---@param fs_stat uv.fs_stat.result|nil
 ---@return Node
-function M.link(parent, absolute_path, name)
+function M.link(parent, absolute_path, name, fs_stat)
   --- I dont know if this is needed, because in my understanding, there isn't hard links in windows, but just to be sure i changed it.
   local link_to = vim.loop.fs_realpath(absolute_path)
   local open, nodes, has_children
 
   local is_dir_link = (link_to ~= nil) and vim.loop.fs_stat(link_to).type == "directory"
 
-  if is_dir_link then
+  if is_dir_link and link_to then
     local handle = vim.loop.fs_scandir(link_to)
     has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
     open = false
@@ -84,7 +87,7 @@ function M.link(parent, absolute_path, name)
   local node = {
     type = "link",
     absolute_path = absolute_path,
-    fs_stat = vim.loop.fs_stat(absolute_path),
+    fs_stat = fs_stat,
     group_next = nil, -- If node is grouped, this points to the next child dir/link node
     has_children = has_children,
     link_to = link_to,

lua/nvim-tree/explorer/node.lua

@@ -29,7 +29,7 @@ end
 ---@param absolute_path string
 ---@return GitStatus
 local function get_git_status(parent_ignored, status, absolute_path)
-  local file_status = parent_ignored and "!!" or status.files and status.files[absolute_path]
+  local file_status = parent_ignored and "!!" or (status and status.files and status.files[absolute_path])
   return { file = file_status }
 end
 
@@ -128,6 +128,19 @@ function M.is_git_ignored(node)
   return node and node.git_status ~= nil and node.git_status.file == "!!"
 end
 
+---@param node Node
+---@return boolean
+function M.is_dotfile(node)
+  if node == nil then
+    return false
+  end
+  if node.is_dot or (node.name and (node.name:sub(1, 1) == ".")) or M.is_dotfile(node.parent) then
+    node.is_dot = true
+    return true
+  end
+  return false
+end
+
 ---@param node Node
 function M.node_destroy(node)
   if not node then

lua/nvim-tree/explorer/reload.lua

@@ -1,9 +1,6 @@
 local utils = require "nvim-tree.utils"
 local builders = require "nvim-tree.explorer.node-builders"
 local explorer_node = require "nvim-tree.explorer.node"
-local filters = require "nvim-tree.explorer.filters"
-local sorters = require "nvim-tree.explorer.sorters"
-local live_filter = require "nvim-tree.live-filter"
 local git = require "nvim-tree.git"
 local log = require "nvim-tree.log"
 
@@ -69,8 +66,11 @@ 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 explorer = require("nvim-tree.core").get_explorer()
+  if not explorer then
+    return
+  end
   local cwd = node.link_to or node.absolute_path
   local handle = vim.loop.fs_scandir(cwd)
   if not handle then
@@ -79,37 +79,30 @@ 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 = explorer.filters:prepare(git_status)
 
   if node.group_next then
     node.nodes = { node.group_next }
     node.group_next = nil
   end
 
-  local child_names = {}
+  local remain_childs = {}
 
   local node_ignored = explorer_node.is_git_ignored(node)
+  ---@type table<string, Node>
   local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
   while true do
-    local name, t = vim.loop.fs_scandir_next(handle, cwd)
+    local name, t = vim.loop.fs_scandir_next(handle)
     if not name then
       break
     end
 
-    local stat
-    local function fs_stat_cached(path)
-      if stat ~= nil then
-        return stat
-      end
-
-      stat = vim.loop.fs_stat(path)
-      return stat
-    end
-
     local abs = utils.path_join { cwd, name }
-    t = t or (fs_stat_cached(abs) or {}).type
+    ---@type uv.fs_stat.result|nil
-    if not filters.should_filter(abs, filter_status) then
+    local stat = vim.loop.fs_stat(abs)
-      child_names[abs] = true
+
+    if not explorer.filters:should_filter(abs, stat, filter_status) then
+      remain_childs[abs] = true
 
       -- Recreate node if type changes.
       if nodes_by_path[abs] then
@@ -123,26 +116,26 @@ function M.reload(node, git_status, unloaded_bufnr)
       end
 
       if not nodes_by_path[abs] then
+        local new_child = nil
         if t == "directory" and vim.loop.fs_access(abs, "R") and Watcher.is_fs_event_capable(abs) then
-          local folder = builders.folder(node, abs, name)
+          new_child = builders.folder(node, abs, name, stat)
-          nodes_by_path[abs] = folder
-          table.insert(node.nodes, folder)
         elseif t == "file" then
-          local file = builders.file(node, abs, name)
+          new_child = builders.file(node, abs, name, stat)
-          nodes_by_path[abs] = file
-          table.insert(node.nodes, file)
         elseif t == "link" then
-          local link = builders.link(node, abs, name)
+          local link = builders.link(node, abs, name, stat)
           if link.link_to ~= nil then
-            nodes_by_path[abs] = link
+            new_child = link
-            table.insert(node.nodes, link)
           end
         end
+        if new_child then
+          table.insert(node.nodes, new_child)
+          nodes_by_path[abs] = new_child
+        end
       else
         local n = nodes_by_path[abs]
         if n then
-          n.executable = builders.is_executable(abs)
+          n.executable = builders.is_executable(abs) or false
-          n.fs_stat = fs_stat_cached(abs)
+          n.fs_stat = stat
         end
       end
     end
@@ -151,8 +144,8 @@ function M.reload(node, git_status, unloaded_bufnr)
   node.nodes = vim.tbl_map(
     update_status(nodes_by_path, node_ignored, git_status),
     vim.tbl_filter(function(n)
-      if child_names[n.absolute_path] then
+      if remain_childs[n.absolute_path] then
-        return child_names[n.absolute_path]
+        return remain_childs[n.absolute_path]
       else
         explorer_node.node_destroy(n)
         return false
@@ -170,8 +163,8 @@ function M.reload(node, git_status, unloaded_bufnr)
     return ns
   end
 
-  sorters.sort(node.nodes)
+  explorer.sorters:sort(node.nodes)
-  live_filter.apply_filter(node)
+  explorer.live_filter:apply_filter(node)
   log.profile_end(profile)
   return node.nodes
 end

lua/nvim-tree/explorer/sorters.lua

@@ -1,12 +1,27 @@
-local M = {}
-
 local C = {}
 
+---@class Sorter
+local Sorter = {}
+
+function Sorter:new(opts)
+  local o = {}
+  setmetatable(o, self)
+  self.__index = self
+  o.config = vim.deepcopy(opts.sort)
+
+  if type(o.config.sorter) == "function" then
+    o.user = o.config.sorter
+  end
+  return o
+end
+
 --- Predefined comparator, defaulting to name
 ---@param sorter string as per options
 ---@return function
-local function get_comparator(sorter)
+function Sorter:get_comparator(sorter)
-  return C[sorter] or C.name
+  return function(a, b)
+    return (C[sorter] or C.name)(a, b, self.config)
+  end
 end
 
 ---Create a shallow copy of a portion of a list.
@@ -27,17 +42,17 @@ end
 ---@param a Node
 ---@param b Node
 ---@return boolean|nil
-local function folders_or_files_first(a, b)
+local function folders_or_files_first(a, b, cfg)
-  if not (M.config.sort.folders_first or M.config.sort.files_first) then
+  if not (cfg.folders_first or cfg.files_first) then
     return
   end
 
   if not a.nodes and b.nodes then
     -- file <> folder
-    return M.config.sort.files_first
+    return cfg.files_first
   elseif a.nodes and not b.nodes then
     -- folder <> file
-    return not M.config.sort.files_first
+    return not cfg.files_first
   end
 end
 
@@ -97,8 +112,8 @@ end
 
 ---Perform a merge sort using sorter option.
 ---@param t table nodes
-function M.sort(t)
+function Sorter:sort(t)
-  if C.user then
+  if self.user then
     local t_user = {}
     local origin_index = {}
 
@@ -115,9 +130,9 @@ function M.sort(t)
       table.insert(origin_index, n)
     end
 
-    local predefined = C.user(t_user)
+    local predefined = self.user(t_user)
     if predefined then
-      split_merge(t, 1, #t, get_comparator(predefined))
+      split_merge(t, 1, #t, self:get_comparator(predefined))
       return
     end
 
@@ -142,7 +157,7 @@ function M.sort(t)
 
     split_merge(t, 1, #t, mini_comparator) -- sort by user order
   else
-    split_merge(t, 1, #t, get_comparator(M.config.sort.sorter))
+    split_merge(t, 1, #t, self:get_comparator(self.config.sorter))
   end
 end
 
@@ -150,12 +165,12 @@ end
 ---@param b Node
 ---@param ignorecase boolean|nil
 ---@return boolean
-local function node_comparator_name_ignorecase_or_not(a, b, ignorecase)
+local function node_comparator_name_ignorecase_or_not(a, b, ignorecase, cfg)
   if not (a and b) then
     return true
   end
 
-  local early_return = folders_or_files_first(a, b)
+  local early_return = folders_or_files_first(a, b, cfg)
   if early_return ~= nil then
     return early_return
   end
@@ -167,20 +182,20 @@ local function node_comparator_name_ignorecase_or_not(a, b, ignorecase)
   end
 end
 
-function C.case_sensitive(a, b)
+function C.case_sensitive(a, b, cfg)
-  return node_comparator_name_ignorecase_or_not(a, b, false)
+  return node_comparator_name_ignorecase_or_not(a, b, false, cfg)
 end
 
-function C.name(a, b)
+function C.name(a, b, cfg)
-  return node_comparator_name_ignorecase_or_not(a, b, true)
+  return node_comparator_name_ignorecase_or_not(a, b, true, cfg)
 end
 
-function C.modification_time(a, b)
+function C.modification_time(a, b, cfg)
   if not (a and b) then
     return true
   end
 
-  local early_return = folders_or_files_first(a, b)
+  local early_return = folders_or_files_first(a, b, cfg)
   if early_return ~= nil then
     return early_return
   end
@@ -199,17 +214,17 @@ function C.modification_time(a, b)
   return last_modified_b <= last_modified_a
 end
 
-function C.suffix(a, b)
+function C.suffix(a, b, cfg)
   if not (a and b) then
     return true
   end
 
   -- directories go first
-  local early_return = folders_or_files_first(a, b)
+  local early_return = folders_or_files_first(a, b, cfg)
   if early_return ~= nil then
     return early_return
   elseif a.nodes and b.nodes then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   -- dotfiles go second
@@ -218,7 +233,7 @@ function C.suffix(a, b)
   elseif a.name:sub(1, 1) ~= "." and b.name:sub(1, 1) == "." then
     return false
   elseif a.name:sub(1, 1) == "." and b.name:sub(1, 1) == "." then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   -- unsuffixed go third
@@ -230,7 +245,7 @@ function C.suffix(a, b)
   elseif a_suffix_ndx and not b_suffix_ndx then
     return false
   elseif not (a_suffix_ndx and b_suffix_ndx) then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   -- finally, compare by suffixes
@@ -242,18 +257,18 @@ function C.suffix(a, b)
   elseif not a_suffix and b_suffix then
     return false
   elseif a_suffix:lower() == b_suffix:lower() then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   return a_suffix:lower() < b_suffix:lower()
 end
 
-function C.extension(a, b)
+function C.extension(a, b, cfg)
   if not (a and b) then
     return true
   end
 
-  local early_return = folders_or_files_first(a, b)
+  local early_return = folders_or_files_first(a, b, cfg)
   if early_return ~= nil then
     return early_return
   end
@@ -267,18 +282,18 @@ function C.extension(a, b)
   local a_ext = (a.extension or ""):lower()
   local b_ext = (b.extension or ""):lower()
   if a_ext == b_ext then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   return a_ext < b_ext
 end
 
-function C.filetype(a, b)
+function C.filetype(a, b, cfg)
   local a_ft = vim.filetype.match { filename = a.name }
   local b_ft = vim.filetype.match { filename = b.name }
 
   -- directories first
-  local early_return = folders_or_files_first(a, b)
+  local early_return = folders_or_files_first(a, b, cfg)
   if early_return ~= nil then
     return early_return
   end
@@ -292,19 +307,10 @@ function C.filetype(a, b)
 
   -- same filetype or both nil, sort by name
   if a_ft == b_ft then
-    return C.name(a, b)
+    return C.name(a, b, cfg)
   end
 
   return a_ft < b_ft
 end
 
-function M.setup(opts)
+return Sorter
-  M.config = {}
-  M.config.sort = opts.sort
-
-  if type(M.config.sort.sorter) == "function" then
-    C.user = M.config.sort.sorter
-  end
-end
-
-return M

lua/nvim-tree/explorer/view.lua

@@ -0,0 +1,599 @@
+local events = require "nvim-tree.events"
+local utils = require "nvim-tree.utils"
+local log = require "nvim-tree.log"
+
+local ExplorerView = {}
+
+local DEFAULT_MIN_WIDTH = 30
+local DEFAULT_MAX_WIDTH = -1
+local DEFAULT_PADDING = 1
+
+function ExplorerView:new(opts)
+  local o = {
+    View = {
+      adaptive_size = false,
+      centralize_selection = false,
+      tabpages = {},
+      cursors = {},
+      hide_root_folder = false,
+      live_filter = {
+        prev_focused_node = nil,
+      },
+      winopts = {
+        relativenumber = false,
+        number = false,
+        list = false,
+        foldenable = false,
+        winfixwidth = true,
+        winfixheight = true,
+        spell = false,
+        signcolumn = "yes",
+        foldmethod = "manual",
+        foldcolumn = "0",
+        cursorcolumn = false,
+        cursorline = true,
+        cursorlineopt = "both",
+        colorcolumn = "0",
+        wrap = false,
+        winhl = table.concat({
+          "EndOfBuffer:NvimTreeEndOfBuffer",
+          "CursorLine:NvimTreeCursorLine",
+          "CursorLineNr:NvimTreeCursorLineNr",
+          "LineNr:NvimTreeLineNr",
+          "WinSeparator:NvimTreeWinSeparator",
+          "StatusLine:NvimTreeStatusLine",
+          "StatusLineNC:NvimTreeStatuslineNC",
+          "SignColumn:NvimTreeSignColumn",
+          "Normal:NvimTreeNormal",
+          "NormalNC:NvimTreeNormalNC",
+          "NormalFloat:NvimTreeNormalFloat",
+        }, ","),
+      },
+    }
+  }
+  local options = opts.view or {}
+  o.View.centralize_selection = options.centralize_selection
+  o.View.side = (options.side == "right") and "right" or "left"
+  o.View.height = options.height
+  o.View.hide_root_folder = opts.renderer.root_folder_label == false
+  o.View.tab = opts.tab
+  o.View.preserve_window_proportions = options.preserve_window_proportions
+  o.View.winopts.cursorline = options.cursorline
+  o.View.winopts.number = options.number
+  o.View.winopts.relativenumber = options.relativenumber
+  o.View.winopts.signcolumn = options.signcolumn
+  o.View.float = options.float
+  o.on_attach = opts.on_attach
+
+  o.config = vim.deepcopy(options)
+  setmetatable(o, self)
+  self.__index = self
+
+  o:configure_width(options.width)
+
+  o.View.initial_width = o:get_width()
+end
+
+-- The initial state of a tab
+local tabinitial = {
+  -- The position of the cursor { line, column }
+  cursor = { 0, 0 },
+  -- The NvimTree window number
+  winnr = nil,
+}
+
+local BUFNR_PER_TAB = {}
+local BUFFER_OPTIONS = {
+  swapfile = false,
+  buftype = "nofile",
+  modifiable = false,
+  filetype = "NvimTree",
+  bufhidden = "wipe",
+  buflisted = false,
+}
+
+---@param bufnr integer
+---@return boolean
+local function matches_bufnr(bufnr)
+  for _, b in pairs(BUFNR_PER_TAB) do
+    if b == bufnr then
+      return true
+    end
+  end
+  return false
+end
+
+local function wipe_rogue_buffer()
+  for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
+    if not matches_bufnr(bufnr) and utils.is_nvim_tree_buf(bufnr) then
+      pcall(vim.api.nvim_buf_delete, bufnr, { force = true })
+    end
+  end
+end
+
+---@param bufnr integer|boolean|nil
+local function create_buffer(self, bufnr)
+  wipe_rogue_buffer()
+
+  local tab = vim.api.nvim_get_current_tabpage()
+  BUFNR_PER_TAB[tab] = bufnr or vim.api.nvim_create_buf(false, false)
+  vim.api.nvim_buf_set_name(self:get_bufnr(), "NvimTree_" .. tab)
+
+  for option, value in pairs(BUFFER_OPTIONS) do
+    vim.bo[self:get_bufnr()][option] = value
+  end
+
+  require("nvim-tree.keymap").on_attach(self:get_bufnr())
+
+  events._dispatch_tree_attached_post(self:get_bufnr())
+end
+
+---@param size (fun():integer)|integer|string
+---@return integer
+local function get_size(size)
+  if type(size) == "number" then
+    return size
+  elseif type(size) == "function" then
+    return size()
+  end
+  local size_as_number = tonumber(size:sub(0, -2))
+  local percent_as_decimal = size_as_number / 100
+  return math.floor(vim.o.columns * percent_as_decimal)
+end
+
+---@param size (fun():integer)|integer|nil
+function ExplorerView:get_width(size)
+  if size then
+    return get_size(size)
+  else
+    return get_size(self.View.width)
+  end
+end
+
+local move_tbl = {
+  left = "H",
+  right = "L",
+}
+
+-- setup_tabpage sets up the initial state of a tab
+---@param tabpage integer
+local function setup_tabpage(self, tabpage)
+  local winnr = vim.api.nvim_get_current_win()
+  self.View.tabpages[tabpage] = vim.tbl_extend("force", self.View.tabpages[tabpage] or tabinitial, { winnr = winnr })
+end
+
+local function set_window_options_and_buffer(self)
+  pcall(vim.api.nvim_command, "buffer " .. self:get_bufnr())
+  local eventignore = vim.opt.eventignore:get()
+  vim.opt.eventignore = "all"
+  for k, v in pairs(self.View.winopts) do
+    vim.opt_local[k] = v
+  end
+  vim.opt.eventignore = eventignore
+end
+
+---@return table
+local function open_win_config(self)
+  if type(self.View.float.open_win_config) == "function" then
+    return self.View.float.open_win_config(self)
+  else
+    return self.View.float.open_win_config
+  end
+end
+
+local function open_window(self)
+  if self.View.float.enable then
+    vim.api.nvim_open_win(0, true, open_win_config(self))
+  else
+    vim.api.nvim_command "vsp"
+    self:reposition_window()
+  end
+  setup_tabpage(self, vim.api.nvim_get_current_tabpage())
+  set_window_options_and_buffer(self)
+end
+
+---@param buf integer
+---@return boolean
+local function is_buf_displayed(buf)
+  return vim.api.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1
+end
+
+---@return number|nil
+local function get_alt_or_next_buf()
+  local alt_buf = vim.fn.bufnr "#"
+  if is_buf_displayed(alt_buf) then
+    return alt_buf
+  end
+
+  for _, buf in ipairs(vim.api.nvim_list_bufs()) do
+    if is_buf_displayed(buf) then
+      return buf
+    end
+  end
+end
+
+local function switch_buf_if_last_buf()
+  if #vim.api.nvim_list_wins() == 1 then
+    local buf = get_alt_or_next_buf()
+    if buf then
+      vim.cmd("sb" .. buf)
+    else
+      vim.cmd "new"
+    end
+  end
+end
+
+-- save_tab_state saves any state that should be preserved across redraws.
+---@param tabnr integer
+local function save_tab_state(self, tabnr)
+  local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
+  self.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(self:get_winnr(tabpage) or 0)
+end
+
+---@param tabpage integer
+local function close(self, tabpage)
+  if not self:is_visible { tabpage = tabpage } then
+    return
+  end
+  save_tab_state(self, tabpage)
+  switch_buf_if_last_buf()
+  local tree_win = self:get_winnr(tabpage)
+  local current_win = vim.api.nvim_get_current_win()
+  for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabpage)) do
+    if vim.api.nvim_win_get_config(win).relative == "" then
+      local prev_win = vim.fn.winnr "#" -- this tab only
+      if tree_win == current_win and prev_win > 0 then
+        vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
+      end
+      if vim.api.nvim_win_is_valid(tree_win or 0) then
+        vim.api.nvim_win_close(tree_win or 0, true)
+      end
+      events._dispatch_on_tree_close()
+      return
+    end
+  end
+end
+
+function ExplorerView:close_this_tab_only()
+  close(self, vim.api.nvim_get_current_tabpage())
+end
+
+function ExplorerView:close_all_tabs()
+  for tabpage, _ in pairs(self.View.tabpages) do
+    close(self, tabpage)
+  end
+end
+
+function ExplorerView:close()
+  if self.View.tab.sync.close then
+    self:close_all_tabs()
+  else
+    self:close_this_tab_only()
+  end
+end
+
+---@param options table|nil
+function ExplorerView:open(options)
+  if self:is_visible() then
+    return
+  end
+
+  local profile = log.profile_start "view open"
+
+  create_buffer(self)
+  open_window(self)
+  self:resize()
+
+  local opts = options or { focus_tree = true }
+  if not opts.focus_tree then
+    vim.cmd "wincmd p"
+  end
+  events._dispatch_on_tree_open()
+
+  log.profile_end(profile)
+end
+
+local function grow(self)
+  local starts_at = self:is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0
+  local lines = vim.api.nvim_buf_get_lines(self:get_bufnr(), starts_at, -1, false)
+  -- number of columns of right-padding to indicate end of path
+  local padding = get_size(self.View.padding)
+
+  -- account for sign/number columns etc.
+  local wininfo = vim.fn.getwininfo(self:get_winnr())
+  if type(wininfo) == "table" and type(wininfo[1]) == "table" then
+    padding = padding + wininfo[1].textoff
+  end
+
+  local resizing_width = self.View.initial_width - padding
+  local max_width
+
+  -- maybe bound max
+  if self.View.max_width == -1 then
+    max_width = -1
+  else
+    max_width = self:get_width(self.View.max_width) - padding
+  end
+
+  for _, l in pairs(lines) do
+    local count = vim.fn.strchars(l)
+    if resizing_width < count then
+      resizing_width = count
+    end
+    if self.View.adaptive_size and max_width >= 0 and resizing_width >= max_width then
+      resizing_width = max_width
+      break
+    end
+  end
+  self:resize(resizing_width + padding)
+end
+
+function ExplorerView:grow_from_content()
+  if self.View.adaptive_size then
+    grow(self)
+  end
+end
+
+---@param size string|number|nil
+function ExplorerView:resize(size)
+  if self.View.float.enable and not self.View.adaptive_size then
+    -- if the floating windows's adaptive size is not desired, then the
+    -- float size should be defined in view.float.open_win_config
+    return
+  end
+
+  if type(size) == "string" then
+    size = vim.trim(size)
+    local first_char = size:sub(1, 1)
+    size = tonumber(size)
+
+    if first_char == "+" or first_char == "-" then
+      size = self.View.width + size
+    end
+  end
+
+  if type(size) == "number" and size <= 0 then
+    return
+  end
+
+  if size then
+    self.View.width = size
+    self.View.height = size
+  end
+
+  if not self:is_visible() then
+    return
+  end
+
+  local new_size = self:get_width()
+  vim.api.nvim_win_set_width(self:get_winnr() or 0, new_size)
+
+  events._dispatch_on_tree_resize(new_size)
+
+  if not self.View.preserve_window_proportions then
+    vim.cmd ":wincmd ="
+  end
+end
+
+function ExplorerView:reposition_window()
+  local move_to = move_tbl[self.View.side]
+  vim.api.nvim_command("wincmd " .. move_to)
+  self:resize()
+end
+
+local function set_current_win(self)
+  local current_tab = vim.api.nvim_get_current_tabpage()
+  self.View.tabpages[current_tab].winnr = vim.api.nvim_get_current_win()
+end
+
+---Open the tree in the a window
+---@param opts OpenInWinOpts|nil
+function ExplorerView:open_in_win(opts)
+  opts = opts or { hijack_current_buf = true, resize = true }
+  if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then
+    vim.api.nvim_set_current_win(opts.winid)
+  end
+  create_buffer(self, opts.hijack_current_buf and vim.api.nvim_get_current_buf())
+  setup_tabpage(self, vim.api.nvim_get_current_tabpage())
+  set_current_win(self)
+  set_window_options_and_buffer(self)
+  if opts.resize then
+    self:reposition_window()
+    self:resize()
+  end
+end
+
+function ExplorerView:abandon_current_window()
+  local tab = vim.api.nvim_get_current_tabpage()
+  BUFNR_PER_TAB[tab] = nil
+  if self.View.tabpages[tab] then
+    self.View.tabpages[tab].winnr = nil
+  end
+end
+
+function ExplorerView:abandon_all_windows()
+  for tab, _ in pairs(vim.api.nvim_list_tabpages()) do
+    BUFNR_PER_TAB[tab] = nil
+    if self.View.tabpages[tab] then
+      self.View.tabpages[tab].winnr = nil
+    end
+  end
+end
+
+---@param opts table|nil
+function ExplorerView:is_visible(opts)
+  if opts and opts.tabpage then
+    if self.View.tabpages[opts.tabpage] == nil then
+      return false
+    end
+    local winnr = self.View.tabpages[opts.tabpage].winnr
+    return winnr and vim.api.nvim_win_is_valid(winnr)
+  end
+
+  if opts and opts.any_tabpage then
+    for _, v in pairs(self.View.tabpages) do
+      if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then
+        return true
+      end
+    end
+    return false
+  end
+
+  return self:get_winnr() ~= nil and vim.api.nvim_win_is_valid(self:get_winnr() or 0)
+end
+
+---@param opts table|nil
+function ExplorerView:set_cursor(opts)
+  if self:is_visible() then
+    pcall(vim.api.nvim_win_set_cursor, self:get_winnr(), opts)
+  end
+end
+
+---@param winnr number|nil
+---@param open_if_closed boolean|nil
+function ExplorerView:focus(winnr, open_if_closed)
+  local wnr = winnr or self:get_winnr()
+
+  if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then
+    self:close()
+    self:open()
+    wnr = self:get_winnr()
+  elseif open_if_closed and not self:is_visible() then
+    self:open()
+  end
+
+  if wnr then
+    vim.api.nvim_set_current_win(wnr)
+  end
+end
+
+--- Retrieve the winid of the open tree.
+---@param opts ApiTreeWinIdOpts|nil
+---@return number|nil winid unlike get_winnr(), this returns nil if the nvim-tree window is not visible
+function ExplorerView:winid(opts)
+  local tabpage = opts and opts.tabpage
+  if tabpage == 0 then
+    tabpage = vim.api.nvim_get_current_tabpage()
+  end
+  if self:is_visible { tabpage = tabpage } then
+    return self:get_winnr(tabpage)
+  else
+    return nil
+  end
+end
+
+--- Restores the state of a NvimTree window if it was initialized before.
+function ExplorerView:restore_tab_state()
+  local tabpage = vim.api.nvim_get_current_tabpage()
+  self:set_cursor(self.View.cursors[tabpage])
+end
+
+--- Returns the window number for nvim-tree within the tabpage specified
+---@param tabpage number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
+---@return number|nil
+function ExplorerView:get_winnr(tabpage)
+  tabpage = tabpage or vim.api.nvim_get_current_tabpage()
+  local tabinfo = self.View.tabpages[tabpage]
+  if tabinfo and tabinfo.winnr and vim.api.nvim_win_is_valid(tabinfo.winnr) then
+    return tabinfo.winnr
+  end
+end
+
+--- Returns the current nvim tree bufnr
+---@return number
+function ExplorerView:get_bufnr()
+  return BUFNR_PER_TAB[vim.api.nvim_get_current_tabpage()]
+end
+
+---@param bufnr number
+---@return boolean
+function ExplorerView:is_buf_valid(bufnr)
+  return bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
+end
+
+function ExplorerView:_prevent_buffer_override()
+  local view_winnr = self:get_winnr()
+  local view_bufnr = self:get_bufnr()
+
+  -- need to schedule to let the new buffer populate the window
+  -- because this event needs to be run on bufWipeout.
+  -- Otherwise the curwin/curbuf would match the view buffer and the view window.
+  vim.schedule(function()
+    local curwin = vim.api.nvim_get_current_win()
+    local curwinconfig = vim.api.nvim_win_get_config(curwin)
+    local curbuf = vim.api.nvim_win_get_buf(curwin)
+    local bufname = vim.api.nvim_buf_get_name(curbuf)
+
+    if not bufname:match "NvimTree" then
+      for i, tabpage in ipairs(self.View.tabpages) do
+        if tabpage.winnr == view_winnr then
+          M.View.tabpages[i] = nil
+          break
+        end
+      end
+    end
+    if curwin ~= view_winnr or bufname == "" or curbuf == view_bufnr then
+      return
+    end
+
+    -- patch to avoid the overriding window to be fixed in size
+    -- might need a better patch
+    vim.cmd "setlocal nowinfixwidth"
+    vim.cmd "setlocal nowinfixheight"
+    M.open { focus_tree = false }
+    require("nvim-tree.renderer").draw()
+    pcall(vim.api.nvim_win_close, curwin, { force = true })
+
+    -- to handle opening a file using :e when nvim-tree is on floating mode
+    -- falling back to the current window instead of creating a new one
+    if curwinconfig.relative ~= "" then
+      require("nvim-tree.actions.node.open-file").fn("edit_in_place", bufname)
+    else
+      require("nvim-tree.actions.node.open-file").fn("edit", bufname)
+    end
+  end)
+end
+
+---@param cwd string|nil
+---@return boolean
+function ExplorerView:is_root_folder_visible(cwd)
+  return cwd ~= "/" and not self.View.hide_root_folder
+end
+
+-- used on ColorScheme event
+function ExplorerView:reset_winhl()
+  local winnr = self:get_winnr()
+  if winnr and vim.api.nvim_win_is_valid(winnr) then
+    vim.wo[self:get_winnr()].winhl = self.View.winopts.winhl
+  end
+end
+
+---Check if width determined or calculated on-fly
+---@return boolean
+function ExplorerView:is_width_determined()
+  return type(self.View.width) ~= "function"
+end
+
+---Configure width-related config
+---@param width string|function|number|table|nil
+function ExplorerView:configure_width(width)
+  if type(width) == "table" then
+    self.View.adaptive_size = true
+    self.View.width = width.min or DEFAULT_MIN_WIDTH
+    self.View.max_width = width.max or DEFAULT_MAX_WIDTH
+    self.View.padding = width.padding or DEFAULT_PADDING
+  elseif width == nil then
+    if self.config.width ~= nil then
+      -- if we had input config - fallback to it
+      self.configure_width(self.config.width)
+    else
+      -- otherwise - restore initial width
+      self.View.width = self.View.initial_width
+    end
+  else
+    self.View.adaptive_size = false
+    self.View.width = width
+  end
+end
+
+return ExplorerView

lua/nvim-tree/explorer/watch.lua

@@ -40,11 +40,15 @@ local function is_folder_ignored(path)
     end
   end
 
+  if type(M.config.filesystem_watchers.ignore_dirs) == "table" then
     for _, ignore_dir in ipairs(M.config.filesystem_watchers.ignore_dirs) do
       if vim.fn.match(path, ignore_dir) ~= -1 then
         return true
       end
     end
+  elseif type(M.config.filesystem_watchers.ignore_dirs) == "function" then
+    return M.config.filesystem_watchers.ignore_dirs(path)
+  end
 
   return false
 end

lua/nvim-tree/git/init.lua

@@ -136,6 +136,10 @@ end
 ---@param path string absolute
 ---@return string|nil
 function M.get_toplevel(path)
+  if not path then
+    return nil
+  end
+
   if not M.config.git.enable then
     return nil
   end
@@ -166,15 +170,21 @@ function M.get_toplevel(path)
   if not toplevel or not git_dir then
     return nil
   end
+  local toplevel_norm = vim.fn.fnamemodify(toplevel, ":p")
 
   -- ignore disabled paths
+  if type(M.config.git.disable_for_dirs) == "table" then
     for _, disabled_for_dir in ipairs(M.config.git.disable_for_dirs) do
-    local toplevel_norm = vim.fn.fnamemodify(toplevel, ":p")
       local disabled_norm = vim.fn.fnamemodify(disabled_for_dir, ":p")
       if toplevel_norm == disabled_norm then
         return nil
       end
     end
+  elseif type(M.config.git.disable_for_dirs) == "function" then
+    if M.config.git.disable_for_dirs(toplevel_norm) then
+      return nil
+    end
+  end
 
   M._toplevels_by_path[path] = toplevel
   M._git_dirs_by_toplevel[toplevel] = git_dir

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
@@ -167,7 +173,12 @@ local function open()
 
   -- populate it
   vim.api.nvim_buf_set_lines(M.bufnr, 0, -1, false, lines)
-  vim.api.nvim_buf_set_option(M.bufnr, "modifiable", false)
+
+  if vim.fn.has "nvim-0.10" == 1 then
+    vim.api.nvim_set_option_value("modifiable", false, { buf = M.bufnr })
+  else
+    vim.api.nvim_buf_set_option(M.bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
+  end
 
   -- highlight it
   for _, h in ipairs(hl) do

lua/nvim-tree/keymap.lua

@@ -68,10 +68,12 @@ function M.default_on_attach(bufnr)
   vim.keymap.set('n', 'f',       api.live_filter.start,               opts('Live Filter: Start'))
   vim.keymap.set('n', 'g?',      api.tree.toggle_help,                opts('Help'))
   vim.keymap.set('n', 'gy',      api.fs.copy.absolute_path,           opts('Copy Absolute Path'))
+  vim.keymap.set('n', 'ge',      api.fs.copy.basename,                opts('Copy Basename'))
   vim.keymap.set('n', 'H',       api.tree.toggle_hidden_filter,       opts('Toggle Filter: Dotfiles'))
   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

@@ -3,6 +3,7 @@ local notify = require "nvim-tree.notify"
 
 local M = {}
 
+-- silently move, please add to help nvim-tree-legacy-opts
 local function refactored(opts)
   -- 2022/06/20
   utils.move_missing_val(opts, "update_focused_file", "update_cwd", opts, "update_focused_file", "update_root", true)
@@ -41,6 +42,24 @@ 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
+
+  -- 2024/02/15
+  if type(opts.update_focused_file) == "table" then
+    if type(opts.update_focused_file.update_root) ~= "table" then
+      opts.update_focused_file.update_root = { enable = opts.update_focused_file.update_root }
+    end
+  end
+  utils.move_missing_val(opts, "update_focused_file", "ignore_list", opts, "update_focused_file.update_root", "ignore_list", true)
 end
 
 local function deprecated(opts)
@@ -51,12 +70,12 @@ end
 
 local function removed(opts)
   if opts.auto_close then
-    notify.warn "auto close feature has been removed, see note in the README (tips & reminder section)"
+    notify.warn "auto close feature has been removed: https://github.com/nvim-tree/nvim-tree.lua/wiki/Auto-Close"
     opts.auto_close = nil
   end
 
   if opts.focus_empty_on_setup then
-    notify.warn "focus_empty_on_setup has been removed and will be replaced by a new startup configuration. Please remove this option. See https://bit.ly/3yJch2T"
+    notify.warn "focus_empty_on_setup has been removed: https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup"
     opts.focus_empty_on_setup = nil
   end
 

lua/nvim-tree/lib.lua

@@ -1,8 +1,9 @@
 local renderer = require "nvim-tree.renderer"
-local view = require "nvim-tree.view"
 local core = require "nvim-tree.core"
 local utils = require "nvim-tree.utils"
 local events = require "nvim-tree.events"
+local notify = require "nvim-tree.notify"
+local explorer_node = require "nvim-tree.explorer.node"
 
 ---@class LibOpenOpts
 ---@field path string|nil path
@@ -15,19 +16,20 @@ local M = {
 
 ---@return Node|nil
 function M.get_node_at_cursor()
-  if not core.get_explorer() then
+  local explorer = core.get_explorer()
+  if not explorer then
     return
   end
 
-  local winnr = view.get_winnr()
+  local winnr = explorer.view:get_winnr()
   if not winnr then
     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
+  if line == 1 and explorer.view:is_root_folder_visible(core.get_cwd()) then
     return { name = ".." }
   end
 
@@ -56,6 +58,7 @@ local function clone_node(node)
     name = node.name,
     open = node.open,
     type = node.type,
+    fs_stat = node.fs_stat,
   }
 
   if type(node.nodes) == "table" then
@@ -82,8 +85,35 @@ function M.get_last_group_node(node)
     node = node.group_next
   end
 
-  ---@diagnostic disable-next-line: return-type-mismatch -- it can't be nil
+  return node ---@diagnostic disable-line: return-type-mismatch -- it can't be nil
-  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
@@ -98,8 +128,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 +151,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()
@@ -135,8 +189,12 @@ local function handle_buf_cwd(cwd)
 end
 
 local function open_view_and_draw()
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
   local cwd = vim.fn.getcwd()
-  view.open()
+  explorer.view:open()
   handle_buf_cwd(cwd)
   renderer.draw()
 end
@@ -144,8 +202,15 @@ end
 local function should_hijack_current_buf()
   local bufnr = vim.api.nvim_get_current_buf()
   local bufname = vim.api.nvim_buf_get_name(bufnr)
-  local bufmodified = vim.api.nvim_buf_get_option(bufnr, "modified")
+
-  local ft = vim.api.nvim_buf_get_option(bufnr, "ft")
+  local bufmodified, ft
+  if vim.fn.has "nvim-0.10" == 1 then
+    bufmodified = vim.api.nvim_get_option_value("modified", { buf = bufnr })
+    ft = vim.api.nvim_get_option_value("ft", { buf = bufnr })
+  else
+    bufmodified = vim.api.nvim_buf_get_option(bufnr, "modified") ---@diagnostic disable-line: deprecated
+    ft = vim.api.nvim_buf_get_option(bufnr, "ft") ---@diagnostic disable-line: deprecated
+  end
 
   local should_hijack_unnamed = M.hijack_unnamed_buffer_when_opening and bufname == "" and not bufmodified and ft == ""
   local should_hijack_dir = bufname ~= "" and vim.fn.isdirectory(bufname) == 1 and M.hijack_directories.enable
@@ -189,22 +254,35 @@ function M.open(opts)
 
   M.set_target_win()
   if not core.get_explorer() or opts.path then
-    core.init(opts.path or vim.loop.cwd())
+    if opts.path then
+      core.init(opts.path)
+    else
+      local cwd, err = vim.loop.cwd()
+      if not cwd then
+        notify.error(string.format("current working directory unavailable: %s", err))
+        return
+      end
+      core.init(cwd)
+    end
+  end
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
   end
   if should_hijack_current_buf() then
-    view.close_this_tab_only()
+    explorer.view:close_this_tab_only()
-    view.open_in_win()
+    explorer.view:open_in_win()
     renderer.draw()
   elseif opts.winid then
-    view.open_in_win { hijack_current_buf = false, resize = false, winid = opts.winid }
+    explorer.view:open_in_win { hijack_current_buf = false, resize = false, winid = opts.winid }
     renderer.draw()
   elseif opts.current_window then
-    view.open_in_win { hijack_current_buf = false, resize = false }
+    explorer.view:open_in_win { hijack_current_buf = false, resize = false }
     renderer.draw()
   else
     open_view_and_draw()
   end
-  view.restore_tab_state()
+  explorer.view:restore_tab_state()
   events._dispatch_on_tree_open()
 end
 
@@ -213,6 +291,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/live-filter.lua

@@ -1,186 +0,0 @@
-local view = require "nvim-tree.view"
-local utils = require "nvim-tree.utils"
-local Iterator = require "nvim-tree.iterators.node-iterator"
-
-local M = {
-  filter = nil,
-}
-
-local function redraw()
-  require("nvim-tree.renderer").draw()
-end
-
----@param node_ Node|nil
-local function reset_filter(node_)
-  node_ = node_ or require("nvim-tree.core").get_explorer()
-
-  if node_ == nil then
-    return
-  end
-
-  Iterator.builder(node_.nodes)
-    :hidden()
-    :applier(function(node)
-      node.hidden = false
-    end)
-    :iterate()
-end
-
-local overlay_bufnr = nil
-local overlay_winnr = nil
-
-local function remove_overlay()
-  if view.View.float.enable and view.View.float.quit_on_focus_loss then
-    -- return to normal nvim-tree float behaviour when filter window is closed
-    vim.api.nvim_create_autocmd("WinLeave", {
-      pattern = "NvimTree_*",
-      group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
-      callback = function()
-        if utils.is_nvim_tree_buf(0) then
-          view.close()
-        end
-      end,
-    })
-  end
-
-  vim.api.nvim_win_close(overlay_winnr, true)
-  vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
-  overlay_bufnr = nil
-  overlay_winnr = nil
-
-  if M.filter == "" then
-    M.clear_filter()
-  end
-end
-
----@param node Node
----@return boolean
-local function matches(node)
-  local path = node.absolute_path
-  local name = vim.fn.fnamemodify(path, ":t")
-  return vim.regex(M.filter):match_str(name) ~= nil
-end
-
----@param node_ Node|nil
-function M.apply_filter(node_)
-  if not M.filter or M.filter == "" then
-    reset_filter(node_)
-    return
-  end
-
-  -- TODO(kiyan): this iterator cannot yet be refactored with the Iterator module
-  -- since the node mapper is based on its children
-  local function iterate(node)
-    local filtered_nodes = 0
-    local nodes = node.group_next and { node.group_next } or node.nodes
-
-    if nodes then
-      for _, n in pairs(nodes) do
-        iterate(n)
-        if n.hidden then
-          filtered_nodes = filtered_nodes + 1
-        end
-      end
-    end
-
-    local has_nodes = nodes and (M.always_show_folders or #nodes > filtered_nodes)
-    local ok, is_match = pcall(matches, node)
-    node.hidden = not (has_nodes or (ok and is_match))
-  end
-
-  iterate(node_ or require("nvim-tree.core").get_explorer())
-end
-
-local function record_char()
-  vim.schedule(function()
-    M.filter = vim.api.nvim_buf_get_lines(overlay_bufnr, 0, -1, false)[1]
-    M.apply_filter()
-    redraw()
-  end)
-end
-
-local function configure_buffer_overlay()
-  overlay_bufnr = vim.api.nvim_create_buf(false, true)
-
-  vim.api.nvim_buf_attach(overlay_bufnr, true, {
-    on_lines = record_char,
-  })
-
-  vim.api.nvim_create_autocmd("InsertLeave", {
-    callback = remove_overlay,
-    once = true,
-  })
-
-  vim.api.nvim_buf_set_keymap(overlay_bufnr, "i", "<CR>", "<cmd>stopinsert<CR>", {})
-end
-
----@return integer
-local function calculate_overlay_win_width()
-  local wininfo = vim.fn.getwininfo(view.get_winnr())[1]
-
-  if wininfo then
-    return wininfo.width - wininfo.textoff - #M.prefix
-  end
-
-  return 20
-end
-
-local function create_overlay()
-  if view.View.float.enable then
-    -- don't close nvim-tree float when focus is changed to filter window
-    vim.api.nvim_clear_autocmds {
-      event = "WinLeave",
-      pattern = "NvimTree_*",
-      group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
-    }
-  end
-
-  configure_buffer_overlay()
-  overlay_winnr = vim.api.nvim_open_win(overlay_bufnr, true, {
-    col = 1,
-    row = 0,
-    relative = "cursor",
-    width = calculate_overlay_win_width(),
-    height = 1,
-    border = "none",
-    style = "minimal",
-  })
-  vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true)
-  vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { M.filter })
-  vim.cmd "startinsert"
-  vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #M.filter + 1 })
-end
-
-function M.start_filtering()
-  view.View.live_filter.prev_focused_node = require("nvim-tree.lib").get_node_at_cursor()
-  M.filter = M.filter or ""
-
-  redraw()
-  local row = require("nvim-tree.core").get_nodes_starting_line() - 1
-  local col = #M.prefix > 0 and #M.prefix - 1 or 1
-  view.set_cursor { row, col }
-  -- needs scheduling to let the cursor move before initializing the window
-  vim.schedule(create_overlay)
-end
-
-function M.clear_filter()
-  local node = require("nvim-tree.lib").get_node_at_cursor()
-  local last_node = view.View.live_filter.prev_focused_node
-
-  M.filter = nil
-  reset_filter()
-  redraw()
-
-  if node then
-    utils.focus_file(node.absolute_path)
-  elseif last_node then
-    utils.focus_file(last_node.absolute_path)
-  end
-end
-
-function M.setup(opts)
-  M.prefix = opts.live_filter.prefix
-  M.always_show_folders = opts.live_filter.always_show_folders
-end
-
-return M

lua/nvim-tree/marks/bulk-delete.lua

@@ -1,4 +1,3 @@
-local marks = require "nvim-tree.marks"
 local utils = require "nvim-tree.utils"
 local remove_file = require "nvim-tree.actions.fs.remove-file"
 local notify = require "nvim-tree.notify"
@@ -10,12 +9,13 @@ local M = {
 
 --- Delete nodes; each removal will be optionally notified
 ---@param nodes Node[]
-local function do_delete(nodes)
+---@param marks Marks
+local function do_delete(marks, nodes)
   for _, node in pairs(nodes) do
     remove_file.remove(node)
   end
 
-  marks.clear_marks()
+  marks:clear_marks()
 
   if not M.config.filesystem_watchers.enable then
     require("nvim-tree.actions.reloaders").reload_explorer()
@@ -23,8 +23,15 @@ local function do_delete(nodes)
 end
 
 --- Delete marked nodes, optionally prompting
-function M.bulk_delete()
+---@param explorer Explorer
-  local nodes = marks.get_marks()
+function M.bulk_delete(explorer)
+  if not explorer then
+    return
+  end
+
+  local marks = explorer.marks
+
+  local nodes = marks:get_marks()
   if not nodes or #nodes == 0 then
     notify.warn "No bookmarksed to delete."
     return
@@ -36,11 +43,11 @@ function M.bulk_delete()
     lib.prompt(prompt_input, prompt_select, { "", "y" }, { "No", "Yes" }, "nvimtree_bulk_delete", function(item_short)
       utils.clear_prompt()
       if item_short == "y" then
-        do_delete(nodes)
+        do_delete(marks, nodes)
       end
     end)
   else
-    do_delete(nodes)
+    do_delete(marks, nodes)
   end
 end
 

lua/nvim-tree/marks/bulk-move.lua

@@ -1,22 +1,37 @@
-local marks = require "nvim-tree.marks"
 local core = require "nvim-tree.core"
 local utils = require "nvim-tree.utils"
 local rename_file = require "nvim-tree.actions.fs.rename-file"
 local notify = require "nvim-tree.notify"
+local lib = require "nvim-tree.lib"
 
 local M = {
   config = {},
 }
 
-function M.bulk_move()
+---@param explorer Explorer
-  if #marks.get_marks() == 0 then
+function M.bulk_move(explorer)
+  if not explorer then
+    return
+  end
+  local marks = explorer.marks
+
+  if #marks:get_marks() == 0 then
     notify.warn "No bookmarks to move."
     return
   end
 
+  local node_at_cursor = lib.get_node_at_cursor()
+  local default_path = core.get_cwd()
+
+  if node_at_cursor and node_at_cursor.type == "directory" then
+    default_path = node_at_cursor.absolute_path
+  elseif node_at_cursor and node_at_cursor.parent then
+    default_path = node_at_cursor.parent.absolute_path
+  end
+
   local input_opts = {
     prompt = "Move to: ",
-    default = core.get_cwd(),
+    default = default_path,
     completion = "dir",
   }
 
@@ -30,14 +45,14 @@ function M.bulk_move()
       return
     end
 
-    local nodes = marks.get_marks()
+    local nodes = marks:get_marks()
     for _, node in pairs(nodes) do
       local head = vim.fn.fnamemodify(node.absolute_path, ":t")
       local to = utils.path_join { location, head }
       rename_file.rename(node, to)
     end
 
-    marks.clear_marks()
+    marks:clear_marks()
 
     if not M.config.filesystem_watchers.enable then
       require("nvim-tree.actions.reloaders").reload_explorer()

lua/nvim-tree/marks/bulk-trash.lua

@@ -1,4 +1,3 @@
-local marks = require "nvim-tree.marks"
 local utils = require "nvim-tree.utils"
 local remove_file = require "nvim-tree.actions.fs.trash"
 local notify = require "nvim-tree.notify"
@@ -14,12 +13,17 @@ local function do_trash(nodes)
   for _, node in pairs(nodes) do
     remove_file.remove(node)
   end
-
-  marks.clear_marks()
 end
 
-function M.bulk_trash()
+---@param explorer Explorer
-  local nodes = marks.get_marks()
+function M.bulk_trash(explorer)
+  if not explorer then
+    return
+  end
+
+  local marks = explorer.marks
+
+  local nodes = marks:get_marks()
   if not nodes or #nodes == 0 then
     notify.warn "No bookmarks to trash."
     return
@@ -32,10 +36,12 @@ function M.bulk_trash()
       utils.clear_prompt()
       if item_short == "y" then
         do_trash(nodes)
+        marks:clear_marks()
       end
     end)
   else
     do_trash(nodes)
+    marks:clear_marks()
   end
 end
 

lua/nvim-tree/marks/init.lua

@@ -1,63 +1,73 @@
 local renderer = {} -- circular dependency
 
-local NvimTreeMarks = {}
+---@class Marks
+---@field private marks Node[]
+local Marks = {}
 
-local M = {}
+---@return Marks
+function Marks:new()
+  local o = {}
+  setmetatable(o, self)
+  self.__index = self
 
----@class MinimalNode
+  o.marks = {}
----@field absolute_path string
 
----@param node Node|MinimalNode
+  return o
-local function add_mark(node)
+end
-  NvimTreeMarks[node.absolute_path] = node
+
+---@private
+---@param node Node
+function Marks:add_mark(node)
+  self.marks[node.absolute_path] = node
 
   renderer.draw()
 end
 
----@param node Node|MinimalNode
+---@private
-local function remove_mark(node)
+---@param node Node
-  NvimTreeMarks[node.absolute_path] = nil
+function Marks:remove_mark(node)
+  self.marks[node.absolute_path] = nil
 
   renderer.draw()
 end
 
----@param node Node|MinimalNode
+---@param node Node
-function M.toggle_mark(node)
+function Marks:toggle_mark(node)
   if node.absolute_path == nil then
     return
   end
 
-  if M.get_mark(node) then
+  if self:get_mark(node) then
-    remove_mark(node)
+    self:remove_mark(node)
   else
-    add_mark(node)
+    self:add_mark(node)
   end
 
   renderer.draw()
 end
 
-function M.clear_marks()
+function Marks:clear_marks()
-  NvimTreeMarks = {}
+  self.marks = {}
 
   renderer.draw()
 end
 
----@param node Node|MinimalNode
+---@param node Node
----@return table|nil
+---@return Node|nil
-function M.get_mark(node)
+function Marks:get_mark(node)
-  return NvimTreeMarks[node.absolute_path]
+  return node and self.marks[node.absolute_path]
 end
 
----@return table
+---@return Node[]
-function M.get_marks()
+function Marks:get_marks()
   local list = {}
-  for _, node in pairs(NvimTreeMarks) do
+  for _, node in pairs(self.marks) do
     table.insert(list, node)
   end
   return list
 end
 
-function M.setup(opts)
+function Marks.setup(opts)
   renderer = require "nvim-tree.renderer"
 
   require("nvim-tree.marks.bulk-delete").setup(opts)
@@ -65,4 +75,4 @@ function M.setup(opts)
   require("nvim-tree.marks.bulk-move").setup(opts)
 end
 
-return M
+return Marks

lua/nvim-tree/marks/navigation.lua

@@ -1,6 +1,5 @@
 local Iterator = require "nvim-tree.iterators.node-iterator"
 local core = require "nvim-tree.core"
-local Marks = require "nvim-tree.marks"
 local open_file = require "nvim-tree.actions.node.open-file"
 local utils = require "nvim-tree.utils"
 local lib = require "nvim-tree.lib"
@@ -9,10 +8,15 @@ local lib = require "nvim-tree.lib"
 ---@param where string
 ---@return Node|nil
 local function get_nearest(node, where)
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
+
   local first, prev, next, last = nil, nil, nil, nil
   local found = false
 
-  Iterator.builder(core.get_explorer().nodes)
+  Iterator.builder(explorer.nodes)
     :recursor(function(n)
       return n.open and n.nodes
     end)
@@ -22,7 +26,7 @@ local function get_nearest(node, where)
         return
       end
 
-      if not Marks.get_mark(n) then
+      if not explorer.marks:get_mark(n) then
         return
       end
 
@@ -84,9 +88,14 @@ M.next = navigate_to "next"
 M.prev = navigate_to "prev"
 
 function M.select()
+  local explorer = core.get_explorer()
+  if not explorer then
+    return
+  end
+
   local list = vim.tbl_map(function(n)
     return n.absolute_path
-  end, Marks.get_marks())
+  end, explorer.marks:get_marks())
 
   vim.ui.select(list, {
     prompt = "Select a file to open or a folder to focus",
@@ -94,7 +103,7 @@ function M.select()
     if not choice or choice == "" then
       return
     end
-    local node = Marks.get_mark { absolute_path = choice }
+    local node = explorer.marks:get_mark { absolute_path = choice }
     open_or_focus(node)
   end)
 end

lua/nvim-tree/modified.lua

@@ -1,40 +0,0 @@
-local M = {}
-
----@type table<string, boolean> record of which file is modified
-M._record = {}
-
----refresh M.record
-function M.reload()
-  M._record = {}
-  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
-        -- no need to keep going if already recorded
-        -- This also prevents an infinite loop
-      do
-        M._record[path] = true
-        path = vim.fn.fnamemodify(path, ":h")
-      end
-    end
-  end
-end
-
----@param node Node
----@return boolean
-function M.is_modified(node)
-  return M.config.enable
-    and M._record[node.absolute_path]
-    and (not node.nodes or M.config.show_on_dirs)
-    and (not node.open or M.config.show_on_open_dirs)
-end
-
----@param opts table
-function M.setup(opts)
-  M.config = opts.modified
-end
-
-return M

lua/nvim-tree/node.lua

@@ -1,18 +1,15 @@
 ---@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
 
 ---@class BaseNode
 ---@field absolute_path string
 ---@field executable boolean
----@field fs_stat uv.uv_fs_t
+---@field fs_stat uv.fs_stat.result|nil
 ---@field git_status GitStatus|nil
 ---@field hidden boolean
+---@field is_dot boolean
 ---@field name string
 ---@field parent DirNode
 ---@field type string

lua/nvim-tree/renderer/builder.lua

@@ -1,136 +1,92 @@
-local utils = require "nvim-tree.utils"
 local core = require "nvim-tree.core"
 local notify = require "nvim-tree.notify"
+local utils = require "nvim-tree.utils"
+
+local DecoratorBookmarks = require "nvim-tree.renderer.decorator.bookmarks"
+local DecoratorCopied = require "nvim-tree.renderer.decorator.copied"
+local DecoratorCut = require "nvim-tree.renderer.decorator.cut"
+local DecoratorDiagnostics = require "nvim-tree.renderer.decorator.diagnostics"
+local DecoratorGit = require "nvim-tree.renderer.decorator.git"
+local DecoratorModified = require "nvim-tree.renderer.decorator.modified"
+local DecoratorHidden = require "nvim-tree.renderer.decorator.hidden"
+local DecoratorOpened = require "nvim-tree.renderer.decorator.opened"
 
-local 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,
+    extmarks = {},
-  }, 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 })
+  local rights = {}
+  for i = #M.decorators, 1, -1 do
+    add_to_end(rights, M.decorators[i]:icons_right_align(node))
   end
-  if diagnostics_icon and self.diagnostics_placement == "after" then
+  if #rights > 0 then
-    add_to_end(line, { diagnostics_icon })
+    self.extmarks[self.index] = rights
-  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
+  if #icon_groups > 1 then
+    icon_hl_group = self:create_combined_group(icon_groups)
+  else
+    icon_hl_group = icon_groups[1]
+  end
+
+  -- one or many name groups
+  if #name_groups > 1 then
+    name_hl_group = self:create_combined_group(name_groups)
+  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,15 @@ 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)
+  local explorer = core.get_explorer()
+  if not explorer or not explorer.live_filter.filter then
     return #nodes
   end
 
@@ -477,53 +373,92 @@ 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
     end
+  elseif type(root_label) == "string" then
+    return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
   end
-  return utils.path_remove_trailing(vim.fn.fnamemodify(root_cwd, root_label))
+  return "???"
 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)
+  local explorer = core.get_explorer()
-    self:_insert_line(root_name)
+  if not explorer then
-    self:_insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
+    return
+  end
+  if explorer.view:is_root_folder_visible(core.get_cwd()) then
+    local root_name = self:format_root_name(M.opts.renderer.root_folder_label)
+    table.insert(self.lines, root_name)
+    self:insert_highlight({ "NvimTreeRootFolder" }, 0, string.len(root_name))
     self.index = 1
   end
 
-  if self.filter then
+  if explorer.live_filter.filter then
-    local filter_line = self.filter_prefix .. "/" .. self.filter .. "/"
+    local filter_line = string.format("%s/%s/", M.opts.live_filter.prefix, explorer.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
 
+---Sanitize lines for rendering.
+---Replace newlines with literal \n
+---@private
+function Builder:sanitize_lines()
+  self.lines = vim.tbl_map(function(line)
+    return line and line:gsub("\n", "\\n") or ""
+  end, self.lines)
+end
+
+---Build all lines with highlights and signs
+---@return Builder
+function Builder:build()
+  self:build_header()
+  self:build_lines()
+  self:sanitize_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),
+    DecoratorHidden: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,
@@ -67,12 +67,19 @@ local function show()
   })
 
   local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
-  local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = 1 })
+  local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true })
   vim.api.nvim_win_call(M.popup_win, function()
     vim.api.nvim_buf_set_lines(0, 0, -1, true, { line })
     for _, extmark in ipairs(extmarks) do
-      local hl = extmark[4]
+      -- nvim 0.10 luadoc is incorrect: vim.api.keyset.get_extmark_item is missing the extmark_id at the start
-      vim.api.nvim_buf_add_highlight(0, ns_id, hl.hl_group, 0, extmark[3], hl.end_col)
+
+      ---@cast extmark table
+      ---@type integer
+      local col = extmark[3]
+      ---@type vim.api.keyset.extmark_details
+      local details = extmark[4]
+
+      vim.api.nvim_buf_add_highlight(0, ns_id, details.hl_group, 0, col, details.end_col)
     end
     vim.cmd [[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=hide ]]
   end)

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/icons.lua

@@ -64,10 +64,15 @@ local function get_file_icon_webdev(fname, extension)
   elseif string.match(extension, "%.(.*)") then
     -- If there are more extensions to the file, try to grab the icon for them recursively
     return get_file_icon_webdev(fname, string.match(extension, "%.(.*)"))
+  else
+    local devicons_default = M.devicons.get_default_icon()
+    if devicons_default and type(devicons_default.icon) == "string" and type(devicons_default.name) == "string" then
+      return devicons_default.icon, "DevIcon" .. devicons_default.name
     else
       return get_file_icon_default()
     end
   end
+end
 
 local function config_file_icon()
   if M.config.show.file then

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 core = require "nvim-tree.core"
+
+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 core.get_explorer() and core.get_explorer().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 core.get_explorer() and core.get_explorer().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/hidden.lua

@@ -0,0 +1,55 @@
+local HL_POSITION = require("nvim-tree.enum").HL_POSITION
+local ICON_PLACEMENT = require("nvim-tree.enum").ICON_PLACEMENT
+local explorer_node = require "nvim-tree.explorer.node"
+local Decorator = require "nvim-tree.renderer.decorator"
+
+---@class DecoratorHidden: Decorator
+---@field icon HighlightedString|nil
+local DecoratorHidden = Decorator:new()
+
+---@param opts table
+---@return DecoratorHidden
+function DecoratorHidden:new(opts)
+  local o = Decorator.new(self, {
+    enabled = true,
+    hl_pos = HL_POSITION[opts.renderer.highlight_hidden] or HL_POSITION.none,
+    icon_placement = ICON_PLACEMENT[opts.renderer.icons.hidden_placement] or ICON_PLACEMENT.none,
+  })
+  ---@cast o DecoratorHidden
+
+  if opts.renderer.icons.show.hidden then
+    o.icon = {
+      str = opts.renderer.icons.glyphs.hidden,
+      hl = { "NvimTreeHiddenIcon" },
+    }
+    o:define_sign(o.icon)
+  end
+
+  return o
+end
+
+---Hidden icon: hidden.enable, renderer.icons.show.hidden and node starts with `.` (dotfile).
+---@param node Node
+---@return HighlightedString[]|nil icons
+function DecoratorHidden:calculate_icons(node)
+  if self.enabled and explorer_node.is_dotfile(node) then
+    return { self.icon }
+  end
+end
+
+---Hidden highlight: hidden.enable, renderer.highlight_hidden and node starts with `.` (dotfile).
+---@param node Node
+---@return string|nil group
+function DecoratorHidden:calculate_highlight(node)
+  if not self.enabled or self.hl_pos == HL_POSITION.none or (not explorer_node.is_dotfile(node)) then
+    return nil
+  end
+
+  if node.nodes then
+    return "NvimTreeHiddenFolderHL"
+  else
+    return "NvimTreeHiddenFileHL"
+  end
+end
+
+return DecoratorHidden

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

@@ -0,0 +1,133 @@
+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
+
+---Icons when ICON_PLACEMENT.right_align
+---@param node Node
+---@return HighlightedString[]|nil icons
+function Decorator:icons_right_align(node)
+  if not self.enabled or self.icon_placement ~= ICON_PLACEMENT.right_align then
+    return
+  end
+
+  return self:calculate_icons(node)
+end
+
+---Maybe icons, optionally implemented
+---@protected
+---@param _ Node
+---@return HighlightedString[]|nil icons
+function Decorator:calculate_icons(_)
+  return nil
+end
+
+---Maybe highlight group, optionally implemented
+---@protected
+---@param _ Node
+---@return string|nil group
+function Decorator:calculate_highlight(_)
+  return nil
+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

@@ -1,34 +1,53 @@
 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 namespace_highlights_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
+local namespace_extmarks_id = vim.api.nvim_create_namespace "NvimTreeExtmarks"
+
+---@param bufnr number
+---@param lines string[]
+---@param hl_args AddHighlightArgs[]
+---@param signs string[]
+local function _draw(bufnr, lines, hl_args, signs, extmarks)
+  if vim.fn.has "nvim-0.10" == 1 then
+    vim.api.nvim_set_option_value("modifiable", true, { buf = bufnr })
+  else
+    vim.api.nvim_buf_set_option(bufnr, "modifiable", true) ---@diagnostic disable-line: deprecated
+  end
 
-local function _draw(bufnr, lines, hl, 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)
+
+  if vim.fn.has "nvim-0.10" == 1 then
+    vim.api.nvim_set_option_value("modifiable", false, { buf = bufnr })
+  else
+    vim.api.nvim_buf_set_option(bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
+  end
+
   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
+
+  vim.api.nvim_buf_clear_namespace(bufnr, namespace_extmarks_id, 0, -1)
+  for i, extname in pairs(extmarks) do
+    for _, mark in ipairs(extname) do
+      vim.api.nvim_buf_set_extmark(bufnr, namespace_extmarks_id, i, -1, {
+        virt_text = { { mark.str, mark.hl } },
+        virt_text_pos = "right_align",
+        hl_mode = "combine",
+      })
+    end
   end
 end
 
@@ -36,81 +55,54 @@ function M.render_hl(bufnr, hl)
   if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
     return
   end
-  vim.api.nvim_buf_clear_namespace(bufnr, namespace_id, 0, -1)
+  vim.api.nvim_buf_clear_namespace(bufnr, namespace_highlights_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])
+        vim.api.nvim_buf_add_highlight(bufnr, namespace_highlights_id, group, data[2], data[3], data[4])
       end
     end
   end
 end
 
-local picture_map = {
+function M.draw()
-  jpg = true,
+  local explorer = core.get_explorer()
-  jpeg = true,
+  if not explorer then
-  png = true,
+    return
-  gif = true,
+  end
-  webp = true,
+  local bufnr = explorer.view:get_bufnr()
-  jxl = true,
+  if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
-}
-
-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
   end
 
   local profile = log.profile_start "draw"
 
-  local cursor = vim.api.nvim_win_get_cursor(view.get_winnr())
+  local cursor = vim.api.nvim_win_get_cursor(explorer.view:get_winnr() or 0)
   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, builder.extmarks)
 
-  M.last_highlights = hl
+  if cursor and #builder.lines >= cursor[1] then
-
+    vim.api.nvim_win_set_cursor(explorer.view:get_winnr() or 0, cursor)
-  if cursor and #lines >= cursor[1] then
-    vim.api.nvim_win_set_cursor(view.get_winnr(), cursor)
   end
 
-  view.grow_from_content()
+  explorer.view:grow_from_content()
 
   log.profile_end(profile)
 
-  events._dispatch_on_tree_rendered(bufnr, view.get_winnr())
+  events._dispatch_on_tree_rendered(bufnr, explorer.view:get_winnr())
 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

@@ -111,11 +111,36 @@ function M.find_node(nodes, fn)
       return node.group_next and { node.group_next } or (node.open and #node.nodes > 0 and node.nodes)
     end)
     :iterate()
-  i = require("nvim-tree.view").is_root_folder_visible() and i or i - 1
+  local explorer = require("nvim-tree.core").get_explorer()
-  i = require("nvim-tree.live-filter").filter and i + 1 or i
+  i = explorer and explorer.view:is_root_folder_visible() and i or i - 1
+  if explorer and explorer.live_filter.filter then
+    i = i + 1
+  end
   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
@@ -204,7 +229,14 @@ function M.rename_loaded_buffers(old_path, new_path)
         vim.api.nvim_buf_set_name(buf, new_path .. buf_name:sub(#old_path + 1))
         -- to avoid the 'overwrite existing file' error message on write for
         -- normal files
-        if vim.api.nvim_buf_get_option(buf, "buftype") == "" then
+        local buftype
+        if vim.fn.has "nvim-0.10" == 1 then
+          buftype = vim.api.nvim_get_option_value("buftype", { buf = buf })
+        else
+          buftype = vim.api.nvim_buf_get_option(buf, "buftype") ---@diagnostic disable-line: deprecated
+        end
+
+        if buftype == "" then
           vim.api.nvim_buf_call(buf, function()
             vim.cmd "silent! write!"
             vim.cmd "edit"
@@ -384,6 +416,9 @@ function M.debounce(context, timeout, callback)
   end
 
   local timer = vim.loop.new_timer()
+  if not timer then
+    return
+  end
   debouncer.timer = timer
   timer:start(timeout, 0, function()
     timer_stop_close(timer)
@@ -409,10 +444,14 @@ function M.debounce(context, timeout, callback)
 end
 
 function M.focus_file(path)
-  local _, i = M.find_node(require("nvim-tree.core").get_explorer().nodes, function(node)
+  local explorer = require("nvim-tree.core").get_explorer()
+  if not explorer then
+    return
+  end
+  local _, i = M.find_node(explorer.nodes, function(node)
     return node.absolute_path == path
   end)
-  require("nvim-tree.view").set_cursor { i + 1, 1 }
+  explorer.view:set_cursor { i + 1, 1 }
 end
 
 ---Focus node passed as parameter if visible, otherwise focus first visible parent.
@@ -432,7 +471,7 @@ function M.focus_node_or_parent(node)
     end)
 
     if found_node or node.parent == nil then
-      require("nvim-tree.view").set_cursor { i + 1, 1 }
+      explorer.view:set_cursor { i + 1, 1 }
       break
     end
 

lua/nvim-tree/view.lua

@@ -1,577 +0,0 @@
-local events = require "nvim-tree.events"
-local utils = require "nvim-tree.utils"
-local log = require "nvim-tree.log"
-
----@class OpenInWinOpts
----@field hijack_current_buf boolean|nil default true
----@field resize boolean|nil default true
----@field winid number|nil 0 or nil for current
-
-local M = {}
-
-local DEFAULT_MIN_WIDTH = 30
-local DEFAULT_MAX_WIDTH = -1
-local DEFAULT_PADDING = 1
-
-M.View = {
-  adaptive_size = false,
-  centralize_selection = false,
-  tabpages = {},
-  cursors = {},
-  hide_root_folder = false,
-  live_filter = {
-    prev_focused_node = nil,
-  },
-  winopts = {
-    relativenumber = false,
-    number = false,
-    list = false,
-    foldenable = false,
-    winfixwidth = true,
-    winfixheight = true,
-    spell = false,
-    signcolumn = "yes",
-    foldmethod = "manual",
-    foldcolumn = "0",
-    cursorcolumn = false,
-    cursorline = true,
-    cursorlineopt = "both",
-    colorcolumn = "0",
-    wrap = false,
-    winhl = table.concat({
-      "EndOfBuffer:NvimTreeEndOfBuffer",
-      "CursorLine:NvimTreeCursorLine",
-      "CursorLineNr:NvimTreeCursorLineNr",
-      "LineNr:NvimTreeLineNr",
-      "WinSeparator:NvimTreeWinSeparator",
-      "StatusLine:NvimTreeStatusLine",
-      "StatusLineNC:NvimTreeStatuslineNC",
-      "SignColumn:NvimTreeSignColumn",
-      "Normal:NvimTreeNormal",
-      "NormalNC:NvimTreeNormalNC",
-      "NormalFloat:NvimTreeNormalFloat",
-    }, ","),
-  },
-}
-
--- The initial state of a tab
-local tabinitial = {
-  -- The position of the cursor { line, column }
-  cursor = { 0, 0 },
-  -- The NvimTree window number
-  winnr = nil,
-}
-
-local BUFNR_PER_TAB = {}
-local BUFFER_OPTIONS = {
-  swapfile = false,
-  buftype = "nofile",
-  modifiable = false,
-  filetype = "NvimTree",
-  bufhidden = "wipe",
-  buflisted = false,
-}
-
----@param bufnr integer
----@return boolean
-local function matches_bufnr(bufnr)
-  for _, b in pairs(BUFNR_PER_TAB) do
-    if b == bufnr then
-      return true
-    end
-  end
-  return false
-end
-
-local function wipe_rogue_buffer()
-  for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
-    if not matches_bufnr(bufnr) and utils.is_nvim_tree_buf(bufnr) then
-      pcall(vim.api.nvim_buf_delete, bufnr, { force = true })
-    end
-  end
-end
-
----@param bufnr integer|boolean|nil
-local function create_buffer(bufnr)
-  wipe_rogue_buffer()
-
-  local tab = vim.api.nvim_get_current_tabpage()
-  BUFNR_PER_TAB[tab] = bufnr or vim.api.nvim_create_buf(false, false)
-  vim.api.nvim_buf_set_name(M.get_bufnr(), "NvimTree_" .. tab)
-
-  for option, value in pairs(BUFFER_OPTIONS) do
-    vim.bo[M.get_bufnr()][option] = value
-  end
-
-  require("nvim-tree.keymap").on_attach(M.get_bufnr())
-
-  events._dispatch_tree_attached_post(M.get_bufnr())
-end
-
----@param size number|fun():number
----@return integer
-local function get_size(size)
-  if type(size) == "number" then
-    return size
-  elseif type(size) == "function" then
-    return size()
-  end
-  local size_as_number = tonumber(size:sub(0, -2))
-  local percent_as_decimal = size_as_number / 100
-  return math.floor(vim.o.columns * percent_as_decimal)
-end
-
----@param size number|function|nil
-local function get_width(size)
-  size = size or M.View.width
-  return get_size(size)
-end
-
-local move_tbl = {
-  left = "H",
-  right = "L",
-}
-
--- setup_tabpage sets up the initial state of a tab
----@param tabpage integer
-local function setup_tabpage(tabpage)
-  local winnr = vim.api.nvim_get_current_win()
-  M.View.tabpages[tabpage] = vim.tbl_extend("force", M.View.tabpages[tabpage] or tabinitial, { winnr = winnr })
-end
-
-local function set_window_options_and_buffer()
-  pcall(vim.cmd, "buffer " .. M.get_bufnr())
-  local eventignore = vim.opt.eventignore:get()
-  vim.opt.eventignore = "all"
-  for k, v in pairs(M.View.winopts) do
-    vim.opt_local[k] = v
-  end
-  vim.opt.eventignore = eventignore
-end
-
----@return table
-local function open_win_config()
-  if type(M.View.float.open_win_config) == "function" then
-    return M.View.float.open_win_config()
-  else
-    return M.View.float.open_win_config
-  end
-end
-
-local function open_window()
-  if M.View.float.enable then
-    vim.api.nvim_open_win(0, true, open_win_config())
-  else
-    vim.api.nvim_command "vsp"
-    M.reposition_window()
-  end
-  setup_tabpage(vim.api.nvim_get_current_tabpage())
-  set_window_options_and_buffer()
-end
-
----@param buf integer
----@return boolean
-local function is_buf_displayed(buf)
-  return vim.api.nvim_buf_is_valid(buf) and vim.fn.buflisted(buf) == 1
-end
-
----@return number|nil
-local function get_alt_or_next_buf()
-  local alt_buf = vim.fn.bufnr "#"
-  if is_buf_displayed(alt_buf) then
-    return alt_buf
-  end
-
-  for _, buf in ipairs(vim.api.nvim_list_bufs()) do
-    if is_buf_displayed(buf) then
-      return buf
-    end
-  end
-end
-
-local function switch_buf_if_last_buf()
-  if #vim.api.nvim_list_wins() == 1 then
-    local buf = get_alt_or_next_buf()
-    if buf then
-      vim.cmd("sb" .. buf)
-    else
-      vim.cmd "new"
-    end
-  end
-end
-
--- save_tab_state saves any state that should be preserved across redraws.
----@param tabnr integer
-local function save_tab_state(tabnr)
-  local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
-  M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage))
-end
-
----@param tabpage integer
-local function close(tabpage)
-  if not M.is_visible { tabpage = tabpage } then
-    return
-  end
-  save_tab_state(tabpage)
-  switch_buf_if_last_buf()
-  local tree_win = M.get_winnr(tabpage)
-  local current_win = vim.api.nvim_get_current_win()
-  for _, win in pairs(vim.api.nvim_tabpage_list_wins(tabpage)) do
-    if vim.api.nvim_win_get_config(win).relative == "" then
-      local prev_win = vim.fn.winnr "#" -- this tab only
-      if tree_win == current_win and prev_win > 0 then
-        vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
-      end
-      if vim.api.nvim_win_is_valid(tree_win) then
-        vim.api.nvim_win_close(tree_win, true)
-      end
-      events._dispatch_on_tree_close()
-      return
-    end
-  end
-end
-
-function M.close_this_tab_only()
-  close(vim.api.nvim_get_current_tabpage())
-end
-
-function M.close_all_tabs()
-  for tabpage, _ in pairs(M.View.tabpages) do
-    close(tabpage)
-  end
-end
-
-function M.close()
-  if M.View.tab.sync.close then
-    M.close_all_tabs()
-  else
-    M.close_this_tab_only()
-  end
-end
-
----@param options table|nil
-function M.open(options)
-  if M.is_visible() then
-    return
-  end
-
-  local profile = log.profile_start "view open"
-
-  create_buffer()
-  open_window()
-  M.resize()
-
-  local opts = options or { focus_tree = true }
-  if not opts.focus_tree then
-    vim.cmd "wincmd p"
-  end
-  events._dispatch_on_tree_open()
-
-  log.profile_end(profile)
-end
-
-local function grow()
-  local starts_at = M.is_root_folder_visible(require("nvim-tree.core").get_cwd()) and 1 or 0
-  local lines = vim.api.nvim_buf_get_lines(M.get_bufnr(), starts_at, -1, false)
-  -- number of columns of right-padding to indicate end of path
-  local padding = get_size(M.View.padding)
-
-  -- account for sign/number columns etc.
-  local wininfo = vim.fn.getwininfo(M.get_winnr())
-  if type(wininfo) == "table" and type(wininfo[1]) == "table" then
-    padding = padding + wininfo[1].textoff
-  end
-
-  local resizing_width = M.View.initial_width - padding
-  local max_width
-
-  -- maybe bound max
-  if M.View.max_width == -1 then
-    max_width = -1
-  else
-    max_width = get_width(M.View.max_width) - padding
-  end
-
-  for _, l in pairs(lines) do
-    local count = vim.fn.strchars(l)
-    if resizing_width < count then
-      resizing_width = count
-    end
-    if M.View.adaptive_size and max_width >= 0 and resizing_width >= max_width then
-      resizing_width = max_width
-      break
-    end
-  end
-  M.resize(resizing_width + padding)
-end
-
-function M.grow_from_content()
-  if M.View.adaptive_size then
-    grow()
-  end
-end
-
----@param size string|number|nil
-function M.resize(size)
-  if M.View.float.enable and not M.View.adaptive_size then
-    -- if the floating windows's adaptive size is not desired, then the
-    -- float size should be defined in view.float.open_win_config
-    return
-  end
-
-  if type(size) == "string" then
-    size = vim.trim(size)
-    local first_char = size:sub(1, 1)
-    size = tonumber(size)
-
-    if first_char == "+" or first_char == "-" then
-      size = M.View.width + size
-    end
-  end
-
-  if type(size) == "number" and size <= 0 then
-    return
-  end
-
-  if size then
-    M.View.width = size
-    M.View.height = size
-  end
-
-  if not M.is_visible() then
-    return
-  end
-
-  local new_size = get_width()
-  vim.api.nvim_win_set_width(M.get_winnr(), new_size)
-
-  -- TODO #1545 remove similar check from setup_autocommands
-  -- We let nvim handle sending resize events after 0.9
-  if vim.fn.has "nvim-0.9" == 0 then
-    events._dispatch_on_tree_resize(new_size)
-  end
-
-  if not M.View.preserve_window_proportions then
-    vim.cmd ":wincmd ="
-  end
-end
-
-function M.reposition_window()
-  local move_to = move_tbl[M.View.side]
-  vim.api.nvim_command("wincmd " .. move_to)
-  M.resize()
-end
-
-local function set_current_win()
-  local current_tab = vim.api.nvim_get_current_tabpage()
-  M.View.tabpages[current_tab].winnr = vim.api.nvim_get_current_win()
-end
-
----Open the tree in the a window
----@param opts OpenInWinOpts|nil
-function M.open_in_win(opts)
-  opts = opts or { hijack_current_buf = true, resize = true }
-  if opts.winid and vim.api.nvim_win_is_valid(opts.winid) then
-    vim.api.nvim_set_current_win(opts.winid)
-  end
-  create_buffer(opts.hijack_current_buf and vim.api.nvim_get_current_buf())
-  setup_tabpage(vim.api.nvim_get_current_tabpage())
-  set_current_win()
-  set_window_options_and_buffer()
-  if opts.resize then
-    M.reposition_window()
-    M.resize()
-  end
-end
-
-function M.abandon_current_window()
-  local tab = vim.api.nvim_get_current_tabpage()
-  BUFNR_PER_TAB[tab] = nil
-  if M.View.tabpages[tab] then
-    M.View.tabpages[tab].winnr = nil
-  end
-end
-
-function M.abandon_all_windows()
-  for tab, _ in pairs(vim.api.nvim_list_tabpages()) do
-    BUFNR_PER_TAB[tab] = nil
-    if M.View.tabpages[tab] then
-      M.View.tabpages[tab].winnr = nil
-    end
-  end
-end
-
----@param opts table|nil
-function M.is_visible(opts)
-  if opts and opts.tabpage then
-    if M.View.tabpages[opts.tabpage] == nil then
-      return false
-    end
-    local winnr = M.View.tabpages[opts.tabpage].winnr
-    return winnr and vim.api.nvim_win_is_valid(winnr)
-  end
-
-  if opts and opts.any_tabpage then
-    for _, v in pairs(M.View.tabpages) do
-      if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then
-        return true
-      end
-    end
-    return false
-  end
-
-  return M.get_winnr() ~= nil and vim.api.nvim_win_is_valid(M.get_winnr())
-end
-
----@param opts table|nil
-function M.set_cursor(opts)
-  if M.is_visible() then
-    pcall(vim.api.nvim_win_set_cursor, M.get_winnr(), opts)
-  end
-end
-
----@param winnr number|nil
----@param open_if_closed boolean|nil
-function M.focus(winnr, open_if_closed)
-  local wnr = winnr or M.get_winnr()
-
-  if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then
-    M.close()
-    M.open()
-    wnr = M.get_winnr()
-  elseif open_if_closed and not M.is_visible() then
-    M.open()
-  end
-
-  vim.api.nvim_set_current_win(wnr)
-end
-
---- Retrieve the winid of the open tree.
----@param opts ApiTreeWinIdOpts|nil
----@return number|nil winid unlike get_winnr(), this returns nil if the nvim-tree window is not visible
-function M.winid(opts)
-  local tabpage = opts and opts.tabpage
-  if tabpage == 0 then
-    tabpage = vim.api.nvim_get_current_tabpage()
-  end
-  if M.is_visible { tabpage = tabpage } then
-    return M.get_winnr(tabpage)
-  else
-    return nil
-  end
-end
-
---- Restores the state of a NvimTree window if it was initialized before.
-function M.restore_tab_state()
-  local tabpage = vim.api.nvim_get_current_tabpage()
-  M.set_cursor(M.View.cursors[tabpage])
-end
-
---- Returns the window number for nvim-tree within the tabpage specified
----@param tabpage number|nil (optional) the number of the chosen tabpage. Defaults to current tabpage.
----@return number|nil
-function M.get_winnr(tabpage)
-  tabpage = tabpage or vim.api.nvim_get_current_tabpage()
-  local tabinfo = M.View.tabpages[tabpage]
-  if tabinfo ~= nil then
-    return tabinfo.winnr
-  end
-end
-
---- Returns the current nvim tree bufnr
----@return number
-function M.get_bufnr()
-  return BUFNR_PER_TAB[vim.api.nvim_get_current_tabpage()]
-end
-
----@param bufnr number
----@return boolean
-function M.is_buf_valid(bufnr)
-  return bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
-end
-
-function M._prevent_buffer_override()
-  local view_winnr = M.get_winnr()
-  local view_bufnr = M.get_bufnr()
-
-  -- need to schedule to let the new buffer populate the window
-  -- because this event needs to be run on bufWipeout.
-  -- Otherwise the curwin/curbuf would match the view buffer and the view window.
-  vim.schedule(function()
-    local curwin = vim.api.nvim_get_current_win()
-    local curwinconfig = vim.api.nvim_win_get_config(curwin)
-    local curbuf = vim.api.nvim_win_get_buf(curwin)
-    local bufname = vim.api.nvim_buf_get_name(curbuf)
-
-    if not bufname:match "NvimTree" then
-      for i, tabpage in ipairs(M.View.tabpages) do
-        if tabpage.winnr == view_winnr then
-          M.View.tabpages[i] = nil
-          break
-        end
-      end
-    end
-    if curwin ~= view_winnr or bufname == "" or curbuf == view_bufnr then
-      return
-    end
-
-    -- patch to avoid the overriding window to be fixed in size
-    -- might need a better patch
-    vim.cmd "setlocal nowinfixwidth"
-    vim.cmd "setlocal nowinfixheight"
-    M.open { focus_tree = false }
-    require("nvim-tree.renderer").draw()
-    pcall(vim.api.nvim_win_close, curwin, { force = true })
-
-    -- to handle opening a file using :e when nvim-tree is on floating mode
-    -- falling back to the current window instead of creating a new one
-    if curwinconfig.relative ~= "" then
-      require("nvim-tree.actions.node.open-file").fn("edit_in_place", bufname)
-    else
-      require("nvim-tree.actions.node.open-file").fn("edit", bufname)
-    end
-  end)
-end
-
----@param cwd string|nil
----@return boolean
-function M.is_root_folder_visible(cwd)
-  return cwd ~= "/" and not M.View.hide_root_folder
-end
-
--- used on ColorScheme event
-function M.reset_winhl()
-  if M.get_winnr() and vim.api.nvim_win_is_valid(M.get_winnr()) then
-    vim.wo[M.get_winnr()].winhl = M.View.winopts.winhl
-  end
-end
-
-function M.setup(opts)
-  local options = opts.view or {}
-  M.View.centralize_selection = options.centralize_selection
-  M.View.side = (options.side == "right") and "right" or "left"
-  M.View.height = options.height
-  M.View.hide_root_folder = opts.renderer.root_folder_label == false
-  M.View.tab = opts.tab
-  M.View.preserve_window_proportions = options.preserve_window_proportions
-  M.View.winopts.cursorline = options.cursorline
-  M.View.winopts.number = options.number
-  M.View.winopts.relativenumber = options.relativenumber
-  M.View.winopts.signcolumn = options.signcolumn
-  M.View.float = options.float
-  M.on_attach = opts.on_attach
-
-  if type(options.width) == "table" then
-    M.View.adaptive_size = true
-    M.View.width = options.width.min or DEFAULT_MIN_WIDTH
-    M.View.max_width = options.width.max or DEFAULT_MAX_WIDTH
-    M.View.padding = options.width.padding or DEFAULT_PADDING
-  else
-    M.View.adaptive_size = false
-    M.View.width = options.width
-  end
-
-  M.View.initial_width = get_width()
-end
-
-return M

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
 
 
 #
@@ -21,6 +21,39 @@ sed -e "s/^  /      /" /tmp/DEFAULT_OPTS.2.lua > /tmp/DEFAULT_OPTS.6.lua
 sed -i -e "/${begin}/,/${end}/{ /${begin}/{p; r /tmp/DEFAULT_OPTS.6.lua
            }; /${end}/p; d; }" doc/nvim-tree-lua.txt
 
+
+#
+# opts index
+#
+begin="nvim-tree-index-opts\*"
+end="====================="
+
+printf '\n' > /tmp/index-opts.txt
+sed -E "
+/^ *\*(nvim-tree\..*)\*$/! d ;
+s/^.*\*(.*)\*/|\1|/g
+" doc/nvim-tree-lua.txt | sort -d >> /tmp/index-opts.txt
+printf '\n' >> /tmp/index-opts.txt
+
+sed -i -e "/${begin}/,/${end}/{ /${begin}/{p; r /tmp/index-opts.txt
+           }; /${end}/p; d; }" doc/nvim-tree-lua.txt
+
+#
+# api index
+#
+begin="nvim-tree-index-api\*"
+end="====================="
+
+printf '\n' > /tmp/index-api.txt
+sed -E "
+/\*(nvim-tree-api.*\(\))\*/! d ;
+s/^.*\*(.*)\*/|\1|/g
+" doc/nvim-tree-lua.txt | sort -d >> /tmp/index-api.txt
+printf '\n' >> /tmp/index-api.txt
+
+sed -i -e "/${begin}/,/${end}/{ /${begin}/{p; r /tmp/index-api.txt
+           }; /${end}/p; d; }" doc/nvim-tree-lua.txt
+
 #
 # DEFAULT_ON_ATTACH
 #
@@ -38,7 +71,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,40 @@
+#!/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\ completed,\ no\ problems\ found*)
+		exit 0
+		;;
+	*)
+		cat "${DIR_OUT}/check.json"
+		exit 1
+		;;
+esac
+