Skip to content

Commit f183c7f

Browse files
committed
chore: move last autocmds from view to entrypoint
1 parent ea92e7b commit f183c7f

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

lua/nvim-tree.lua

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,11 @@ end
264264

265265
local function setup_autocommands(opts)
266266
vim.cmd "augroup NvimTree"
267-
vim.cmd [[
268-
""" reset highlights when colorscheme is changed
269-
au ColorScheme * lua require'nvim-tree'.reset_highlight()
270267

271-
au BufWritePost * lua require'nvim-tree.actions.reloaders'.reload_explorer()
272-
au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree.actions.reloaders'.reload_git()
273-
]]
268+
-- reset highlights when colorscheme is changed
269+
vim.cmd "au ColorScheme * lua require'nvim-tree'.reset_highlight()"
270+
vim.cmd "au BufWritePost * lua require'nvim-tree.actions.reloaders'.reload_explorer()"
271+
vim.cmd "au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree.actions.reloaders'.reload_git()"
274272

275273
if opts.auto_close then
276274
vim.cmd "au WinClosed * lua require'nvim-tree'.on_leave()"
@@ -287,7 +285,12 @@ local function setup_autocommands(opts)
287285
if opts.update_focused_file.enable then
288286
vim.cmd "au BufEnter * lua require'nvim-tree'.find_file(false)"
289287
end
288+
290289
vim.cmd "au BufUnload NvimTree lua require'nvim-tree.view'.View.tabpages = {}"
290+
if not opts.actions.open_file.quit_on_open then
291+
vim.cmd "au BufWinEnter,BufWinLeave * lua require'nvim-tree.view'._prevent_buffer_override()"
292+
end
293+
vim.cmd "au BufEnter,BufNewFile * lua require'nvim-tree'.open_on_directory()"
291294

292295
vim.cmd "augroup end"
293296
end
@@ -360,12 +363,11 @@ function M.setup(conf)
360363
require'nvim-tree.colors'.setup()
361364
require'nvim-tree.actions'.setup(opts)
362365
require'nvim-tree.diagnostics'.setup(opts)
363-
require'nvim-tree.view'.setup(opts or {})
366+
require'nvim-tree.view'.setup(opts)
364367
require'nvim-tree.explorer'.setup(opts)
365368
require'nvim-tree.git'.setup(opts)
366-
367-
setup_autocommands(opts)
368369
setup_vim_commands()
370+
setup_autocommands(opts)
369371

370372
M.on_enter(netrw_disabled)
371373
end

lua/nvim-tree/view.lua

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,6 @@ function M.setup(opts)
8282
M.View.winopts.number = options.number
8383
M.View.winopts.relativenumber = options.relativenumber
8484
M.View.winopts.signcolumn = options.signcolumn
85-
86-
vim.cmd "augroup NvimTreeView"
87-
vim.cmd "au!"
88-
if not opts.actions.open_file.quit_on_open then
89-
vim.cmd "au BufWinEnter,BufWinLeave * lua require'nvim-tree.view'._prevent_buffer_override()"
90-
end
91-
vim.cmd "au BufEnter,BufNewFile * lua require'nvim-tree'.open_on_directory()"
92-
vim.cmd "augroup END"
93-
9485
create_buffer()
9586
end
9687

0 commit comments

Comments
 (0)