vim: nvim-tree: more logging

Author: alex-courtis

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

@@ -190,7 +190,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()
+      explorer.view:close(nil, "open-file.open_file_in_tab")
     end
   end
   if M.relative_path then
@@ -203,7 +203,7 @@ local function drop(filename)
   if M.quit_on_open then
     local explorer = core.get_explorer()
     if explorer then
-      explorer.view:close()
+      explorer.view:close(nil, "open-file.drop")
     end
   end
   if M.relative_path then
@@ -216,7 +216,7 @@ local function tab_drop(filename)
   if M.quit_on_open then
     local explorer = core.get_explorer()
     if explorer then
-      explorer.view:close()
+      explorer.view:close(nil, "open-file.tab_drop")
     end
   end
   if M.relative_path then
@@ -447,7 +447,7 @@ function M.fn(mode, filename)
   end
 
   if M.quit_on_open and explorer then
-    explorer.view:close()
+    explorer.view:close(nil, "open-file.fn")
   end
 end
 

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()
+    explorer.view:close(nil, "toggle.fn")
   else
     -- open
     lib.open({

lua/nvim-tree/api.lua

@@ -247,7 +247,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)
+      explorer.view:close(cur_tabpage, "api.edit " .. mode)
     end
   end
 

lua/nvim-tree/explorer/init.lua

@@ -107,7 +107,7 @@ function Explorer:create_autocmds()
       pattern = "NvimTree_*",
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          self.view:close()
+          self.view:close(nil, "WinLeave")
         end
       end,
     })

lua/nvim-tree/explorer/view.lua

@@ -133,10 +133,12 @@ function View:create_buffer(bufnr)
   if self.explorer.opts.experimental.multi_instance then
     local tabid = tab
     self.bufnr_by_tab[tabid] = globals.BUFNR_PER_TAB[tabid]
+
     log.line("dev", "buffer channel attaching t%d b%d", tabid, self.bufnr_by_tab[tabid])
-    vim.api.nvim_buf_attach(self.bufnr_by_tab[tabid], true, {
+    vim.api.nvim_buf_attach(self.bufnr_by_tab[tabid], false, {
       on_detach = function(op, bnr)
         log.line("dev", "buffer channel %s t%d b%d", op, tabid, bnr)
+        self.bufnr_by_tab[tabid] = nil
       end,
     })
   end
@@ -291,6 +293,9 @@ end
 ---@private
 ---@param tabpage integer
 function View:close_internal(tabpage)
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:close_internal(t%s)", tabpage)
+  end
   if not self:is_visible({ tabpage = tabpage }) then
     return
   end
@@ -305,6 +310,9 @@ function View:close_internal(tabpage)
         vim.api.nvim_set_current_win(vim.fn.win_getid(prev_win))
       end
       if vim.api.nvim_win_is_valid(tree_win or 0) then
+        if self.explorer.opts.experimental.multi_instance then
+          log.line("dev", "View:close_internal(t%s) w%s", tabpage, tree_win)
+        end
         local success, error = pcall(vim.api.nvim_win_close, tree_win or 0, true)
         if not success then
           notify.debug("Failed to close window: " .. error)
@@ -327,7 +335,12 @@ function View:close_all_tabs()
 end
 
 ---@param tabpage integer|nil
-function View:close(tabpage)
+---@param callsite string
+function View:close(tabpage, callsite)
+  if self.explorer.opts.experimental.multi_instance then
+    log.line("dev", "View:close(t%s, %s)", tabpage, callsite)
+  end
+
   if self.explorer.opts.tab.sync.close then
     self:close_all_tabs()
   elseif tabpage then
@@ -503,7 +516,7 @@ function View:abandon_current_window(callsite)
     log.line("dev", "View:abandon_current_window(%-20.20s) t%d w%s b%s member b%s %s",
       callsite,
       tab,
-      globals.TABPAGES and globals.TABPAGES.winnr or nil,
+      globals.TABPAGES[tab] and globals.TABPAGES[tab].winnr or nil,
       globals.BUFNR_PER_TAB[tab],
       self.bufnr_by_tab[tab],
       (globals.BUFNR_PER_TAB[tab] == self.bufnr_by_tab[tab]) and "" or "MISMATCH")
@@ -575,7 +588,7 @@ function View:focus(winnr, open_if_closed)
   local wnr = winnr or self:get_winnr(nil, "View:focus1")
 
   if vim.api.nvim_win_get_tabpage(wnr or 0) ~= vim.api.nvim_win_get_tabpage(0) then
-    self:close()
+    self:close(nil, "View:focus")
     self:open()
     wnr = self:get_winnr(nil, "View:focus2")
   elseif open_if_closed and not self:is_visible() then