refactor(#2826): singleton View class, WIP

Author: alex-courtis

lua/nvim-tree.lua

@@ -158,7 +158,7 @@ local function setup_autocommands(opts)
         return
       end
       if opts.actions.open_file.eject then
-        view._prevent_buffer_override()
+        view.View:prevent_buffer_override()
       else
         view.View:abandon_current_window()
       end

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

@@ -21,7 +21,7 @@ end
 local function usable_win_ids()
   local tabpage = vim.api.nvim_get_current_tabpage()
   local win_ids = vim.api.nvim_tabpage_list_wins(tabpage)
-  local tree_winid = view.get_winnr(tabpage)
+  local tree_winid = view.View:get_winnr(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)

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

@@ -21,7 +21,7 @@ function M.fn(opts)
     return
   end
 
-  if not view.is_width_determined() then
+  if not view.View:is_width_determined() then
     -- {absolute} and {relative} do nothing when {width} is a function.
     return
   end

lua/nvim-tree/diagnostics.lua

@@ -182,7 +182,7 @@ function M.update_coc()
     end
     log.profile_end(profile)
 
-    local bufnr = view.get_bufnr()
+    local bufnr = view.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()

lua/nvim-tree/explorer/init.lua

@@ -84,7 +84,7 @@ function Explorer:create_autocmds()
     group = self.augroup_id,
     callback = function()
       appearance.setup()
-      view.reset_winhl()
+      view.View:reset_winhl()
       self.renderer:draw()
     end,
   })
@@ -508,7 +508,7 @@ end
 ---nil on no explorer or invalid view win
 ---@return integer[]|nil
 function Explorer:get_cursor_position()
-  local winnr = view.get_winnr()
+  local winnr = view.View:get_winnr()
   if not winnr or not vim.api.nvim_win_is_valid(winnr) then
     return
   end

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

@@ -156,7 +156,7 @@ end
 
 ---@return integer
 local function calculate_overlay_win_width(self)
-  local wininfo = vim.fn.getwininfo(view.get_winnr())[1]
+  local wininfo = vim.fn.getwininfo(view.View:get_winnr())[1]
 
   if wininfo then
     return wininfo.width - wininfo.textoff - #self.prefix

lua/nvim-tree/lib.lua

@@ -13,7 +13,7 @@ local M = {
 
 function M.set_target_win()
   local id = vim.api.nvim_get_current_win()
-  local tree_id = view.get_winnr()
+  local tree_id = view.View:get_winnr()
   if tree_id and id == tree_id then
     M.target_winid = 0
     return

lua/nvim-tree/renderer/init.lua

@@ -96,28 +96,28 @@ function Renderer:render_hl(bufnr, hl_range_args)
 end
 
 function Renderer:draw()
-  local bufnr = view.get_bufnr()
+  local bufnr = view.View:get_bufnr()
   if not bufnr or not vim.api.nvim_buf_is_loaded(bufnr) then
     return
   end
 
   local profile = log.profile_start("draw")
 
-  local cursor = vim.api.nvim_win_get_cursor(view.get_winnr() or 0)
+  local cursor = vim.api.nvim_win_get_cursor(view.View:get_winnr() or 0)
 
   local builder = Builder(self.explorer):build()
 
   self:_draw(bufnr, builder.lines, builder.hl_range_args, builder.signs, builder.extmarks, builder.virtual_lines)
 
   if cursor and #builder.lines >= cursor[1] then
-    vim.api.nvim_win_set_cursor(view.get_winnr() or 0, cursor)
+    vim.api.nvim_win_set_cursor(view.View:get_winnr() or 0, cursor)
   end
 
   view.View:grow_from_content()
 
   log.profile_end(profile)
 
-  events._dispatch_on_tree_rendered(bufnr, view.get_winnr())
+  events._dispatch_on_tree_rendered(bufnr, view.View:get_winnr())
 end
 
 return Renderer