Skip to content

Commit 1429801

Browse files
alex-courtisalex-courtis
committed
stylua -> EmmyLuaCodeStyle
1 parent 61d3f26 commit 1429801

File tree

8 files changed

+112
-114
lines changed

8 files changed

+112
-114
lines changed

‎lua/nvim-tree/actions/moves/item.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ local function move_prev_recursive(what, skip_gitignored)
175175
if
176176
node_cur == nil
177177
or node_cur == node_init -- we didn't move
178-
or not node_cur.nodes -- node is a file
178+
or not node_cur.nodes -- node is a file
179179
then
180180
return
181181
end
@@ -186,7 +186,7 @@ local function move_prev_recursive(what, skip_gitignored)
186186

187187
-- 4.3)
188188
if node_init.name == ".." then -- root node
189-
view.set_cursor { 1, 0 } -- move to root node (position 1)
189+
view.set_cursor { 1, 0 } -- move to root node (position 1)
190190
else
191191
local node_init_line = utils.find_node_line(node_init)
192192
if node_init_line < 0 then

‎lua/nvim-tree/appearance/init.lua

+78-78
Original file line numberDiff line numberDiff line change
@@ -12,126 +12,126 @@ local M = {}
1212
M.HIGHLIGHT_GROUPS = {
1313

1414
-- Standard
15-
{ group = "NvimTreeNormal", link = "Normal" },
16-
{ group = "NvimTreeNormalFloat", link = "NormalFloat" },
17-
{ group = "NvimTreeNormalFloatBorder", link = "FloatBorder" },
18-
{ group = "NvimTreeNormalNC", link = "NvimTreeNormal" },
15+
{ group = "NvimTreeNormal", link = "Normal" },
16+
{ group = "NvimTreeNormalFloat", link = "NormalFloat" },
17+
{ group = "NvimTreeNormalFloatBorder", link = "FloatBorder" },
18+
{ group = "NvimTreeNormalNC", link = "NvimTreeNormal" },
1919

20-
{ group = "NvimTreeLineNr", link = "LineNr" },
21-
{ group = "NvimTreeWinSeparator", link = "WinSeparator" },
22-
{ group = "NvimTreeEndOfBuffer", link = "EndOfBuffer" },
23-
{ group = "NvimTreePopup", link = "Normal" },
24-
{ group = "NvimTreeSignColumn", link = "NvimTreeNormal" },
20+
{ group = "NvimTreeLineNr", link = "LineNr" },
21+
{ group = "NvimTreeWinSeparator", link = "WinSeparator" },
22+
{ group = "NvimTreeEndOfBuffer", link = "EndOfBuffer" },
23+
{ group = "NvimTreePopup", link = "Normal" },
24+
{ group = "NvimTreeSignColumn", link = "NvimTreeNormal" },
2525

26-
{ group = "NvimTreeCursorColumn", link = "CursorColumn" },
27-
{ group = "NvimTreeCursorLine", link = "CursorLine" },
28-
{ group = "NvimTreeCursorLineNr", link = "CursorLineNr" },
26+
{ group = "NvimTreeCursorColumn", link = "CursorColumn" },
27+
{ group = "NvimTreeCursorLine", link = "CursorLine" },
28+
{ group = "NvimTreeCursorLineNr", link = "CursorLineNr" },
2929

30-
{ group = "NvimTreeStatusLine", link = "StatusLine" },
31-
{ group = "NvimTreeStatusLineNC", link = "StatusLineNC" },
30+
{ group = "NvimTreeStatusLine", link = "StatusLine" },
31+
{ group = "NvimTreeStatusLineNC", link = "StatusLineNC" },
3232

3333
-- File Text
34-
{ group = "NvimTreeExecFile", link = "Question" },
35-
{ group = "NvimTreeImageFile", link = "Question" },
36-
{ group = "NvimTreeSpecialFile", link = "Title" },
37-
{ group = "NvimTreeSymlink", link = "Underlined" },
34+
{ group = "NvimTreeExecFile", link = "Question" },
35+
{ group = "NvimTreeImageFile", link = "Question" },
36+
{ group = "NvimTreeSpecialFile", link = "Title" },
37+
{ group = "NvimTreeSymlink", link = "Underlined" },
3838

3939
-- Folder Text
40-
{ group = "NvimTreeRootFolder", link = "Title" },
41-
{ group = "NvimTreeFolderName", link = "Directory" },
42-
{ group = "NvimTreeEmptyFolderName", link = "Directory" },
43-
{ group = "NvimTreeOpenedFolderName", link = "Directory" },
44-
{ group = "NvimTreeSymlinkFolderName", link = "Directory" },
40+
{ group = "NvimTreeRootFolder", link = "Title" },
41+
{ group = "NvimTreeFolderName", link = "Directory" },
42+
{ group = "NvimTreeEmptyFolderName", link = "Directory" },
43+
{ group = "NvimTreeOpenedFolderName", link = "Directory" },
44+
{ group = "NvimTreeSymlinkFolderName", link = "Directory" },
4545

4646
-- File Icons
47-
{ group = "NvimTreeFileIcon", link = "NvimTreeNormal" },
48-
{ group = "NvimTreeSymlinkIcon", link = "NvimTreeNormal" },
47+
{ group = "NvimTreeFileIcon", link = "NvimTreeNormal" },
48+
{ group = "NvimTreeSymlinkIcon", link = "NvimTreeNormal" },
4949

5050
-- Folder Icons
51-
{ group = "NvimTreeFolderIcon", def = "guifg=#8094b4 ctermfg=Blue" },
52-
{ group = "NvimTreeOpenedFolderIcon", link = "NvimTreeFolderIcon" },
53-
{ group = "NvimTreeClosedFolderIcon", link = "NvimTreeFolderIcon" },
54-
{ group = "NvimTreeFolderArrowClosed", link = "NvimTreeIndentMarker" },
55-
{ group = "NvimTreeFolderArrowOpen", link = "NvimTreeIndentMarker" },
51+
{ group = "NvimTreeFolderIcon", def = "guifg=#8094b4 ctermfg=Blue" },
52+
{ group = "NvimTreeOpenedFolderIcon", link = "NvimTreeFolderIcon" },
53+
{ group = "NvimTreeClosedFolderIcon", link = "NvimTreeFolderIcon" },
54+
{ group = "NvimTreeFolderArrowClosed", link = "NvimTreeIndentMarker" },
55+
{ group = "NvimTreeFolderArrowOpen", link = "NvimTreeIndentMarker" },
5656

5757
-- Indent
58-
{ group = "NvimTreeIndentMarker", link = "NvimTreeFolderIcon" },
58+
{ group = "NvimTreeIndentMarker", link = "NvimTreeFolderIcon" },
5959

6060
-- Picker
61-
{ group = "NvimTreeWindowPicker", def = "guifg=#ededed guibg=#4493c8 gui=bold ctermfg=White ctermbg=DarkBlue" },
61+
{ group = "NvimTreeWindowPicker", def = "guifg=#ededed guibg=#4493c8 gui=bold ctermfg=White ctermbg=DarkBlue" },
6262

6363
-- LiveFilter
64-
{ group = "NvimTreeLiveFilterPrefix", link = "PreProc" },
65-
{ group = "NvimTreeLiveFilterValue", link = "ModeMsg" },
64+
{ group = "NvimTreeLiveFilterPrefix", link = "PreProc" },
65+
{ group = "NvimTreeLiveFilterValue", link = "ModeMsg" },
6666

6767
-- Clipboard
68-
{ group = "NvimTreeCutHL", link = "SpellBad" },
69-
{ group = "NvimTreeCopiedHL", link = "SpellRare" },
68+
{ group = "NvimTreeCutHL", link = "SpellBad" },
69+
{ group = "NvimTreeCopiedHL", link = "SpellRare" },
7070

7171
-- Bookmark
72-
{ group = "NvimTreeBookmarkIcon", link = "NvimTreeFolderIcon" },
73-
{ group = "NvimTreeBookmarkHL", link = "SpellLocal" },
72+
{ group = "NvimTreeBookmarkIcon", link = "NvimTreeFolderIcon" },
73+
{ group = "NvimTreeBookmarkHL", link = "SpellLocal" },
7474

7575
-- Modified
76-
{ group = "NvimTreeModifiedIcon", link = "Type" },
77-
{ group = "NvimTreeModifiedFileHL", link = "NvimTreeModifiedIcon" },
78-
{ group = "NvimTreeModifiedFolderHL", link = "NvimTreeModifiedFileHL" },
76+
{ group = "NvimTreeModifiedIcon", link = "Type" },
77+
{ group = "NvimTreeModifiedFileHL", link = "NvimTreeModifiedIcon" },
78+
{ group = "NvimTreeModifiedFolderHL", link = "NvimTreeModifiedFileHL" },
7979

8080
-- Hidden
81-
{ group = "NvimTreeHiddenIcon", link = "Conceal" },
82-
{ group = "NvimTreeHiddenFileHL", link = "NvimTreeHiddenIcon" },
83-
{ group = "NvimTreeHiddenFolderHL", link = "NvimTreeHiddenFileHL" },
81+
{ group = "NvimTreeHiddenIcon", link = "Conceal" },
82+
{ group = "NvimTreeHiddenFileHL", link = "NvimTreeHiddenIcon" },
83+
{ group = "NvimTreeHiddenFolderHL", link = "NvimTreeHiddenFileHL" },
8484

8585
-- Hidden Display
86-
{ group = "NvimTreeHiddenDisplay", link = "Conceal" },
86+
{ group = "NvimTreeHiddenDisplay", link = "Conceal" },
8787

8888
-- Opened
89-
{ group = "NvimTreeOpenedHL", link = "Special" },
89+
{ group = "NvimTreeOpenedHL", link = "Special" },
9090

9191
-- Git Icon
92-
{ group = "NvimTreeGitDeletedIcon", link = "Statement" },
93-
{ group = "NvimTreeGitDirtyIcon", link = "Statement" },
94-
{ group = "NvimTreeGitIgnoredIcon", link = "Comment" },
95-
{ group = "NvimTreeGitMergeIcon", link = "Constant" },
96-
{ group = "NvimTreeGitNewIcon", link = "PreProc" },
97-
{ group = "NvimTreeGitRenamedIcon", link = "PreProc" },
98-
{ group = "NvimTreeGitStagedIcon", link = "Constant" },
92+
{ group = "NvimTreeGitDeletedIcon", link = "Statement" },
93+
{ group = "NvimTreeGitDirtyIcon", link = "Statement" },
94+
{ group = "NvimTreeGitIgnoredIcon", link = "Comment" },
95+
{ group = "NvimTreeGitMergeIcon", link = "Constant" },
96+
{ group = "NvimTreeGitNewIcon", link = "PreProc" },
97+
{ group = "NvimTreeGitRenamedIcon", link = "PreProc" },
98+
{ group = "NvimTreeGitStagedIcon", link = "Constant" },
9999

100100
-- Git File Highlight
101-
{ group = "NvimTreeGitFileDeletedHL", link = "NvimTreeGitDeletedIcon" },
102-
{ group = "NvimTreeGitFileDirtyHL", link = "NvimTreeGitDirtyIcon" },
103-
{ group = "NvimTreeGitFileIgnoredHL", link = "NvimTreeGitIgnoredIcon" },
104-
{ group = "NvimTreeGitFileMergeHL", link = "NvimTreeGitMergeIcon" },
105-
{ group = "NvimTreeGitFileNewHL", link = "NvimTreeGitNewIcon" },
106-
{ group = "NvimTreeGitFileRenamedHL", link = "NvimTreeGitRenamedIcon" },
107-
{ group = "NvimTreeGitFileStagedHL", link = "NvimTreeGitStagedIcon" },
101+
{ group = "NvimTreeGitFileDeletedHL", link = "NvimTreeGitDeletedIcon" },
102+
{ group = "NvimTreeGitFileDirtyHL", link = "NvimTreeGitDirtyIcon" },
103+
{ group = "NvimTreeGitFileIgnoredHL", link = "NvimTreeGitIgnoredIcon" },
104+
{ group = "NvimTreeGitFileMergeHL", link = "NvimTreeGitMergeIcon" },
105+
{ group = "NvimTreeGitFileNewHL", link = "NvimTreeGitNewIcon" },
106+
{ group = "NvimTreeGitFileRenamedHL", link = "NvimTreeGitRenamedIcon" },
107+
{ group = "NvimTreeGitFileStagedHL", link = "NvimTreeGitStagedIcon" },
108108

109109
-- Git Folder Highlight
110-
{ group = "NvimTreeGitFolderDeletedHL", link = "NvimTreeGitFileDeletedHL" },
111-
{ group = "NvimTreeGitFolderDirtyHL", link = "NvimTreeGitFileDirtyHL" },
112-
{ group = "NvimTreeGitFolderIgnoredHL", link = "NvimTreeGitFileIgnoredHL" },
113-
{ group = "NvimTreeGitFolderMergeHL", link = "NvimTreeGitFileMergeHL" },
114-
{ group = "NvimTreeGitFolderNewHL", link = "NvimTreeGitFileNewHL" },
115-
{ group = "NvimTreeGitFolderRenamedHL", link = "NvimTreeGitFileRenamedHL" },
116-
{ group = "NvimTreeGitFolderStagedHL", link = "NvimTreeGitFileStagedHL" },
110+
{ group = "NvimTreeGitFolderDeletedHL", link = "NvimTreeGitFileDeletedHL" },
111+
{ group = "NvimTreeGitFolderDirtyHL", link = "NvimTreeGitFileDirtyHL" },
112+
{ group = "NvimTreeGitFolderIgnoredHL", link = "NvimTreeGitFileIgnoredHL" },
113+
{ group = "NvimTreeGitFolderMergeHL", link = "NvimTreeGitFileMergeHL" },
114+
{ group = "NvimTreeGitFolderNewHL", link = "NvimTreeGitFileNewHL" },
115+
{ group = "NvimTreeGitFolderRenamedHL", link = "NvimTreeGitFileRenamedHL" },
116+
{ group = "NvimTreeGitFolderStagedHL", link = "NvimTreeGitFileStagedHL" },
117117

118118
-- Diagnostics Icon
119-
{ group = "NvimTreeDiagnosticErrorIcon", link = "DiagnosticError" },
120-
{ group = "NvimTreeDiagnosticWarnIcon", link = "DiagnosticWarn" },
121-
{ group = "NvimTreeDiagnosticInfoIcon", link = "DiagnosticInfo" },
122-
{ group = "NvimTreeDiagnosticHintIcon", link = "DiagnosticHint" },
119+
{ group = "NvimTreeDiagnosticErrorIcon", link = "DiagnosticError" },
120+
{ group = "NvimTreeDiagnosticWarnIcon", link = "DiagnosticWarn" },
121+
{ group = "NvimTreeDiagnosticInfoIcon", link = "DiagnosticInfo" },
122+
{ group = "NvimTreeDiagnosticHintIcon", link = "DiagnosticHint" },
123123

124124
-- Diagnostics File Highlight
125-
{ group = "NvimTreeDiagnosticErrorFileHL", link = "DiagnosticUnderlineError" },
126-
{ group = "NvimTreeDiagnosticWarnFileHL", link = "DiagnosticUnderlineWarn" },
127-
{ group = "NvimTreeDiagnosticInfoFileHL", link = "DiagnosticUnderlineInfo" },
128-
{ group = "NvimTreeDiagnosticHintFileHL", link = "DiagnosticUnderlineHint" },
125+
{ group = "NvimTreeDiagnosticErrorFileHL", link = "DiagnosticUnderlineError" },
126+
{ group = "NvimTreeDiagnosticWarnFileHL", link = "DiagnosticUnderlineWarn" },
127+
{ group = "NvimTreeDiagnosticInfoFileHL", link = "DiagnosticUnderlineInfo" },
128+
{ group = "NvimTreeDiagnosticHintFileHL", link = "DiagnosticUnderlineHint" },
129129

130130
-- Diagnostics Folder Highlight
131131
{ group = "NvimTreeDiagnosticErrorFolderHL", link = "NvimTreeDiagnosticErrorFileHL" },
132-
{ group = "NvimTreeDiagnosticWarnFolderHL", link = "NvimTreeDiagnosticWarnFileHL" },
133-
{ group = "NvimTreeDiagnosticInfoFolderHL", link = "NvimTreeDiagnosticInfoFileHL" },
134-
{ group = "NvimTreeDiagnosticHintFolderHL", link = "NvimTreeDiagnosticHintFileHL" },
132+
{ group = "NvimTreeDiagnosticWarnFolderHL", link = "NvimTreeDiagnosticWarnFileHL" },
133+
{ group = "NvimTreeDiagnosticInfoFolderHL", link = "NvimTreeDiagnosticInfoFileHL" },
134+
{ group = "NvimTreeDiagnosticHintFolderHL", link = "NvimTreeDiagnosticHintFileHL" },
135135
}
136136

