Compare commits
23 Commits
nvim-tree-
...
v1.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9ff00bc06 | ||
|
|
abfd1d1b67 | ||
|
|
2ede0de67b | ||
|
|
12a9a995a4 | ||
|
|
d1957d3472 | ||
|
|
869c064721 | ||
|
|
74e94625b1 | ||
|
|
8b2c5c678b | ||
|
|
2086e564c4 | ||
|
|
1cac8005df | ||
|
|
8704b6f7fc | ||
|
|
26632f496e | ||
|
|
5a87ffe35c | ||
|
|
517e4fbb9e | ||
|
|
4c8ddee453 | ||
|
|
4215f33da5 | ||
|
|
2bc725a3eb | ||
|
|
340d3a9795 | ||
|
|
edd4e25fd4 | ||
|
|
78c4c083ed | ||
|
|
acffab931a | ||
|
|
64f61e4c91 | ||
|
|
347e1eb352 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -67,7 +67,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
nvim_version: [ stable, nightly ]
|
||||
luals_version: [ 3.7.3 ]
|
||||
luals_version: [ 3.9.1 ]
|
||||
|
||||
steps:
|
||||
- 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@v7
|
||||
env:
|
||||
LUAROCKS_API_KEY: ${{ secrets.LUAROCKS_API_KEY }}
|
||||
with:
|
||||
summary: A File Explorer For Neovim
|
||||
detailed_description: |
|
||||
Automatic updates
|
||||
|
||||
File type icons
|
||||
|
||||
Git integration
|
||||
|
||||
Diagnostics integration - LSP and COC
|
||||
|
||||
(Live) filtering
|
||||
|
||||
Cut, copy, paste, rename, delete, create etc.
|
||||
|
||||
Highly customisable
|
||||
|
||||
Rich API
|
||||
license: "GPL-3.0"
|
||||
labels: neovim
|
||||
dependencies: |
|
||||
nvim-web-devicons
|
||||
20
.github/workflows/release-please.yml
vendored
20
.github/workflows/release-please.yml
vendored
@@ -23,11 +23,15 @@ jobs:
|
||||
git config user.name github-actions[bot]
|
||||
git config user.email 41898282+github-actions[bot]@users.noreply.github.com
|
||||
git remote add gh-token "https://${{ secrets.GITHUB_TOKEN }}@github.com/google-github-actions/release-please-action.git"
|
||||
git tag -d v${{ steps.release.outputs.major }} || true
|
||||
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
|
||||
git push origin :v${{ steps.release.outputs.major }} || true
|
||||
git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
|
||||
git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
|
||||
git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
|
||||
git push origin v${{ steps.release.outputs.major }}
|
||||
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
|
||||
git tag -d v${{ steps.release.outputs.major }} || true
|
||||
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
|
||||
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true
|
||||
git push origin :v${{ steps.release.outputs.major }} || true
|
||||
git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
|
||||
git push origin :v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} || true
|
||||
git tag -a v${{ steps.release.outputs.major }} -m "Release v${{ steps.release.outputs.major }}"
|
||||
git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}"
|
||||
git tag -a v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} -m "Release v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}"
|
||||
git push origin v${{ steps.release.outputs.major }}
|
||||
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}
|
||||
git push origin v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }}
|
||||
|
||||
2
.github/workflows/semantic-pr-subject.yml
vendored
2
.github/workflows/semantic-pr-subject.yml
vendored
@@ -14,6 +14,6 @@ jobs:
|
||||
semantic-pr-subject:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: amannn/action-semantic-pull-request@v5.5.2
|
||||
- uses: amannn/action-semantic-pull-request@v5.5.3
|
||||
env:
|
||||
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",
|
||||
"runtime.version" : "Lua 5.1",
|
||||
"runtime.version": "Lua 5.1",
|
||||
"workspace": {
|
||||
"library": [
|
||||
"$VIMRUNTIME/lua/vim/lsp",
|
||||
"$VIMRUNTIME/lua/vim",
|
||||
"${3rd}/luv/library"
|
||||
]
|
||||
},
|
||||
"diagnostics": {
|
||||
"libraryFiles": "Disable",
|
||||
"globals": [
|
||||
"vim"
|
||||
],
|
||||
"globals": [],
|
||||
"neededFileStatus": {
|
||||
"ambiguity-1": "Any",
|
||||
"assign-type-mismatch": "Any",
|
||||
@@ -33,11 +31,19 @@
|
||||
"duplicate-index": "Any",
|
||||
"duplicate-set-field": "Any",
|
||||
"empty-block": "Any",
|
||||
"global-element": "Any",
|
||||
"global-in-nil-env": "Any",
|
||||
"incomplete-signature-doc": "None",
|
||||
"inject-field": "Any",
|
||||
"invisible": "Any",
|
||||
"lowercase-global": "Any",
|
||||
"missing-fields": "Any",
|
||||
"missing-global-doc": "Any",
|
||||
"missing-local-export-doc": "None",
|
||||
"missing-parameter": "Any",
|
||||
"missing-return": "Any",
|
||||
"missing-return-value": "Any",
|
||||
"name-style-check": "None",
|
||||
"need-check-nil": "Any",
|
||||
"newfield-call": "Any",
|
||||
"newline-call": "Any",
|
||||
@@ -70,4 +76,3 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
".": "1.3.1"
|
||||
".": "1.5.0"
|
||||
}
|
||||
|
||||
47
CHANGELOG.md
47
CHANGELOG.md
@@ -1,5 +1,52 @@
|
||||
# Changelog
|
||||
|
||||
## [1.5.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.4.0...nvim-tree-v1.5.0) (2024-07-11)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **#2127:** add experimental.actions.open_file.relative_path to open files with a relative path rather than absolute ([#2805](https://github.com/nvim-tree/nvim-tree.lua/issues/2805)) ([869c064](https://github.com/nvim-tree/nvim-tree.lua/commit/869c064721a6c2091f22c3541e8f0ff958361771))
|
||||
* **#2598:** add api.tree.resize ([#2811](https://github.com/nvim-tree/nvim-tree.lua/issues/2811)) ([2ede0de](https://github.com/nvim-tree/nvim-tree.lua/commit/2ede0de67b47e89e2b4cb488ea3f58b8f5a8c90a))
|
||||
* **#2799:** `filesystem_watchers.ignore_dirs` and `git.disable_for_dirs` may be functions ([#2800](https://github.com/nvim-tree/nvim-tree.lua/issues/2800)) ([8b2c5c6](https://github.com/nvim-tree/nvim-tree.lua/commit/8b2c5c678be4b49dff6a2df794877000113fd77b))
|
||||
* **#2799:** filesystem_watchers.ignore_dirs and git.disable_for_dirs may be functions ([8b2c5c6](https://github.com/nvim-tree/nvim-tree.lua/commit/8b2c5c678be4b49dff6a2df794877000113fd77b))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **#2813:** macos: enable file renaming with changed capitalization ([#2814](https://github.com/nvim-tree/nvim-tree.lua/issues/2814)) ([abfd1d1](https://github.com/nvim-tree/nvim-tree.lua/commit/abfd1d1b6772540364743531cc0331e08a0027a9))
|
||||
* **#2819:** experimental.actions.open_file.relative_path issue following change directory ([#2820](https://github.com/nvim-tree/nvim-tree.lua/issues/2820)) ([12a9a99](https://github.com/nvim-tree/nvim-tree.lua/commit/12a9a995a455d2c2466e47140663275365a5d2fc))
|
||||
|
||||
## [1.4.0](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.3...nvim-tree-v1.4.0) (2024-06-09)
|
||||
|
||||
### Notice
|
||||
|
||||
* Neovim 0.9 is now the minimum supported version; please upgrade to neovim release version 0.9 or 0.10.
|
||||
|
||||
### Reverts
|
||||
|
||||
* **#2781:** "refactor: replace deprecated use of vim.diagnostic.is_disabled()" ([#2784](https://github.com/nvim-tree/nvim-tree.lua/issues/2784)) ([517e4fb](https://github.com/nvim-tree/nvim-tree.lua/commit/517e4fbb9ef3c0986da7047f44b4b91a2400f93c))
|
||||
|
||||
|
||||
### Miscellaneous Chores
|
||||
|
||||
* release 1.4.0 ([1cac800](https://github.com/nvim-tree/nvim-tree.lua/commit/1cac8005df6da484c97499247754afa59fef92db))
|
||||
|
||||
## [1.3.3](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.2...nvim-tree-v1.3.3) (2024-05-14)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* nil access exception with git integration when changing branches ([#2774](https://github.com/nvim-tree/nvim-tree.lua/issues/2774)) ([340d3a9](https://github.com/nvim-tree/nvim-tree.lua/commit/340d3a9795e06bdd1814228de398cd510f9bfbb0))
|
||||
|
||||
## [1.3.2](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.1...nvim-tree-v1.3.2) (2024-05-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **#2758:** use nvim-webdevicons default file icon, not renderer.icons.glyphs.default, as per :help ([#2759](https://github.com/nvim-tree/nvim-tree.lua/issues/2759)) ([347e1eb](https://github.com/nvim-tree/nvim-tree.lua/commit/347e1eb35264677f66a79466bb5e3d111968e12c))
|
||||
* **#2758:** use nvim-webdevicons default for default files ([347e1eb](https://github.com/nvim-tree/nvim-tree.lua/commit/347e1eb35264677f66a79466bb5e3d111968e12c))
|
||||
* **#925:** handle newlines in file names ([#2754](https://github.com/nvim-tree/nvim-tree.lua/issues/2754)) ([64f61e4](https://github.com/nvim-tree/nvim-tree.lua/commit/64f61e4c913047a045ff90bd188dd3b54ee443cf))
|
||||
|
||||
## [1.3.1](https://github.com/nvim-tree/nvim-tree.lua/compare/nvim-tree-v1.3.0...nvim-tree-v1.3.1) (2024-04-25)
|
||||
|
||||
|
||||
|
||||
@@ -61,6 +61,15 @@ Assumes `$VIMRUNTIME` is `/usr/share/nvim/runtime`. Adjust as necessary e.g.
|
||||
VIMRUNTIME="/my/path/to/runtime" make check
|
||||
```
|
||||
|
||||
If `lua-language-server` is not available or `--check` doesn't function (e.g. Arch Linux 3.9.1-1) you can manually install it as per `ci.yml` e.g.
|
||||
|
||||
```sh
|
||||
mkdir luals
|
||||
curl -L "https://github.com/LuaLS/lua-language-server/releases/download/3.9.1/lua-language-server-3.9.1-linux-x64.tar.gz" | tar zx --directory luals
|
||||
|
||||
PATH="luals/bin:${PATH}" make check
|
||||
```
|
||||
|
||||
# Adding New Actions
|
||||
|
||||
To add a new action, add a file in `actions/name-of-the-action.lua`. You should export a `setup` function if some configuration is needed.
|
||||
|
||||
2
Makefile
2
Makefile
@@ -22,7 +22,7 @@ style-doc:
|
||||
scripts/doc-comments.sh
|
||||
|
||||
luals:
|
||||
scripts/luals-check.sh
|
||||
@scripts/luals-check.sh
|
||||
|
||||
#
|
||||
# fixes
|
||||
|
||||
@@ -28,7 +28,7 @@ Questions and general support: [Discussions](https://github.com/nvim-tree/nvim-t
|
||||
|
||||
## 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"
|
||||
|
||||
|
||||
@@ -103,7 +103,7 @@ Git Integration
|
||||
|
||||
Requirements
|
||||
|
||||
This file explorer requires `neovim >= 0.8.0`
|
||||
This file explorer requires `neovim >= 0.9.0`
|
||||
|
||||
==============================================================================
|
||||
2. QUICKSTART *nvim-tree-quickstart*
|
||||
@@ -620,7 +620,13 @@ Following is the default configuration. See |nvim-tree-opts| for details.
|
||||
default_yes = false,
|
||||
},
|
||||
},
|
||||
experimental = {},
|
||||
experimental = {
|
||||
actions = {
|
||||
open_file = {
|
||||
relative_path = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
log = {
|
||||
enable = false,
|
||||
truncate = false,
|
||||
@@ -832,7 +838,6 @@ Use nvim-tree in a floating window.
|
||||
|
||||
Highlight precedence, additive:
|
||||
git < opened < modified < bookmarked < diagnostics < copied < cut
|
||||
Neovim <= 0.8 will only show the highest.
|
||||
|
||||
*nvim-tree.renderer.add_trailing*
|
||||
Appends a trailing slash to folder names.
|
||||
@@ -1171,8 +1176,9 @@ Only relevant when `git.show_on_dirs` is `true`.
|
||||
|
||||
*nvim-tree.git.disable_for_dirs*
|
||||
Disable git integration when git top-level matches these paths.
|
||||
May be relative, evaluated via |fnamemodify| `":p"`
|
||||
Type: `table`, Default: `{}`
|
||||
Strings may be relative, evaluated via |fnamemodify| `":p"`
|
||||
Function is passed an absolute path and returns true for disable.
|
||||
Type: `string[] | fun(path: string): boolean`, Default: `{}`
|
||||
|
||||
*nvim-tree.git.timeout*
|
||||
Kills the git process after some time if it takes too long.
|
||||
@@ -1334,10 +1340,12 @@ Idle milliseconds between filesystem change and action.
|
||||
Type: `number`, Default: `50` (ms)
|
||||
|
||||
*nvim-tree.filesystem_watchers.ignore_dirs*
|
||||
List of vim regex for absolute directory paths that will not be watched.
|
||||
Backslashes must be escaped e.g. `"my-project/\\.build$"`. See |string-match|.
|
||||
List of vim regex for absolute directory paths that will not be watched or
|
||||
function returning whether a path should be ignored.
|
||||
Strings must be backslash escaped e.g. `"my-proj/\\.build$"`. See |string-match|.
|
||||
Function is passed an absolute path.
|
||||
Useful when path is not in `.gitignore` or git integration is disabled.
|
||||
Type: {string}, Default: `{}`
|
||||
Type: `string[] | fun(path: string): boolean`, Default: `{}`
|
||||
|
||||
==============================================================================
|
||||
5.13 OPTS: ACTIONS *nvim-tree-opts-actions*
|
||||
@@ -1537,6 +1545,12 @@ Confirmation prompts.
|
||||
Experimental features that may become default or optional functionality.
|
||||
In the event of a problem please disable the experiment and raise an issue.
|
||||
|
||||
*nvim-tree.experimental.actions.open_file.relative_path*
|
||||
Buffers opened by nvim-tree will use with relative paths instead of
|
||||
absolute.
|
||||
Execute |:ls| to see the paths of all open buffers.
|
||||
Type: `boolean`, Default: `false`
|
||||
|
||||
==============================================================================
|
||||
5.20 OPTS: LOG *nvim-tree-opts-log*
|
||||
|
||||
@@ -1656,6 +1670,22 @@ tree.focus() *nvim-tree-api.tree.focus()*
|
||||
tree.reload() *nvim-tree-api.tree.reload()*
|
||||
Refresh the tree. Does nothing if closed.
|
||||
|
||||
tree.resize({opts}) *nvim-tree-api.tree.resize()*
|
||||
Resize the tree, persisting the new size.
|
||||
Resets to |nvim-tree.view.width| when no {opts} provided.
|
||||
See |:NvimTreeResize|
|
||||
|
||||
Parameters: ~
|
||||
• {opts} (table) optional parameters
|
||||
|
||||
Options: ~
|
||||
• {width} (table) new |nvim-tree.view.width| value
|
||||
• {absolute} (number) set the width
|
||||
• {relative} (number) increase or decrease the width
|
||||
|
||||
Only one option is supported, in the priority order above.
|
||||
{absolute} and {relative} do nothing when {width} is a function.
|
||||
|
||||
tree.change_root({path}) *nvim-tree-api.tree.change_root()*
|
||||
Change the tree's root to a path.
|
||||
|
||||
@@ -2772,6 +2802,7 @@ highlight group is not, hard linking as follows: >
|
||||
|nvim-tree.diagnostics.show_on_open_dirs|
|
||||
|nvim-tree.disable_netrw|
|
||||
|nvim-tree.experimental|
|
||||
|nvim-tree.experimental.actions.open_file.relative_path|
|
||||
|nvim-tree.filesystem_watchers.debounce_delay|
|
||||
|nvim-tree.filesystem_watchers.enable|
|
||||
|nvim-tree.filesystem_watchers.ignore_dirs|
|
||||
@@ -2986,6 +3017,7 @@ highlight group is not, hard linking as follows: >
|
||||
|nvim-tree-api.tree.is_visible()|
|
||||
|nvim-tree-api.tree.open()|
|
||||
|nvim-tree-api.tree.reload()|
|
||||
|nvim-tree-api.tree.resize()|
|
||||
|nvim-tree-api.tree.search_node()|
|
||||
|nvim-tree-api.tree.toggle()|
|
||||
|nvim-tree-api.tree.toggle_custom_filter()|
|
||||
|
||||
@@ -11,7 +11,6 @@ local core = require "nvim-tree.core"
|
||||
local git = require "nvim-tree.git"
|
||||
local filters = require "nvim-tree.explorer.filters"
|
||||
local buffers = require "nvim-tree.buffers"
|
||||
local events = require "nvim-tree.events"
|
||||
local notify = require "nvim-tree.notify"
|
||||
|
||||
local _config = {}
|
||||
@@ -26,7 +25,14 @@ local M = {
|
||||
function M.change_root(path, bufnr)
|
||||
-- skip if current file is in ignore_list
|
||||
if type(bufnr) == "number" then
|
||||
local ft = vim.api.nvim_buf_get_option(bufnr, "filetype") or ""
|
||||
local ft
|
||||
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
ft = vim.api.nvim_get_option_value("filetype", { buf = bufnr }) or ""
|
||||
else
|
||||
ft = vim.api.nvim_buf_get_option(bufnr, "filetype") or "" ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
for _, value in pairs(_config.update_focused_file.update_root.ignore_list) do
|
||||
if utils.str_find(path, value) or utils.str_find(ft, value) then
|
||||
return
|
||||
@@ -78,7 +84,14 @@ end
|
||||
function M.tab_enter()
|
||||
if view.is_visible { any_tabpage = true } then
|
||||
local bufname = vim.api.nvim_buf_get_name(0)
|
||||
local ft = vim.api.nvim_buf_get_option(0, "ft")
|
||||
|
||||
local ft
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
ft = vim.api.nvim_get_option_value("filetype", { buf = 0 }) or ""
|
||||
else
|
||||
ft = vim.api.nvim_buf_get_option(0, "ft") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
for _, filter in ipairs(M.config.tab.sync.ignore) do
|
||||
if bufname:match(filter) ~= nil or ft:match(filter) ~= nil then
|
||||
return
|
||||
@@ -324,21 +337,6 @@ local function setup_autocommands(opts)
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
-- TODO #1545 remove similar check from view.resize
|
||||
if vim.fn.has "nvim-0.9" == 1 then
|
||||
create_nvim_tree_autocmd("WinResized", {
|
||||
callback = function()
|
||||
if vim.v.event and vim.v.event.windows then
|
||||
for _, winid in ipairs(vim.v.event.windows) do
|
||||
if vim.api.nvim_win_is_valid(winid) and utils.is_nvim_tree_buf(vim.api.nvim_win_get_buf(winid)) then
|
||||
events._dispatch_on_tree_resize(vim.api.nvim_win_get_width(winid))
|
||||
end
|
||||
end
|
||||
end
|
||||
end,
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
||||
@@ -586,7 +584,13 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
|
||||
default_yes = false,
|
||||
},
|
||||
},
|
||||
experimental = {},
|
||||
experimental = {
|
||||
actions = {
|
||||
open_file = {
|
||||
relative_path = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
log = {
|
||||
enable = false,
|
||||
truncate = false,
|
||||
@@ -634,9 +638,15 @@ local ACCEPTED_TYPES = {
|
||||
update_focused_file = {
|
||||
exclude = { "function" },
|
||||
},
|
||||
git = {
|
||||
disable_for_dirs = { "function" },
|
||||
},
|
||||
filters = {
|
||||
custom = { "function" },
|
||||
},
|
||||
filesystem_watchers = {
|
||||
ignore_dirs = { "function" },
|
||||
},
|
||||
actions = {
|
||||
open_file = {
|
||||
window_picker = {
|
||||
@@ -766,8 +776,8 @@ end
|
||||
|
||||
---@param conf table|nil
|
||||
function M.setup(conf)
|
||||
if vim.fn.has "nvim-0.8" == 0 then
|
||||
notify.warn "nvim-tree.lua requires Neovim 0.8 or higher"
|
||||
if vim.fn.has "nvim-0.9" == 0 then
|
||||
notify.warn "nvim-tree.lua requires Neovim 0.9 or higher"
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -69,8 +69,15 @@ function M.fn()
|
||||
|
||||
-- temporarily set &path
|
||||
local bufnr = vim.api.nvim_get_current_buf()
|
||||
local path_existed, path_opt = pcall(vim.api.nvim_buf_get_option, bufnr, "path")
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", core.get_cwd() .. "/**")
|
||||
|
||||
local path_existed, path_opt
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
path_existed, path_opt = pcall(vim.api.nvim_get_option_value, "path", { buf = bufnr })
|
||||
vim.api.nvim_set_option_value("path", core.get_cwd() .. "/**", { buf = bufnr })
|
||||
else
|
||||
path_existed, path_opt = pcall(vim.api.nvim_buf_get_option, bufnr, "path") ---@diagnostic disable-line: deprecated
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", core.get_cwd() .. "/**") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
vim.ui.input({ prompt = "Search: ", completion = "file_in_path" }, function(input_path)
|
||||
if not input_path or input_path == "" then
|
||||
@@ -78,9 +85,17 @@ function M.fn()
|
||||
end
|
||||
-- reset &path
|
||||
if path_existed then
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", path_opt)
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("path", path_opt, { buf = bufnr })
|
||||
else
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", path_opt) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
else
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", nil)
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("path", nil, { buf = bufnr })
|
||||
else
|
||||
vim.api.nvim_buf_set_option(bufnr, "path", nil) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
end
|
||||
|
||||
-- strip trailing slash
|
||||
|
||||
@@ -12,7 +12,7 @@ local M = {}
|
||||
local function create_and_notify(file)
|
||||
events._dispatch_will_create_file(file)
|
||||
local ok, fd = pcall(vim.loop.fs_open, file, "w", 420)
|
||||
if not ok then
|
||||
if not ok or type(fd) ~= "number" then
|
||||
notify.error("Couldn't create file " .. notify.render_path(file))
|
||||
return
|
||||
end
|
||||
|
||||
@@ -49,9 +49,9 @@ end
|
||||
---@param cwd string
|
||||
---@return boolean|nil
|
||||
local function remove_dir(cwd)
|
||||
local handle = vim.loop.fs_scandir(cwd)
|
||||
if type(handle) == "string" then
|
||||
notify.error(handle)
|
||||
local handle, err = vim.loop.fs_scandir(cwd)
|
||||
if not handle then
|
||||
notify.error(err)
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
@@ -30,13 +30,25 @@ local function err_fmt(from, to, reason)
|
||||
return string.format("Cannot rename %s -> %s: %s", from, to, reason)
|
||||
end
|
||||
|
||||
local function rename_file_exists(node, to)
|
||||
if not utils.is_macos then
|
||||
return utils.file_exists(to)
|
||||
end
|
||||
|
||||
if string.lower(node) == string.lower(to) then
|
||||
return false
|
||||
end
|
||||
|
||||
return utils.file_exists(to)
|
||||
end
|
||||
|
||||
---@param node Node
|
||||
---@param to string
|
||||
function M.rename(node, to)
|
||||
local notify_from = notify.render_path(node.absolute_path)
|
||||
local notify_to = notify.render_path(to)
|
||||
|
||||
if utils.file_exists(to) then
|
||||
if rename_file_exists(notify_from, notify_to) then
|
||||
notify.warn(err_fmt(notify_from, notify_to, "file already exists"))
|
||||
return
|
||||
end
|
||||
@@ -65,7 +77,7 @@ function M.rename(node, to)
|
||||
notify.warn(err_fmt(notify_from, notify_to, err))
|
||||
return
|
||||
end
|
||||
elseif not utils.file_exists(path_to_create) then
|
||||
elseif not rename_file_exists(notify_from, path_to_create) then
|
||||
local success = vim.loop.fs_mkdir(path_to_create, 493)
|
||||
if not success then
|
||||
notify.error("Could not create folder " .. notify.render_path(path_to_create))
|
||||
|
||||
@@ -56,7 +56,7 @@ end
|
||||
|
||||
function M.close_popup()
|
||||
if current_popup ~= nil then
|
||||
vim.api.nvim_win_close(current_popup.winnr, { force = true })
|
||||
vim.api.nvim_win_close(current_popup.winnr, true)
|
||||
vim.cmd "augroup NvimTreeRemoveFilePopup | au! CursorMoved | augroup END"
|
||||
|
||||
current_popup = nil
|
||||
|
||||
@@ -26,14 +26,20 @@ local function usable_win_ids()
|
||||
return vim.tbl_filter(function(id)
|
||||
local bufid = vim.api.nvim_win_get_buf(id)
|
||||
for option, v in pairs(M.window_picker.exclude) do
|
||||
local ok, option_value = pcall(vim.api.nvim_buf_get_option, bufid, option)
|
||||
local ok, option_value
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
ok, option_value = pcall(vim.api.nvim_get_option_value, option, { buf = bufid })
|
||||
else
|
||||
ok, option_value = pcall(vim.api.nvim_buf_get_option, bufid, option) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
if ok and vim.tbl_contains(v, option_value) then
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
local win_config = vim.api.nvim_win_get_config(id)
|
||||
return id ~= tree_winid and win_config.focusable and not win_config.external
|
||||
return id ~= tree_winid and win_config.focusable and not win_config.external or false
|
||||
end, win_ids)
|
||||
end
|
||||
|
||||
@@ -83,8 +89,15 @@ local function pick_win_id()
|
||||
|
||||
if laststatus == 3 then
|
||||
for _, win_id in ipairs(not_selectable) do
|
||||
local ok_status, statusline = pcall(vim.api.nvim_win_get_option, win_id, "statusline")
|
||||
local ok_hl, winhl = pcall(vim.api.nvim_win_get_option, win_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 = win_id })
|
||||
ok_hl, winhl = pcall(vim.api.nvim_get_option_value, "winhl", { win = win_id })
|
||||
else
|
||||
ok_status, statusline = pcall(vim.api.nvim_win_get_option, win_id, "statusline") ---@diagnostic disable-line: deprecated
|
||||
ok_hl, winhl = pcall(vim.api.nvim_win_get_option, win_id, "winhl") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
win_opts[win_id] = {
|
||||
statusline = ok_status and statusline or "",
|
||||
@@ -92,15 +105,26 @@ local function pick_win_id()
|
||||
}
|
||||
|
||||
-- Clear statusline for windows not selectable
|
||||
vim.api.nvim_win_set_option(win_id, "statusline", " ")
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("statusline", " ", { win = win_id })
|
||||
else
|
||||
vim.api.nvim_win_set_option(win_id, "statusline", " ") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Setup UI
|
||||
for _, id in ipairs(selectable) do
|
||||
local char = M.window_picker.chars:sub(i, i)
|
||||
local ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline")
|
||||
local ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl")
|
||||
|
||||
local ok_status, statusline, ok_hl, winhl
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
ok_status, statusline = pcall(vim.api.nvim_get_option_value, "statusline", { win = id })
|
||||
ok_hl, winhl = pcall(vim.api.nvim_get_option_value, "winhl", { win = id })
|
||||
else
|
||||
ok_status, statusline = pcall(vim.api.nvim_win_get_option, id, "statusline") ---@diagnostic disable-line: deprecated
|
||||
ok_hl, winhl = pcall(vim.api.nvim_win_get_option, id, "winhl") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
win_opts[id] = {
|
||||
statusline = ok_status and statusline or "",
|
||||
@@ -108,8 +132,13 @@ local function pick_win_id()
|
||||
}
|
||||
win_map[char] = id
|
||||
|
||||
vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=")
|
||||
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker")
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("statusline", "%=" .. char .. "%=", { win = id })
|
||||
vim.api.nvim_set_option_value("winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker", { win = id })
|
||||
else
|
||||
vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=") ---@diagnostic disable-line: deprecated
|
||||
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
i = i + 1
|
||||
if i > #M.window_picker.chars then
|
||||
@@ -128,14 +157,22 @@ local function pick_win_id()
|
||||
-- Restore window options
|
||||
for _, id in ipairs(selectable) do
|
||||
for opt, value in pairs(win_opts[id]) do
|
||||
vim.api.nvim_win_set_option(id, opt, value)
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value(opt, value, { win = id })
|
||||
else
|
||||
vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if laststatus == 3 then
|
||||
for _, id in ipairs(not_selectable) do
|
||||
for opt, value in pairs(win_opts[id]) do
|
||||
vim.api.nvim_win_set_option(id, opt, value)
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value(opt, value, { win = id })
|
||||
else
|
||||
vim.api.nvim_win_set_option(id, opt, value) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -153,6 +190,9 @@ local function open_file_in_tab(filename)
|
||||
if M.quit_on_open then
|
||||
view.close()
|
||||
end
|
||||
if M.relative_path then
|
||||
filename = utils.path_relative(filename, vim.fn.getcwd())
|
||||
end
|
||||
vim.cmd("tabe " .. vim.fn.fnameescape(filename))
|
||||
end
|
||||
|
||||
@@ -160,6 +200,9 @@ local function drop(filename)
|
||||
if M.quit_on_open then
|
||||
view.close()
|
||||
end
|
||||
if M.relative_path then
|
||||
filename = utils.path_relative(filename, vim.fn.getcwd())
|
||||
end
|
||||
vim.cmd("drop " .. vim.fn.fnameescape(filename))
|
||||
end
|
||||
|
||||
@@ -167,6 +210,9 @@ local function tab_drop(filename)
|
||||
if M.quit_on_open then
|
||||
view.close()
|
||||
end
|
||||
if M.relative_path then
|
||||
filename = utils.path_relative(filename, vim.fn.getcwd())
|
||||
end
|
||||
vim.cmd("tab :drop " .. vim.fn.fnameescape(filename))
|
||||
end
|
||||
|
||||
@@ -258,25 +304,21 @@ local function open_in_new_window(filename, mode)
|
||||
-- If `hidden` is not enabled, check if buffer in target window is
|
||||
-- modified, and create new split if it is.
|
||||
local target_bufid = vim.api.nvim_win_get_buf(target_winid)
|
||||
if vim.api.nvim_buf_get_option(target_bufid, "modified") then
|
||||
|
||||
local modified
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
modified = vim.api.nvim_get_option_value("modified", { buf = target_bufid })
|
||||
else
|
||||
modified = vim.api.nvim_buf_get_option(target_bufid, "modified") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
if modified then
|
||||
if not mode:match "split$" then
|
||||
mode = "vsplit"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local fname = vim.fn.fnameescape(filename)
|
||||
fname = utils.escape_special_chars(fname)
|
||||
|
||||
local cmd
|
||||
if create_new_window then
|
||||
cmd = string.format("%s vsplit %s", new_window_side, fname)
|
||||
elseif mode:match "split$" then
|
||||
cmd = string.format("%s %s", mode, fname)
|
||||
else
|
||||
cmd = string.format("edit %s", fname)
|
||||
end
|
||||
|
||||
if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
|
||||
-- ignore "WinLeave" autocmd on preview
|
||||
-- because the registered "WinLeave"
|
||||
@@ -286,7 +328,24 @@ local function open_in_new_window(filename, mode)
|
||||
set_current_win_no_autocmd(target_winid, { "BufEnter" })
|
||||
end
|
||||
|
||||
pcall(vim.cmd, cmd)
|
||||
local fname
|
||||
if M.relative_path then
|
||||
fname = utils.escape_special_chars(vim.fn.fnameescape(utils.path_relative(filename, vim.fn.getcwd())))
|
||||
else
|
||||
fname = utils.escape_special_chars(vim.fn.fnameescape(filename))
|
||||
end
|
||||
|
||||
local command
|
||||
if create_new_window then
|
||||
-- generated from vim.api.nvim_parse_cmd("belowright vsplit foo", {})
|
||||
command = { cmd = "vsplit", mods = { split = new_window_side }, args = { fname } }
|
||||
elseif mode:match "split$" then
|
||||
command = { cmd = mode, args = { fname } }
|
||||
else
|
||||
command = { cmd = "edit", args = { fname } }
|
||||
end
|
||||
|
||||
pcall(vim.api.nvim_cmd, command, { output = false })
|
||||
lib.set_target_win()
|
||||
end
|
||||
|
||||
@@ -301,6 +360,9 @@ end
|
||||
|
||||
local function edit_in_current_buf(filename)
|
||||
require("nvim-tree.view").abandon_current_window()
|
||||
if M.relative_path then
|
||||
filename = utils.path_relative(filename, vim.fn.getcwd())
|
||||
end
|
||||
vim.cmd("keepalt keepjumps edit " .. vim.fn.fnameescape(filename))
|
||||
end
|
||||
|
||||
@@ -357,6 +419,7 @@ end
|
||||
function M.setup(opts)
|
||||
M.quit_on_open = opts.actions.open_file.quit_on_open
|
||||
M.resize_window = opts.actions.open_file.resize_window
|
||||
M.relative_path = opts.experimental.actions.open_file.relative_path
|
||||
if opts.actions.open_file.window_picker.chars then
|
||||
opts.actions.open_file.window_picker.chars = tostring(opts.actions.open_file.window_picker.chars):upper()
|
||||
end
|
||||
|
||||
@@ -24,18 +24,19 @@ function M.fn(opts)
|
||||
local bufnr, path
|
||||
|
||||
-- (optional) buffer number and path
|
||||
if type(opts.buf) == "nil" then
|
||||
local opts_buf = opts.buf
|
||||
if type(opts_buf) == "nil" then
|
||||
bufnr = vim.api.nvim_get_current_buf()
|
||||
path = vim.api.nvim_buf_get_name(bufnr)
|
||||
elseif type(opts.buf) == "number" then
|
||||
if not vim.api.nvim_buf_is_valid(opts.buf) then
|
||||
elseif type(opts_buf) == "number" then
|
||||
if not vim.api.nvim_buf_is_valid(opts_buf) then
|
||||
return
|
||||
end
|
||||
bufnr = tonumber(opts.buf)
|
||||
bufnr = opts_buf
|
||||
path = vim.api.nvim_buf_get_name(bufnr)
|
||||
elseif type(opts.buf) == "string" then
|
||||
elseif type(opts_buf) == "string" then
|
||||
bufnr = nil
|
||||
path = tostring(opts.buf)
|
||||
path = tostring(opts_buf)
|
||||
else
|
||||
return
|
||||
end
|
||||
|
||||
@@ -4,12 +4,14 @@ M.find_file = require "nvim-tree.actions.tree.find-file"
|
||||
M.modifiers = require "nvim-tree.actions.tree.modifiers"
|
||||
M.open = require "nvim-tree.actions.tree.open"
|
||||
M.toggle = require "nvim-tree.actions.tree.toggle"
|
||||
M.resize = require "nvim-tree.actions.tree.resize"
|
||||
|
||||
function M.setup(opts)
|
||||
M.find_file.setup(opts)
|
||||
M.modifiers.setup(opts)
|
||||
M.open.setup(opts)
|
||||
M.toggle.setup(opts)
|
||||
M.resize.setup(opts)
|
||||
end
|
||||
|
||||
return M
|
||||
|
||||
51
lua/nvim-tree/actions/tree/resize.lua
Normal file
51
lua/nvim-tree/actions/tree/resize.lua
Normal file
@@ -0,0 +1,51 @@
|
||||
local view = require "nvim-tree.view"
|
||||
|
||||
local M = {}
|
||||
|
||||
---Resize the tree, persisting the new size.
|
||||
---@param opts ApiTreeResizeOpts|nil
|
||||
function M.fn(opts)
|
||||
if opts == nil then
|
||||
-- reset to config values
|
||||
view.configure_width()
|
||||
view.resize()
|
||||
return
|
||||
end
|
||||
|
||||
local options = opts or {}
|
||||
local width_cfg = options.width
|
||||
|
||||
if width_cfg ~= nil then
|
||||
view.configure_width(width_cfg)
|
||||
view.resize()
|
||||
return
|
||||
end
|
||||
|
||||
if not view.is_width_determined() then
|
||||
-- {absolute} and {relative} do nothing when {width} is a function.
|
||||
return
|
||||
end
|
||||
|
||||
local absolute = options.absolute
|
||||
if type(absolute) == "number" then
|
||||
view.resize(absolute)
|
||||
return
|
||||
end
|
||||
|
||||
local relative = options.relative
|
||||
if type(relative) == "number" then
|
||||
local relative_size = tostring(relative)
|
||||
if relative > 0 then
|
||||
relative_size = "+" .. relative_size
|
||||
end
|
||||
|
||||
view.resize(relative_size)
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
function M.setup(opts)
|
||||
M.config = opts or {}
|
||||
end
|
||||
|
||||
return M
|
||||
@@ -100,6 +100,13 @@ Api.tree.close_in_this_tab = wrap(view.close_this_tab_only)
|
||||
Api.tree.close_in_all_tabs = wrap(view.close_all_tabs)
|
||||
Api.tree.reload = wrap(actions.reloaders.reload_explorer)
|
||||
|
||||
---@class ApiTreeResizeOpts
|
||||
---@field width string|function|number|table|nil
|
||||
---@field absolute number|nil
|
||||
---@field relative number|nil
|
||||
|
||||
Api.tree.resize = wrap(actions.tree.resize.fn)
|
||||
|
||||
Api.tree.change_root = wrap(function(...)
|
||||
require("nvim-tree").change_dir(...)
|
||||
end)
|
||||
|
||||
@@ -129,7 +129,12 @@ function M.hi_test()
|
||||
render_displays("other, long", displays_long, bufnr, l)
|
||||
|
||||
-- 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)
|
||||
end
|
||||
|
||||
|
||||
@@ -183,15 +183,8 @@ function M.setup()
|
||||
|
||||
-- hard link override when legacy only is present
|
||||
for from, to in pairs(M.LEGACY_LINKS) do
|
||||
local hl_from
|
||||
local hl_to
|
||||
if vim.fn.has "nvim-0.9" == 1 then
|
||||
hl_from = vim.api.nvim_get_hl(0, { name = from })
|
||||
hl_to = vim.api.nvim_get_hl(0, { name = to })
|
||||
else
|
||||
hl_from = vim.api.nvim__get_hl_defs(0)[from] or {}
|
||||
hl_to = vim.api.nvim__get_hl_defs(0)[to] or {}
|
||||
end
|
||||
local hl_from = vim.api.nvim_get_hl(0, { name = from })
|
||||
local hl_to = vim.api.nvim_get_hl(0, { name = to })
|
||||
if vim.tbl_isempty(hl_from) and not vim.tbl_isempty(hl_to) then
|
||||
vim.api.nvim_command("hi link " .. from .. " " .. to)
|
||||
end
|
||||
|
||||
@@ -6,7 +6,7 @@ M._modified = {}
|
||||
---refresh M._modified
|
||||
function M.reload_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
|
||||
local path = buf.name
|
||||
if path ~= "" then -- not a [No Name] buffer
|
||||
|
||||
@@ -39,19 +39,21 @@ end
|
||||
local function from_nvim_lsp()
|
||||
local buffer_severity = {}
|
||||
|
||||
local is_disabled = false
|
||||
if vim.fn.has "nvim-0.9" == 1 then
|
||||
is_disabled = vim.diagnostic.is_disabled()
|
||||
-- is_enabled is not present in all 0.10 builds/releases, see #2781
|
||||
local is_enabled = false
|
||||
if vim.fn.has "nvim-0.10" == 1 and type(vim.diagnostic.is_enabled) == "function" then
|
||||
is_enabled = vim.diagnostic.is_enabled()
|
||||
elseif type(vim.diagnostic.is_disabled) == "function" then ---@diagnostic disable-line: deprecated
|
||||
is_enabled = not vim.diagnostic.is_disabled() ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
if not is_disabled then
|
||||
if is_enabled then
|
||||
for _, diagnostic in ipairs(vim.diagnostic.get(nil, { severity = M.severity })) do
|
||||
local buf = diagnostic.bufnr
|
||||
if vim.api.nvim_buf_is_valid(buf) then
|
||||
local bufname = uniformize_path(vim.api.nvim_buf_get_name(buf))
|
||||
local severity = diagnostic.severity
|
||||
local highest_severity = buffer_severity[bufname] or severity
|
||||
buffer_severity[bufname] = math.min(highest_severity, severity)
|
||||
if diagnostic.severity and diagnostic.bufnr and vim.api.nvim_buf_is_valid(diagnostic.bufnr) then
|
||||
local bufname = uniformize_path(vim.api.nvim_buf_get_name(diagnostic.bufnr))
|
||||
if not buffer_severity[bufname] or diagnostic.severity < buffer_severity[bufname] then
|
||||
buffer_severity[bufname] = diagnostic.severity
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
local git = require "nvim-tree.git"
|
||||
local notify = require "nvim-tree.notify"
|
||||
local watch = require "nvim-tree.explorer.watch"
|
||||
local explorer_node = require "nvim-tree.explorer.node"
|
||||
|
||||
@@ -15,14 +16,24 @@ M.reload = require("nvim-tree.explorer.reload").reload
|
||||
local Explorer = {}
|
||||
Explorer.__index = Explorer
|
||||
|
||||
---@param cwd string|nil
|
||||
---@return Explorer
|
||||
function Explorer.new(cwd)
|
||||
cwd = vim.loop.fs_realpath(cwd or vim.loop.cwd())
|
||||
---@param path string|nil
|
||||
---@return Explorer|nil
|
||||
function Explorer.new(path)
|
||||
local err
|
||||
|
||||
if path then
|
||||
path, err = vim.loop.fs_realpath(path)
|
||||
else
|
||||
path, err = vim.loop.cwd()
|
||||
end
|
||||
if not path then
|
||||
notify.error(err)
|
||||
return
|
||||
end
|
||||
|
||||
---@class Explorer
|
||||
local explorer = setmetatable({
|
||||
absolute_path = cwd,
|
||||
absolute_path = path,
|
||||
nodes = {},
|
||||
open = true,
|
||||
}, Explorer)
|
||||
|
||||
@@ -77,7 +77,7 @@ function M.link(parent, absolute_path, name, fs_stat)
|
||||
|
||||
local is_dir_link = (link_to ~= nil) and vim.loop.fs_stat(link_to).type == "directory"
|
||||
|
||||
if is_dir_link then
|
||||
if is_dir_link and link_to then
|
||||
local handle = vim.loop.fs_scandir(link_to)
|
||||
has_children = handle and vim.loop.fs_scandir_next(handle) ~= nil
|
||||
open = false
|
||||
|
||||
@@ -29,7 +29,7 @@ end
|
||||
---@param absolute_path string
|
||||
---@return GitStatus
|
||||
local function get_git_status(parent_ignored, status, absolute_path)
|
||||
local file_status = parent_ignored and "!!" or status.files and status.files[absolute_path]
|
||||
local file_status = parent_ignored and "!!" or (status and status.files and status.files[absolute_path])
|
||||
return { file = file_status }
|
||||
end
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ function M.reload(node, git_status)
|
||||
---@type table<string, Node>
|
||||
local nodes_by_path = utils.key_by(node.nodes, "absolute_path")
|
||||
while true do
|
||||
local name, t = vim.loop.fs_scandir_next(handle, cwd)
|
||||
local name, t = vim.loop.fs_scandir_next(handle)
|
||||
if not name then
|
||||
break
|
||||
end
|
||||
|
||||
@@ -40,10 +40,14 @@ local function is_folder_ignored(path)
|
||||
end
|
||||
end
|
||||
|
||||
for _, ignore_dir in ipairs(M.config.filesystem_watchers.ignore_dirs) do
|
||||
if vim.fn.match(path, ignore_dir) ~= -1 then
|
||||
return true
|
||||
if type(M.config.filesystem_watchers.ignore_dirs) == "table" then
|
||||
for _, ignore_dir in ipairs(M.config.filesystem_watchers.ignore_dirs) do
|
||||
if vim.fn.match(path, ignore_dir) ~= -1 then
|
||||
return true
|
||||
end
|
||||
end
|
||||
elseif type(M.config.filesystem_watchers.ignore_dirs) == "function" then
|
||||
return M.config.filesystem_watchers.ignore_dirs(path)
|
||||
end
|
||||
|
||||
return false
|
||||
|
||||
@@ -170,12 +170,18 @@ function M.get_toplevel(path)
|
||||
if not toplevel or not git_dir then
|
||||
return nil
|
||||
end
|
||||
local toplevel_norm = vim.fn.fnamemodify(toplevel, ":p")
|
||||
|
||||
-- ignore disabled paths
|
||||
for _, disabled_for_dir in ipairs(M.config.git.disable_for_dirs) do
|
||||
local toplevel_norm = vim.fn.fnamemodify(toplevel, ":p")
|
||||
local disabled_norm = vim.fn.fnamemodify(disabled_for_dir, ":p")
|
||||
if toplevel_norm == disabled_norm then
|
||||
if type(M.config.git.disable_for_dirs) == "table" then
|
||||
for _, disabled_for_dir in ipairs(M.config.git.disable_for_dirs) do
|
||||
local disabled_norm = vim.fn.fnamemodify(disabled_for_dir, ":p")
|
||||
if toplevel_norm == disabled_norm then
|
||||
return nil
|
||||
end
|
||||
end
|
||||
elseif type(M.config.git.disable_for_dirs) == "function" then
|
||||
if M.config.git.disable_for_dirs(toplevel_norm) then
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
@@ -173,7 +173,12 @@ local function open()
|
||||
|
||||
-- populate it
|
||||
vim.api.nvim_buf_set_lines(M.bufnr, 0, -1, false, lines)
|
||||
vim.api.nvim_buf_set_option(M.bufnr, "modifiable", false)
|
||||
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("modifiable", false, { buf = M.bufnr })
|
||||
else
|
||||
vim.api.nvim_buf_set_option(M.bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
-- highlight it
|
||||
for _, h in ipairs(hl) do
|
||||
|
||||
@@ -3,6 +3,7 @@ local view = require "nvim-tree.view"
|
||||
local core = require "nvim-tree.core"
|
||||
local utils = require "nvim-tree.utils"
|
||||
local events = require "nvim-tree.events"
|
||||
local notify = require "nvim-tree.notify"
|
||||
local explorer_node = require "nvim-tree.explorer.node"
|
||||
|
||||
---@class LibOpenOpts
|
||||
@@ -84,8 +85,7 @@ function M.get_last_group_node(node)
|
||||
node = node.group_next
|
||||
end
|
||||
|
||||
---@diagnostic disable-next-line: return-type-mismatch -- it can't be nil
|
||||
return node
|
||||
return node ---@diagnostic disable-line: return-type-mismatch -- it can't be nil
|
||||
end
|
||||
|
||||
---Group empty folders
|
||||
@@ -198,8 +198,15 @@ end
|
||||
local function should_hijack_current_buf()
|
||||
local bufnr = vim.api.nvim_get_current_buf()
|
||||
local bufname = vim.api.nvim_buf_get_name(bufnr)
|
||||
local bufmodified = vim.api.nvim_buf_get_option(bufnr, "modified")
|
||||
local ft = vim.api.nvim_buf_get_option(bufnr, "ft")
|
||||
|
||||
local bufmodified, ft
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
bufmodified = vim.api.nvim_get_option_value("modified", { buf = bufnr })
|
||||
ft = vim.api.nvim_get_option_value("ft", { buf = bufnr })
|
||||
else
|
||||
bufmodified = vim.api.nvim_buf_get_option(bufnr, "modified") ---@diagnostic disable-line: deprecated
|
||||
ft = vim.api.nvim_buf_get_option(bufnr, "ft") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
local should_hijack_unnamed = M.hijack_unnamed_buffer_when_opening and bufname == "" and not bufmodified and ft == ""
|
||||
local should_hijack_dir = bufname ~= "" and vim.fn.isdirectory(bufname) == 1 and M.hijack_directories.enable
|
||||
@@ -243,7 +250,16 @@ function M.open(opts)
|
||||
|
||||
M.set_target_win()
|
||||
if not core.get_explorer() or opts.path then
|
||||
core.init(opts.path or vim.loop.cwd())
|
||||
if opts.path then
|
||||
core.init(opts.path)
|
||||
else
|
||||
local cwd, err = vim.loop.cwd()
|
||||
if not cwd then
|
||||
notify.error(string.format("current working directory unavailable: %s", err))
|
||||
return
|
||||
end
|
||||
core.init(cwd)
|
||||
end
|
||||
end
|
||||
if should_hijack_current_buf() then
|
||||
view.close_this_tab_only()
|
||||
|
||||
@@ -27,8 +27,8 @@ local function reset_filter(node_)
|
||||
:iterate()
|
||||
end
|
||||
|
||||
local overlay_bufnr = nil
|
||||
local overlay_winnr = nil
|
||||
local overlay_bufnr = 0
|
||||
local overlay_winnr = 0
|
||||
|
||||
local function remove_overlay()
|
||||
if view.View.float.enable and view.View.float.quit_on_focus_loss then
|
||||
@@ -46,8 +46,8 @@ local function remove_overlay()
|
||||
|
||||
vim.api.nvim_win_close(overlay_winnr, true)
|
||||
vim.api.nvim_buf_delete(overlay_bufnr, { force = true })
|
||||
overlay_bufnr = nil
|
||||
overlay_winnr = nil
|
||||
overlay_bufnr = 0
|
||||
overlay_winnr = 0
|
||||
|
||||
if M.filter == "" then
|
||||
M.clear_filter()
|
||||
@@ -150,7 +150,13 @@ local function create_overlay()
|
||||
border = "none",
|
||||
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.cmd "startinsert"
|
||||
vim.api.nvim_win_set_cursor(overlay_winnr, { 1, #M.filter + 1 })
|
||||
|
||||
@@ -295,24 +295,16 @@ function Builder:add_highlights(node)
|
||||
table.insert(name_groups, name)
|
||||
end
|
||||
|
||||
-- one or many icon groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
|
||||
-- one or many icon groups
|
||||
if #icon_groups > 1 then
|
||||
if vim.fn.has "nvim-0.9" == 1 then
|
||||
icon_hl_group = self:create_combined_group(icon_groups)
|
||||
else
|
||||
icon_hl_group = icon_groups[#icon_groups]
|
||||
end
|
||||
icon_hl_group = self:create_combined_group(icon_groups)
|
||||
else
|
||||
icon_hl_group = icon_groups[1]
|
||||
end
|
||||
|
||||
-- one or many name groups; <= 0.8 always uses highest due to lack of a practical nvim_get_hl equivalent
|
||||
-- one or many name groups
|
||||
if #name_groups > 1 then
|
||||
if vim.fn.has "nvim-0.9" == 1 then
|
||||
name_hl_group = self:create_combined_group(name_groups)
|
||||
else
|
||||
name_hl_group = name_groups[#name_groups]
|
||||
end
|
||||
name_hl_group = self:create_combined_group(name_groups)
|
||||
else
|
||||
name_hl_group = name_groups[1]
|
||||
end
|
||||
@@ -396,11 +388,11 @@ function Builder:format_root_name(root_label)
|
||||
local label = root_label(self.root_cwd)
|
||||
if type(label) == "string" then
|
||||
return label
|
||||
else
|
||||
return "???"
|
||||
end
|
||||
elseif type(root_label) == "string" then
|
||||
return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
|
||||
end
|
||||
return utils.path_remove_trailing(vim.fn.fnamemodify(self.root_cwd, root_label))
|
||||
return "???"
|
||||
end
|
||||
|
||||
---@private
|
||||
@@ -422,11 +414,21 @@ function Builder:build_header()
|
||||
end
|
||||
end
|
||||
|
||||
---Sanitize lines for rendering.
|
||||
---Replace newlines with literal \n
|
||||
---@private
|
||||
function Builder:sanitize_lines()
|
||||
self.lines = vim.tbl_map(function(line)
|
||||
return line and line:gsub("\n", "\\n") or ""
|
||||
end, self.lines)
|
||||
end
|
||||
|
||||
---Build all lines with highlights and signs
|
||||
---@return Builder
|
||||
function Builder:build()
|
||||
self:build_header()
|
||||
self:build_lines()
|
||||
self:sanitize_lines()
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
@@ -67,12 +67,19 @@ local function show()
|
||||
})
|
||||
|
||||
local ns_id = vim.api.nvim_get_namespaces()["NvimTreeHighlights"]
|
||||
local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = 1 })
|
||||
local extmarks = vim.api.nvim_buf_get_extmarks(0, ns_id, { line_nr - 1, 0 }, { line_nr - 1, -1 }, { details = true })
|
||||
vim.api.nvim_win_call(M.popup_win, function()
|
||||
vim.api.nvim_buf_set_lines(0, 0, -1, true, { line })
|
||||
for _, extmark in ipairs(extmarks) do
|
||||
local hl = extmark[4]
|
||||
vim.api.nvim_buf_add_highlight(0, ns_id, hl.hl_group, 0, extmark[3], hl.end_col)
|
||||
-- nvim 0.10 luadoc is incorrect: vim.api.keyset.get_extmark_item is missing the extmark_id at the start
|
||||
|
||||
---@cast extmark table
|
||||
---@type integer
|
||||
local col = extmark[3]
|
||||
---@type vim.api.keyset.extmark_details
|
||||
local details = extmark[4]
|
||||
|
||||
vim.api.nvim_buf_add_highlight(0, ns_id, details.hl_group, 0, col, details.end_col)
|
||||
end
|
||||
vim.cmd [[ setlocal nowrap cursorline noswapfile nobuflisted buftype=nofile bufhidden=hide ]]
|
||||
end)
|
||||
|
||||
@@ -65,7 +65,12 @@ local function get_file_icon_webdev(fname, extension)
|
||||
-- If there are more extensions to the file, try to grab the icon for them recursively
|
||||
return get_file_icon_webdev(fname, string.match(extension, "%.(.*)"))
|
||||
else
|
||||
return get_file_icon_default()
|
||||
local devicons_default = M.devicons.get_default_icon()
|
||||
if devicons_default and type(devicons_default.icon) == "string" and type(devicons_default.name) == "string" then
|
||||
return devicons_default.icon, "DevIcon" .. devicons_default.name
|
||||
else
|
||||
return get_file_icon_default()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -19,10 +19,21 @@ local namespace_id = vim.api.nvim_create_namespace "NvimTreeHighlights"
|
||||
---@param hl_args AddHighlightArgs[]
|
||||
---@param signs string[]
|
||||
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)
|
||||
M.render_hl(bufnr, hl_args)
|
||||
vim.api.nvim_buf_set_option(bufnr, "modifiable", false)
|
||||
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
vim.api.nvim_set_option_value("modifiable", false, { buf = bufnr })
|
||||
else
|
||||
vim.api.nvim_buf_set_option(bufnr, "modifiable", false) ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
vim.fn.sign_unplace(SIGN_GROUP)
|
||||
for i, sign_name in pairs(signs) do
|
||||
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 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()
|
||||
|
||||
local builder = Builder:new():build()
|
||||
@@ -59,7 +70,7 @@ function M.draw()
|
||||
_draw(bufnr, builder.lines, builder.hl_args, builder.signs)
|
||||
|
||||
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
|
||||
|
||||
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))
|
||||
-- to avoid the 'overwrite existing file' error message on write for
|
||||
-- normal files
|
||||
if vim.api.nvim_buf_get_option(buf, "buftype") == "" then
|
||||
local buftype
|
||||
if vim.fn.has "nvim-0.10" == 1 then
|
||||
buftype = vim.api.nvim_get_option_value("buftype", { buf = buf })
|
||||
else
|
||||
buftype = vim.api.nvim_buf_get_option(buf, "buftype") ---@diagnostic disable-line: deprecated
|
||||
end
|
||||
|
||||
if buftype == "" then
|
||||
vim.api.nvim_buf_call(buf, function()
|
||||
vim.cmd "silent! write!"
|
||||
vim.cmd "edit"
|
||||
@@ -406,6 +413,9 @@ function M.debounce(context, timeout, callback)
|
||||
end
|
||||
|
||||
local timer = vim.loop.new_timer()
|
||||
if not timer then
|
||||
return
|
||||
end
|
||||
debouncer.timer = timer
|
||||
timer:start(timeout, 0, function()
|
||||
timer_stop_close(timer)
|
||||
|
||||
@@ -108,7 +108,7 @@ local function create_buffer(bufnr)
|
||||
events._dispatch_tree_attached_post(M.get_bufnr())
|
||||
end
|
||||
|
||||
---@param size number|fun():number
|
||||
---@param size (fun():integer)|integer|string
|
||||
---@return integer
|
||||
local function get_size(size)
|
||||
if type(size) == "number" then
|
||||
@@ -121,10 +121,13 @@ local function get_size(size)
|
||||
return math.floor(vim.o.columns * percent_as_decimal)
|
||||
end
|
||||
|
||||
---@param size number|function|nil
|
||||
---@param size (fun():integer)|integer|nil
|
||||
local function get_width(size)
|
||||
size = size or M.View.width
|
||||
return get_size(size)
|
||||
if size then
|
||||
return get_size(size)
|
||||
else
|
||||
return get_size(M.View.width)
|
||||
end
|
||||
end
|
||||
|
||||
local move_tbl = {
|
||||
@@ -140,7 +143,7 @@ local function setup_tabpage(tabpage)
|
||||
end
|
||||
|
||||
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()
|
||||
vim.opt.eventignore = "all"
|
||||
for k, v in pairs(M.View.winopts) do
|
||||
@@ -204,7 +207,7 @@ end
|
||||
---@param tabnr integer
|
||||
local function save_tab_state(tabnr)
|
||||
local tabpage = tabnr or vim.api.nvim_get_current_tabpage()
|
||||
M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage))
|
||||
M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr(tabpage) or 0)
|
||||
end
|
||||
|
||||
---@param tabpage integer
|
||||
@@ -222,8 +225,8 @@ local function close(tabpage)
|
||||
if tree_win == current_win and prev_win > 0 then
|
||||
vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
|
||||
end
|
||||
if vim.api.nvim_win_is_valid(tree_win) then
|
||||
vim.api.nvim_win_close(tree_win, true)
|
||||
if vim.api.nvim_win_is_valid(tree_win or 0) then
|
||||
vim.api.nvim_win_close(tree_win or 0, true)
|
||||
end
|
||||
events._dispatch_on_tree_close()
|
||||
return
|
||||
@@ -343,13 +346,9 @@ function M.resize(size)
|
||||
end
|
||||
|
||||
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)
|
||||
end
|
||||
events._dispatch_on_tree_resize(new_size)
|
||||
|
||||
if not M.View.preserve_window_proportions then
|
||||
vim.cmd ":wincmd ="
|
||||
@@ -420,7 +419,7 @@ function M.is_visible(opts)
|
||||
return false
|
||||
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
|
||||
|
||||
---@param opts table|nil
|
||||
@@ -443,7 +442,9 @@ function M.focus(winnr, open_if_closed)
|
||||
M.open()
|
||||
end
|
||||
|
||||
vim.api.nvim_set_current_win(wnr)
|
||||
if wnr then
|
||||
vim.api.nvim_set_current_win(wnr)
|
||||
end
|
||||
end
|
||||
|
||||
--- Retrieve the winid of the open tree.
|
||||
@@ -541,11 +542,40 @@ end
|
||||
|
||||
-- used on ColorScheme event
|
||||
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
|
||||
end
|
||||
end
|
||||
|
||||
---Check if width determined or calculated on-fly
|
||||
---@return boolean
|
||||
function M.is_width_determined()
|
||||
return type(M.View.width) ~= "function"
|
||||
end
|
||||
|
||||
---Configure width-related config
|
||||
---@param width string|function|number|table|nil
|
||||
function M.configure_width(width)
|
||||
if type(width) == "table" then
|
||||
M.View.adaptive_size = true
|
||||
M.View.width = width.min or DEFAULT_MIN_WIDTH
|
||||
M.View.max_width = width.max or DEFAULT_MAX_WIDTH
|
||||
M.View.padding = width.padding or DEFAULT_PADDING
|
||||
elseif width == nil then
|
||||
if M.config.width ~= nil then
|
||||
-- if we had input config - fallback to it
|
||||
M.configure_width(M.config.width)
|
||||
else
|
||||
-- otherwise - restore initial width
|
||||
M.View.width = M.View.initial_width
|
||||
end
|
||||
else
|
||||
M.View.adaptive_size = false
|
||||
M.View.width = width
|
||||
end
|
||||
end
|
||||
|
||||
function M.setup(opts)
|
||||
local options = opts.view or {}
|
||||
M.View.centralize_selection = options.centralize_selection
|
||||
@@ -561,15 +591,8 @@ function M.setup(opts)
|
||||
M.View.float = options.float
|
||||
M.on_attach = opts.on_attach
|
||||
|
||||
if type(options.width) == "table" then
|
||||
M.View.adaptive_size = true
|
||||
M.View.width = options.width.min or DEFAULT_MIN_WIDTH
|
||||
M.View.max_width = options.width.max or DEFAULT_MAX_WIDTH
|
||||
M.View.padding = options.width.padding or DEFAULT_PADDING
|
||||
else
|
||||
M.View.adaptive_size = false
|
||||
M.View.width = options.width
|
||||
end
|
||||
M.config = options
|
||||
M.configure_width(options.width)
|
||||
|
||||
M.View.initial_width = get_width()
|
||||
end
|
||||
|
||||
@@ -29,15 +29,11 @@ fi
|
||||
|
||||
# any output is a fail
|
||||
case "${OUT}" in
|
||||
*Diagnosis\ complete*)
|
||||
if [ -f "${DIR_OUT}/check.json" ]; then
|
||||
cat "${DIR_OUT}/check.json"
|
||||
exit 1
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
*Diagnosis\ completed,\ no\ problems\ found*)
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
cat "${DIR_OUT}/check.json"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user