Skip to content

Commit c9104a5

Browse files
alex-courtisalex-courtis
authored
chore: style: align_continuous_similar_call_args (#2937)
* chore: style: align_continuous_similar_call_args * chore: style: align_continuous_similar_call_args * chore: style: align_continuous_similar_call_args * chore: style: align_continuous_similar_call_args * chore: style: consistent use of double quotes
1 parent 4a9e82d commit c9104a5

File tree

9 files changed

+153
-154
lines changed

9 files changed

+153
-154
lines changed

Diff for: ‎.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ continuation_indent = 2
1818
quote_style = double
1919
call_arg_parentheses = always
2020
space_before_closure_open_parenthesis = false
21+
align_continuous_similar_call_args = true

Diff for: ‎doc/nvim-tree-lua.txt

+74-74
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ via |nvim-tree.on_attach| e.g. >
228228
api.config.mappings.default_on_attach(bufnr)
229229
230230
-- custom mappings
231-
vim.keymap.set('n', '<C-t>', api.tree.change_root_to_parent, opts('Up'))
232-
vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help'))
231+
vim.keymap.set("n", "<C-t>", api.tree.change_root_to_parent, opts("Up"))
232+
vim.keymap.set("n", "?", api.tree.toggle_help, opts("Help"))
233233
end
234234
235235
-- pass to setup along with your other options
@@ -1505,7 +1505,7 @@ Configuration options for opening a file from nvim-tree.
15051505
e.g. s1n7ax/nvim-window-picker plugin: >
15061506
window_picker = {
15071507
enable = true,
1508-
picker = require('window-picker').pick_window,
1508+
picker = require("window-picker").pick_window,
15091509
<
15101510
*nvim-tree.actions.open_file.window_picker.chars*
15111511
A string of chars used as identifiers by the window picker.
@@ -2278,27 +2278,27 @@ The `on_attach` function is passed the `bufnr` of nvim-tree. Use
22782278
|vim.keymap.set()| or |nvim_set_keymap()| to define mappings as usual. e.g. >
22792279
22802280
local function my_on_attach(bufnr)
2281-
local api = require('nvim-tree.api')
2281+
local api = require("nvim-tree.api")
22822282
22832283
local function opts(desc)
2284-
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
2284+
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
22852285
end
22862286
22872287
-- copy default mappings here from defaults in next section
2288-
vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
2289-
vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
2288+
vim.keymap.set("n", "<C-]>", api.tree.change_root_to_node, opts("CD"))
2289+
vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer, opts("Open: In Place"))
22902290
---
22912291
-- OR use all default mappings
22922292
api.config.mappings.default_on_attach(bufnr)
22932293
22942294
-- remove a default
2295-
vim.keymap.del('n', '<C-]>', { buffer = bufnr })
2295+
vim.keymap.del("n", "<C-]>", { buffer = bufnr })
22962296
22972297
-- override a default
2298-
vim.keymap.set('n', '<C-e>', api.tree.reload, opts('Refresh'))
2298+
vim.keymap.set("n", "<C-e>", api.tree.reload, opts("Refresh"))
22992299
23002300
-- add your mappings
2301-
vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help'))
2301+
vim.keymap.set("n", "?", api.tree.toggle_help, opts("Help"))
23022302
---
23032303
end
23042304
@@ -2318,13 +2318,13 @@ Single right / middle mouse mappings will require changes to |mousemodel| or |mo
23182318
define your own function to map complex functionality e.g. >
23192319
23202320
local function print_node_path()
2321-
local api = require('nvim-tree.api')
2321+
local api = require("nvim-tree.api")
23222322
local node = api.tree.get_node_under_cursor()
23232323
print(node.absolute_path)
23242324
end
23252325
23262326
-- on_attach
2327-
vim.keymap.set('n', '<C-P>', print_node_path, opts('Print Path'))
2327+
vim.keymap.set("n", "<C-P>", print_node_path, opts("Print Path"))
23282328
<
23292329
==============================================================================
23302330
7.1 MAPPINGS: DEFAULT *nvim-tree-mappings-default*
@@ -2334,81 +2334,81 @@ will be applied.
23342334

23352335
You are encouraged to copy these to your own |nvim-tree.on_attach| function.
23362336
>
2337-
local api = require('nvim-tree.api')
2337+
local api = require("nvim-tree.api")
23382338
23392339
local function opts(desc)
2340-
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
2340+
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
23412341
end
23422342
23432343
-- BEGIN_DEFAULT_ON_ATTACH
2344-
vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
2345-
vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
2346-
vim.keymap.set('n', '<C-k>', api.node.show_info_popup, opts('Info'))
2347-
vim.keymap.set('n', '<C-r>', api.fs.rename_sub, opts('Rename: Omit Filename'))
2348-
vim.keymap.set('n', '<C-t>', api.node.open.tab, opts('Open: New Tab'))
2349-
vim.keymap.set('n', '<C-v>', api.node.open.vertical, opts('Open: Vertical Split'))
2350-
vim.keymap.set('n', '<C-x>', api.node.open.horizontal, opts('Open: Horizontal Split'))
2351-
vim.keymap.set('n', '<BS>', api.node.navigate.parent_close, opts('Close Directory'))
2352-
vim.keymap.set('n', '<CR>', api.node.open.edit, opts('Open'))
2353-
vim.keymap.set('n', '<Tab>', api.node.open.preview, opts('Open Preview'))
2354-
vim.keymap.set('n', '>', api.node.navigate.sibling.next, opts('Next Sibling'))
2355-
vim.keymap.set('n', '<', api.node.navigate.sibling.prev, opts('Previous Sibling'))
2356-
vim.keymap.set('n', '.', api.node.run.cmd, opts('Run Command'))
2357-
vim.keymap.set('n', '-', api.tree.change_root_to_parent, opts('Up'))
2358-
vim.keymap.set('n', 'a', api.fs.create, opts('Create File Or Directory'))
2359-
vim.keymap.set('n', 'bd', api.marks.bulk.delete, opts('Delete Bookmarked'))
2360-
vim.keymap.set('n', 'bt', api.marks.bulk.trash, opts('Trash Bookmarked'))
2361-
vim.keymap.set('n', 'bmv', api.marks.bulk.move, opts('Move Bookmarked'))
2362-
vim.keymap.set('n', 'B', api.tree.toggle_no_buffer_filter, opts('Toggle Filter: No Buffer'))
2363-
vim.keymap.set('n', 'c', api.fs.copy.node, opts('Copy'))
2364-
vim.keymap.set('n', 'C', api.tree.toggle_git_clean_filter, opts('Toggle Filter: Git Clean'))
2365-
vim.keymap.set('n', '[c', api.node.navigate.git.prev, opts('Prev Git'))
2366-
vim.keymap.set('n', ']c', api.node.navigate.git.next, opts('Next Git'))
2367-
vim.keymap.set('n', 'd', api.fs.remove, opts('Delete'))
2368-
vim.keymap.set('n', 'D', api.fs.trash, opts('Trash'))
2369-
vim.keymap.set('n', 'E', api.tree.expand_all, opts('Expand All'))
2370-
vim.keymap.set('n', 'e', api.fs.rename_basename, opts('Rename: Basename'))
2371-
vim.keymap.set('n', ']e', api.node.navigate.diagnostics.next, opts('Next Diagnostic'))
2372-
vim.keymap.set('n', '[e', api.node.navigate.diagnostics.prev, opts('Prev Diagnostic'))
2373-
vim.keymap.set('n', 'F', api.live_filter.clear, opts('Live Filter: Clear'))
2374-
vim.keymap.set('n', 'f', api.live_filter.start, opts('Live Filter: Start'))
2375-
vim.keymap.set('n', 'g?', api.tree.toggle_help, opts('Help'))
2376-
vim.keymap.set('n', 'gy', api.fs.copy.absolute_path, opts('Copy Absolute Path'))
2377-
vim.keymap.set('n', 'ge', api.fs.copy.basename, opts('Copy Basename'))
2378-
vim.keymap.set('n', 'H', api.tree.toggle_hidden_filter, opts('Toggle Filter: Dotfiles'))
2379-
vim.keymap.set('n', 'I', api.tree.toggle_gitignore_filter, opts('Toggle Filter: Git Ignore'))
2380-
vim.keymap.set('n', 'J', api.node.navigate.sibling.last, opts('Last Sibling'))
2381-
vim.keymap.set('n', 'K', api.node.navigate.sibling.first, opts('First Sibling'))
2382-
vim.keymap.set('n', 'L', api.node.open.toggle_group_empty, opts('Toggle Group Empty'))
2383-
vim.keymap.set('n', 'M', api.tree.toggle_no_bookmark_filter, opts('Toggle Filter: No Bookmark'))
2384-
vim.keymap.set('n', 'm', api.marks.toggle, opts('Toggle Bookmark'))
2385-
vim.keymap.set('n', 'o', api.node.open.edit, opts('Open'))
2386-
vim.keymap.set('n', 'O', api.node.open.no_window_picker, opts('Open: No Window Picker'))
2387-
vim.keymap.set('n', 'p', api.fs.paste, opts('Paste'))
2388-
vim.keymap.set('n', 'P', api.node.navigate.parent, opts('Parent Directory'))
2389-
vim.keymap.set('n', 'q', api.tree.close, opts('Close'))
2390-
vim.keymap.set('n', 'r', api.fs.rename, opts('Rename'))
2391-
vim.keymap.set('n', 'R', api.tree.reload, opts('Refresh'))
2392-
vim.keymap.set('n', 's', api.node.run.system, opts('Run System'))
2393-
vim.keymap.set('n', 'S', api.tree.search_node, opts('Search'))
2394-
vim.keymap.set('n', 'u', api.fs.rename_full, opts('Rename: Full Path'))
2395-
vim.keymap.set('n', 'U', api.tree.toggle_custom_filter, opts('Toggle Filter: Hidden'))
2396-
vim.keymap.set('n', 'W', api.tree.collapse_all, opts('Collapse'))
2397-
vim.keymap.set('n', 'x', api.fs.cut, opts('Cut'))
2398-
vim.keymap.set('n', 'y', api.fs.copy.filename, opts('Copy Name'))
2399-
vim.keymap.set('n', 'Y', api.fs.copy.relative_path, opts('Copy Relative Path'))
2400-
vim.keymap.set('n', '<2-LeftMouse>', api.node.open.edit, opts('Open'))
2401-
vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
2344+
vim.keymap.set("n", "<C-]>", api.tree.change_root_to_node, opts("CD"))
2345+
vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer, opts("Open: In Place"))
2346+
vim.keymap.set("n", "<C-k>", api.node.show_info_popup, opts("Info"))
2347+
vim.keymap.set("n", "<C-r>", api.fs.rename_sub, opts("Rename: Omit Filename"))
2348+
vim.keymap.set("n", "<C-t>", api.node.open.tab, opts("Open: New Tab"))
2349+
vim.keymap.set("n", "<C-v>", api.node.open.vertical, opts("Open: Vertical Split"))
2350+
vim.keymap.set("n", "<C-x>", api.node.open.horizontal, opts("Open: Horizontal Split"))
2351+
vim.keymap.set("n", "<BS>", api.node.navigate.parent_close, opts("Close Directory"))
2352+
vim.keymap.set("n", "<CR>", api.node.open.edit, opts("Open"))
2353+
vim.keymap.set("n", "<Tab>", api.node.open.preview, opts("Open Preview"))
2354+
vim.keymap.set("n", ">", api.node.navigate.sibling.next, opts("Next Sibling"))
2355+
vim.keymap.set("n", "<", api.node.navigate.sibling.prev, opts("Previous Sibling"))
2356+
vim.keymap.set("n", ".", api.node.run.cmd, opts("Run Command"))
2357+
vim.keymap.set("n", "-", api.tree.change_root_to_parent, opts("Up"))
2358+
vim.keymap.set("n", "a", api.fs.create, opts("Create File Or Directory"))
2359+
vim.keymap.set("n", "bd", api.marks.bulk.delete, opts("Delete Bookmarked"))
2360+
vim.keymap.set("n", "bt", api.marks.bulk.trash, opts("Trash Bookmarked"))
2361+
vim.keymap.set("n", "bmv", api.marks.bulk.move, opts("Move Bookmarked"))
2362+
vim.keymap.set("n", "B", api.tree.toggle_no_buffer_filter, opts("Toggle Filter: No Buffer"))
2363+
vim.keymap.set("n", "c", api.fs.copy.node, opts("Copy"))
2364+
vim.keymap.set("n", "C", api.tree.toggle_git_clean_filter, opts("Toggle Filter: Git Clean"))
2365+
vim.keymap.set("n", "[c", api.node.navigate.git.prev, opts("Prev Git"))
2366+
vim.keymap.set("n", "]c", api.node.navigate.git.next, opts("Next Git"))
2367+
vim.keymap.set("n", "d", api.fs.remove, opts("Delete"))
2368+
vim.keymap.set("n", "D", api.fs.trash, opts("Trash"))
2369+
vim.keymap.set("n", "E", api.tree.expand_all, opts("Expand All"))
2370+
vim.keymap.set("n", "e", api.fs.rename_basename, opts("Rename: Basename"))
2371+
vim.keymap.set("n", "]e", api.node.navigate.diagnostics.next, opts("Next Diagnostic"))
2372+
vim.keymap.set("n", "[e", api.node.navigate.diagnostics.prev, opts("Prev Diagnostic"))
2373+
vim.keymap.set("n", "F", api.live_filter.clear, opts("Live Filter: Clear"))
2374+
vim.keymap.set("n", "f", api.live_filter.start, opts("Live Filter: Start"))
2375+
vim.keymap.set("n", "g?", api.tree.toggle_help, opts("Help"))
2376+
vim.keymap.set("n", "gy", api.fs.copy.absolute_path, opts("Copy Absolute Path"))
2377+
vim.keymap.set("n", "ge", api.fs.copy.basename, opts("Copy Basename"))
2378+
vim.keymap.set("n", "H", api.tree.toggle_hidden_filter, opts("Toggle Filter: Dotfiles"))
2379+
vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Filter: Git Ignore"))
2380+
vim.keymap.set("n", "J", api.node.navigate.sibling.last, opts("Last Sibling"))
2381+
vim.keymap.set("n", "K", api.node.navigate.sibling.first, opts("First Sibling"))
2382+
vim.keymap.set("n", "L", api.node.open.toggle_group_empty, opts("Toggle Group Empty"))
2383+
vim.keymap.set("n", "M", api.tree.toggle_no_bookmark_filter, opts("Toggle Filter: No Bookmark"))
2384+
vim.keymap.set("n", "m", api.marks.toggle, opts("Toggle Bookmark"))
2385+
vim.keymap.set("n", "o", api.node.open.edit, opts("Open"))
2386+
vim.keymap.set("n", "O", api.node.open.no_window_picker, opts("Open: No Window Picker"))
2387+
vim.keymap.set("n", "p", api.fs.paste, opts("Paste"))
2388+
vim.keymap.set("n", "P", api.node.navigate.parent, opts("Parent Directory"))
2389+
vim.keymap.set("n", "q", api.tree.close, opts("Close"))
2390+
vim.keymap.set("n", "r", api.fs.rename, opts("Rename"))
2391+
vim.keymap.set("n", "R", api.tree.reload, opts("Refresh"))
2392+
vim.keymap.set("n", "s", api.node.run.system, opts("Run System"))
2393+
vim.keymap.set("n", "S", api.tree.search_node, opts("Search"))
2394+
vim.keymap.set("n", "u", api.fs.rename_full, opts("Rename: Full Path"))
2395+
vim.keymap.set("n", "U", api.tree.toggle_custom_filter, opts("Toggle Filter: Hidden"))
2396+
vim.keymap.set("n", "W", api.tree.collapse_all, opts("Collapse"))
2397+
vim.keymap.set("n", "x", api.fs.cut, opts("Cut"))
2398+
vim.keymap.set("n", "y", api.fs.copy.filename, opts("Copy Name"))
2399+
vim.keymap.set("n", "Y", api.fs.copy.relative_path, opts("Copy Relative Path"))
2400+
vim.keymap.set("n", "<2-LeftMouse>", api.node.open.edit, opts("Open"))
2401+
vim.keymap.set("n", "<2-RightMouse>", api.tree.change_root_to_node, opts("CD"))
24022402
-- END_DEFAULT_ON_ATTACH
24032403
<
24042404
Alternatively, you may apply these default mappings from your |nvim-tree.on_attach| via
24052405
|nvim-tree-api.config.mappings.default_on_attach()| e.g.
24062406
>
24072407
local function my_on_attach(bufnr)
2408-
local api = require('nvim-tree.api')
2408+
local api = require("nvim-tree.api")
24092409
24102410
local function opts(desc)
2411-
return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
2411+
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
24122412
end
24132413
24142414
api.config.mappings.default_on_attach(bufnr)

