Skip to content

Commit 13b6c8c

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat-branch-complete-on-attach
2 parents b2cdee5 + 7e89276 commit 13b6c8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+922
-555
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ body:
55
- type: markdown
66
attributes:
77
value: |
8-
Before reporting: search [existing issues](https://github.com/kyazdani42/nvim-tree.lua/issues) and make sure that nvim-tree is updated to the latest version. If you are experiencing performance issues, please [enable profiling](https://github.com/kyazdani42/nvim-tree.lua#performance-issues) and attach the logs.
8+
Is this a question?
9+
* Please start a new [Q&A discussion](https://github.com/nvim-tree/nvim-tree.lua/discussions/new) instead of raising a bug.
10+
11+
Before reporting:
12+
* search [existing issues](https://github.com/nvim-tree/nvim-tree.lua/issues)
13+
* ensure that nvim-tree is updated to the latest version
14+
15+
If you are experiencing performance issues, please [enable profiling](https://github.com/nvim-tree/nvim-tree.lua#performance-issues) and attach the logs.
916
- type: textarea
1017
attributes:
1118
label: "Description"
@@ -15,7 +22,7 @@ body:
1522
- type: textarea
1623
attributes:
1724
label: "Neovim version"
18-
description: "Output of `nvim --version`. Please see nvim-tree.lua [minimum required version](https://github.com/kyazdani42/nvim-tree.lua#notice)."
25+
description: "Output of `nvim --version`. Please see nvim-tree.lua [minimum required version](https://github.com/nvim-tree/nvim-tree.lua#notice)."
1926
placeholder: |
2027
NVIM v0.6.1
2128
Build type&#58 Release
@@ -42,7 +49,7 @@ body:
4249
label: "Minimal config"
4350
description: "Minimal(!) configuration necessary to reproduce the issue.
4451
45-
(Right click) save [nvt-min.lua](https://raw.githubusercontent.com/kyazdani42/nvim-tree.lua/master/.github/ISSUE_TEMPLATE/nvt-min.lua) to `/tmp` and run using `nvim -nu /tmp/nvt-min.lua`
52+
(Right click) save [nvt-min.lua](https://raw.githubusercontent.com/nvim-tree/nvim-tree.lua/master/.github/ISSUE_TEMPLATE/nvt-min.lua) to `/tmp` and run using `nvim -nu /tmp/nvt-min.lua`
4653
4754
If _absolutely_ necessary, add plugins and modify the nvim-tree setup at the indicated lines.
4855

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ labels: feature request
66
assignees: ''
77

88
---
9+
**Is this a question?**
10+
Please start a new [Q&A discussion](https://github.com/nvim-tree/nvim-tree.lua/discussions/new) instead of raising a feature request.
911

1012
**Is your feature request related to a problem? Please describe.**
1113
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

.github/ISSUE_TEMPLATE/nvt-min.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ local function load_plugins()
66
require("packer").startup {
77
{
88
"wbthomason/packer.nvim",
9-
"kyazdani42/nvim-tree.lua",
10-
"kyazdani42/nvim-web-devicons",
9+
"nvim-tree/nvim-tree.lua",
10+
"nvim-tree/nvim-web-devicons",
1111
-- ADD PLUGINS THAT ARE _NECESSARY_ FOR REPRODUCING THE ISSUE
1212
},
1313
config = {

.github/example.png

-84.3 KB
Binary file not shown.

.github/screenshot.png

-243 KB
Binary file not shown.

.github/screenshot2.png

-615 KB
Binary file not shown.

.github/screenshot3.png

-78.5 KB
Binary file not shown.

.github/screenshot4.png

-565 KB
Binary file not shown.

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- uses: actions/checkout@v2
31-
- uses: JohnnyMorganz/stylua-action@1.0.0
31+
- uses: JohnnyMorganz/stylua-action@v1
3232
with:
3333
token: ${{ secrets.GITHUB_TOKEN }}
34+
version: 0.15.1
3435
args: --color always --check lua/

README.md

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# A File Explorer For Neovim Written In Lua
22

3-
[![CI](https://github.com/kyazdani42/nvim-tree.lua/actions/workflows/ci.yml/badge.svg)](https://github.com/kyazdani42/nvim-tree.lua/actions/workflows/ci.yml)
3+
[![CI](https://github.com/nvim-tree/nvim-tree.lua/actions/workflows/ci.yml/badge.svg)](https://github.com/nvim-tree/nvim-tree.lua/actions/workflows/ci.yml)
44

5-
<img align="left" width="124" height="332" src=".github/example.png?raw=true">
5+
<img align="left" width="149" height="484" src="https://user-images.githubusercontent.com/17254073/195207026-f3434ba1-dc86-4c48-8ab3-b2efc3b85227.png">
6+
<img align="left" width="149" height="484" src="https://user-images.githubusercontent.com/17254073/195207023-7b709e35-7f10-416b-aafb-5bb61268c7d3.png">
67

78
Automatic updates
89

@@ -27,24 +28,24 @@
2728

2829
[neovim >=0.7.0](https://github.com/neovim/neovim/wiki/Installing-Neovim)
2930

30-
[nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons) is optional and used to display file icons. It requires a [patched font](https://www.nerdfonts.com/).
31+
[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/).
3132

3233
## Install
3334

3435
Install with [vim-plug](https://github.com/junegunn/vim-plug):
3536

3637
```vim
37-
Plug 'kyazdani42/nvim-web-devicons' " optional, for file icons
38-
Plug 'kyazdani42/nvim-tree.lua'
38+
Plug 'nvim-tree/nvim-web-devicons' " optional, for file icons
39+
Plug 'nvim-tree/nvim-tree.lua'
3940
```
4041

4142
or with [packer](https://github.com/wbthomason/packer.nvim):
4243

4344
```lua
4445
use {
45-
'kyazdani42/nvim-tree.lua',
46+
'nvim-tree/nvim-tree.lua',
4647
requires = {
47-
'kyazdani42/nvim-web-devicons', -- optional, for file icons
48+
'nvim-tree/nvim-web-devicons', -- optional, for file icons
4849
},
4950
tag = 'nightly' -- optional, updated every week. (see issue #1193)
5051
}
@@ -57,6 +58,13 @@ Setup should be run in a lua file or in a lua heredoc [:help lua-heredoc](https:
5758
```lua
5859
-- examples for your init.lua
5960

61+
-- disable netrw at the very start of your init.lua (strongly advised)
62+
vim.g.loaded_netrw = 1
63+
vim.g.loaded_netrwPlugin = 1
64+
65+
-- set termguicolors to enable highlight groups
66+
vim.opt.termguicolors = true
67+
6068
-- empty setup using defaults
6169
require("nvim-tree").setup()
6270

@@ -98,33 +106,66 @@ Basic commands:
98106

99107
`:NvimTreeCollapse` Collapses the nvim-tree recursively.
100108

101-
## Api
102-
103-
nvim-tree exposes a public api; see [:help nvim-tree-api](doc/nvim-tree-lua.txt). This is a stable non breaking api.
104-
105109
## Mappings
106110

107111
nvim-tree comes with number of mappings; for default mappings please see [:help nvim-tree-default-mappings](doc/nvim-tree-lua.txt), for way of configuring mappings see [:help nvim-tree-mappings](doc/nvim-tree-lua.txt)
108112

109113
`g?` toggles help, showing all the mappings and their actions.
110114

115+
## Roadmap
116+
117+
nvim-tree is stable and new major features will not be added. The focus is on existing user experience.
118+
119+
Users are encouraged to add their own custom features via the public [API](#api).
120+
121+
Development is focused on:
122+
* Bug fixes
123+
* Performance
124+
* Quality of Life improvements
125+
* API / Events
126+
* Enhancements to existing features
127+
128+
## API
129+
130+
nvim-tree exposes a public API. This is non breaking, with additions made as necessary.
131+
132+
Please raise a [feature request](https://github.com/nvim-tree/nvim-tree.lua/issues/new?assignees=&labels=feature+request&template=feature_request.md&title=) if the API is insufficent for your needs. [Pull requests](#contributing) are always welcome.
133+
134+
[:help nvim-tree-api](doc/nvim-tree-lua.txt)
135+
136+
### Events
137+
138+
Users may subscribe to events that nvim-tree will dispatch in a variety of situations.
139+
140+
[:help nvim-tree-events](doc/nvim-tree-lua.txt)
141+
142+
### Actions
143+
144+
Custom actions may be mapped which can invoke API or perform your own actions.
145+
146+
[:help nvim-tree-mappings](doc/nvim-tree-lua.txt)
147+
111148
## Tips & tricks
112149

113150
* You can add a directory by adding a `/` at the end of the paths, entering multiple directories `BASE/foo/bar/baz` will add directory foo, then bar and add a file baz to it.
114151
* You can update window options for the tree by setting `require"nvim-tree.view".View.winopts.MY_OPTION = MY_OPTION_VALUE`
115152
* `toggle` has a second parameter which allows to toggle without focusing the explorer (`require"nvim-tree".toggle(false, true)`).
116153
* You can allow nvim-tree to behave like vinegar, see [:help nvim-tree-vinegar](doc/nvim-tree-lua.txt)
117154
* If you `:set nosplitright`, the files will open on the left side of the tree, placing the tree window in the right side of the file you opened.
118-
* You can automatically close the tab/vim when nvim-tree is the last window in the tab: <https://github.com/kyazdani42/nvim-tree.lua/discussions/1115>. WARNING: this can catastrophically fail: <https://github.com/kyazdani42/nvim-tree.lua/issues/1368>. This will not be added to nvim-tree and the team will not provide support / assistance with this, due to complexities in vim event timings and side-effects.
155+
* You can automatically close the tab/vim when nvim-tree is the last window in the tab: <https://github.com/nvim-tree/nvim-tree.lua/discussions/1115>. WARNING: this can catastrophically fail: <https://github.com/nvim-tree/nvim-tree.lua/issues/1368>. This will not be added to nvim-tree and the team will not provide support / assistance with this, due to complexities in vim event timings and side-effects.
119156
* Hide the `.git` folder: `filters = { custom = { "^.git$" } }`. See [:help nvim-tree.filters.custom](doc/nvim-tree-lua.txt).
120157
* To disable the display of icons see [:help nvim-tree.renderer.icons.show](doc/nvim-tree-lua.txt).
121158

122159
## Troubleshooting
123160

124-
### Diagnostic Logging
161+
## Diagnostic Logging
125162

126163
You may enable diagnostic logging to `$XDG_CACHE_HOME/nvim/nvim-tree.log`. See [:help nvim-tree.log](doc/nvim-tree-lua.txt)
127164

165+
## netrw Keeps Popping Up
166+
167+
Eagerly disable netrw. See [:help nvim-tree.disable_netrw](doc/nvim-tree-lua.txt)
168+
128169
## Performance Issues
129170

130171
If you are experiencing performance issues with nvim-tree.lua, you can enable profiling in the logs. It is advisable to enable git logging at the same time, as that can be a source of performance problems.
@@ -134,8 +175,10 @@ log = {
134175
enable = true,
135176
truncate = true,
136177
types = {
178+
diagnostics = true,
137179
git = true,
138180
profile = true,
181+
watcher = true,
139182
},
140183
},
141184
```
@@ -144,7 +187,7 @@ Please attach `$XDG_CACHE_HOME/nvim/nvim-tree.log` if you raise an issue.
144187

145188
*Performance Tips:*
146189

147-
* If you are using fish as an editor shell (which might be fixed in the future), try set `shell=/bin/bash` in your vim config. Alternatively, you can [prevent fish from loading interactive configuration in a non-interactive shell](https://github.com/kyazdani42/nvim-tree.lua/issues/549#issuecomment-1127394585).
190+
* If you are using fish as an editor shell (which might be fixed in the future), try set `shell=/bin/bash` in your vim config. Alternatively, you can [prevent fish from loading interactive configuration in a non-interactive shell](https://github.com/nvim-tree/nvim-tree.lua/issues/549#issuecomment-1127394585).
148191

149192
* Try manually running the git command (see the logs) in your shell e.g. `git --no-optional-locks status --porcelain=v1 --ignored=matching -u`.
150193

@@ -172,7 +215,7 @@ Let us know you're interested by commenting on issues and raising PRs.
172215

173216
## Screenshots
174217

175-
![alt text](.github/screenshot.png?raw=true "kyazdani42 tree")
176-
![alt text](.github/screenshot2.png?raw=true "akin909 tree")
177-
![alt text](.github/screenshot3.png?raw=true "stsewd tree")
178-
![alt text](.github/screenshot4.png?raw=true "reyhankaplan tree")
218+
See [Showcases](https://github.com/nvim-tree/nvim-tree.lua/wiki/Showcases) wiki page for examples of user's configurations with sources.
219+
220+
Please add your own!
221+

0 commit comments

Comments
 (0)