refactor(#2826): View is an Explorer member

Author: alex-courtis

lua/nvim-tree.lua

@@ -1,5 +1,4 @@
 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")
@@ -74,7 +73,8 @@ function M.change_root(path, bufnr)
 end
 
 function M.tab_enter()
-  if view.View:is_visible({ any_tabpage = true }) then
+  local explorer = core.get_explorer()
+  if explorer and explorer.view:is_visible({ any_tabpage = true }) then
     local bufname = vim.api.nvim_buf_get_name(0)
 
     local ft
@@ -89,17 +89,15 @@ function M.tab_enter()
         return
       end
     end
-    view.View:open({ focus_tree = false })
+    explorer.view:open({ focus_tree = false })
 
-    local explorer = core.get_explorer()
-    if explorer then
-      explorer.renderer:draw()
-    end
+    explorer.renderer:draw()
   end
 end
 
 function M.open_on_directory()
-  local should_proceed = _config.hijack_directories.auto_open or view.View:is_visible()
+  local explorer = core.get_explorer()
+  local should_proceed = _config.hijack_directories.auto_open or explorer and explorer.view:is_visible()
   if not should_proceed then
     return
   end
@@ -150,17 +148,22 @@ local function setup_autocommands(opts)
     vim.api.nvim_create_autocmd(name, vim.tbl_extend("force", default_opts, custom_opts))
   end
 
+  -- TODO #2826 move this to explorer
   -- 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.View:prevent_buffer_override()
-      else
-        view.View:abandon_current_window()
+
+      local explorer = core.get_explorer()
+      if explorer then
+        if opts.actions.open_file.eject then
+          explorer.view:prevent_buffer_override()
+        else
+          explorer.view:abandon_current_window()
+        end
       end
     end,
   })
@@ -226,12 +229,16 @@ local function setup_autocommands(opts)
     })
   end
 
+  -- TODO #2826 move this to explorer
   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()
+          local explorer = core.get_explorer()
+          if explorer then
+            explorer.view:close()
+          end
         end
       end,
     })
@@ -692,10 +699,10 @@ local function localise_default_opts()
 end
 
 function M.purge_all_state()
-  view.View:close_all_tabs()
-  view.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()
@@ -748,7 +755,6 @@ 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,5 +1,4 @@
 local log = require("nvim-tree.log")
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local core = require("nvim-tree.core")
 
@@ -14,7 +13,7 @@ local running = {}
 ---@param path string relative or absolute
 function M.fn(path)
   local explorer = core.get_explorer()
-  if not explorer or not view.View:is_visible() then
+  if not explorer or not explorer.view:is_visible() then
     return
   end
 
@@ -84,9 +83,9 @@ function M.fn(path)
     end)
     :iterate()
 
-  if found and view.View:is_visible() then
+  if found and explorer.view:is_visible() then
     explorer.renderer:draw()
-    view.View:set_cursor({ line, 0 })
+    explorer.view:set_cursor({ line, 0 })
   end
 
   running[path_real] = false

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

@@ -1,7 +1,6 @@
 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")
 
@@ -14,10 +13,12 @@ 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 view.View.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if explorer and explorer.view.float.enable and #vim.api.nvim_list_wins() < 3 then
     return
   end
 
@@ -30,16 +31,17 @@ 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 view.View.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or explorer and explorer.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 not view.View.float.quit_on_focus_loss then
+      if explorer and not explorer.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,5 +1,4 @@
 local utils = require("nvim-tree.utils")
-local view = require("nvim-tree.view")
 local core = require("nvim-tree.core")
 local diagnostics = require("nvim-tree.diagnostics")
 
@@ -67,9 +66,9 @@ local function move(explorer, where, what, skip_gitignored)
   end
 
   if nex then
-    view.View:set_cursor({ nex, 0 })
+    explorer.view:set_cursor({ nex, 0 })
   elseif vim.o.wrapscan and first then
-    view.View:set_cursor({ first, 0 })
+    explorer.view:set_cursor({ first, 0 })
   end
 end
 
@@ -189,13 +188,13 @@ local function move_prev_recursive(explorer, what, skip_gitignored)
 
       -- 4.3)
       if node_init.name == ".." then -- root node
