From f183c7f31197ae499c3420341fb8b275636a49b8 Mon Sep 17 00:00:00 2001
From: kiyan <yazdani.kiyan@protonmail.com>
Date: Tue, 8 Feb 2022 20:56:02 +0100
Subject: [PATCH] chore: move last autocmds from view to entrypoint

---
 lua/nvim-tree.lua      | 20 +++++++++++---------
 lua/nvim-tree/view.lua |  9 ---------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/lua/nvim-tree.lua b/lua/nvim-tree.lua
index 8948f485..d00f8222 100644
--- a/lua/nvim-tree.lua
+++ b/lua/nvim-tree.lua
@@ -264,13 +264,11 @@ end
 
 local function setup_autocommands(opts)
   vim.cmd "augroup NvimTree"
-  vim.cmd [[
-    """ reset highlights when colorscheme is changed
-    au ColorScheme * lua require'nvim-tree'.reset_highlight()
 
-    au BufWritePost * lua require'nvim-tree.actions.reloaders'.reload_explorer()
-    au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree.actions.reloaders'.reload_git()
-  ]]
+  -- reset highlights when colorscheme is changed
+  vim.cmd "au ColorScheme * lua require'nvim-tree'.reset_highlight()"
+  vim.cmd "au BufWritePost * lua require'nvim-tree.actions.reloaders'.reload_explorer()"
+  vim.cmd "au User FugitiveChanged,NeogitStatusRefreshed lua require'nvim-tree.actions.reloaders'.reload_git()"
 
   if opts.auto_close then
     vim.cmd "au WinClosed * lua require'nvim-tree'.on_leave()"
@@ -287,7 +285,12 @@ local function setup_autocommands(opts)
   if opts.update_focused_file.enable then
     vim.cmd "au BufEnter * lua require'nvim-tree'.find_file(false)"
   end
+
   vim.cmd "au BufUnload NvimTree lua require'nvim-tree.view'.View.tabpages = {}"
+  if not opts.actions.open_file.quit_on_open then
+    vim.cmd "au BufWinEnter,BufWinLeave * lua require'nvim-tree.view'._prevent_buffer_override()"
+  end
+  vim.cmd "au BufEnter,BufNewFile * lua require'nvim-tree'.open_on_directory()"
 
   vim.cmd "augroup end"
 end
@@ -360,12 +363,11 @@ function M.setup(conf)
   require'nvim-tree.colors'.setup()
   require'nvim-tree.actions'.setup(opts)
   require'nvim-tree.diagnostics'.setup(opts)
-  require'nvim-tree.view'.setup(opts or {})
+  require'nvim-tree.view'.setup(opts)
   require'nvim-tree.explorer'.setup(opts)
   require'nvim-tree.git'.setup(opts)
-
-  setup_autocommands(opts)
   setup_vim_commands()
+  setup_autocommands(opts)
 
   M.on_enter(netrw_disabled)
 end
diff --git a/lua/nvim-tree/view.lua b/lua/nvim-tree/view.lua
index 1c0635f7..52865878 100644
--- a/lua/nvim-tree/view.lua
+++ b/lua/nvim-tree/view.lua
@@ -82,15 +82,6 @@ function M.setup(opts)
   M.View.winopts.number = options.number
   M.View.winopts.relativenumber = options.relativenumber
   M.View.winopts.signcolumn = options.signcolumn
-
-  vim.cmd "augroup NvimTreeView"
-  vim.cmd "au!"
-  if not opts.actions.open_file.quit_on_open then
-    vim.cmd "au BufWinEnter,BufWinLeave * lua require'nvim-tree.view'._prevent_buffer_override()"
-  end
-  vim.cmd "au BufEnter,BufNewFile * lua require'nvim-tree'.open_on_directory()"
-  vim.cmd "augroup END"
-
   create_buffer()
 end