Sync closing of nvim-tree across tabs

doc/nvim-tree-lua.txt

@@ -1074,8 +1074,9 @@ You can easily implement a toggle using this too:
 >
     local function toggle_replace()
       local view = require"nvim-tree.view"
+      local api = require"nvim-tree.api"
       if view.is_visible() then
-        view.close()
+        api.close()
       else
         require"nvim-tree".open_replacing_current_buffer()
       end

lua/nvim-tree.lua

@@ -70,7 +70,8 @@ M.on_keypress = require("nvim-tree.actions.dispatch").dispatch
 
 function M.toggle(find_file, no_focus, cwd, bang)
   if view.is_visible() then
-    view.close()
+    view.close() -- TODO Choose one
+    -- view.close_this_tab_only() -- TODO Choose one
   else
     local previous_buf = vim.api.nvim_get_current_buf()
     M.open(cwd)
@@ -438,7 +439,8 @@ local function setup_autocommands(opts)
       pattern = "NvimTree_*",
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          view.close()
+          view.close() -- TODO Choose one
+          -- view.close_this_tab_only() -- TODO Choose one
         end
       end,
     })
@@ -773,7 +775,8 @@ function M.setup(conf)
   end
 
   if M.setup_called and view.is_visible() then
-    view.close()
+    view.close() -- TODO Choose one
+    -- view.close_this_tab_only() -- TODO Choose one
     view.abandon_current_window()
   end
 

lua/nvim-tree/actions/dispatch.lua

@@ -4,7 +4,8 @@ local lib = require "nvim-tree.lib"
 local M = {}
 
 local Actions = {
-  close = view.close,
+  -- close = view.close(), -- TODO Choose one
+  close = view.close_this_tab_only(), -- TODO Choose one
 
   -- Tree modifiers
   collapse_all = require("nvim-tree.actions.tree-modifiers.collapse-all").fn,

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

@@ -143,7 +143,8 @@ end
 
 local function open_file_in_tab(filename)
   if M.quit_on_open then
-    view.close()
+    view.close() -- TODO Choose one
+    -- view.close_this_tab_only() -- TODO Choose one
   end
   vim.cmd("tabe " .. vim.fn.fnameescape(filename))
 end
@@ -306,7 +307,8 @@ function M.fn(mode, filename)
   end
 
   if M.quit_on_open then
-    view.close()
+    view.close() -- TODO Choose one
+    -- view.close_this_tab_only() -- TODO Choose one
   end
 end
 

lua/nvim-tree/api.lua

@@ -18,6 +18,7 @@ end
 Api.tree.open = require("nvim-tree").open
 Api.tree.toggle = require("nvim-tree").toggle
 Api.tree.close = require("nvim-tree.view").close
+Api.tree.close_this_tab = require("nvim-tree.view").close_this_tab_only
 Api.tree.focus = require("nvim-tree").focus
 Api.tree.reload = require("nvim-tree.actions.reloaders.reloaders").reload_explorer
 Api.tree.change_root = require("nvim-tree").change_dir

lua/nvim-tree/lib.lua

@@ -117,7 +117,8 @@ function M.open(cwd)
     core.init(cwd or vim.loop.cwd())
   end
   if should_hijack_current_buf() then
-    view.close()
+    -- view.close() -- TODO Choose one
+    view.close_this_tab_only() -- TODO Choose one
     view.open_in_current_win()
     renderer.draw()
   else

lua/nvim-tree/live-filter.lua

@@ -31,7 +31,8 @@ local function remove_overlay()
       group = vim.api.nvim_create_augroup("NvimTree", { clear = false }),
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          view.close()
+          view.close() -- TODO Choose one
+          -- view.close_this_tab_only() -- TODO Choose one
         end
       end,
     })

lua/nvim-tree/view.lua

@@ -184,7 +184,7 @@ local function save_tab_state()
   M.View.cursors[tabpage] = vim.api.nvim_win_get_cursor(M.get_winnr())
 end
 
-function M.close()
+local function close(all_tabpages)
   if not M.is_visible() then
     return
   end
@@ -201,12 +201,27 @@ function M.close()
       if vim.api.nvim_win_is_valid(tree_win) then
         vim.api.nvim_win_close(tree_win, true)
       end
+      if all_tabpages then
+        for _, v in pairs(M.View.tabpages) do
+          if v.winnr and vim.api.nvim_win_is_valid(v.winnr) then
+            vim.api.nvim_win_close(v.winnr, true)
+          end
+        end
+      end
       events._dispatch_on_tree_close()
       return
     end
   end
 end
 
+function M.close_this_tab_only()
+  close(false)
+end
+
+function M.close()
+  close(M.View.open_on_tab)
+end
+
 function M.open(options)
   if M.is_visible() then
     return
@@ -450,6 +465,7 @@ function M.setup(opts)
   M.View.height = options.height
   M.View.initial_width = get_size()
   M.View.hide_root_folder = options.hide_root_folder
+  M.View.open_on_tab = opts.open_on_tab
   M.View.preserve_window_proportions = options.preserve_window_proportions
   M.View.winopts.number = options.number
   M.View.winopts.relativenumber = options.relativenumber