mirror of
https://github.com/nvim-tree/nvim-tree.lua
synced 2024-09-16 14:34:03 +02:00
chore: stylua column width 120 -> 140 (#2448)
* chore: stylua column width 120 -> 140
* chore: stylua column width 120 -> 140, tidy
* Revert "chore: stylua column width 120 -> 140, tidy"
This reverts commit 8a0524d6bd
.
* chore: stylua column width 120 -> 140, tidy watcher.lua
* chore: stylua column width 120 -> 140, tidy diagnostics.lua
* chore: stylua column width 120 -> 140, tidy git.lua
* chore: stylua column width 120 -> 140, tidy open-file.lua
* chore: stylua column width 120 -> 140, tidy system-open.lua
* chore: stylua column width 120 -> 140, tidy runner.lua
This commit is contained in:
parent
94e572e141
commit
53b0bcaada
18 changed files with 38 additions and 114 deletions
|
@ -1,4 +1,4 @@
|
||||||
column_width = 120
|
column_width = 140
|
||||||
line_endings = "Unix"
|
line_endings = "Unix"
|
||||||
indent_type = "Spaces"
|
indent_type = "Spaces"
|
||||||
indent_width = 2
|
indent_width = 2
|
||||||
|
|
|
@ -218,10 +218,7 @@ local function setup_autocommands(opts)
|
||||||
create_nvim_tree_autocmd("BufReadPost", {
|
create_nvim_tree_autocmd("BufReadPost", {
|
||||||
callback = function(data)
|
callback = function(data)
|
||||||
-- update opened file buffers
|
-- update opened file buffers
|
||||||
if
|
if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
|
||||||
(filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
|
|
||||||
and vim.bo[data.buf].buftype == ""
|
|
||||||
then
|
|
||||||
utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
|
utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
|
||||||
reloaders.reload_explorer()
|
reloaders.reload_explorer()
|
||||||
end)
|
end)
|
||||||
|
@ -232,10 +229,7 @@ local function setup_autocommands(opts)
|
||||||
create_nvim_tree_autocmd("BufUnload", {
|
create_nvim_tree_autocmd("BufUnload", {
|
||||||
callback = function(data)
|
callback = function(data)
|
||||||
-- update opened file buffers
|
-- update opened file buffers
|
||||||
if
|
if (filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none") and vim.bo[data.buf].buftype == "" then
|
||||||
(filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
|
|
||||||
and vim.bo[data.buf].buftype == ""
|
|
||||||
then
|
|
||||||
utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
|
utils.debounce("Buf:filter_buffer", opts.view.debounce_delay, function()
|
||||||
reloaders.reload_explorer(nil, data.buf)
|
reloaders.reload_explorer(nil, data.buf)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -52,9 +52,7 @@ function M.fn(default_modifier)
|
||||||
|
|
||||||
-- support for only specific modifiers have been implemented
|
-- support for only specific modifiers have been implemented
|
||||||
if not ALLOWED_MODIFIERS[modifier] then
|
if not ALLOWED_MODIFIERS[modifier] then
|
||||||
return notify.warn(
|
return notify.warn("Modifier " .. vim.inspect(modifier) .. " is not in allowed list : " .. table.concat(ALLOWED_MODIFIERS, ","))
|
||||||
"Modifier " .. vim.inspect(modifier) .. " is not in allowed list : " .. table.concat(ALLOWED_MODIFIERS, ",")
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
node = lib.get_last_group_node(node)
|
node = lib.get_last_group_node(node)
|
||||||
|
|
|
@ -62,13 +62,7 @@ local function pick_win_id()
|
||||||
end
|
end
|
||||||
|
|
||||||
if #M.window_picker.chars < #selectable then
|
if #M.window_picker.chars < #selectable then
|
||||||
notify.error(
|
notify.error(string.format("More windows (%d) than actions.open_file.window_picker.chars (%d).", #selectable, #M.window_picker.chars))
|
||||||
string.format(
|
|
||||||
"More windows (%d) than actions.open_file.window_picker.chars (%d) - please add more.",
|
|
||||||
#selectable,
|
|
||||||
#M.window_picker.chars
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -16,18 +16,18 @@ function M.fn(node)
|
||||||
stderr = vim.loop.new_pipe(false),
|
stderr = vim.loop.new_pipe(false),
|
||||||
}
|
}
|
||||||
table.insert(process.args, node.link_to or node.absolute_path)
|
table.insert(process.args, node.link_to or node.absolute_path)
|
||||||
process.handle, process.pid = vim.loop.spawn(
|
|
||||||
process.cmd,
|
local opts = { args = process.args, stdio = { nil, nil, process.stderr }, detached = true }
|
||||||
{ args = process.args, stdio = { nil, nil, process.stderr }, detached = true },
|
|
||||||
function(code)
|
process.handle, process.pid = vim.loop.spawn(process.cmd, opts, function(code)
|
||||||
process.stderr:read_stop()
|
process.stderr:read_stop()
|
||||||
process.stderr:close()
|
process.stderr:close()
|
||||||
process.handle:close()
|
process.handle:close()
|
||||||
if code ~= 0 then
|
if code ~= 0 then
|
||||||
notify.warn(string.format("system_open failed with return code %d: %s", code, process.errors))
|
notify.warn(string.format("system_open failed with return code %d: %s", code, process.errors))
|
||||||
end
|
|
||||||
end
|
end
|
||||||
)
|
end)
|
||||||
|
|
||||||
table.remove(process.args)
|
table.remove(process.args)
|
||||||
if not process.handle then
|
if not process.handle then
|
||||||
notify.warn(string.format("system_open failed to spawn command '%s': %s", process.cmd, process.pid))
|
notify.warn(string.format("system_open failed to spawn command '%s': %s", process.cmd, process.pid))
|
||||||
|
|
|
@ -47,8 +47,7 @@ local function gen_iterator()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
:recursor(function(node)
|
:recursor(function(node)
|
||||||
return expansion_count < M.MAX_FOLDER_DISCOVERY
|
return expansion_count < M.MAX_FOLDER_DISCOVERY and (node.group_next and { node.group_next } or (node.open and node.nodes))
|
||||||
and (node.group_next and { node.group_next } or (node.open and node.nodes))
|
|
||||||
end)
|
end)
|
||||||
:iterate()
|
:iterate()
|
||||||
|
|
||||||
|
|
|
@ -95,11 +95,9 @@ function M.update()
|
||||||
for line, node in pairs(nodes_by_line) do
|
for line, node in pairs(nodes_by_line) do
|
||||||
local nodepath = utils.canonical_path(node.absolute_path)
|
local nodepath = utils.canonical_path(node.absolute_path)
|
||||||
log.line("diagnostics", " %d checking nodepath '%s'", line, nodepath)
|
log.line("diagnostics", " %d checking nodepath '%s'", line, nodepath)
|
||||||
if
|
|
||||||
M.show_on_dirs
|
local node_contains_buf = vim.startswith(bufpath:gsub("\\", "/"), nodepath:gsub("\\", "/") .. "/")
|
||||||
and vim.startswith(bufpath:gsub("\\", "/"), nodepath:gsub("\\", "/") .. "/")
|
if M.show_on_dirs and node_contains_buf and (not node.open or M.show_on_open_dirs) then
|
||||||
and (not node.open or M.show_on_open_dirs)
|
|
||||||
then
|
|
||||||
log.line("diagnostics", " matched fold node '%s'", node.absolute_path)
|
log.line("diagnostics", " matched fold node '%s'", node.absolute_path)
|
||||||
node.diag_status = severity
|
node.diag_status = severity
|
||||||
elseif nodepath == bufpath then
|
elseif nodepath == bufpath then
|
||||||
|
|
|
@ -30,11 +30,7 @@ local function populate_children(handle, cwd, node, git_status)
|
||||||
local profile = log.profile_start("explore populate_children %s", abs)
|
local profile = log.profile_start("explore populate_children %s", abs)
|
||||||
|
|
||||||
t = get_type_from(t, abs)
|
t = get_type_from(t, abs)
|
||||||
if
|
if not filters.should_filter(abs, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
|
||||||
not filters.should_filter(abs, filter_status)
|
|
||||||
and not nodes_by_path[abs]
|
|
||||||
and Watcher.is_fs_event_capable(abs)
|
|
||||||
then
|
|
||||||
local child = nil
|
local child = nil
|
||||||
if t == "directory" and vim.loop.fs_access(abs, "R") then
|
if t == "directory" and vim.loop.fs_access(abs, "R") then
|
||||||
child = builders.folder(node, abs, name)
|
child = builders.folder(node, abs, name)
|
||||||
|
|
|
@ -121,10 +121,7 @@ function M.should_filter(path, status)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
return git(path, status.git_status)
|
return git(path, status.git_status) or buf(path, status.bufinfo, status.unloaded_bufnr) or dotfile(path) or custom(path)
|
||||||
or buf(path, status.bufinfo, status.unloaded_bufnr)
|
|
||||||
or dotfile(path)
|
|
||||||
or custom(path)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function M.setup(opts)
|
function M.setup(opts)
|
||||||
|
|
|
@ -156,13 +156,7 @@ function Runner:_finalise(opts)
|
||||||
log.line("git", "job timed out %s %s", opts.toplevel, opts.path)
|
log.line("git", "job timed out %s %s", opts.toplevel, opts.path)
|
||||||
timeouts = timeouts + 1
|
timeouts = timeouts + 1
|
||||||
if timeouts == MAX_TIMEOUTS then
|
if timeouts == MAX_TIMEOUTS then
|
||||||
notify.warn(
|
notify.warn(string.format("%d git jobs have timed out after git.timeout %dms, disabling git integration.", timeouts, opts.timeout))
|
||||||
string.format(
|
|
||||||
"%d git jobs have timed out after %dms, disabling git integration. Try increasing git.timeout",
|
|
||||||
timeouts,
|
|
||||||
opts.timeout
|
|
||||||
)
|
|
||||||
)
|
|
||||||
require("nvim-tree.git").disable_git_integration()
|
require("nvim-tree.git").disable_git_integration()
|
||||||
end
|
end
|
||||||
elseif self.rc ~= 0 then
|
elseif self.rc ~= 0 then
|
||||||
|
|
|
@ -109,8 +109,7 @@ local function compute()
|
||||||
|
|
||||||
-- header, not padded
|
-- header, not padded
|
||||||
local hl = { { "NvimTreeRootFolder", 0, 0, #head_lhs } }
|
local hl = { { "NvimTreeRootFolder", 0, 0, #head_lhs } }
|
||||||
local lines =
|
local lines = { ("%s%s%s"):format(head_lhs, string.rep(" ", max_desc + max_lhs - #head_lhs - #head_rhs + 2), head_rhs) }
|
||||||
{ ("%s%s%s"):format(head_lhs, string.rep(" ", max_desc + max_lhs - #head_lhs - #head_rhs + 2), head_rhs) }
|
|
||||||
local width = #lines[1]
|
local width = #lines[1]
|
||||||
|
|
||||||
-- mappings, left padded 1
|
-- mappings, left padded 1
|
||||||
|
@ -177,12 +176,7 @@ local function open()
|
||||||
vim.wo[M.winnr].cursorline = M.config.cursorline
|
vim.wo[M.winnr].cursorline = M.config.cursorline
|
||||||
|
|
||||||
-- quit binding
|
-- quit binding
|
||||||
vim.keymap.set(
|
vim.keymap.set("n", "q", close, { desc = "nvim-tree: exit help", buffer = M.bufnr, noremap = true, silent = true, nowait = true })
|
||||||
"n",
|
|
||||||
"q",
|
|
||||||
close,
|
|
||||||
{ desc = "nvim-tree: exit help", buffer = M.bufnr, noremap = true, silent = true, nowait = true }
|
|
||||||
)
|
|
||||||
|
|
||||||
-- close window and delete buffer on leave
|
-- close window and delete buffer on leave
|
||||||
vim.api.nvim_create_autocmd({ "BufLeave", "WinLeave" }, {
|
vim.api.nvim_create_autocmd({ "BufLeave", "WinLeave" }, {
|
||||||
|
|
|
@ -40,15 +40,7 @@ local function refactored(opts)
|
||||||
utils.move_missing_val(opts, "git", "ignore", opts, "filters", "git_ignored", true)
|
utils.move_missing_val(opts, "git", "ignore", opts, "filters", "git_ignored", true)
|
||||||
|
|
||||||
-- 2023/08/26
|
-- 2023/08/26
|
||||||
utils.move_missing_val(
|
utils.move_missing_val(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
|
||||||
opts,
|
|
||||||
"renderer.icons",
|
|
||||||
"webdev_colors",
|
|
||||||
opts,
|
|
||||||
"renderer.icons.web_devicons.file",
|
|
||||||
"color",
|
|
||||||
true
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function deprecated(opts)
|
local function deprecated(opts)
|
||||||
|
|
|
@ -7,15 +7,12 @@ local config = {
|
||||||
|
|
||||||
local title_support
|
local title_support
|
||||||
function M.supports_title()
|
function M.supports_title()
|
||||||
-- TODO increase stylua column_width
|
|
||||||
-- stylua: ignore start
|
|
||||||
if title_support == nil then
|
if title_support == nil then
|
||||||
title_support = (package.loaded.notify and (vim.notify == require "notify" or vim.notify == require("notify").notify))
|
title_support = (package.loaded.notify and (vim.notify == require "notify" or vim.notify == require("notify").notify))
|
||||||
or (package.loaded.noice and (vim.notify == require("noice").notify or vim.notify == require("noice.source.notify").notify))
|
or (package.loaded.noice and (vim.notify == require("noice").notify or vim.notify == require("noice.source.notify").notify))
|
||||||
or (package.loaded.notifier and require("notifier.config").has_component "nvim")
|
or (package.loaded.notifier and require("notifier.config").has_component "nvim")
|
||||||
or false
|
or false
|
||||||
end
|
end
|
||||||
-- stylua: ignore end
|
|
||||||
|
|
||||||
return title_support
|
return title_support
|
||||||
end
|
end
|
||||||
|
|
|
@ -168,9 +168,7 @@ function Builder:_build_folder(node)
|
||||||
local link_to = utils.path_relative(node.link_to, core.get_cwd())
|
local link_to = utils.path_relative(node.link_to, core.get_cwd())
|
||||||
foldername = foldername .. arrow .. link_to
|
foldername = foldername .. arrow .. link_to
|
||||||
foldername_hl = "NvimTreeSymlinkFolderName"
|
foldername_hl = "NvimTreeSymlinkFolderName"
|
||||||
elseif
|
elseif vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
|
||||||
vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name)
|
|
||||||
then
|
|
||||||
foldername_hl = "NvimTreeSpecialFolderName"
|
foldername_hl = "NvimTreeSpecialFolderName"
|
||||||
elseif node.open then
|
elseif node.open then
|
||||||
foldername_hl = "NvimTreeOpenedFolderName"
|
foldername_hl = "NvimTreeOpenedFolderName"
|
||||||
|
@ -278,11 +276,7 @@ function Builder:_get_highlight_override(node, unloaded_bufnr)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- opened file
|
-- opened file
|
||||||
if
|
if self.highlight_opened_files and vim.fn.bufloaded(node.absolute_path) > 0 and vim.fn.bufnr(node.absolute_path) ~= unloaded_bufnr then
|
||||||
self.highlight_opened_files
|
|
||||||
and vim.fn.bufloaded(node.absolute_path) > 0
|
|
||||||
and vim.fn.bufnr(node.absolute_path) ~= unloaded_bufnr
|
|
||||||
then
|
|
||||||
if self.highlight_opened_files == "all" or self.highlight_opened_files == "name" then
|
if self.highlight_opened_files == "all" or self.highlight_opened_files == "name" then
|
||||||
name_hl = "NvimTreeOpenedFile"
|
name_hl = "NvimTreeOpenedFile"
|
||||||
end
|
end
|
||||||
|
@ -331,16 +325,7 @@ end
|
||||||
---@param modified_icon HighlightedString|nil
|
---@param modified_icon HighlightedString|nil
|
||||||
---@param bookmark_icon HighlightedString|nil
|
---@param bookmark_icon HighlightedString|nil
|
||||||
---@return HighlightedString[]
|
---@return HighlightedString[]
|
||||||
function Builder:_format_line(
|
function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
|
||||||
indent_markers,
|
|
||||||
arrows,
|
|
||||||
icon,
|
|
||||||
name,
|
|
||||||
git_icons,
|
|
||||||
diagnostics_icon,
|
|
||||||
modified_icon,
|
|
||||||
bookmark_icon
|
|
||||||
)
|
|
||||||
local added_len = 0
|
local added_len = 0
|
||||||
local function add_to_end(t1, t2)
|
local function add_to_end(t1, t2)
|
||||||
for _, v in ipairs(t2) do
|
for _, v in ipairs(t2) do
|
||||||
|
@ -430,8 +415,7 @@ function Builder:_build_line(node, idx, num_children, unloaded_bufnr)
|
||||||
self:_append_highlight(node, diagnostics.get_highlight, icon.hl, name.hl)
|
self:_append_highlight(node, diagnostics.get_highlight, icon.hl, name.hl)
|
||||||
self:_append_highlight(node, copy_paste.get_highlight, icon.hl, name.hl)
|
self:_append_highlight(node, copy_paste.get_highlight, icon.hl, name.hl)
|
||||||
|
|
||||||
local line =
|
local line = self:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
|
||||||
self:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
|
|
||||||
self:_insert_line(self:_unwrap_highlighted_strings(line))
|
self:_insert_line(self:_unwrap_highlighted_strings(line))
|
||||||
|
|
||||||
self.index = self.index + 1
|
self.index = self.index + 1
|
||||||
|
|
|
@ -94,11 +94,7 @@ end
|
||||||
local function nil_() end
|
local function nil_() end
|
||||||
|
|
||||||
local function warn_status(git_status)
|
local function warn_status(git_status)
|
||||||
notify.warn(
|
notify.warn(string.format("Unrecognized git state '%s'", git_status))
|
||||||
'Unrecognized git state "'
|
|
||||||
.. git_status
|
|
||||||
.. '". Please open up an issue on https://github.com/nvim-tree/nvim-tree.lua/issues with this message.'
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param node table
|
---@param node table
|
||||||
|
|
|
@ -30,9 +30,7 @@ local function get_padding_indent_markers(depth, idx, nodes_number, markers, wit
|
||||||
for i = 1, depth do
|
for i = 1, depth do
|
||||||
local glyph
|
local glyph
|
||||||
if idx == nodes_number and i == depth then
|
if idx == nodes_number and i == depth then
|
||||||
local bottom_width = M.config.indent_width
|
local bottom_width = M.config.indent_width - 2 + (with_arrows and not inline_arrows and has_folder_sibling and 2 or 0)
|
||||||
- 2
|
|
||||||
+ (with_arrows and not inline_arrows and has_folder_sibling and 2 or 0)
|
|
||||||
glyph = M.config.indent_markers.icons.corner
|
glyph = M.config.indent_markers.icons.corner
|
||||||
.. string.rep(M.config.indent_markers.icons.bottom, bottom_width)
|
.. string.rep(M.config.indent_markers.icons.bottom, bottom_width)
|
||||||
.. (M.config.indent_width > 1 and " " or "")
|
.. (M.config.indent_width > 1 and " " or "")
|
||||||
|
|
|
@ -176,9 +176,7 @@ function M.rename_loaded_buffers(old_path, new_path)
|
||||||
if vim.api.nvim_buf_is_loaded(buf) then
|
if vim.api.nvim_buf_is_loaded(buf) then
|
||||||
local buf_name = vim.api.nvim_buf_get_name(buf)
|
local buf_name = vim.api.nvim_buf_get_name(buf)
|
||||||
local exact_match = buf_name == old_path
|
local exact_match = buf_name == old_path
|
||||||
local child_match = (
|
local child_match = (buf_name:sub(1, #old_path) == old_path and buf_name:sub(#old_path + 1, #old_path + 1) == path_separator)
|
||||||
buf_name:sub(1, #old_path) == old_path and buf_name:sub(#old_path + 1, #old_path + 1) == path_separator
|
|
||||||
)
|
|
||||||
if exact_match or child_match then
|
if exact_match or child_match then
|
||||||
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
|
||||||
|
|
|
@ -73,14 +73,10 @@ function Event:start()
|
||||||
|
|
||||||
rc, _, name = self._fs_event:start(self._path, FS_EVENT_FLAGS, event_cb)
|
rc, _, name = self._fs_event:start(self._path, FS_EVENT_FLAGS, event_cb)
|
||||||
if rc ~= 0 then
|
if rc ~= 0 then
|
||||||
local warning = string.format("Could not start the fs_event watcher for path %s : %s", self._path, name)
|
|
||||||
if name == "EMFILE" then
|
if name == "EMFILE" then
|
||||||
M.disable_watchers(
|
M.disable_watchers "fs.inotify.max_user_watches exceeded, see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting"
|
||||||
warning,
|
|
||||||
"Please see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting#could-not-start-fs_event-for-path--emfile"
|
|
||||||
)
|
|
||||||
else
|
else
|
||||||
notify.warn(warning)
|
notify.warn(string.format("Could not start the fs_event watcher for path %s : %s", self._path, name))
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
@ -164,10 +160,9 @@ end
|
||||||
M.Watcher = Watcher
|
M.Watcher = Watcher
|
||||||
|
|
||||||
--- Permanently disable watchers and purge all state following a catastrophic error.
|
--- Permanently disable watchers and purge all state following a catastrophic error.
|
||||||
--- @param warning string
|
--- @param msg string
|
||||||
--- @param detail string
|
function M.disable_watchers(msg)
|
||||||
function M.disable_watchers(warning, detail)
|
notify.warn(string.format("Disabling watchers: %s", msg))
|
||||||
notify.warn(string.format("%s Disabling watchers: %s", warning, detail))
|
|
||||||
M.config.filesystem_watchers.enable = false
|
M.config.filesystem_watchers.enable = false
|
||||||
require("nvim-tree").purge_all_state()
|
require("nvim-tree").purge_all_state()
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue