Merge branch 'master' into expand-until-2

Author: ghostbuster91

lua/nvim-tree.lua

@@ -1,4 +1,5 @@
 local log = require("nvim-tree.log")
+local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local actions = require("nvim-tree.actions")
 local core = require("nvim-tree.core")
@@ -73,8 +74,7 @@ function M.change_root(path, bufnr)
 end
 
 function M.tab_enter()
-  local explorer = core.get_explorer()
-  if explorer and explorer.view:is_visible({ any_tabpage = true }) then
+  if view.is_visible({ any_tabpage = true }) then
     local bufname = vim.api.nvim_buf_get_name(0)
 
     local ft
@@ -89,15 +89,17 @@ function M.tab_enter()
         return
       end
     end
-    explorer.view:open({ focus_tree = false })
+    view.open({ focus_tree = false })
 
-    explorer.renderer:draw()
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.renderer:draw()
+    end
   end
 end
 
 function M.open_on_directory()
-  local explorer = core.get_explorer()
-  local should_proceed = _config.hijack_directories.auto_open or explorer and explorer.view:is_visible()
+  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
   if not should_proceed then
     return
   end
@@ -148,6 +150,21 @@ local function setup_autocommands(opts)
     vim.api.nvim_create_autocmd(name, vim.tbl_extend("force", default_opts, custom_opts))
   end
 
+  -- prevent new opened file from opening in the same window as nvim-tree
+  create_nvim_tree_autocmd("BufWipeout", {
+    pattern = "NvimTree_*",
+    callback = function()
+      if not utils.is_nvim_tree_buf(0) then
+        return
+      end
+      if opts.actions.open_file.eject then
+        view._prevent_buffer_override()
+      else
+        view.abandon_current_window()
+      end
+    end,
+  })
+
   if opts.tab.sync.open then
     create_nvim_tree_autocmd("TabEnter", { callback = vim.schedule_wrap(M.tab_enter) })
   end
@@ -209,6 +226,17 @@ local function setup_autocommands(opts)
     })
   end
 
+  if opts.view.float.enable and opts.view.float.quit_on_focus_loss then
+    create_nvim_tree_autocmd("WinLeave", {
+      pattern = "NvimTree_*",
+      callback = function()
+        if utils.is_nvim_tree_buf(0) then
+          view.close()
+        end
+      end,
+    })
+  end
+
   -- Handles event dispatch when tree is closed by `:q`
   create_nvim_tree_autocmd("WinClosed", {
     pattern = "*",
@@ -665,10 +693,10 @@ local function localise_default_opts()
 end
 
 function M.purge_all_state()
+  view.close_all_tabs()
+  view.abandon_all_windows()
   local explorer = core.get_explorer()
   if explorer then
-    explorer.view:close_all_tabs()
-    explorer.view:abandon_all_windows()
     require("nvim-tree.git").purge_state()
     explorer:destroy()
     core.reset_explorer()
@@ -721,6 +749,7 @@ function M.setup(conf)
   require("nvim-tree.explorer.watch").setup(opts)
   require("nvim-tree.git").setup(opts)
   require("nvim-tree.git.utils").setup(opts)
+  require("nvim-tree.view").setup(opts)
   require("nvim-tree.lib").setup(opts)
   require("nvim-tree.renderer.components").setup(opts)
   require("nvim-tree.buffers").setup(opts)

lua/nvim-tree/actions/finders/find-file.lua

@@ -1,4 +1,5 @@
 local log = require("nvim-tree.log")
+local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local core = require("nvim-tree.core")
 
@@ -13,7 +14,7 @@ local running = {}
 ---@param path string relative or absolute
 function M.fn(path)
   local explorer = core.get_explorer()
-  if not explorer or not explorer.view:is_visible() then
+  if not explorer or not view.is_visible() then
     return
   end
 
@@ -83,9 +84,9 @@ function M.fn(path)
     end)
     :iterate()
 
-  if found and explorer.view:is_visible() then
+  if found and view.is_visible() then
     explorer.renderer:draw()
-    explorer.view:set_cursor({ line, 0 })
+    view.set_cursor({ line, 0 })
   end
 
   running[path_real] = false

lua/nvim-tree/actions/fs/clipboard.lua

@@ -31,8 +31,6 @@ local Clipboard = Class:extend()
 ---@protected
 ---@param args ClipboardArgs
 function Clipboard:new(args)
-  args.explorer:log_new("Clipboard")
-
   self.explorer = args.explorer
 
   self.data = {
@@ -44,10 +42,6 @@ function Clipboard:new(args)
   self.reg = self.explorer.opts.actions.use_system_clipboard and "+" or "1"
 end
 
-function Clipboard:destroy()
-  self.explorer:log_destroy("Clipboard")
-end
-
 ---@param source string
 ---@param destination string
 ---@return boolean

lua/nvim-tree/actions/fs/remove-file.lua

@@ -1,6 +1,7 @@
 local core = require("nvim-tree.core")
 local utils = require("nvim-tree.utils")
 local events = require("nvim-tree.events")
+local view = require("nvim-tree.view")
 local lib = require("nvim-tree.lib")
 local notify = require("nvim-tree.notify")
 
@@ -13,12 +14,10 @@ local M = {
 
 ---@param windows integer[]
 local function close_windows(windows)
-  local explorer = core.get_explorer()
-
   -- Prevent from closing when the win count equals 1 or 2,
   -- where the win to remove could be the last opened.
   -- For details see #2503.
-  if explorer and explorer.opts.view.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
     return
   end
 
@@ -31,17 +30,16 @@ end
 
 ---@param absolute_path string
 local function clear_buffer(absolute_path)
-  local explorer = core.get_explorer()
   local bufs = vim.fn.getbufinfo({ bufloaded = 1, buflisted = 1 })
   for _, buf in pairs(bufs) do
     if buf.name == absolute_path then
       local tree_winnr = vim.api.nvim_get_current_win()
-      if buf.hidden == 0 and (#bufs > 1 or explorer and explorer.opts.view.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or view.View.float.enable) then
         vim.api.nvim_set_current_win(buf.windows[1])
         vim.cmd(":bn")
       end
       vim.api.nvim_buf_delete(buf.bufnr, { force = true })
-      if explorer and not explorer.opts.view.float.quit_on_focus_loss then
+      if not view.View.float.quit_on_focus_loss then
         vim.api.nvim_set_current_win(tree_winnr)
       end
       if M.config.actions.remove_file.close_window then

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

@@ -1,4 +1,5 @@
 local utils = require("nvim-tree.utils")
+local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
 local diagnostics = require("nvim-tree.diagnostics")
 
@@ -66,9 +67,9 @@ local function move(explorer, where, what, skip_gitignored)
   end
 
   if nex then
-    explorer.view:set_cursor({ nex, 0 })
+    view.set_cursor({ nex, 0 })
   elseif vim.o.wrapscan and first then
-    explorer.view:set_cursor({ first, 0 })
+    view.set_cursor({ first, 0 })
   end
 end
 
@@ -188,13 +189,13 @@ local function move_prev_recursive(explorer, what, skip_gitignored)
 
       -- 4.3)
       if node_init.name == ".." then -- root node
-        explorer.view:set_cursor({ 1, 0 })    -- move to root node (position 1)
+        view.set_cursor({ 1, 0 })    -- move to root node (position 1)
       else
         local node_init_line = utils.find_node_line(node_init)
         if node_init_line < 0 then
           return
         end
-        explorer.view:set_cursor({ node_init_line, 0 })
+        view.set_cursor({ node_init_line, 0 })
       end
 
       -- 4.4)

lua/nvim-tree/actions/moves/parent.lua

@@ -1,3 +1,4 @@
+local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 
 local DirectoryNode = require("nvim-tree.node.directory")
@@ -24,15 +25,15 @@ function M.fn(should_close)
     local parent = (node:get_parent_of_group() or node).parent
 
     if not parent or not parent.parent then
-      node.explorer.view:set_cursor({ 1, 0 })
+      view.set_cursor({ 1, 0 })
       return
     end
 
     local _, line = utils.find_node(parent.explorer.nodes, function(n)
       return n.absolute_path == parent.absolute_path
     end)
 
-    node.explorer.view:set_cursor({ line + 1, 0 })
+    view.set_cursor({ line + 1, 0 })
     if should_close then
       parent.open = false
       parent.explorer.renderer:draw()

lua/nvim-tree/actions/node/open-file.lua

@@ -2,8 +2,8 @@
 local lib = require("nvim-tree.lib")
 local notify = require("nvim-tree.notify")
 local utils = require("nvim-tree.utils")
-local core = require("nvim-tree.core")
 local full_name = require("nvim-tree.renderer.components.full-name")
+local view = require("nvim-tree.view")
 
 local M = {}
 
@@ -20,10 +20,9 @@ end
 ---Get all windows in the current tabpage that aren't NvimTree.
 ---@return table with valid win_ids
 local function usable_win_ids()
-  local explorer = core.get_explorer()
   local tabpage = vim.api.nvim_get_current_tabpage()
   local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = explorer and explorer.view:get_winid(tabpage)
+  local tree_winid = view.get_winnr(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)
@@ -194,10 +193,7 @@ end
 
 local function open_file_in_tab(filename)
   if M.quit_on_open then
-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -207,10 +203,7 @@ end
 
 local function drop(filename)
   if M.quit_on_open then
-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -220,10 +213,7 @@ end
 
 local function tab_drop(filename)
   if M.quit_on_open then
-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.view:close()
-    end
+    view.close()
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -244,10 +234,7 @@ local function on_preview(buf_loaded)
       once = true,
     })
   end