-        view.View:set_cursor({ 1, 0 })    -- move to root node (position 1)
+        explorer.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
-        view.View:set_cursor({ node_init_line, 0 })
+        explorer.view:set_cursor({ node_init_line, 0 })
       end
 
       -- 4.4)

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

@@ -1,4 +1,3 @@
-local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 
 local DirectoryNode = require("nvim-tree.node.directory")
@@ -25,15 +24,15 @@ function M.fn(should_close)
     local parent = (node:get_parent_of_group() or node).parent
 
     if not parent or not parent.parent then
-      view.View:set_cursor({ 1, 0 })
+      node.explorer.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)
 
-    view.View:set_cursor({ line + 1, 0 })
+    node.explorer.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,7 +2,7 @@
 local lib = require("nvim-tree.lib")
 local notify = require("nvim-tree.notify")
 local utils = require("nvim-tree.utils")
-local view = require("nvim-tree.view")
+local core = require("nvim-tree.core")
 
 local M = {}
 
@@ -19,9 +19,10 @@ 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 = view.View:get_winnr(tabpage)
+  local tree_winid = explorer and explorer.view:get_winnr(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)
@@ -187,7 +188,10 @@ end
 
 local function open_file_in_tab(filename)
   if M.quit_on_open then
-    view.View:close()
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -197,7 +201,10 @@ end
 
 local function drop(filename)
   if M.quit_on_open then
-    view.View:close()
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -207,7 +214,10 @@ end
 
 local function tab_drop(filename)
   if M.quit_on_open then
-    view.View:close()
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.view:close()
+    end
   end
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
@@ -228,7 +238,10 @@ local function on_preview(buf_loaded)
       once = true,
     })
   end
-  view.View:focus()
+  local explorer = core.get_explorer()
+  if explorer then
+    explorer.view:focus()
+  end
 end
 
 local function get_target_winid(mode)
@@ -273,6 +286,8 @@ 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
@@ -295,7 +310,11 @@ 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 = (view.View.side == "right") and "aboveleft" or "belowright"
+
+  local new_window_side = "belowright"
+  if explorer and (explorer.view.side == "right") then
+    new_window_side = "aboveleft"
+  end
 
   -- Target is invalid: create new window
   if not vim.tbl_contains(win_ids, target_winid) then
@@ -327,7 +346,7 @@ local function open_in_new_window(filename, mode)
     end
   end
 
-  if (mode == "preview" or mode == "preview_no_picker") and view.View.float.enable then
+  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.view.float.enable then
     -- ignore "WinLeave" autocmd on preview
     -- because the registered "WinLeave"
     -- will kill the floating window immediately
@@ -367,7 +386,12 @@ local function is_already_loaded(filename)
 end
 
 local function edit_in_current_buf(filename)
-  require("nvim-tree.view").View:abandon_current_window()
+  local explorer = core.get_explorer()
+
+  if explorer then
+    explorer.view:abandon_current_window()
+  end
+
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
   end
@@ -378,6 +402,8 @@ end
 ---@param filename string
 ---@return nil
 function M.fn(mode, filename)
+  local explorer = core.get_explorer()
+
   if type(mode) ~= "string" then
     mode = ""
   end
@@ -412,16 +438,16 @@ function M.fn(mode, filename)
     vim.bo.bufhidden = ""
   end
 
-  if M.resize_window then
-    view.View:resize()
+  if M.resize_window and explorer then
+    explorer.view:resize()
   end
 
   if mode == "preview" or mode == "preview_no_picker" then
     return on_preview(buf_loaded)
   end
 
-  if M.quit_on_open then
-    view.View:close()
+  if M.quit_on_open and explorer then
+    explorer.view:close()
   end
 end
 

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

@@ -1,6 +1,5 @@
 local core = require("nvim-tree.core")
 local lib = require("nvim-tree.lib")
-local view = require("nvim-tree.view")
 local finders_find_file = require("nvim-tree.actions.finders.find-file")
 
 local M = {}
@@ -41,11 +40,12 @@ function M.fn(opts)
     return
   end
 
-  if view.View:is_visible() then
+  local explorer = core.get_explorer()
+  if explorer and explorer.view:is_visible() then
     -- focus
     if opts.focus then
       lib.set_target_win()
-      view.View:focus()
+      explorer.view:focus()
     end
   elseif opts.open then
     -- open