137137
-- nvim-tree highlight groups to legacy

‎lua/nvim-tree/buffers.lua

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ function M.reload_modified()
1111
local path = buf.name
1212
if path ~= "" then -- not a [No Name] buffer
1313
-- mark all the parent as modified as well
14-
while
15-
M._modified[path] ~= true
14+
while M._modified[path] ~= true do
1615
-- no need to keep going if already recorded
1716
-- This also prevents an infinite loop
18-
do
1917
M._modified[path] = true
2018
path = vim.fn.fnamemodify(path, ":h")
2119
end

‎lua/nvim-tree/git/init.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ local M = {
2323
-- Utilities (like watchman) can also write to this directory (often) and aren't useful for us.
2424
local WATCHED_FILES = {
2525
"FETCH_HEAD", -- remote ref
26-
"HEAD", -- local ref
27-
"HEAD.lock", -- HEAD will not always be updated e.g. revert
28-
"config", -- user config
29-
"index", -- staging area
26+
"HEAD", -- local ref
27+
"HEAD.lock", -- HEAD will not always be updated e.g. revert
28+
"config", -- user config
29+
"index", -- staging area
3030
}
3131

3232
---@param toplevel string|nil

‎lua/nvim-tree/help.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ local function compute(map)
130130

131131
-- header highlight, assume one character keys
132132
local hl = {
133-
{ "NvimTreeFolderName", 0, 0, #head_lhs },
133+
{ "NvimTreeFolderName", 0, 0, #head_lhs },
134134
{ "NvimTreeFolderName", 0, width - 1, width },
135135
{ "NvimTreeFolderName", 1, width - 1, width },
136136
}

‎lua/nvim-tree/keymap.lua

+23-23
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,40 @@ local function generate_keymap(fn)
1919
return keymap
2020
end
2121

22-
-- stylua: ignore start
22+
---@return table
23+
function M.get_keymap()
24+
return generate_keymap(M.on_attach)
25+
end
26+
27+
---@return table
28+
function M.get_keymap_default()
29+
return generate_keymap(M.default_on_attach)
30+
end
31+
32+
function M.setup(opts)
33+
if type(opts.on_attach) ~= "function" then
34+
M.on_attach = M.default_on_attach
35+
else
36+
M.on_attach = opts.on_attach
37+
end
38+
end
39+
2340
---@param bufnr integer
2441
function M.default_on_attach(bufnr)
25-
local api = require('nvim-tree.api')
42+
local api = require("nvim-tree.api")
2643

2744
local function opts(desc)
2845
return {
29-
desc = 'nvim-tree: ' .. desc,
46+
desc = "nvim-tree: " .. desc,
3047
buffer = bufnr,
3148
noremap = true,
3249
silent = true,
3350
nowait = true,
34-
}
51+
}
3552
end
3653

54+
-- formatting cannot be re-enabled, hence this is at the end
55+
---@format disable
3756
-- BEGIN_DEFAULT_ON_ATTACH
3857
vim.keymap.set('n', '<C-]>', api.tree.change_root_to_node, opts('CD'))
3958
vim.keymap.set('n', '<C-e>', api.node.open.replace_tree_buffer, opts('Open: In Place'))
@@ -95,24 +114,5 @@ function M.default_on_attach(bufnr)
95114
vim.keymap.set('n', '<2-RightMouse>', api.tree.change_root_to_node, opts('CD'))
96115
-- END_DEFAULT_ON_ATTACH
97116
end
98-
-- stylua: ignore end
99-
100-
---@return table
101-
function M.get_keymap()
102-
return generate_keymap(M.on_attach)
103-
end
104-
105-
---@return table
106-
function M.get_keymap_default()
107-
return generate_keymap(M.default_on_attach)
108-
end
109-
110-
function M.setup(opts)
111-
if type(opts.on_attach) ~= "function" then
112-
M.on_attach = M.default_on_attach
113-
else
114-
M.on_attach = opts.on_attach
115-
end
116-
end
117117

118118
return M

‎lua/nvim-tree/notify.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ end
2121
local modes = {
2222
{ name = "trace", level = vim.log.levels.TRACE },
2323
{ name = "debug", level = vim.log.levels.DEBUG },
24-
{ name = "info", level = vim.log.levels.INFO },
25-
{ name = "warn", level = vim.log.levels.WARN },
24+
{ name = "info", level = vim.log.levels.INFO },
25+
{ name = "warn", level = vim.log.levels.WARN },
2626
{ name = "error", level = vim.log.levels.ERROR },
2727
}
2828

‎lua/nvim-tree/renderer/builder.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ function Builder:add_hidden_count_string(node, idx, num_children)
397397
-- if we change the traversal, we might need to sort by depth before rendering `self.virtual_lines`
398398
-- to maintain proper ordering of parent and child folder hidden count info.
399399
table.insert(self.virtual_lines[line_nr], {
400-
{ indent_string, indent_markers.hl },
400+
{ indent_string, indent_markers.hl },
401401
{ string.rep(indent_padding, (node.parent == nil and 0 or 1)) .. hidden_count_string, "NvimTreeHiddenDisplay" },
402402
})
403403
end

0 commit comments

Comments
 (0)