refactor(#2826): split global View and instance Window

Author: alex-courtis

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.window: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.window:open({ focus_tree = false })
 
-    explorer.renderer:draw()
+    local explorer = core.get_explorer()
+    if explorer then
+      explorer.window:open({ focus_tree = false })
+      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.window:is_visible()
+  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
   if not should_proceed then
     return
   end
@@ -668,7 +670,9 @@ function M.purge_all_state()
   local explorer = core.get_explorer()
   if explorer then
     explorer.window:close_all_tabs()
-    explorer.window:abandon_all_windows()
+  end
+  view.abandon_all_windows()
+  if explorer then
     require("nvim-tree.git").purge_state()
     explorer:destroy()
     core.reset_explorer()

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.window: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.window:is_visible() then
+  if found and view.is_visible() then
     explorer.renderer:draw()
-    explorer.window:set_cursor({ line, 0 })
+    view.set_cursor({ line, 0 })
   end
 
   running[path_real] = false

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.window:set_cursor({ nex, 0 })
+    view.set_cursor({ nex, 0 })
   elseif vim.o.wrapscan and first then
-    explorer.window: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.window: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.window: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.window: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.window: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

@@ -3,6 +3,7 @@ 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 view = require("nvim-tree.view")
 
 local M = {}
 
@@ -19,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.window:get_winnr(tabpage)
+  local tree_winid = view.get_winnr(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)
@@ -386,12 +386,7 @@ local function is_already_loaded(filename)
 end
 
 local function edit_in_current_buf(filename)
-  local explorer = core.get_explorer()
-
-  if explorer then
-    explorer.window: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

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

@@ -1,5 +1,6 @@
 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,7 +42,7 @@ function M.fn(opts)
   end
 
   local explorer = core.get_explorer()
-  if explorer and explorer.window:is_visible() then
+  if explorer and view.is_visible() then
     -- focus
     if opts.focus then
       lib.set_target_win()

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

@@ -1,5 +1,6 @@
 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 = {}
@@ -25,7 +26,7 @@ function M.fn(opts)
 
   local explorer = core.get_explorer()
 
-  if explorer and explorer.window:is_visible() then
+  if explorer and view.is_visible() then
     -- focus
     lib.set_target_win()
     explorer.window:focus()

lua/nvim-tree/actions/tree/toggle.lua

@@ -1,5 +1,6 @@
 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 = {}
@@ -42,7 +43,7 @@ function M.fn(opts, no_focus, cwd, bang)
     opts.path = nil
   end
 
-  if explorer and explorer.window:is_visible() then
+  if explorer and view.is_visible() then
     -- close
     explorer.window:close()
   else

lua/nvim-tree/api.lua

@@ -1,4 +1,5 @@
 local core = require("nvim-tree.core")
+local view = require("nvim-tree.view")
 local utils = require("nvim-tree.utils")
 local actions = require("nvim-tree.actions")
 local appearance_hi_test = require("nvim-tree.appearance.hi-test")
@@ -140,9 +141,9 @@ Api.tree.focus = Api.tree.open
 ---@field focus boolean|nil default true
 
 Api.tree.toggle = wrap(actions.tree.toggle.fn)
-Api.tree.close = wrap_explorer_member("view", "close")
-Api.tree.close_in_this_tab = wrap_explorer_member("view", "close_this_tab_only")
-Api.tree.close_in_all_tabs = wrap_explorer_member("view", "close_all_tabs")
+Api.tree.close = wrap_explorer_member("window", "close")
+Api.tree.close_in_this_tab = wrap_explorer_member("window", "close_this_tab_only")
+Api.tree.close_in_all_tabs = wrap_explorer_member("window", "close_all_tabs")
 Api.tree.reload = wrap_explorer("reload_explorer")
 
 ---@class ApiTreeResizeOpts
@@ -201,12 +202,12 @@ Api.tree.is_tree_buf = wrap(utils.is_nvim_tree_buf)
 ---@field tabpage number|nil
 ---@field any_tabpage boolean|nil default false
 
-Api.tree.is_visible = wrap_explorer_member("view", "is_visible")
+Api.tree.is_visible = wrap(view.is_visible)
 
 ---@class ApiTreeWinIdOpts
 ---@field tabpage number|nil default nil
 
-Api.tree.winid = wrap_explorer_member("view", "winid")
+Api.tree.winid = wrap(view.winid)
 
 Api.fs.create = wrap_node_or_nil(actions.fs.create_file.fn)
 Api.fs.remove = wrap_node(actions.fs.remove_file.fn)

lua/nvim-tree/diagnostics.lua

@@ -1,5 +1,6 @@
 local core = require("nvim-tree.core")
 local utils = require("nvim-tree.utils")
+local view = require("nvim-tree.view")
 local log = require("nvim-tree.log")
 
 local DirectoryNode = require("nvim-tree.node.directory")
@@ -181,15 +182,10 @@ function M.update_coc()
     end
     log.profile_end(profile)
 
-    local explorer = core.get_explorer()
-
-    local bufnr
-    if explorer then
-      bufnr = explorer.window:get_bufnr()
-    end
-
+    local bufnr = view.get_bufnr()
     local should_draw = bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)
     if should_draw then
+      local explorer = core.get_explorer()
       if explorer then
         explorer.renderer:draw()
       end