Compare commits
8 Commits
nvim-tree-
...
v1.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2086e564c4 | ||
|
|
1cac8005df | ||
|
|
8704b6f7fc | ||
|
|
26632f496e | ||
|
|
5a87ffe35c | ||
|
|
517e4fbb9e | ||
|
|
4c8ddee453 | ||
|
|
4215f33da5 |
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -67,7 +67,7 @@ jobs:
|
|||||||
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
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: Release
|
name: Luarocks Release
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
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 }}
|
||||||
|
|||||||
15
.luarc.json
15
.luarc.json
@@ -3,15 +3,13 @@
|
|||||||
"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.3.3"
|
".": "1.4.0"
|
||||||
}
|
}
|
||||||
|
|||||||
15
CHANGELOG.md
15
CHANGELOG.md
@@ -1,5 +1,20 @@
|
|||||||
# 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)
|
## [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)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
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
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ Questions and general support: [Discussions](https://github.com/nvim-tree/nvim-t
|
|||||||
|
|
||||||
## 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*
|
||||||
@@ -832,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.
|
||||||
|
|||||||
@@ -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,7 +25,14 @@ 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
|
||||||
|
|
||||||
|
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
|
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
|
||||||
@@ -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
|
||||||
@@ -324,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
|
||||||
@@ -766,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
|
||||||
|
|
||||||
|
|||||||
@@ -69,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
|
||||||
@@ -78,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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -56,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,15 +295,22 @@ 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 command
|
local command
|
||||||
if create_new_window then
|
if create_new_window then
|
||||||
@@ -287,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, command)
|
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
|
||||||
|
|||||||
@@ -129,7 +129,12 @@ function M.hi_test()
|
|||||||
render_displays("other, long", displays_long, bufnr, l)
|
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
|
||||||
|
|
||||||
|
|||||||
@@ -183,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
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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"
|
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
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ function M.reload(node, git_status)
|
|||||||
---@type table<string, 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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -84,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
|
||||||
@@ -198,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
|
||||||
@@ -243,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()
|
||||||
|
|||||||
@@ -27,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
|
||||||
@@ -46,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()
|
||||||
@@ -150,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 })
|
||||||
|
|||||||
@@ -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,12 +388,12 @@ 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
|
end
|
||||||
|
return "???"
|
||||||
|
end
|
||||||
|
|
||||||
---@private
|
---@private
|
||||||
function Builder:build_header()
|
function Builder:build_header()
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -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,8 +442,10 @@ 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.
|
||||||
---@param opts ApiTreeWinIdOpts|nil
|
---@param opts ApiTreeWinIdOpts|nil
|
||||||
@@ -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