Merge branch 'master' into expand-until-2

Author: ghostbuster91

doc/nvim-tree-lua.txt

@@ -639,7 +639,6 @@ Following is the default configuration. See |nvim-tree-opts| for details. >lua
         },
       },
       experimental = {
-        multi_instance = false,
       },
       log = {
         enable = false,

lua/nvim-tree.lua

@@ -486,7 +486,6 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     },
   },
   experimental = {
-    multi_instance = false,
   },
   log = {
     enable = false,
@@ -669,7 +668,7 @@ function M.purge_all_state()
   local explorer = core.get_explorer()
   if explorer then
     explorer.view:close_all_tabs()
-    explorer.view:abandon_all_windows("purge_all_state")
+    explorer.view:abandon_all_windows()
     require("nvim-tree.git").purge_state()
     explorer:destroy()
     core.reset_explorer()
@@ -727,7 +726,6 @@ function M.setup(conf)
   require("nvim-tree.buffers").setup(opts)
   require("nvim-tree.help").setup(opts)
   require("nvim-tree.watcher").setup(opts)
-  require("nvim-tree.multi-instance-debug").setup(opts)
 
   setup_autocommands(opts)
 

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

@@ -18,7 +18,7 @@ local function close_windows(windows)
   -- 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.view.float.enable and #vim.api.nvim_list_wins() < 3 then
+  if explorer and explorer.opts.view.float.enable and #vim.api.nvim_list_wins() < 3 then
     return
   end
 
@@ -36,12 +36,12 @@ local function clear_buffer(absolute_path)
   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.view.float.enable) then
+      if buf.hidden == 0 and (#bufs > 1 or explorer and explorer.opts.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.view.float.quit_on_focus_loss then
+      if explorer and not explorer.opts.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/node/open-file.lua

@@ -23,7 +23,7 @@ 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_winnr(tabpage, "open-file.usable_win_ids")
+  local tree_winid = explorer and explorer.view:get_winid(tabpage)
 
   return vim.tbl_filter(function(id)
     local bufid = vim.api.nvim_win_get_buf(id)
@@ -196,7 +196,7 @@ local function open_file_in_tab(filename)
   if M.quit_on_open then
     local explorer = core.get_explorer()
     if explorer then
-      explorer.view:close(nil, "open-file.open_file_in_tab")
+      explorer.view:close()
     end
   end
   if M.relative_path then
@@ -209,7 +209,7 @@ local function drop(filename)
   if M.quit_on_open then
     local explorer = core.get_explorer()
     if explorer then
-      explorer.view:close(nil, "open-file.drop")
+      explorer.view:close()
     end
   end
   if M.relative_path then
@@ -222,7 +222,7 @@ local function tab_drop(filename)
   if M.quit_on_open then
     local explorer = core.get_explorer()
     if explorer then
-      explorer.view:close(nil, "open-file.tab_drop")
+      explorer.view:close()
     end
   end
   if M.relative_path then
@@ -352,7 +352,7 @@ local function open_in_new_window(filename, mode)
     end
   end
 
-  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.view.float.enable then
+  if (mode == "preview" or mode == "preview_no_picker") and explorer and explorer.opts.view.float.enable then
     -- ignore "WinLeave" autocmd on preview
     -- because the registered "WinLeave"
     -- will kill the floating window immediately
@@ -453,7 +453,7 @@ function M.fn(mode, filename)
   end
 
   if M.quit_on_open and explorer then
-    explorer.view:close(nil, "open-file.fn")
+    explorer.view:close()
   end
 end
 

lua/nvim-tree/actions/root/change-dir.lua

@@ -85,7 +85,7 @@ M.force_dirchange = add_profiling_to(function(foldername, should_open_view)
     if should_change_dir() then
       cd(M.options.global, foldername)
     end
-    core.init(foldername, "change-dir")
+    core.init(foldername)
   end
 
   if should_open_view then

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

@@ -44,7 +44,7 @@ function M.fn(opts, no_focus, cwd, bang)
 
   if explorer and explorer.view:is_visible() then
     -- close
-    explorer.view:close(nil, "toggle.fn")
+    explorer.view:close()
   else
     -- open
     lib.open({

lua/nvim-tree/api.lua

@@ -252,7 +252,7 @@ local function edit(mode, node, edit_opts)
   local mode_unsupported_quit_on_open = mode == "drop" or mode == "tab_drop" or mode == "edit_in_place"
   if not mode_unsupported_quit_on_open and edit_opts.quit_on_open then
     if explorer then
-      explorer.view:close(cur_tabpage, "api.edit " .. mode)
+      explorer.view:close(cur_tabpage)
     end
   end
 

lua/nvim-tree/core.lua

@@ -9,12 +9,9 @@ local TreeExplorer = nil
 local first_init_done = false
 
 ---@param foldername string
----@param callsite string
-function M.init(foldername, callsite)
+function M.init(foldername)
   local profile = log.profile_start("core init %s", foldername)
 
-  log.line("dev", "core.init(%s, %s)", foldername, callsite)
-
   if TreeExplorer then
     TreeExplorer:destroy()
   end

lua/nvim-tree/diagnostics.lua

@@ -185,7 +185,7 @@ function M.update_coc()
 
     local bufnr
     if explorer then
-      bufnr = explorer.view:get_bufnr("diagnostics.update_coc")
+      bufnr = explorer.view:get_bufnr()
     end
 
     local should_draw = bufnr and vim.api.nvim_buf_is_valid(bufnr) and vim.api.nvim_buf_is_loaded(bufnr)

lua/nvim-tree/explorer/init.lua

@@ -105,12 +105,9 @@ function Explorer:create_autocmds()
     vim.api.nvim_create_autocmd("WinLeave", {
       group = self.augroup_id,
       pattern = "NvimTree_*",
-      callback = function(data)
-        if self.opts.experimental.multi_instance then
-          log.line("dev", "WinLeave %s", vim.inspect(data, { newline = "" }))
-        end
+      callback = function()
         if utils.is_nvim_tree_buf(0) then
-          self.view:close(nil, "WinLeave")
+          self.view:close()
         end
       end,
     })
@@ -168,25 +165,6 @@ function Explorer:create_autocmds()
     end,
   })
 
-  -- prevent new opened file from opening in the same window as nvim-tree
-  vim.api.nvim_create_autocmd("BufWipeout", {
-    group = self.augroup_id,
-    pattern = "NvimTree_*",
-    callback = function(data)
-      if self.opts.experimental.multi_instance then
-        log.line("dev", "BufWipeout %s", vim.inspect(data, { newline = "" }))
-      end
-      if not utils.is_nvim_tree_buf(0) then
-        return
-      end
-      if self.opts.actions.open_file.eject then
-        self.view:prevent_buffer_override()
-      else
-        self.view:abandon_current_window()
-      end
-    end,
-  })
-
   vim.api.nvim_create_autocmd("BufEnter", {
     group = self.augroup_id,
     pattern = "NvimTree_*",
@@ -554,7 +532,7 @@ end
 ---nil on no explorer or invalid view win
 ---@return integer[]|nil
 function Explorer:get_cursor_position()
-  local winnr = self.view:get_winnr(nil, "Explorer:get_cursor_position")
+  local winnr = self.view:get_winid()
   if not winnr or not vim.api.nvim_win_is_valid(winnr) then
     return
   end