Diff for: ‎lua/nvim-tree/actions/node/open-file.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ local function pick_win_id()
133133
win_map[char] = id
134134

135135
if vim.fn.has("nvim-0.10") == 1 then
136-
vim.api.nvim_set_option_value("statusline", "%=" .. char .. "%=", { win = id })
137-
vim.api.nvim_set_option_value("winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker", { win = id })
136+
vim.api.nvim_set_option_value("statusline", "%=" .. char .. "%=", { win = id })
137+
vim.api.nvim_set_option_value("winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker", { win = id })
138138
else
139139
vim.api.nvim_win_set_option(id, "statusline", "%=" .. char .. "%=") ---@diagnostic disable-line: deprecated
140-
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker") ---@diagnostic disable-line: deprecated
140+
vim.api.nvim_win_set_option(id, "winhl", "StatusLine:NvimTreeWindowPicker,StatusLineNC:NvimTreeWindowPicker") ---@diagnostic disable-line: deprecated
141141
end
142142

143143
i = i + 1

Diff for: ‎lua/nvim-tree/explorer/sorters.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ local function split_merge(t, first, last, comparator)
105105

106106
local mid = math.floor((first + last) / 2)
107107

108-
split_merge(t, first, mid, comparator)
108+
split_merge(t, first, mid, comparator)
109109
split_merge(t, mid + 1, last, comparator)
110110
merge(t, first, mid, last, comparator)
111111
end

Diff for: ‎lua/nvim-tree/git/runner.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ function Runner:_run_git_job(callback)
125125

126126
local opts = self:_getopts(stdout, stderr)
127127
log.line("git", "running job with timeout %dms", self.timeout)
128-
log.line("git", "git %s", table.concat(utils.array_remove_nils(opts.args), " "))
128+
log.line("git", "git %s", table.concat(utils.array_remove_nils(opts.args), " "))
129129

130130
handle, pid = vim.loop.spawn(
131131
"git",

0 commit comments

Comments
 (0)