Skip to content

Commit 189c036

Browse files
committed
Merge branch 'master' of https://github.com/uanela/nvim-tree.lua into moving-change-dir-to-explorer
2 parents db36b04 + 869fc95 commit 189c036

39 files changed

+3196
-1955
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353

5454
env:
5555
VIMRUNTIME: /home/runner/nvim-${{ matrix.nvim_version }}/share/nvim/runtime
56+
DIR_NVIM_SRC: /home/runner/src/neovim-${{ matrix.nvim_version }}
5657

5758
steps:
5859
- name: checkout
@@ -72,8 +73,15 @@ jobs:
7273
7374
- run: make check
7475

75-
- run: make help-check
76-
7776
- run: make style
7877

7978
- run: make style-doc
79+
80+
- name: build Nvim from source
81+
run: |
82+
mkdir -p "${DIR_NVIM_SRC}"
83+
curl -L "https://github.com/neovim/neovim/archive/refs/tags/${{ matrix.nvim_version }}.tar.gz" | tar zx --directory "${DIR_NVIM_SRC}/.."
84+
cd "${DIR_NVIM_SRC}"
85+
make
86+
87+
- run: make help-check

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.14.0"
2+
".": "1.15.0"
33
}

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Changelog
22

3+
## [1.15.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.14.0...nvim-tree-v1.15.0) (2026-01-11)
4+
5+
6+
### Features
7+
8+
* **#1826:** add diagnostics.diagnostic_opts: vim.diagnostic.Opts will override diagnostics.severity and diagnostics.icons ([#3190](https://github.com/nvim-tree/nvim-tree.lua/issues/3190)) ([fefa335](https://github.com/nvim-tree/nvim-tree.lua/commit/fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e))
9+
* **#1851:** add bookmarks.persist, default path: vim.fn.stdpath("data") .. "/nvim-tree-bookmarks.json", disabled by default ([#3033](https://github.com/nvim-tree/nvim-tree.lua/issues/3033)) ([c89215d](https://github.com/nvim-tree/nvim-tree.lua/commit/c89215d6a1107a3c0c134750be48657ba8e6a9aa))
10+
* **#3213:** add `view.width.lines_excluded` option ([776a5cd](https://github.com/nvim-tree/nvim-tree.lua/commit/776a5cdfac948b490e06f1d1d22c4cb986e40699))
11+
* **#3213:** add view.width.lines_excluded option ([#3214](https://github.com/nvim-tree/nvim-tree.lua/issues/3214)) ([776a5cd](https://github.com/nvim-tree/nvim-tree.lua/commit/776a5cdfac948b490e06f1d1d22c4cb986e40699))
12+
* add NvimTreeFilter filetype ([64e2192](https://github.com/nvim-tree/nvim-tree.lua/commit/64e2192f5250796aa4a7f33c6ad888515af50640))
13+
* load command definitions at nvim startup ([#3211](https://github.com/nvim-tree/nvim-tree.lua/issues/3211)) ([1eda256](https://github.com/nvim-tree/nvim-tree.lua/commit/1eda2569394f866360e61f590f1796877388cb8a))
14+
* load command definitions in `plugin` directory ([1eda256](https://github.com/nvim-tree/nvim-tree.lua/commit/1eda2569394f866360e61f590f1796877388cb8a))
15+
* set filter input filetype to NvimTreeFilter ([#3207](https://github.com/nvim-tree/nvim-tree.lua/issues/3207)) ([64e2192](https://github.com/nvim-tree/nvim-tree.lua/commit/64e2192f5250796aa4a7f33c6ad888515af50640))
16+
* use `add_trailing` also for symlink destination ([81ede55](https://github.com/nvim-tree/nvim-tree.lua/commit/81ede55c47528ff7c81b2a498fbee61b298c4e2f))
17+
18+
19+
### Bug Fixes
20+
21+
* **#3226:** set &swapfile=false before setting tree buffer name, avoiding any potential collisions with a swapfile ([#3227](https://github.com/nvim-tree/nvim-tree.lua/issues/3227)) ([8298117](https://github.com/nvim-tree/nvim-tree.lua/commit/8298117311a1f23f039c278e4e4977ab80a15e33))
22+
* api.tree.change_root_to_node on a file now changes directory to parent as per documentation ([#3228](https://github.com/nvim-tree/nvim-tree.lua/issues/3228)) ([b8b44b6](https://github.com/nvim-tree/nvim-tree.lua/commit/b8b44b6a2494d086a9177251a119f9daec6cace8))
23+
* correctly assign extmarks to lines when computing tree window width in `grow` when `nvim-tree.view.width.lines_excluded` contains "root" ([e66994d](https://github.com/nvim-tree/nvim-tree.lua/commit/e66994d40db2d57c91bf9aeaee8bf7ab8b1131f6))
24+
* incorrect window width when right_align icons present ([#3239](https://github.com/nvim-tree/nvim-tree.lua/issues/3239)) ([e66994d](https://github.com/nvim-tree/nvim-tree.lua/commit/e66994d40db2d57c91bf9aeaee8bf7ab8b1131f6))
25+
* prevent NvimTree to be alternate buffer when tab open ([#3205](https://github.com/nvim-tree/nvim-tree.lua/issues/3205)) ([e397756](https://github.com/nvim-tree/nvim-tree.lua/commit/e397756d2a79d74314ea4cd3efc41300e91c0ff0))
26+
* renderer.add_trailing applies to symlink destination ([#3217](https://github.com/nvim-tree/nvim-tree.lua/issues/3217)) ([81ede55](https://github.com/nvim-tree/nvim-tree.lua/commit/81ede55c47528ff7c81b2a498fbee61b298c4e2f))
27+
28+
29+
### Performance Improvements
30+
31+
* **commands:** defer module loading ([#3210](https://github.com/nvim-tree/nvim-tree.lua/issues/3210)) ([68c67ad](https://github.com/nvim-tree/nvim-tree.lua/commit/68c67adfabfd1ce923839570507ef2e81ab8a408))
32+
333
## [1.14.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.13.0...nvim-tree-v1.14.0) (2025-08-12)
434

535

CONTRIBUTING.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ markdown-toc --maxdepth=2 -i CONTRIBUTING.md
1818
* [check](#check)
1919
- [Diagnostics](#diagnostics)
2020
- [Backwards Compatibility](#backwards-compatibility)
21-
- [Adding New Actions](#adding-new-actions)
2221
- [Documentation](#documentation)
23-
* [Opts](#opts)
22+
* [Config And Mappings](#config-and-mappings)
2423
* [API](#api)
2524
- [Windows](#windows)
2625
- [Pull Request](#pull-request)
@@ -120,19 +119,32 @@ else
120119
end
121120
```
122121

123-
# Adding New Actions
122+
# Documentation
124123

125-
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.
124+
## Config And Mappings
126125

127-
Once you did, you should run `make help-update`
126+
When adding to or changing:
127+
1. Default config
128+
2. `config` classes
129+
3. `on_attach` default mappings
128130

129-
# Documentation
131+
You must generate help documentation. This requires neovim stable sources. You will be promted with instructions on fetching and referencing the source.
130132

131-
## Opts
133+
```sh
134+
make help-update
135+
```
132136

133-
When adding new options, you should declare the defaults in the main `nvim-tree.lua` file.
137+
This will:
138+
1. Update config defaults in `*nvim-tree-setup*`
139+
2. Regenerate from `*nvim-tree-config*` to the end of the file, see `gen_vimdoc.sh`
140+
3. Update default mappings in `*nvim-tree-mappings-default*` and `*nvim-tree-quickstart-help*`
141+
142+
Commit your changes then run:
143+
```sh
144+
make help-check
145+
```
134146

135-
Documentation for options should also be added to `nvim-tree-opts` in `doc/nvim-tree-lua.txt`
147+
This will re-run `help-update` and check that there are no diffs. It will also lint the documentation, see `lintdoc.sh`
136148

137149
## API
138150

Makefile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ check: luals
1212
#
1313
# subtasks
1414
#
15+
# TODO #3241 ensure that decorator is checked - all meta should be valid
1516
luacheck:
16-
luacheck --codes --quiet lua --exclude-files "**/_meta/**"
17+
luacheck --codes --quiet lua --exclude-files "**/_meta/api_decorator.lua"
18+
luacheck --codes --quiet scripts
1719

18-
# --diagnosis-as-error does not function for workspace, hence we post-process the output
1920
style-check:
20-
@scripts/luals-check.sh codestyle-check
21+
scripts/luals-check.sh codestyle-check
2122

2223
style-doc:
2324
scripts/doc-comments.sh
2425

2526
luals:
26-
@scripts/luals-check.sh
27+
scripts/luals-check.sh
2728

2829
#
2930
# fixes
@@ -35,13 +36,16 @@ style-fix:
3536
# utility
3637
#
3738
help-update:
39+
scripts/gen_vimdoc.sh
3840
scripts/help-update.sh
3941

4042
#
4143
# CI
44+
# --ignore-blank-lines is used as nightly has removed unnecessary blank lines that stable (0.11.5) currently inserts
4245
#
4346
help-check: help-update
44-
git diff --exit-code doc/nvim-tree-lua.txt
47+
scripts/lintdoc.sh
48+
git diff --ignore-blank-lines --exit-code doc/nvim-tree-lua.txt
4549

4650

4751
.PHONY: all lint style check luacheck style-check style-doc luals style-fix help-update help-check

0 commit comments

Comments
 (0)