refactor(#2826): singleton View class, WIP

Author: alex-courtis

lua/nvim-tree.lua

@@ -74,7 +74,7 @@ function M.change_root(path, bufnr)
 end
 
 function M.tab_enter()
-  if view.is_visible({ any_tabpage = true }) then
+  if view.View:is_visible({ any_tabpage = true }) then
     local bufname = vim.api.nvim_buf_get_name(0)
 
     local ft
@@ -99,7 +99,7 @@ function M.tab_enter()
 end
 
 function M.open_on_directory()
-  local should_proceed = _config.hijack_directories.auto_open or view.is_visible()
+  local should_proceed = _config.hijack_directories.auto_open or view.View:is_visible()
   if not should_proceed then
     return
   end
@@ -160,7 +160,7 @@ local function setup_autocommands(opts)
       if opts.actions.open_file.eject then
         view._prevent_buffer_override()
       else
-        view.abandon_current_window()
+        view.View:abandon_current_window()
       end
     end,
   })
@@ -687,7 +687,7 @@ end
 
 function M.purge_all_state()
   view.View:close_all_tabs()
-  view.abandon_all_windows()
+  view.View:abandon_all_windows()
   local explorer = core.get_explorer()
   if explorer then
     require("nvim-tree.git").purge_state()

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

@@ -14,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 view.is_visible() then
+  if not explorer or not view.View:is_visible() then
     return
   end
 
@@ -84,9 +84,9 @@ function M.fn(path)
     end)
     :iterate()
 
-  if found and view.is_visible() then
+  if found and view.View:is_visible() then
     explorer.renderer:draw()
-    view.set_cursor({ line, 0 })
+    view.View:set_cursor({ line, 0 })
   end
 
   running[path_real] = false

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

@@ -67,9 +67,9 @@ local function move(explorer, where, what, skip_gitignored)
   end
 
   if nex then
-    view.set_cursor({ nex, 0 })
+    view.View:set_cursor({ nex, 0 })
   elseif vim.o.wrapscan and first then
-    view.set_cursor({ first, 0 })
+    view.View:set_cursor({ first, 0 })
   end
 end
 
@@ -189,13 +189,13 @@ local function move_prev_recursive(explorer, what, skip_gitignored)
 
       -- 4.3)
       if node_init.name == ".." then -- root node
-        view.set_cursor({ 1, 0 })    -- move to root node (position 1)
+        view.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.set_cursor({ node_init_line, 0 })
+        view.View:set_cursor({ node_init_line, 0 })
       end
 
       -- 4.4)

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

@@ -25,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
-      view.set_cursor({ 1, 0 })
+      view.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.set_cursor({ line + 1, 0 })
+    view.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

@@ -373,7 +373,7 @@ local function is_already_loaded(filename)
 end
 
 local function edit_in_current_buf(filename)
-  require("nvim-tree.view").abandon_current_window()
+  require("nvim-tree.view").View:abandon_current_window()
   if M.relative_path then
     filename = utils.path_relative(filename, vim.fn.getcwd())
   end
@@ -419,7 +419,7 @@ function M.fn(mode, filename)
   end
 
   if M.resize_window then
-    view.resize()
+    view.View:resize()
   end
 
   if mode == "preview" or mode == "preview_no_picker" then

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

@@ -41,7 +41,7 @@ function M.fn(opts)
     return
   end
 
-  if view.is_visible() then
+  if view.View:is_visible() then
     -- focus
     if opts.focus then
       lib.set_target_win()

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

@@ -23,7 +23,7 @@ function M.fn(opts)
     opts.path = nil
   end
 
-  if view.is_visible() then
+  if view.View:is_visible() then
     -- focus
     lib.set_target_win()
     view.focus()

lua/nvim-tree/actions/tree/resize.lua

@@ -8,7 +8,7 @@ function M.fn(opts)
   if opts == nil then
     -- reset to config values
     view.View:configure_width()
-    view.resize()
+    view.View:resize()
     return
   end
 
@@ -17,7 +17,7 @@ function M.fn(opts)
 
   if width_cfg ~= nil then
     view.View:configure_width(width_cfg)
-    view.resize()
+    view.View:resize()
     return
   end
 
@@ -28,7 +28,7 @@ function M.fn(opts)
 
   local absolute = options.absolute
   if type(absolute) == "number" then
-    view.resize(absolute)
+    view.View:resize(absolute)
     return
   end
 
@@ -39,7 +39,7 @@ function M.fn(opts)
       relative_size = "+" .. relative_size
     end
 
-    view.resize(relative_size)
+    view.View:resize(relative_size)
     return
   end
 end

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

@@ -40,7 +40,7 @@ function M.fn(opts, no_focus, cwd, bang)
     opts.path = nil
   end
 
-  if view.is_visible() then
+  if view.View:is_visible() then
     -- close
     view.View:close()
   else

lua/nvim-tree/commands.lua

@@ -111,7 +111,7 @@ local CMDS = {
       bar = true,
     },
     command = function(c)
-      view.resize(c.args)
+      view.View:resize(c.args)
     end,
   },
   {

lua/nvim-tree/explorer/init.lua

@@ -486,7 +486,7 @@ function Explorer:reload_explorer()
 
   local projects = git.reload_all_projects()
   self:refresh_nodes(projects)
-  if view.is_visible() then
+  if view.View:is_visible() then
     self.renderer:draw()
   end
   event_running = false

lua/nvim-tree/explorer/live-filter.lua

@@ -204,7 +204,7 @@ function LiveFilter:start_filtering()
   self.explorer.renderer:draw()
   local row = require("nvim-tree.core").get_nodes_starting_line() - 1
   local col = #self.prefix > 0 and #self.prefix - 1 or 1
-  view.set_cursor({ row, col })
+  view.View:set_cursor({ row, col })
   -- needs scheduling to let the cursor move before initializing the window
   vim.schedule(function()
     return create_overlay(self)

lua/nvim-tree/lib.lua

@@ -111,17 +111,17 @@ function M.open(opts)
 
   if should_hijack_current_buf() then
     view.View:close_this_tab_only()
-    view.open_in_win()
+    view.View:open_in_win()
     if explorer then
       explorer.renderer:draw()
     end
   elseif opts.winid then
-    view.open_in_win({ hijack_current_buf = false, resize = false, winid = opts.winid })
+    view.View:open_in_win({ hijack_current_buf = false, resize = false, winid = opts.winid })
     if explorer then
       explorer.renderer:draw()
     end
   elseif opts.current_window then
-    view.open_in_win({ hijack_current_buf = false, resize = false })
+    view.View:open_in_win({ hijack_current_buf = false, resize = false })
     if explorer then
       explorer.renderer:draw()
     end

lua/nvim-tree/renderer/init.lua

@@ -113,7 +113,7 @@ function Renderer:draw()
     vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
   end
 
-  view.grow_from_content()
+  view.View:grow_from_content()
 
   log.profile_end(profile)