-  local explorer = core.get_explorer()
-  if explorer then
-    explorer.view:focus()
-  end
+  view.focus()
 end
 
 local function get_target_winid(mode)
@@ -292,8 +279,6 @@ local function set_current_win_no_autocmd(winid, autocmd)
 end
 
 local function open_in_new_window(filename, mode)
-  local explorer = core.get_explorer()
-
   if type(mode) ~= "string" then
     mode = ""
   end
@@ -316,11 +301,7 @@ local function open_in_new_window(filename, mode)
   end, vim.api.nvim_list_wins())
 
   local create_new_window = #win_ids == 1 -- This implies that the nvim-tree window is the only one
-
-  local new_window_side = "belowright"
-  if explorer and (explorer.view.side == "right") then
-    new_window_side = "aboveleft"
-  end
+  local new_window_side = (view.View.side == "right") and "aboveleft" or "belowright"
 
   -- Target is invalid: create new window
   if not vim.tbl_contains(win_ids, target_winid) then
@@ -352,7 +333,7 @@ local function open_in_new_window(filename, mode)
     end
   end
 
-  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.opts.view.float.enable then
+  if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
     -- ignore "WinLeave" autocmd on preview
     -- because the registered "WinLeave"
     -- will kill the floating window immediately
@@ -392,12 +373,7 @@ local function is_already_loaded(filename)
 end
 
 local function edit_in_current_buf(filename)
-  local explorer = core.get_explorer()
-
-  if explorer then
-    explorer.view:abandon_current_window()
-  end
-
+  require("nvim-tree.view").abandon_current_window()
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
   end
@@ -408,8 +384,6 @@ end
 ---@param filename string
 ---@return nil
 function M.fn(mode, filename)
-  local explorer = core.get_explorer()
-
   if type(mode) ~= "string" then
     mode = ""
   end
@@ -444,16 +418,16 @@ function M.fn(mode, filename)
     vim.bo.bufhidden = ""
   end
 
-  if M.resize_window and explorer then
-    explorer.view:resize()
+  if M.resize_window then
+    view.resize()
   end
 
   if mode == "preview" or mode == "preview_no_picker" then
     return on_preview(buf_loaded)
   end
 
-  if M.quit_on_open and explorer then
-    explorer.view:close()
+  if M.quit_on_open then
+    view.close()
   end
 end