Skip to content

chore: stylua column width 120 -> 140 #2448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .stylua.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
column_width = 120
column_width = 140
line_endings = "Unix"
indent_type = "Spaces"
indent_width = 2
Expand Down
10 changes: 2 additions & 8 deletions lua/nvim-tree.lua
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,7 @@ local function setup_autocommands(opts)
create_nvim_tree_autocmd("BufReadPost", {
callback = function(data)
-- update opened file buffers
if
(filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
and vim.bo[data.buf].buftype == ""
then
if (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()
reloaders.reload_explorer()
end)
Expand All @@ -232,10 +229,7 @@ local function setup_autocommands(opts)
create_nvim_tree_autocmd("BufUnload", {
callback = function(data)
-- update opened file buffers
if
(filters.config.filter_no_buffer or renderer.config.highlight_opened_files ~= "none")
and vim.bo[data.buf].buftype == ""
then
if (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()
reloaders.reload_explorer(nil, data.buf)
end)
Expand Down
4 changes: 1 addition & 3 deletions lua/nvim-tree/actions/fs/rename-file.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ function M.fn(default_modifier)

-- support for only specific modifiers have been implemented
if not ALLOWED_MODIFIERS[modifier] then
return notify.warn(
"Modifier " .. vim.inspect(modifier) .. " is not in allowed list : " .. table.concat(ALLOWED_MODIFIERS, ",")
)
return notify.warn("Modifier " .. vim.inspect(modifier) .. " is not in allowed list : " .. table.concat(ALLOWED_MODIFIERS, ","))
end

node = lib.get_last_group_node(node)
Expand Down
8 changes: 1 addition & 7 deletions lua/nvim-tree/actions/node/open-file.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,7 @@ local function pick_win_id()
end

if #M.window_picker.chars < #selectable then
notify.error(
string.format(
"More windows (%d) than actions.open_file.window_picker.chars (%d) - please add more.",
#selectable,
#M.window_picker.chars
)
)
notify.error(string.format("More windows (%d) than actions.open_file.window_picker.chars (%d).", #selectable, #M.window_picker.chars))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Action is obvious :)

return nil
end

Expand Down
22 changes: 11 additions & 11 deletions lua/nvim-tree/actions/node/system-open.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ function M.fn(node)
stderr = vim.loop.new_pipe(false),
}
table.insert(process.args, node.link_to or node.absolute_path)
process.handle, process.pid = vim.loop.spawn(
process.cmd,
{ args = process.args, stdio = { nil, nil, process.stderr }, detached = true },
function(code)
process.stderr:read_stop()
process.stderr:close()
process.handle:close()
if code ~= 0 then
notify.warn(string.format("system_open failed with return code %d: %s", code, process.errors))
end

local opts = { args = process.args, stdio = { nil, nil, process.stderr }, detached = true }
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

broke up


process.handle, process.pid = vim.loop.spawn(process.cmd, opts, function(code)
process.stderr:read_stop()
process.stderr:close()
process.handle:close()
if code ~= 0 then
notify.warn(string.format("system_open failed with return code %d: %s", code, process.errors))
end
)
end)

table.remove(process.args)
if not process.handle then
notify.warn(string.format("system_open failed to spawn command '%s': %s", process.cmd, process.pid))
Expand Down
3 changes: 1 addition & 2 deletions lua/nvim-tree/actions/tree-modifiers/expand-all.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ local function gen_iterator()
end
end)
:recursor(function(node)
return expansion_count < M.MAX_FOLDER_DISCOVERY
and (node.group_next and { node.group_next } or (node.open and node.nodes))
return expansion_count < M.MAX_FOLDER_DISCOVERY and (node.group_next and { node.group_next } or (node.open and node.nodes))
end)
:iterate()

Expand Down
8 changes: 3 additions & 5 deletions lua/nvim-tree/diagnostics.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,9 @@ function M.update()
for line, node in pairs(nodes_by_line) do
local nodepath = utils.canonical_path(node.absolute_path)
log.line("diagnostics", " %d checking nodepath '%s'", line, nodepath)
if
M.show_on_dirs
and vim.startswith(bufpath:gsub("\\", "/"), nodepath:gsub("\\", "/") .. "/")
and (not node.open or M.show_on_open_dirs)
then

local node_contains_buf = 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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Broke up.

log.line("diagnostics", " matched fold node '%s'", node.absolute_path)
node.diag_status = severity
elseif nodepath == bufpath then
Expand Down
6 changes: 1 addition & 5 deletions lua/nvim-tree/explorer/explore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ local function populate_children(handle, cwd, node, git_status)
local profile = log.profile_start("explore populate_children %s", abs)

t = get_type_from(t, abs)
if
not filters.should_filter(abs, filter_status)
and not nodes_by_path[abs]
and Watcher.is_fs_event_capable(abs)
then
if not filters.should_filter(abs, filter_status) and not nodes_by_path[abs] and Watcher.is_fs_event_capable(abs) then
local child = nil
if t == "directory" and vim.loop.fs_access(abs, "R") then
child = builders.folder(node, abs, name)
Expand Down
5 changes: 1 addition & 4 deletions lua/nvim-tree/explorer/filters.lua
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@ function M.should_filter(path, status)
return false
end

return git(path, status.git_status)
or buf(path, status.bufinfo, status.unloaded_bufnr)
or dotfile(path)
or custom(path)
return git(path, status.git_status) or buf(path, status.bufinfo, status.unloaded_bufnr) or dotfile(path) or custom(path)
end

function M.setup(opts)
Expand Down
8 changes: 1 addition & 7 deletions lua/nvim-tree/git/runner.lua
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,7 @@ function Runner:_finalise(opts)
log.line("git", "job timed out %s %s", opts.toplevel, opts.path)
timeouts = timeouts + 1
if timeouts == MAX_TIMEOUTS then
notify.warn(
string.format(
"%d git jobs have timed out after %dms, disabling git integration. Try increasing git.timeout",
timeouts,
opts.timeout
)
)
notify.warn(string.format("%d git jobs have timed out after git.timeout %dms, disabling git integration.", timeouts, opts.timeout))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Message was too verbose

require("nvim-tree.git").disable_git_integration()
end
elseif self.rc ~= 0 then
Expand Down
10 changes: 2 additions & 8 deletions lua/nvim-tree/help.lua
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ local function compute()

-- header, not padded
local hl = { { "NvimTreeRootFolder", 0, 0, #head_lhs } }
local lines =
{ ("%s%s%s"):format(head_lhs, string.rep(" ", max_desc + max_lhs - #head_lhs - #head_rhs + 2), head_rhs) }
local lines = { ("%s%s%s"):format(head_lhs, string.rep(" ", max_desc + max_lhs - #head_lhs - #head_rhs + 2), head_rhs) }
local width = #lines[1]

-- mappings, left padded 1
Expand Down Expand Up @@ -177,12 +176,7 @@ local function open()
vim.wo[M.winnr].cursorline = M.config.cursorline

-- quit binding
vim.keymap.set(
"n",
"q",
close,
{ desc = "nvim-tree: exit help", buffer = M.bufnr, noremap = true, silent = true, nowait = true }
)
vim.keymap.set("n", "q", close, { desc = "nvim-tree: exit help", buffer = M.bufnr, noremap = true, silent = true, nowait = true })

-- close window and delete buffer on leave
vim.api.nvim_create_autocmd({ "BufLeave", "WinLeave" }, {
Expand Down
10 changes: 1 addition & 9 deletions lua/nvim-tree/legacy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,7 @@ local function refactored(opts)
utils.move_missing_val(opts, "git", "ignore", opts, "filters", "git_ignored", true)

-- 2023/08/26
utils.move_missing_val(
opts,
"renderer.icons",
"webdev_colors",
opts,
"renderer.icons.web_devicons.file",
"color",
true
)
utils.move_missing_val(opts, "renderer.icons", "webdev_colors", opts, "renderer.icons.web_devicons.file", "color", true)
end

local function deprecated(opts)
Expand Down
3 changes: 0 additions & 3 deletions lua/nvim-tree/notify.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ local config = {

local title_support
function M.supports_title()
-- TODO increase stylua column_width
-- stylua: ignore start
if title_support == nil then
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.notifier and require("notifier.config").has_component "nvim")
or false
end
-- stylua: ignore end

return title_support
end
Expand Down
24 changes: 4 additions & 20 deletions lua/nvim-tree/renderer/builder.lua
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,7 @@ function Builder:_build_folder(node)
local link_to = utils.path_relative(node.link_to, core.get_cwd())
foldername = foldername .. arrow .. link_to
foldername_hl = "NvimTreeSymlinkFolderName"
elseif
vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name)
then
elseif vim.tbl_contains(self.special_files, node.absolute_path) or vim.tbl_contains(self.special_files, node.name) then
foldername_hl = "NvimTreeSpecialFolderName"
elseif node.open then
foldername_hl = "NvimTreeOpenedFolderName"
Expand Down Expand Up @@ -278,11 +276,7 @@ function Builder:_get_highlight_override(node, unloaded_bufnr)
end

-- opened file
if
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 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
name_hl = "NvimTreeOpenedFile"
end
Expand Down Expand Up @@ -331,16 +325,7 @@ end
---@param modified_icon HighlightedString|nil
---@param bookmark_icon HighlightedString|nil
---@return HighlightedString[]
function Builder:_format_line(
indent_markers,
arrows,
icon,
name,
git_icons,
diagnostics_icon,
modified_icon,
bookmark_icon
)
function Builder:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
local added_len = 0
local function add_to_end(t1, t2)
for _, v in ipairs(t2) do
Expand Down Expand Up @@ -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, copy_paste.get_highlight, icon.hl, name.hl)

local line =
self:_format_line(indent_markers, arrows, icon, name, git_icons, diagnostics_icon, modified_icon, bookmark_icon)
local line = 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.index = self.index + 1
Expand Down
6 changes: 1 addition & 5 deletions lua/nvim-tree/renderer/components/git.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,7 @@ end
local function nil_() end

local function warn_status(git_status)
notify.warn(
'Unrecognized git state "'
.. git_status
.. '". Please open up an issue on https://github.com/nvim-tree/nvim-tree.lua/issues with this message.'
)
notify.warn(string.format("Unrecognized git state '%s'", git_status))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Message is no longer needed; we were fishing for unknown statuses.

end

---@param node table
Expand Down
4 changes: 1 addition & 3 deletions lua/nvim-tree/renderer/components/padding.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ local function get_padding_indent_markers(depth, idx, nodes_number, markers, wit
for i = 1, depth do
local glyph
if idx == nodes_number and i == depth then
local bottom_width = M.config.indent_width
- 2
+ (with_arrows and not inline_arrows and has_folder_sibling and 2 or 0)
local bottom_width = M.config.indent_width - 2 + (with_arrows and not inline_arrows and has_folder_sibling and 2 or 0)
glyph = M.config.indent_markers.icons.corner
.. string.rep(M.config.indent_markers.icons.bottom, bottom_width)
.. (M.config.indent_width > 1 and " " or "")
Expand Down
4 changes: 1 addition & 3 deletions lua/nvim-tree/utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,7 @@ function M.rename_loaded_buffers(old_path, new_path)
if vim.api.nvim_buf_is_loaded(buf) then
local buf_name = vim.api.nvim_buf_get_name(buf)
local exact_match = buf_name == old_path
local child_match = (
buf_name:sub(1, #old_path) == old_path and buf_name:sub(#old_path + 1, #old_path + 1) == path_separator
)
local child_match = (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
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
Expand Down
15 changes: 5 additions & 10 deletions lua/nvim-tree/watcher.lua
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,10 @@ function Event:start()

rc, _, name = self._fs_event:start(self._path, FS_EVENT_FLAGS, event_cb)
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
M.disable_watchers(
warning,
"Please see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting#could-not-start-fs_event-for-path--emfile"
)
M.disable_watchers "fs.inotify.max_user_watches exceeded, see https://github.com/nvim-tree/nvim-tree.lua/wiki/Troubleshooting"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tidied message.

else
notify.warn(warning)
notify.warn(string.format("Could not start the fs_event watcher for path %s : %s", self._path, name))
end
return false
end
Expand Down Expand Up @@ -164,10 +160,9 @@ end
M.Watcher = Watcher

--- Permanently disable watchers and purge all state following a catastrophic error.
--- @param warning string
--- @param detail string
function M.disable_watchers(warning, detail)
notify.warn(string.format("%s Disabling watchers: %s", warning, detail))
--- @param msg string
function M.disable_watchers(msg)
notify.warn(string.format("Disabling watchers: %s", msg))
M.config.filesystem_watchers.enable = false
require("nvim-tree").purge_all_state()
end
Expand Down