Compare commits
30 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2086e564c4 | ||
|
|
1cac8005df | ||
|
|
8704b6f7fc | ||
|
|
26632f496e | ||
|
|
5a87ffe35c | ||
|
|
517e4fbb9e | ||
|
|
4c8ddee453 | ||
|
|
4215f33da5 | ||
|
|
2bc725a3eb | ||
|
|
340d3a9795 | ||
|
|
edd4e25fd4 | ||
|
|
78c4c083ed | ||
|
|
acffab931a | ||
|
|
64f61e4c91 | ||
|
|
347e1eb352 | ||
|
|
76db7ed0da | ||
|
|
5a18b98274 | ||
|
|
62008e5cf2 | ||
|
|
ae8e46e8fa | ||
|
|
81eb8d5192 | ||
|
|
d8d3a1590a | ||
|
|
ddd1d6eb21 | ||
|
|
0aca0920f4 | ||
|
|
308f2fcec2 | ||
|
|
2d97059661 | ||
|
|
e508bdc418 | ||
|
|
e20966ae55 | ||
|
|
85c502e907 | ||
|
|
b1bbd4f7dc | ||
|
|
f7c09bd72e |
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
4
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@@ -59,9 +59,9 @@ body:
|
|||||||
|
|
||||||
If not provided it is very unlikely that the nvim-tree team will be able to address your issue.
|
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
|
render: lua
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
|||||||
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
@@ -6,10 +6,6 @@ on:
|
|||||||
branches: [master]
|
branches: [master]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
@@ -17,6 +13,10 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ matrix.lua_version }}-${{ github.head_ref || github.ref_name }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
lua_version: [ 5.1 ]
|
lua_version: [ 5.1 ]
|
||||||
@@ -37,6 +37,10 @@ jobs:
|
|||||||
style:
|
style:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: ${{ github.workflow }}-${{ matrix.stylua_version }}-${{ github.head_ref || github.ref_name }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
stylua_version: [ 0.19.1 ]
|
stylua_version: [ 0.19.1 ]
|
||||||
@@ -56,10 +60,14 @@ jobs:
|
|||||||
check:
|
check:
|
||||||
runs-on: ubuntu-latest
|
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:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
nvim_version: [ stable, nightly ]
|
nvim_version: [ stable, nightly ]
|
||||||
luals_version: [ 3.7.3 ]
|
luals_version: [ 3.9.1 ]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|||||||
37
.github/workflows/luarocks-release.yml
vendored
Normal file
37
.github/workflows/luarocks-release.yml
vendored
Normal file
@@ -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@v5
|
||||||
|
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
|
||||||
4
.github/workflows/release-please.yml
vendored
4
.github/workflows/release-please.yml
vendored
@@ -25,9 +25,13 @@ jobs:
|
|||||||
git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
|
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 }} || 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 }} || 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 }} || 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 }} || 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 }} -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 }} -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 }}
|
||||||
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
|
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 }}
|
||||||
|
|||||||
2
.github/workflows/semantic-pr-subject.yml
vendored
2
.github/workflows/semantic-pr-subject.yml
vendored
@@ -14,6 +14,6 @@ jobs:
|
|||||||
semantic-pr-subject:
|
semantic-pr-subject:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: amannn/action-semantic-pull-request@v5.4.0
|
- uses: amannn/action-semantic-pull-request@v5.5.2
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
17
.luarc.json
17
.luarc.json
@@ -1,17 +1,15 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
|
"$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
|
||||||
"runtime.version" : "Lua 5.1",
|
"runtime.version": "Lua 5.1",
|
||||||
"workspace": {
|
"workspace": {
|
||||||
"library": [
|
"library": [
|
||||||
"$VIMRUNTIME/lua/vim/lsp",
|
"$VIMRUNTIME/lua/vim",
|
||||||
"${3rd}/luv/library"
|
"${3rd}/luv/library"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"diagnostics": {
|
"diagnostics": {
|
||||||
"libraryFiles": "Disable",
|
"libraryFiles": "Disable",
|
||||||
"globals": [
|
"globals": [],
|
||||||
"vim"
|
|
||||||
],
|
|
||||||
"neededFileStatus": {
|
"neededFileStatus": {
|
||||||
"ambiguity-1": "Any",
|
"ambiguity-1": "Any",
|
||||||
"assign-type-mismatch": "Any",
|
"assign-type-mismatch": "Any",
|
||||||
@@ -33,11 +31,19 @@
|
|||||||
"duplicate-index": "Any",
|
"duplicate-index": "Any",
|
||||||
"duplicate-set-field": "Any",
|
"duplicate-set-field": "Any",
|
||||||
"empty-block": "Any",
|
"empty-block": "Any",
|
||||||
|
"global-element": "Any",
|
||||||
"global-in-nil-env": "Any",
|
"global-in-nil-env": "Any",
|
||||||
|
"incomplete-signature-doc": "None",
|
||||||
|
"inject-field": "Any",
|
||||||
|
"invisible": "Any",
|
||||||
"lowercase-global": "Any",
|
"lowercase-global": "Any",
|
||||||
|
"missing-fields": "Any",
|
||||||
|
"missing-global-doc": "Any",
|
||||||
|
"missing-local-export-doc": "None",
|
||||||
"missing-parameter": "Any",
|
"missing-parameter": "Any",
|
||||||
"missing-return": "Any",
|
"missing-return": "Any",
|
||||||
"missing-return-value": "Any",
|
"missing-return-value": "Any",
|
||||||
|
"name-style-check": "None",
|
||||||
"need-check-nil": "Any",
|
"need-check-nil": "Any",
|
||||||
"newfield-call": "Any",
|
"newfield-call": "Any",
|
||||||
"newline-call": "Any",
|
"newline-call": "Any",
|
||||||
@@ -70,4 +76,3 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
{
|
{
|
||||||
".": "1.1.1"
|
".": "1.4.0"
|
||||||
}
|
}
|
||||||
|
|||||||
59
CHANGELOG.md
59
CHANGELOG.md
@@ -1,5 +1,64 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [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)
|
## [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)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,15 @@ Assumes `$VIMRUNTIME` is `/usr/share/nvim/runtime`. Adjust as necessary e.g.
|
|||||||
VIMRUNTIME="/my/path/to/runtime" make check
|
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
|
# 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.
|
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.
|
||||||
@@ -81,9 +90,31 @@ When adding or changing API please update :help nvim-tree-api
|
|||||||
|
|
||||||
# Pull Request
|
# Pull Request
|
||||||
|
|
||||||
Please reference any issues in the description e.g. "resolves #1234".
|
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.
|
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)
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -22,7 +22,7 @@ style-doc:
|
|||||||
scripts/doc-comments.sh
|
scripts/doc-comments.sh
|
||||||
|
|
||||||
luals:
|
luals:
|
||||||
scripts/luals-check.sh
|
@scripts/luals-check.sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# fixes
|
# fixes
|
||||||
|
|||||||
@@ -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.
|
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
|
## 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"
|
[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"
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ Git Integration
|
|||||||
|
|
||||||
Requirements
|
Requirements
|
||||||
|
|
||||||
This file explorer requires `neovim >= 0.8.0`
|
This file explorer requires `neovim >= 0.9.0`
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
2. QUICKSTART *nvim-tree-quickstart*
|
2. QUICKSTART *nvim-tree-quickstart*
|
||||||
@@ -500,9 +500,12 @@ Following is the default configuration. See |nvim-tree-opts| for details.
|
|||||||
},
|
},
|
||||||
update_focused_file = {
|
update_focused_file = {
|
||||||
enable = false,
|
enable = false,
|
||||||
update_root = false,
|
update_root = {
|
||||||
|
enable = false,
|
||||||
ignore_list = {},
|
ignore_list = {},
|
||||||
},
|
},
|
||||||
|
exclude = false,
|
||||||
|
},
|
||||||
system_open = {
|
system_open = {
|
||||||
cmd = "",
|
cmd = "",
|
||||||
args = {},
|
args = {},
|
||||||
@@ -537,6 +540,7 @@ Following is the default configuration. See |nvim-tree-opts| for details.
|
|||||||
show_on_open_dirs = true,
|
show_on_open_dirs = true,
|
||||||
},
|
},
|
||||||
filters = {
|
filters = {
|
||||||
|
enable = true,
|
||||||
git_ignored = true,
|
git_ignored = true,
|
||||||
dotfiles = false,
|
dotfiles = false,
|
||||||
git_clean = false,
|
git_clean = false,
|
||||||
@@ -828,7 +832,6 @@ Use nvim-tree in a floating window.
|
|||||||
|
|
||||||
Highlight precedence, additive:
|
Highlight precedence, additive:
|
||||||
git < opened < modified < bookmarked < diagnostics < copied < cut
|
git < opened < modified < bookmarked < diagnostics < copied < cut
|
||||||
Neovim <= 0.8 will only show the highest.
|
|
||||||
|
|
||||||
*nvim-tree.renderer.add_trailing*
|
*nvim-tree.renderer.add_trailing*
|
||||||
Appends a trailing slash to folder names.
|
Appends a trailing slash to folder names.
|
||||||
@@ -1104,15 +1107,22 @@ Update the root directory of the tree if the file is not under current
|
|||||||
root directory. It prefers vim's cwd and `root_dirs`.
|
root directory. It prefers vim's cwd and `root_dirs`.
|
||||||
Otherwise it falls back to the folder containing the file.
|
Otherwise it falls back to the folder containing the file.
|
||||||
Only relevant when `update_focused_file.enable` is `true`
|
Only relevant when `update_focused_file.enable` is `true`
|
||||||
|
|
||||||
|
*nvim-tree.update_focused_file.update_root.enable*
|
||||||
Type: `boolean`, Default: `false`
|
Type: `boolean`, Default: `false`
|
||||||
|
|
||||||
*nvim-tree.update_focused_file.ignore_list*
|
*nvim-tree.update_focused_file.update_root.ignore_list*
|
||||||
List of buffer names and filetypes that will not update the root dir
|
List of buffer names and filetypes that will not update the root dir
|
||||||
of the tree if the file isn't found under the current root directory.
|
of the tree if the file isn't found under the current root directory.
|
||||||
Only relevant when `update_focused_file.update_root` and
|
Only relevant when `update_focused_file.update_root.enable` and
|
||||||
`update_focused_file.enable` are `true`.
|
`update_focused_file.enable` are `true`.
|
||||||
Type: {string}, Default: `{}`
|
Type: {string}, Default: `{}`
|
||||||
|
|
||||||
|
*nvim-tree.update_focused_file.exclude*
|
||||||
|
A function that returns true if the file should not be focused when opening.
|
||||||
|
Takes the `BufEnter` event as an argument. see |autocmd-events|
|
||||||
|
Type: {function}, Default: `false`
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
5.6 OPTS: SYSTEM OPEN *nvim-tree-opts-system-open*
|
5.6 OPTS: SYSTEM OPEN *nvim-tree-opts-system-open*
|
||||||
|
|
||||||
@@ -1242,6 +1252,11 @@ Only relevant when |modified.show_on_dirs| is `true`.
|
|||||||
|
|
||||||
File / folder filters that may be toggled.
|
File / folder filters that may be toggled.
|
||||||
|
|
||||||
|
*nvim-tree.filters.enable*
|
||||||
|
Enable / disable all filters including live filter.
|
||||||
|
Toggle via |nvim-tree-api.tree.toggle_enable_filters()|
|
||||||
|
Type: `boolean`, Default: `true`
|
||||||
|
|
||||||
*nvim-tree.filters.git_ignored*
|
*nvim-tree.filters.git_ignored*
|
||||||
Ignore files based on `.gitignore`. Requires |git.enable| `= true`
|
Ignore files based on `.gitignore`. Requires |git.enable| `= true`
|
||||||
Toggle via |nvim-tree-api.tree.toggle_gitignore_filter()|, default `I`
|
Toggle via |nvim-tree-api.tree.toggle_gitignore_filter()|, default `I`
|
||||||
@@ -1702,6 +1717,10 @@ tree.expand_all() *nvim-tree-api.tree.expand_all()*
|
|||||||
Recursively expand all nodes in the tree.
|
Recursively expand all nodes in the tree.
|
||||||
Folder: only the nodes underneath that folder.
|
Folder: only the nodes underneath that folder.
|
||||||
|
|
||||||
|
*nvim-tree-api.tree.toggle_enable_filters()*
|
||||||
|
tree.toggle_enable_filters()
|
||||||
|
Toggle |nvim-tree.filters.enable| all filters.
|
||||||
|
|
||||||
*nvim-tree-api.tree.toggle_gitignore_filter()*
|
*nvim-tree-api.tree.toggle_gitignore_filter()*
|
||||||
tree.toggle_gitignore_filter()
|
tree.toggle_gitignore_filter()
|
||||||
Toggle |nvim-tree.filters.git_ignored| filter.
|
Toggle |nvim-tree.filters.git_ignored| filter.
|
||||||
@@ -2757,6 +2776,7 @@ highlight group is not, hard linking as follows: >
|
|||||||
|nvim-tree.filesystem_watchers.ignore_dirs|
|
|nvim-tree.filesystem_watchers.ignore_dirs|
|
||||||
|nvim-tree.filters.custom|
|
|nvim-tree.filters.custom|
|
||||||
|nvim-tree.filters.dotfiles|
|
|nvim-tree.filters.dotfiles|
|
||||||
|
|nvim-tree.filters.enable|
|
||||||
|nvim-tree.filters.exclude|
|
|nvim-tree.filters.exclude|
|
||||||
|nvim-tree.filters.git_clean|
|
|nvim-tree.filters.git_clean|
|
||||||
|nvim-tree.filters.git_ignored|
|
|nvim-tree.filters.git_ignored|
|
||||||
@@ -2858,8 +2878,10 @@ highlight group is not, hard linking as follows: >
|
|||||||
|nvim-tree.ui.confirm.remove|
|
|nvim-tree.ui.confirm.remove|
|
||||||
|nvim-tree.ui.confirm.trash|
|
|nvim-tree.ui.confirm.trash|
|
||||||
|nvim-tree.update_focused_file.enable|
|
|nvim-tree.update_focused_file.enable|
|
||||||
|nvim-tree.update_focused_file.ignore_list|
|
|nvim-tree.update_focused_file.exclude|
|
||||||
|nvim-tree.update_focused_file.update_root|
|
|nvim-tree.update_focused_file.update_root|
|
||||||
|
|nvim-tree.update_focused_file.update_root.enable|
|
||||||
|
|nvim-tree.update_focused_file.update_root.ignore_list|
|
||||||
|nvim-tree.view.centralize_selection|
|
|nvim-tree.view.centralize_selection|
|
||||||
|nvim-tree.view.cursorline|
|
|nvim-tree.view.cursorline|
|
||||||
|nvim-tree.view.debounce_delay|
|
|nvim-tree.view.debounce_delay|
|
||||||
@@ -2966,6 +2988,7 @@ highlight group is not, hard linking as follows: >
|
|||||||
|nvim-tree-api.tree.search_node()|
|
|nvim-tree-api.tree.search_node()|
|
||||||
|nvim-tree-api.tree.toggle()|
|
|nvim-tree-api.tree.toggle()|
|
||||||
|nvim-tree-api.tree.toggle_custom_filter()|
|
|nvim-tree-api.tree.toggle_custom_filter()|
|
||||||
|
|nvim-tree-api.tree.toggle_enable_filters()|
|
||||||
|nvim-tree-api.tree.toggle_git_clean_filter()|
|
|nvim-tree-api.tree.toggle_git_clean_filter()|
|
||||||
|nvim-tree-api.tree.toggle_gitignore_filter()|
|
|nvim-tree-api.tree.toggle_gitignore_filter()|
|
||||||
|nvim-tree-api.tree.toggle_help()|
|
|nvim-tree-api.tree.toggle_help()|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ local core = require "nvim-tree.core"
|
|||||||
local git = require "nvim-tree.git"
|
local git = require "nvim-tree.git"
|
||||||
local filters = require "nvim-tree.explorer.filters"
|
local filters = require "nvim-tree.explorer.filters"
|
||||||
local buffers = require "nvim-tree.buffers"
|
local buffers = require "nvim-tree.buffers"
|
||||||
local events = require "nvim-tree.events"
|
|
||||||
local notify = require "nvim-tree.notify"
|
local notify = require "nvim-tree.notify"
|
||||||
|
|
||||||
local _config = {}
|
local _config = {}
|
||||||
@@ -26,8 +25,15 @@ local M = {
|
|||||||
function M.change_root(path, bufnr)
|
function M.change_root(path, bufnr)
|
||||||
-- skip if current file is in ignore_list
|
-- skip if current file is in ignore_list
|
||||||
if type(bufnr) == "number" then
|
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
|
if utils.str_find(path, value) or utils.str_find(ft, value) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@@ -78,7 +84,14 @@ end
|
|||||||
function M.tab_enter()
|
function M.tab_enter()
|
||||||
if view.is_visible { any_tabpage = true } then
|
if view.is_visible { any_tabpage = true } then
|
||||||
local bufname = vim.api.nvim_buf_get_name(0)
|
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
|
for _, filter in ipairs(M.config.tab.sync.ignore) do
|
||||||
if bufname:match(filter) ~= nil or ft:match(filter) ~= nil then
|
if bufname:match(filter) ~= nil or ft:match(filter) ~= nil then
|
||||||
return
|
return
|
||||||
@@ -149,7 +162,7 @@ function M.change_dir(name)
|
|||||||
actions.root.change_dir.fn(name)
|
actions.root.change_dir.fn(name)
|
||||||
end
|
end
|
||||||
|
|
||||||
if _config.update_focused_file.enable then
|
if _config.update_focused_file.update_root.enable then
|
||||||
actions.tree.find_file.fn()
|
actions.tree.find_file.fn()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -247,7 +260,11 @@ local function setup_autocommands(opts)
|
|||||||
end
|
end
|
||||||
if opts.update_focused_file.enable then
|
if opts.update_focused_file.enable then
|
||||||
create_nvim_tree_autocmd("BufEnter", {
|
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()
|
utils.debounce("BufEnter:find_file", opts.view.debounce_delay, function()
|
||||||
actions.tree.find_file.fn()
|
actions.tree.find_file.fn()
|
||||||
end)
|
end)
|
||||||
@@ -320,21 +337,6 @@ local function setup_autocommands(opts)
|
|||||||
end,
|
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
|
end
|
||||||
|
|
||||||
local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
||||||
@@ -462,9 +464,12 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
|||||||
},
|
},
|
||||||
update_focused_file = {
|
update_focused_file = {
|
||||||
enable = false,
|
enable = false,
|
||||||
update_root = false,
|
update_root = {
|
||||||
|
enable = false,
|
||||||
ignore_list = {},
|
ignore_list = {},
|
||||||
},
|
},
|
||||||
|
exclude = false,
|
||||||
|
},
|
||||||
system_open = {
|
system_open = {
|
||||||
cmd = "",
|
cmd = "",
|
||||||
args = {},
|
args = {},
|
||||||
@@ -499,6 +504,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
|||||||
show_on_open_dirs = true,
|
show_on_open_dirs = true,
|
||||||
},
|
},
|
||||||
filters = {
|
filters = {
|
||||||
|
enable = true,
|
||||||
git_ignored = true,
|
git_ignored = true,
|
||||||
dotfiles = false,
|
dotfiles = false,
|
||||||
git_clean = false,
|
git_clean = false,
|
||||||
@@ -623,6 +629,9 @@ local ACCEPTED_TYPES = {
|
|||||||
group_empty = { "boolean", "function" },
|
group_empty = { "boolean", "function" },
|
||||||
root_folder_label = { "function", "string", "boolean" },
|
root_folder_label = { "function", "string", "boolean" },
|
||||||
},
|
},
|
||||||
|
update_focused_file = {
|
||||||
|
exclude = { "function" },
|
||||||
|
},
|
||||||
filters = {
|
filters = {
|
||||||
custom = { "function" },
|
custom = { "function" },
|
||||||
},
|
},
|
||||||
@@ -755,8 +764,8 @@ end
|
|||||||
|
|
||||||
---@param conf table|nil
|
---@param conf table|nil
|
||||||
function M.setup(conf)
|
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
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -36,12 +36,13 @@ local function search(search_dir, input_path)
|
|||||||
while name do
|
while name do
|
||||||
path = dir .. "/" .. name
|
path = dir .. "/" .. name
|
||||||
|
|
||||||
|
---@type uv.fs_stat.result|nil
|
||||||
stat, _ = vim.loop.fs_stat(path)
|
stat, _ = vim.loop.fs_stat(path)
|
||||||
if not stat then
|
if not stat then
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|
||||||
if not filters.should_filter(path, filter_status) then
|
if not filters.should_filter(path, stat, filter_status) then
|
||||||
if string.find(path, "/" .. input_path .. "$") then
|
if string.find(path, "/" .. input_path .. "$") then
|
||||||
return path
|
return path
|
||||||
end
|
end
|
||||||
@@ -68,8 +69,15 @@ function M.fn()
|
|||||||
|
|
||||||
-- temporarily set &path
|
-- temporarily set &path
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
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)
|
vim.ui.input({ prompt = "Search: ", completion = "file_in_path" }, function(input_path)
|
||||||
if not input_path or input_path == "" then
|
if not input_path or input_path == "" then
|
||||||
@@ -77,9 +85,17 @@ function M.fn()
|
|||||||
end
|
end
|
||||||
-- reset &path
|
-- reset &path
|
||||||
if path_existed then
|
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
|
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
|
end
|
||||||
|
|
||||||
-- strip trailing slash
|
-- strip trailing slash
|
||||||
|
|||||||
@@ -276,17 +276,24 @@ end
|
|||||||
---@param content string
|
---@param content string
|
||||||
local function copy_to_clipboard(content)
|
local function copy_to_clipboard(content)
|
||||||
local clipboard_name
|
local clipboard_name
|
||||||
|
local reg
|
||||||
if M.config.actions.use_system_clipboard == true then
|
if M.config.actions.use_system_clipboard == true then
|
||||||
vim.fn.setreg("+", content)
|
|
||||||
vim.fn.setreg('"', content)
|
|
||||||
clipboard_name = "system"
|
clipboard_name = "system"
|
||||||
|
reg = "+"
|
||||||
else
|
else
|
||||||
vim.fn.setreg('"', content)
|
|
||||||
vim.fn.setreg("1", content)
|
|
||||||
clipboard_name = "neovim"
|
clipboard_name = "neovim"
|
||||||
|
reg = "1"
|
||||||
end
|
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))
|
notify.info(string.format("Copied %s to %s clipboard!", content, clipboard_name))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ local M = {}
|
|||||||
local function create_and_notify(file)
|
local function create_and_notify(file)
|
||||||
events._dispatch_will_create_file(file)
|
events._dispatch_will_create_file(file)
|
||||||
local ok, fd = pcall(vim.loop.fs_open, file, "w", 420)
|
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))
|
notify.error("Couldn't create file " .. notify.render_path(file))
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ end
|
|||||||
---@param cwd string
|
---@param cwd string
|
||||||
---@return boolean|nil
|
---@return boolean|nil
|
||||||
local function remove_dir(cwd)
|
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
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ function M.remove(node)
|
|||||||
-- trashes a path (file or folder)
|
-- trashes a path (file or folder)
|
||||||
local function trash_path(on_exit)
|
local function trash_path(on_exit)
|
||||||
local need_sync_wait = utils.is_windows
|
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,
|
detach = not need_sync_wait,
|
||||||
on_exit = on_exit,
|
on_exit = on_exit,
|
||||||
on_stderr = on_stderr,
|
on_stderr = on_stderr,
|
||||||
|
|||||||
@@ -6,6 +6,14 @@ local M = {}
|
|||||||
---@return table
|
---@return table
|
||||||
local function get_formatted_lines(node)
|
local function get_formatted_lines(node)
|
||||||
local stats = node.fs_stat
|
local stats = node.fs_stat
|
||||||
|
if stats == nil then
|
||||||
|
return {
|
||||||
|
"",
|
||||||
|
" Can't retrieve file information",
|
||||||
|
"",
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
local fpath = " fullpath: " .. node.absolute_path
|
local fpath = " fullpath: " .. node.absolute_path
|
||||||
local created_at = " created: " .. os.date("%x %X", stats.birthtime.sec)
|
local created_at = " created: " .. os.date("%x %X", stats.birthtime.sec)
|
||||||
local modified_at = " modified: " .. os.date("%x %X", stats.mtime.sec)
|
local modified_at = " modified: " .. os.date("%x %X", stats.mtime.sec)
|
||||||
@@ -48,7 +56,7 @@ end
|
|||||||
|
|
||||||
function M.close_popup()
|
function M.close_popup()
|
||||||
if current_popup ~= nil then
|
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"
|
vim.cmd "augroup NvimTreeRemoveFilePopup | au! CursorMoved | augroup END"
|
||||||
|
|
||||||
current_popup = nil
|
current_popup = nil
|
||||||
|
|||||||
@@ -26,14 +26,20 @@ local function usable_win_ids()
|
|||||||
return vim.tbl_filter(function(id)
|
return vim.tbl_filter(function(id)
|
||||||
local bufid = vim.api.nvim_win_get_buf(id)
|
local bufid = vim.api.nvim_win_get_buf(id)
|
||||||
for option, v in pairs(M.window_picker.exclude) do
|
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
|
if ok and vim.tbl_contains(v, option_value) then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local win_config = vim.api.nvim_win_get_config(id)
|
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, win_ids)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -83,8 +89,15 @@ local function pick_win_id()
|
|||||||
|
|
||||||
if laststatus == 3 then
|
if laststatus == 3 then
|
||||||
for _, win_id in ipairs(not_selectable) do
|
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] = {
|
win_opts[win_id] = {
|
||||||
statusline = ok_status and statusline or "",
|
statusline = ok_status and statusline or "",
|
||||||
@@ -92,15 +105,26 @@ local function pick_win_id()
|
|||||||
}
|
}
|
||||||
|
|
||||||
-- Clear statusline for windows not selectable
|
-- 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
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Setup UI
|
-- Setup UI
|
||||||
for _, id in ipairs(selectable) do
|
for _, id in ipairs(selectable) do
|
||||||
local char = M.window_picker.chars:sub(i, i)
|
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] = {
|
win_opts[id] = {
|
||||||
statusline = ok_status and statusline or "",
|
statusline = ok_status and statusline or "",
|
||||||
@@ -108,8 +132,13 @@ local function pick_win_id()
|
|||||||
}
|
}
|
||||||
win_map[char] = 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
|
i = i + 1
|
||||||
if i > #M.window_picker.chars then
|
if i > #M.window_picker.chars then
|
||||||
@@ -128,14 +157,22 @@ local function pick_win_id()
|
|||||||
-- Restore window options
|
-- Restore window options
|
||||||
for _, id in ipairs(selectable) do
|
for _, id in ipairs(selectable) do
|
||||||
for opt, value in pairs(win_opts[id]) 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
|
end
|
||||||
|
|
||||||
if laststatus == 3 then
|
if laststatus == 3 then
|
||||||
for _, id in ipairs(not_selectable) do
|
for _, id in ipairs(not_selectable) do
|
||||||
for opt, value in pairs(win_opts[id]) 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
|
end
|
||||||
end
|
end
|
||||||
@@ -258,23 +295,31 @@ local function open_in_new_window(filename, mode)
|
|||||||
-- If `hidden` is not enabled, check if buffer in target window is
|
-- If `hidden` is not enabled, check if buffer in target window is
|
||||||
-- modified, and create new split if it is.
|
-- modified, and create new split if it is.
|
||||||
local target_bufid = vim.api.nvim_win_get_buf(target_winid)
|
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
|
if not mode:match "split$" then
|
||||||
mode = "vsplit"
|
mode = "vsplit"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local fname = vim.fn.fnameescape(filename)
|
local fname = utils.escape_special_chars(vim.fn.fnameescape(filename))
|
||||||
fname = utils.escape_special_chars(fname)
|
|
||||||
|
|
||||||
local cmd
|
local command
|
||||||
if create_new_window then
|
if create_new_window then
|
||||||
cmd = string.format("%s vsplit %s", new_window_side, fname)
|
-- 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
|
elseif mode:match "split$" then
|
||||||
cmd = string.format("%s %s", mode, fname)
|
command = { cmd = mode, args = { fname } }
|
||||||
else
|
else
|
||||||
cmd = string.format("edit %s", fname)
|
command = { cmd = "edit", args = { fname } }
|
||||||
end
|
end
|
||||||
|
|
||||||
if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
|
if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
|
||||||
@@ -286,7 +331,7 @@ local function open_in_new_window(filename, mode)
|
|||||||
set_current_win_no_autocmd(target_winid, { "BufEnter" })
|
set_current_win_no_autocmd(target_winid, { "BufEnter" })
|
||||||
end
|
end
|
||||||
|
|
||||||
pcall(vim.cmd, cmd)
|
pcall(vim.api.nvim_cmd, command, { output = false })
|
||||||
lib.set_target_win()
|
lib.set_target_win()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -24,18 +24,19 @@ function M.fn(opts)
|
|||||||
local bufnr, path
|
local bufnr, path
|
||||||
|
|
||||||
-- (optional) buffer number and 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()
|
bufnr = vim.api.nvim_get_current_buf()
|
||||||
path = vim.api.nvim_buf_get_name(bufnr)
|
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
|
return
|
||||||
end
|
end
|
||||||
bufnr = tonumber(opts.buf)
|
bufnr = opts_buf
|
||||||
path = vim.api.nvim_buf_get_name(bufnr)
|
path = vim.api.nvim_buf_get_name(bufnr)
|
||||||
elseif type(opts.buf) == "string" then
|
elseif type(opts_buf) == "string" then
|
||||||
bufnr = nil
|
bufnr = nil
|
||||||
path = tostring(opts.buf)
|
path = tostring(opts_buf)
|
||||||
else
|
else
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@@ -55,7 +56,7 @@ function M.fn(opts)
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- update root
|
-- 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)
|
require("nvim-tree").change_root(path, bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -41,4 +41,9 @@ function M.dotfiles()
|
|||||||
reload()
|
reload()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function M.enable()
|
||||||
|
filters.config.enable = not filters.config.enable
|
||||||
|
reload()
|
||||||
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ Api.tree.find_file = wrap(actions.tree.find_file.fn)
|
|||||||
Api.tree.search_node = wrap(actions.finders.search_node.fn)
|
Api.tree.search_node = wrap(actions.finders.search_node.fn)
|
||||||
Api.tree.collapse_all = wrap(actions.tree.modifiers.collapse_all.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.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_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_git_clean_filter = wrap(actions.tree.modifiers.toggles.git_clean)
|
||||||
Api.tree.toggle_no_buffer_filter = wrap(actions.tree.modifiers.toggles.no_buffer)
|
Api.tree.toggle_no_buffer_filter = wrap(actions.tree.modifiers.toggles.no_buffer)
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
local appearance = require "nvim-tree.appearance"
|
local appearance = require "nvim-tree.appearance"
|
||||||
|
|
||||||
|
-- others with name and links less than this arbitrary value are short
|
||||||
|
local SHORT_LEN = 50
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
---@class HighlightDisplay for :NvimTreeHiTest
|
---@class HighlightDisplay for :NvimTreeHiTest
|
||||||
@@ -8,7 +11,7 @@ local M = {}
|
|||||||
---@field def string :hi concrete definition after following any links
|
---@field def string :hi concrete definition after following any links
|
||||||
local HighlightDisplay = {}
|
local HighlightDisplay = {}
|
||||||
|
|
||||||
---@param group string nvim-tree highlight group
|
---@param group string nvim-tree highlight group name
|
||||||
---@return HighlightDisplay
|
---@return HighlightDisplay
|
||||||
function HighlightDisplay:new(group)
|
function HighlightDisplay:new(group)
|
||||||
local o = {}
|
local o = {}
|
||||||
@@ -39,41 +42,99 @@ function HighlightDisplay:new(group)
|
|||||||
return o
|
return o
|
||||||
end
|
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)
|
function HighlightDisplay:render(bufnr, fmt, l)
|
||||||
local text = string.format(fmt, self.group, self.links, self.def)
|
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_set_lines(bufnr, l, -1, true, { text })
|
||||||
vim.api.nvim_buf_add_highlight(bufnr, -1, self.group, l, 0, #self.group)
|
vim.api.nvim_buf_add_highlight(bufnr, -1, self.group, l, 0, #self.group)
|
||||||
|
|
||||||
|
return l + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
---Run a test similar to :so $VIMRUNTIME/syntax/hitest.vim
|
---Render many groups.
|
||||||
---Display all nvim-tree highlight groups, their link chain and actual definition
|
---@param header string before with underline line
|
||||||
function M.hi_test()
|
---@param displays HighlightDisplay[] highlight group
|
||||||
local displays = {}
|
---@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_group_len = 0
|
||||||
local max_links_len = 0
|
local max_links_len = 0
|
||||||
|
|
||||||
-- build all highlight groups, name only
|
-- build all highlight groups, using name only
|
||||||
for _, highlight_group in ipairs(appearance.HIGHLIGHT_GROUPS) do
|
for _, display in ipairs(displays) do
|
||||||
local display = HighlightDisplay:new(highlight_group.group)
|
|
||||||
table.insert(displays, display)
|
|
||||||
max_group_len = math.max(max_group_len, #display.group)
|
max_group_len = math.max(max_group_len, #display.group)
|
||||||
max_links_len = math.max(max_links_len, #display.links)
|
max_links_len = math.max(max_links_len, #display.links)
|
||||||
end
|
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
|
-- create a buffer
|
||||||
local bufnr = vim.api.nvim_create_buf(false, true)
|
local bufnr = vim.api.nvim_create_buf(false, true)
|
||||||
|
|
||||||
-- render and highlight
|
|
||||||
local l = 0
|
local l = 0
|
||||||
local fmt = string.format("%%-%d.%ds %%-%d.%ds %%s", max_group_len, max_group_len, max_links_len, max_links_len)
|
|
||||||
for _, display in ipairs(displays) do
|
-- nvim-tree groups, ordered
|
||||||
display:render(bufnr, fmt, l)
|
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
|
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
|
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
|
-- finalise and focus the buffer
|
||||||
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.cmd.buffer(bufnr)
|
vim.cmd.buffer(bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
|
---@class HighlightGroup
|
||||||
|
---@field group string
|
||||||
|
---@field link string|nil
|
||||||
|
---@field def string|nil
|
||||||
|
|
||||||
|
---@type HighlightGroup[]
|
||||||
-- All highlight groups: linked or directly defined.
|
-- All highlight groups: linked or directly defined.
|
||||||
-- Please add new groups to help and preserve order.
|
-- Please add new groups to help and preserve order.
|
||||||
-- Please avoid directly defined groups to preserve accessibility for TUI.
|
-- Please avoid directly defined groups to preserve accessibility for TUI.
|
||||||
@@ -24,10 +30,10 @@ M.HIGHLIGHT_GROUPS = {
|
|||||||
{ group = "NvimTreeStatusLineNC", link = "StatusLineNC" },
|
{ group = "NvimTreeStatusLineNC", link = "StatusLineNC" },
|
||||||
|
|
||||||
-- File Text
|
-- File Text
|
||||||
{ group = "NvimTreeExecFile", link = "SpellCap" },
|
{ group = "NvimTreeExecFile", link = "Question" },
|
||||||
{ group = "NvimTreeImageFile", link = "SpellCap" },
|
{ group = "NvimTreeImageFile", link = "Question" },
|
||||||
{ group = "NvimTreeSpecialFile", link = "SpellCap" },
|
{ group = "NvimTreeSpecialFile", link = "Title" },
|
||||||
{ group = "NvimTreeSymlink", link = "SpellCap" },
|
{ group = "NvimTreeSymlink", link = "Underlined" },
|
||||||
|
|
||||||
-- Folder Text
|
-- Folder Text
|
||||||
{ group = "NvimTreeRootFolder", link = "Title" },
|
{ group = "NvimTreeRootFolder", link = "Title" },
|
||||||
@@ -177,15 +183,8 @@ function M.setup()
|
|||||||
|
|
||||||
-- hard link override when legacy only is present
|
-- hard link override when legacy only is present
|
||||||
for from, to in pairs(M.LEGACY_LINKS) do
|
for from, to in pairs(M.LEGACY_LINKS) do
|
||||||
local hl_from
|
local hl_from = vim.api.nvim_get_hl(0, { name = from })
|
||||||
local hl_to
|
local hl_to = vim.api.nvim_get_hl(0, { name = to })
|
||||||
if vim.fn.has "nvim-0.9" == 1 then
|
|
||||||
hl_from = vim.api.nvim_get_hl(0, { name = from })
|
|
||||||
hl_to = vim.api.nvim_get_hl(0, { name = to })
|
|
||||||
else
|
|
||||||
hl_from = vim.api.nvim__get_hl_defs(0)[from] or {}
|
|
||||||
hl_to = vim.api.nvim__get_hl_defs(0)[to] or {}
|
|
||||||
end
|
|
||||||
if vim.tbl_isempty(hl_from) and not vim.tbl_isempty(hl_to) then
|
if vim.tbl_isempty(hl_from) and not vim.tbl_isempty(hl_to) then
|
||||||
vim.api.nvim_command("hi link " .. from .. " " .. to)
|
vim.api.nvim_command("hi link " .. from .. " " .. to)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ M._modified = {}
|
|||||||
---refresh M._modified
|
---refresh M._modified
|
||||||
function M.reload_modified()
|
function M.reload_modified()
|
||||||
M._modified = {}
|
M._modified = {}
|
||||||
local bufs = vim.fn.getbufinfo { bufmodified = true, buflisted = true }
|
local bufs = vim.fn.getbufinfo { bufmodified = 1, buflisted = 1 }
|
||||||
for _, buf in pairs(bufs) do
|
for _, buf in pairs(bufs) do
|
||||||
local path = buf.name
|
local path = buf.name
|
||||||
if path ~= "" then -- not a [No Name] buffer
|
if path ~= "" then -- not a [No Name] buffer
|
||||||
|
|||||||
@@ -39,19 +39,21 @@ end
|
|||||||
local function from_nvim_lsp()
|
local function from_nvim_lsp()
|
||||||
local buffer_severity = {}
|
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
|
end
|
||||||
|
|
||||||
if not is_disabled then
|
if is_enabled then
|
||||||
for _, diagnostic in ipairs(vim.diagnostic.get(nil, { severity = M.severity })) do
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -11,13 +11,6 @@ local Watcher = require "nvim-tree.watcher"
|
|||||||
|
|
||||||
local M = {}
|
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 handle uv.uv_fs_t
|
||||||
---@param cwd string
|
---@param cwd string
|
||||||
---@param node Node
|
---@param node Node
|
||||||
@@ -33,18 +26,19 @@ local function populate_children(handle, cwd, node, git_status)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local abs = utils.path_join { cwd, name }
|
local abs = utils.path_join { cwd, name }
|
||||||
|
|
||||||
local profile = log.profile_start("explore populate_children %s", abs)
|
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 filters.should_filter(abs, stat, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
|
||||||
local child = nil
|
local child = nil
|
||||||
if t == "directory" and vim.loop.fs_access(abs, "R") then
|
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
|
elseif t == "file" then
|
||||||
child = builders.file(node, abs, name)
|
child = builders.file(node, abs, name, stat)
|
||||||
elseif t == "link" then
|
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
|
if link.link_to ~= nil then
|
||||||
child = link
|
child = link
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -71,19 +71,36 @@ local function dotfile(path)
|
|||||||
end
|
end
|
||||||
|
|
||||||
---@param path string
|
---@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
|
||||||
|
local function bookmark(path, path_type, bookmarks)
|
||||||
if not M.config.filter_no_bookmark then
|
if not M.config.filter_no_bookmark then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
-- if bookmark is empty, we should see a empty filetree
|
||||||
|
if next(bookmarks) == nil then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
-- add trailing slash to make it match only mark's parent directory
|
local mark_parent = utils.path_add_trailing(path)
|
||||||
-- not it's siblings
|
for mark, mark_type in pairs(bookmarks) do
|
||||||
local parent = utils.path_add_trailing(path)
|
if path == mark then
|
||||||
for mark, _ in pairs(bookmarks) do
|
|
||||||
if path == mark or vim.fn.stridx(mark, parent) == 0 then
|
|
||||||
return false
|
return false
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
return true
|
return true
|
||||||
@@ -139,7 +156,7 @@ function M.prepare(git_status)
|
|||||||
end
|
end
|
||||||
|
|
||||||
for _, node in pairs(marks.get_marks()) do
|
for _, node in pairs(marks.get_marks()) do
|
||||||
status.bookmarks[node.absolute_path] = true
|
status.bookmarks[node.absolute_path] = node.type
|
||||||
end
|
end
|
||||||
|
|
||||||
return status
|
return status
|
||||||
@@ -147,19 +164,29 @@ end
|
|||||||
|
|
||||||
---Check if the given path should be filtered.
|
---Check if the given path should be filtered.
|
||||||
---@param path string Absolute path
|
---@param path string Absolute path
|
||||||
|
---@param fs_stat uv.fs_stat.result|nil fs_stat of file
|
||||||
---@param status table from prepare
|
---@param status table from prepare
|
||||||
---@return boolean
|
---@return boolean
|
||||||
function M.should_filter(path, status)
|
function M.should_filter(path, fs_stat, status)
|
||||||
|
if not M.config.enable then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
-- exclusions override all filters
|
-- exclusions override all filters
|
||||||
if is_excluded(path) then
|
if is_excluded(path) then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
return git(path, status.git_status) or buf(path, status.bufinfo) or dotfile(path) or custom(path) or bookmark(path, status.bookmarks)
|
return git(path, status.git_status)
|
||||||
|
or buf(path, status.bufinfo)
|
||||||
|
or dotfile(path)
|
||||||
|
or custom(path)
|
||||||
|
or bookmark(path, fs_stat and fs_stat.type, status.bookmarks)
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.setup(opts)
|
function M.setup(opts)
|
||||||
M.config = {
|
M.config = {
|
||||||
|
enable = opts.filters.enable,
|
||||||
filter_custom = true,
|
filter_custom = true,
|
||||||
filter_dotfiles = opts.filters.dotfiles,
|
filter_dotfiles = opts.filters.dotfiles,
|
||||||
filter_git_ignored = opts.filters.git_ignored,
|
filter_git_ignored = opts.filters.git_ignored,
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
local git = require "nvim-tree.git"
|
local git = require "nvim-tree.git"
|
||||||
|
local notify = require "nvim-tree.notify"
|
||||||
local watch = require "nvim-tree.explorer.watch"
|
local watch = require "nvim-tree.explorer.watch"
|
||||||
local explorer_node = require "nvim-tree.explorer.node"
|
local explorer_node = require "nvim-tree.explorer.node"
|
||||||
|
|
||||||
@@ -15,14 +16,24 @@ M.reload = require("nvim-tree.explorer.reload").reload
|
|||||||
local Explorer = {}
|
local Explorer = {}
|
||||||
Explorer.__index = 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
|
---@class Explorer
|
||||||
local explorer = setmetatable({
|
local explorer = setmetatable({
|
||||||
absolute_path = cwd,
|
absolute_path = path,
|
||||||
nodes = {},
|
nodes = {},
|
||||||
open = true,
|
open = true,
|
||||||
}, Explorer)
|
}, Explorer)
|
||||||
|
|||||||
@@ -6,15 +6,16 @@ local M = {}
|
|||||||
---@param parent Node
|
---@param parent Node
|
||||||
---@param absolute_path string
|
---@param absolute_path string
|
||||||
---@param name string
|
---@param name string
|
||||||
|
---@param fs_stat uv.fs_stat.result|nil
|
||||||
---@return Node
|
---@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 handle = vim.loop.fs_scandir(absolute_path)
|
||||||
local has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
|
local has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
|
||||||
|
|
||||||
local node = {
|
local node = {
|
||||||
type = "directory",
|
type = "directory",
|
||||||
absolute_path = absolute_path,
|
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
|
group_next = nil, -- If node is grouped, this points to the next child dir/link node
|
||||||
has_children = has_children,
|
has_children = has_children,
|
||||||
name = name,
|
name = name,
|
||||||
@@ -43,8 +44,9 @@ end
|
|||||||
---@param parent Node
|
---@param parent Node
|
||||||
---@param absolute_path string
|
---@param absolute_path string
|
||||||
---@param name string
|
---@param name string
|
||||||
|
---@param fs_stat uv.fs_stat.result|nil
|
||||||
---@return Node
|
---@return Node
|
||||||
function M.file(parent, absolute_path, name)
|
function M.file(parent, absolute_path, name, fs_stat)
|
||||||
local ext = string.match(name, ".?[^.]+%.(.*)") or ""
|
local ext = string.match(name, ".?[^.]+%.(.*)") or ""
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -52,7 +54,7 @@ function M.file(parent, absolute_path, name)
|
|||||||
absolute_path = absolute_path,
|
absolute_path = absolute_path,
|
||||||
executable = M.is_executable(absolute_path),
|
executable = M.is_executable(absolute_path),
|
||||||
extension = ext,
|
extension = ext,
|
||||||
fs_stat = vim.loop.fs_stat(absolute_path),
|
fs_stat = fs_stat,
|
||||||
name = name,
|
name = name,
|
||||||
parent = parent,
|
parent = parent,
|
||||||
}
|
}
|
||||||
@@ -66,15 +68,16 @@ end
|
|||||||
---@param parent Node
|
---@param parent Node
|
||||||
---@param absolute_path string
|
---@param absolute_path string
|
||||||
---@param name string
|
---@param name string
|
||||||
|
---@param fs_stat uv.fs_stat.result|nil
|
||||||
---@return Node
|
---@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.
|
--- 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 link_to = vim.loop.fs_realpath(absolute_path)
|
||||||
local open, nodes, has_children
|
local open, nodes, has_children
|
||||||
|
|
||||||
local is_dir_link = (link_to ~= nil) and vim.loop.fs_stat(link_to).type == "directory"
|
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)
|
local handle = vim.loop.fs_scandir(link_to)
|
||||||
has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
|
has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
|
||||||
open = false
|
open = false
|
||||||
@@ -84,7 +87,7 @@ function M.link(parent, absolute_path, name)
|
|||||||
local node = {
|
local node = {
|
||||||
type = "link",
|
type = "link",
|
||||||
absolute_path = absolute_path,
|
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
|
group_next = nil, -- If node is grouped, this points to the next child dir/link node
|
||||||
has_children = has_children,
|
has_children = has_children,
|
||||||
link_to = link_to,
|
link_to = link_to,
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ end
|
|||||||
---@param absolute_path string
|
---@param absolute_path string
|
||||||
---@return GitStatus
|
---@return GitStatus
|
||||||
local function get_git_status(parent_ignored, status, absolute_path)
|
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 }
|
return { file = file_status }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -85,30 +85,23 @@ function M.reload(node, git_status)
|
|||||||
node.group_next = nil
|
node.group_next = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
local child_names = {}
|
local remain_childs = {}
|
||||||
|
|
||||||
local node_ignored = explorer_node.is_git_ignored(node)
|
local node_ignored = explorer_node.is_git_ignored(node)
|
||||||
|
---@type table<string, Node>
|
||||||
local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
|
local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
|
||||||
while true do
|
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
|
if not name then
|
||||||
break
|
break
|
||||||
end
|
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 }
|
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 filters.should_filter(abs, stat, filter_status) then
|
||||||
|
remain_childs[abs] = true
|
||||||
|
|
||||||
-- Recreate node if type changes.
|
-- Recreate node if type changes.
|
||||||
if nodes_by_path[abs] then
|
if nodes_by_path[abs] then
|
||||||
@@ -122,26 +115,26 @@ function M.reload(node, git_status)
|
|||||||
end
|
end
|
||||||
|
|
||||||
if not nodes_by_path[abs] then
|
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
|
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
|
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
|
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
|
if link.link_to ~= nil then
|
||||||
nodes_by_path[abs] = link
|
new_child = link
|
||||||
table.insert(node.nodes, link)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if new_child then
|
||||||
|
table.insert(node.nodes, new_child)
|
||||||
|
nodes_by_path[abs] = new_child
|
||||||
|
end
|
||||||
else
|
else
|
||||||
local n = nodes_by_path[abs]
|
local n = nodes_by_path[abs]
|
||||||
if n then
|
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
|
end
|
||||||
end
|
end
|
||||||
@@ -150,8 +143,8 @@ function M.reload(node, git_status)
|
|||||||
node.nodes = vim.tbl_map(
|
node.nodes = vim.tbl_map(
|
||||||
update_status(nodes_by_path, node_ignored, git_status),
|
update_status(nodes_by_path, node_ignored, git_status),
|
||||||
vim.tbl_filter(function(n)
|
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
|
else
|
||||||
explorer_node.node_destroy(n)
|
explorer_node.node_destroy(n)
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -173,7 +173,12 @@ local function open()
|
|||||||
|
|
||||||
-- populate it
|
-- populate it
|
||||||
vim.api.nvim_buf_set_lines(M.bufnr, 0, -1, false, lines)
|
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
|
-- highlight it
|
||||||
for _, h in ipairs(hl) do
|
for _, h in ipairs(hl) do
|
||||||
|
|||||||
@@ -52,6 +52,14 @@ local function refactored(opts)
|
|||||||
if type(opts.renderer) == "table" and type(opts.renderer.highlight_git) == "boolean" then
|
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"
|
opts.renderer.highlight_git = opts.renderer.highlight_git and "name" or "none"
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
local function deprecated(opts)
|
local function deprecated(opts)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ local view = require "nvim-tree.view"
|
|||||||
local core = require "nvim-tree.core"
|
local core = require "nvim-tree.core"
|
||||||
local utils = require "nvim-tree.utils"
|
local utils = require "nvim-tree.utils"
|
||||||
local events = require "nvim-tree.events"
|
local events = require "nvim-tree.events"
|
||||||
|
local notify = require "nvim-tree.notify"
|
||||||
local explorer_node = require "nvim-tree.explorer.node"
|
local explorer_node = require "nvim-tree.explorer.node"
|
||||||
|
|
||||||
---@class LibOpenOpts
|
---@class LibOpenOpts
|
||||||
@@ -57,6 +58,7 @@ local function clone_node(node)
|
|||||||
name = node.name,
|
name = node.name,
|
||||||
open = node.open,
|
open = node.open,
|
||||||
type = node.type,
|
type = node.type,
|
||||||
|
fs_stat = node.fs_stat,
|
||||||
}
|
}
|
||||||
|
|
||||||
if type(node.nodes) == "table" then
|
if type(node.nodes) == "table" then
|
||||||
@@ -83,8 +85,7 @@ function M.get_last_group_node(node)
|
|||||||
node = node.group_next
|
node = node.group_next
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
---Group empty folders
|
---Group empty folders
|
||||||
@@ -197,8 +198,15 @@ end
|
|||||||
local function should_hijack_current_buf()
|
local function should_hijack_current_buf()
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
local bufnr = vim.api.nvim_get_current_buf()
|
||||||
local bufname = vim.api.nvim_buf_get_name(bufnr)
|
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_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
|
local should_hijack_dir = bufname ~= "" and vim.fn.isdirectory(bufname) == 1 and M.hijack_directories.enable
|
||||||
@@ -242,7 +250,16 @@ function M.open(opts)
|
|||||||
|
|
||||||
M.set_target_win()
|
M.set_target_win()
|
||||||
if not core.get_explorer() or opts.path then
|
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
|
end
|
||||||
if should_hijack_current_buf() then
|
if should_hijack_current_buf() then
|
||||||
view.close_this_tab_only()
|
view.close_this_tab_only()
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
local view = require "nvim-tree.view"
|
local view = require "nvim-tree.view"
|
||||||
local utils = require "nvim-tree.utils"
|
local utils = require "nvim-tree.utils"
|
||||||
local Iterator = require "nvim-tree.iterators.node-iterator"
|
local Iterator = require "nvim-tree.iterators.node-iterator"
|
||||||
|
local filters = require "nvim-tree.explorer.filters"
|
||||||
|
|
||||||
local M = {
|
local M = {
|
||||||
filter = nil,
|
filter = nil,
|
||||||
@@ -26,8 +27,8 @@ local function reset_filter(node_)
|
|||||||
:iterate()
|
:iterate()
|
||||||
end
|
end
|
||||||
|
|
||||||
local overlay_bufnr = nil
|
local overlay_bufnr = 0
|
||||||
local overlay_winnr = nil
|
local overlay_winnr = 0
|
||||||
|
|
||||||
local function remove_overlay()
|
local function remove_overlay()
|
||||||
if view.View.float.enable and view.View.float.quit_on_focus_loss then
|
if view.View.float.enable and view.View.float.quit_on_focus_loss then
|
||||||
@@ -45,8 +46,8 @@ local function remove_overlay()
|
|||||||
|
|
||||||
vim.api.nvim_win_close(overlay_winnr, true)
|
vim.api.nvim_win_close(overlay_winnr, true)
|
||||||
vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
|
vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
|
||||||
overlay_bufnr = nil
|
overlay_bufnr = 0
|
||||||
overlay_winnr = nil
|
overlay_winnr = 0
|
||||||
|
|
||||||
if M.filter == "" then
|
if M.filter == "" then
|
||||||
M.clear_filter()
|
M.clear_filter()
|
||||||
@@ -56,6 +57,10 @@ end
|
|||||||
---@param node Node
|
---@param node Node
|
||||||
---@return boolean
|
---@return boolean
|
||||||
local function matches(node)
|
local function matches(node)
|
||||||
|
if not filters.config.enable then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
local path = node.absolute_path
|
local path = node.absolute_path
|
||||||
local name = vim.fn.fnamemodify(path, ":t")
|
local name = vim.fn.fnamemodify(path, ":t")
|
||||||
return vim.regex(M.filter):match_str(name) ~= nil
|
return vim.regex(M.filter):match_str(name) ~= nil
|
||||||
@@ -145,7 +150,13 @@ local function create_overlay()
|
|||||||
border = "none",
|
border = "none",
|
||||||
style = "minimal",
|
style = "minimal",
|
||||||
})
|
})
|
||||||
vim.api.nvim_buf_set_option(overlay_bufnr, "modifiable", true)
|
|
||||||
|
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, { M.filter })
|
vim.api.nvim_buf_set_lines(overlay_bufnr, 0, -1, false, { M.filter })
|
||||||
vim.cmd "startinsert"
|
vim.cmd "startinsert"
|
||||||
vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #M.filter + 1 })
|
vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #M.filter + 1 })
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
---@class BaseNode
|
---@class BaseNode
|
||||||
---@field absolute_path string
|
---@field absolute_path string
|
||||||
---@field executable boolean
|
---@field executable boolean
|
||||||
---@field fs_stat uv.uv_fs_t
|
---@field fs_stat uv.fs_stat.result|nil
|
||||||
---@field git_status GitStatus|nil
|
---@field git_status GitStatus|nil
|
||||||
---@field hidden boolean
|
---@field hidden boolean
|
||||||
---@field name string
|
---@field name string
|
||||||
|
|||||||
@@ -295,24 +295,16 @@ function Builder:add_highlights(node)
|
|||||||
table.insert(name_groups, name)
|
table.insert(name_groups, name)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- one or many icon groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
|
-- one or many icon groups
|
||||||
if #icon_groups > 1 then
|
if #icon_groups > 1 then
|
||||||
if vim.fn.has "nvim-0.9" == 1 then
|
|
||||||
icon_hl_group = self:create_combined_group(icon_groups)
|
icon_hl_group = self:create_combined_group(icon_groups)
|
||||||
else
|
|
||||||
icon_hl_group = icon_groups[#icon_groups]
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
icon_hl_group = icon_groups[1]
|
icon_hl_group = icon_groups[1]
|
||||||
end
|
end
|
||||||
|
|
||||||
-- one or many name groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
|
-- one or many name groups
|
||||||
if #name_groups > 1 then
|
if #name_groups > 1 then
|
||||||
if vim.fn.has "nvim-0.9" == 1 then
|
|
||||||
name_hl_group = self:create_combined_group(name_groups)
|
name_hl_group = self:create_combined_group(name_groups)
|
||||||
else
|
|
||||||
name_hl_group = name_groups[#name_groups]
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
name_hl_group = name_groups[1]
|
name_hl_group = name_groups[1]
|
||||||
end
|
end
|
||||||
@@ -396,11 +388,11 @@ function Builder:format_root_name(root_label)
|
|||||||
local label = root_label(self.root_cwd)
|
local label = root_label(self.root_cwd)
|
||||||
if type(label) == "string" then
|
if type(label) == "string" then
|
||||||
return label
|
return label
|
||||||
else
|
|
||||||
return "???"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
elseif type(root_label) == "string" then
|
||||||
return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
|
return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
|
||||||
|
end
|
||||||
|
return "???"
|
||||||
end
|
end
|
||||||
|
|
||||||
---@private
|
---@private
|
||||||
@@ -422,11 +414,21 @@ function Builder:build_header()
|
|||||||
end
|
end
|
||||||
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
|
---Build all lines with highlights and signs
|
||||||
---@return Builder
|
---@return Builder
|
||||||
function Builder:build()
|
function Builder:build()
|
||||||
self:build_header()
|
self:build_header()
|
||||||
self:build_lines()
|
self:build_lines()
|
||||||
|
self:sanitize_lines()
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -67,12 +67,19 @@ local function show()
|
|||||||
})
|
})
|
||||||
|
|
||||||
local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
|
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_win_call(M.popup_win, function()
|
||||||
vim.api.nvim_buf_set_lines(0, 0, -1, true, { line })
|
vim.api.nvim_buf_set_lines(0, 0, -1, true, { line })
|
||||||
for _, extmark in ipairs(extmarks) do
|
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
|
end
|
||||||
vim.cmd [[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=hide ]]
|
vim.cmd [[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=hide ]]
|
||||||
end)
|
end)
|
||||||
|
|||||||
@@ -64,9 +64,14 @@ local function get_file_icon_webdev(fname, extension)
|
|||||||
elseif string.match(extension, "%.(.*)") then
|
elseif string.match(extension, "%.(.*)") then
|
||||||
-- If there are more extensions to the file, try to grab the icon for them recursively
|
-- 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, "%.(.*)"))
|
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
|
else
|
||||||
return get_file_icon_default()
|
return get_file_icon_default()
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local function config_file_icon()
|
local function config_file_icon()
|
||||||
|
|||||||
@@ -19,10 +19,21 @@ local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
|
|||||||
---@param hl_args AddHighlightArgs[]
|
---@param hl_args AddHighlightArgs[]
|
||||||
---@param signs string[]
|
---@param signs string[]
|
||||||
local function _draw(bufnr, lines, hl_args, signs)
|
local function _draw(bufnr, lines, hl_args, signs)
|
||||||
vim.api.nvim_buf_set_option(bufnr, "modifiable", true)
|
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
|
||||||
|
|
||||||
vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
|
vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, lines)
|
||||||
M.render_hl(bufnr, hl_args)
|
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)
|
vim.fn.sign_unplace(SIGN_GROUP)
|
||||||
for i, sign_name in pairs(signs) do
|
for i, sign_name in pairs(signs) do
|
||||||
vim.fn.sign_place(0, SIGN_GROUP, sign_name, bufnr, { lnum = i + 1 })
|
vim.fn.sign_place(0, SIGN_GROUP, sign_name, bufnr, { lnum = i + 1 })
|
||||||
@@ -51,7 +62,7 @@ function M.draw()
|
|||||||
|
|
||||||
local profile = log.profile_start "draw"
|
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(view.get_winnr() or 0)
|
||||||
icon_component.reset_config()
|
icon_component.reset_config()
|
||||||
|
|
||||||
local builder = Builder:new():build()
|
local builder = Builder:new():build()
|
||||||
@@ -59,7 +70,7 @@ function M.draw()
|
|||||||
_draw(bufnr, builder.lines, builder.hl_args, builder.signs)
|
_draw(bufnr, builder.lines, builder.hl_args, builder.signs)
|
||||||
|
|
||||||
if cursor and #builder.lines >= cursor[1] then
|
if cursor and #builder.lines >= cursor[1] then
|
||||||
vim.api.nvim_win_set_cursor(view.get_winnr(), cursor)
|
vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
|
||||||
end
|
end
|
||||||
|
|
||||||
view.grow_from_content()
|
view.grow_from_content()
|
||||||
|
|||||||
@@ -226,7 +226,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))
|
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
|
-- to avoid the 'overwrite existing file' error message on write for
|
||||||
-- normal files
|
-- 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.api.nvim_buf_call(buf, function()
|
||||||
vim.cmd "silent! write!"
|
vim.cmd "silent! write!"
|
||||||
vim.cmd "edit"
|
vim.cmd "edit"
|
||||||
@@ -406,6 +413,9 @@ function M.debounce(context, timeout, callback)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local timer = vim.loop.new_timer()
|
local timer = vim.loop.new_timer()
|
||||||
|
if not timer then
|
||||||
|
return
|
||||||
|
end
|
||||||
debouncer.timer = timer
|
debouncer.timer = timer
|
||||||
timer:start(timeout, 0, function()
|
timer:start(timeout, 0, function()
|
||||||
timer_stop_close(timer)
|
timer_stop_close(timer)
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ local function create_buffer(bufnr)
|
|||||||
events._dispatch_tree_attached_post(M.get_bufnr())
|
events._dispatch_tree_attached_post(M.get_bufnr())
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param size number|fun():number
|
---@param size (fun():integer)|integer|string
|
||||||
---@return integer
|
---@return integer
|
||||||
local function get_size(size)
|
local function get_size(size)
|
||||||
if type(size) == "number" then
|
if type(size) == "number" then
|
||||||
@@ -121,10 +121,13 @@ local function get_size(size)
|
|||||||
return math.floor(vim.o.columns * percent_as_decimal)
|
return math.floor(vim.o.columns * percent_as_decimal)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param size number|function|nil
|
---@param size (fun():integer)|integer|nil
|
||||||
local function get_width(size)
|
local function get_width(size)
|
||||||
size = size or M.View.width
|
if size then
|
||||||
return get_size(size)
|
return get_size(size)
|
||||||
|
else
|
||||||
|
return get_size(M.View.width)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local move_tbl = {
|
local move_tbl = {
|
||||||
@@ -140,7 +143,7 @@ local function setup_tabpage(tabpage)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function set_window_options_and_buffer()
|
local function set_window_options_and_buffer()
|
||||||
pcall(vim.cmd, "buffer " .. M.get_bufnr())
|
pcall(vim.api.nvim_command, "buffer " .. M.get_bufnr())
|
||||||
local eventignore = vim.opt.eventignore:get()
|
local eventignore = vim.opt.eventignore:get()
|
||||||
vim.opt.eventignore = "all"
|
vim.opt.eventignore = "all"
|
||||||
for k, v in pairs(M.View.winopts) do
|
for k, v in pairs(M.View.winopts) do
|
||||||
@@ -204,7 +207,7 @@ end
|
|||||||
---@param tabnr integer
|
---@param tabnr integer
|
||||||
local function save_tab_state(tabnr)
|
local function save_tab_state(tabnr)
|
||||||
local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
|
local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
|
||||||
M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage))
|
M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param tabpage integer
|
---@param tabpage integer
|
||||||
@@ -222,8 +225,8 @@ local function close(tabpage)
|
|||||||
if tree_win == current_win and prev_win > 0 then
|
if tree_win == current_win and prev_win > 0 then
|
||||||
vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
|
vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
|
||||||
end
|
end
|
||||||
if vim.api.nvim_win_is_valid(tree_win) then
|
if vim.api.nvim_win_is_valid(tree_win or 0) then
|
||||||
vim.api.nvim_win_close(tree_win, true)
|
vim.api.nvim_win_close(tree_win or 0, true)
|
||||||
end
|
end
|
||||||
events._dispatch_on_tree_close()
|
events._dispatch_on_tree_close()
|
||||||
return
|
return
|
||||||
@@ -343,13 +346,9 @@ function M.resize(size)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local new_size = get_width()
|
local new_size = get_width()
|
||||||
vim.api.nvim_win_set_width(M.get_winnr(), new_size)
|
vim.api.nvim_win_set_width(M.get_winnr() or 0, 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)
|
events._dispatch_on_tree_resize(new_size)
|
||||||
end
|
|
||||||
|
|
||||||
if not M.View.preserve_window_proportions then
|
if not M.View.preserve_window_proportions then
|
||||||
vim.cmd ":wincmd ="
|
vim.cmd ":wincmd ="
|
||||||
@@ -420,7 +419,7 @@ function M.is_visible(opts)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
return M.get_winnr() ~= nil and vim.api.nvim_win_is_valid(M.get_winnr())
|
return M.get_winnr() ~= nil and vim.api.nvim_win_is_valid(M.get_winnr() or 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param opts table|nil
|
---@param opts table|nil
|
||||||
@@ -443,7 +442,9 @@ function M.focus(winnr, open_if_closed)
|
|||||||
M.open()
|
M.open()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if wnr then
|
||||||
vim.api.nvim_set_current_win(wnr)
|
vim.api.nvim_set_current_win(wnr)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Retrieve the winid of the open tree.
|
--- Retrieve the winid of the open tree.
|
||||||
@@ -541,7 +542,8 @@ end
|
|||||||
|
|
||||||
-- used on ColorScheme event
|
-- used on ColorScheme event
|
||||||
function M.reset_winhl()
|
function M.reset_winhl()
|
||||||
if M.get_winnr() and vim.api.nvim_win_is_valid(M.get_winnr()) then
|
local winnr = M.get_winnr()
|
||||||
|
if winnr and vim.api.nvim_win_is_valid(winnr) then
|
||||||
vim.wo[M.get_winnr()].winhl = M.View.winopts.winhl
|
vim.wo[M.get_winnr()].winhl = M.View.winopts.winhl
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -29,15 +29,11 @@ fi
|
|||||||
|
|
||||||
# any output is a fail
|
# any output is a fail
|
||||||
case "${OUT}" in
|
case "${OUT}" in
|
||||||
*Diagnosis\ complete*)
|
*Diagnosis\ completed,\ no\ problems\ found*)
|
||||||
if [ -f "${DIR_OUT}/check.json" ]; then
|
|
||||||
cat "${DIR_OUT}/check.json"
|
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
cat "${DIR_OUT}/check.json"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user