Sync closing of nvim-tree across tabs

Author: rwblokzijl

doc/nvim-tree-lua.txt

@@ -1049,8 +1049,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

@@ -73,7 +73,7 @@ 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()
+    M.close()
   else
     local previous_buf = api.nvim_get_current_buf()
     M.open(cwd)
@@ -86,6 +86,11 @@ function M.toggle(find_file, no_focus, cwd, bang)
   end
 end
 
+function M.close()
+  local config = M.get_config()
+  view.close(config.open_on_tab)
+end
+
 function M.open(cwd)
   cwd = cwd ~= "" and cwd or nil
   if view.is_visible() then
@@ -441,7 +446,7 @@ local function setup_autocommands(opts)
       pattern = "NvimTree_*",
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          view.close()
+          M.close()
         end
       end,
     })
@@ -766,11 +771,11 @@ function M.setup(conf)
   require("nvim-tree.watcher").purge_watchers()
 
   if not M.setup_called then
-    setup_vim_commands()
+    setup_vim_commands(opts)
   end
 
   if M.setup_called and view.is_visible() then
-    view.close()
+    M.close()
     view.abandon_current_window()
   end
 

lua/nvim-tree/actions/dispatch.lua

@@ -1,10 +1,12 @@
+local api = vim.api
+
 local view = require "nvim-tree.view"
 local lib = require "nvim-tree.lib"
 
 local M = {}
 
 local Actions = {
-  close = view.close,
+  close = api.close,
 
   -- Tree modifiers
   collapse_all = require("nvim-tree.actions.tree-modifiers.collapse-all").fn,

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

@@ -126,7 +126,7 @@ end
 
 local function open_file_in_tab(filename)
   if M.quit_on_open then
-    view.close()
+    api.close()
   end
   vim.cmd("tabe " .. vim.fn.fnameescape(filename))
 end
@@ -280,7 +280,7 @@ function M.fn(mode, filename)
   end
 
   if M.quit_on_open then
-    view.close()
+    api.close()
   end
 end
 

lua/nvim-tree/api.lua

@@ -17,7 +17,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 = require("nvim-tree").close
 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

@@ -119,7 +119,7 @@ function M.open(cwd)
     core.init(cwd or vim.loop.cwd())
   end
   if should_hijack_current_buf() then
-    view.close()
+    api.close()
     view.open_in_current_win()
     renderer.draw()
   else

lua/nvim-tree/live-filter.lua

@@ -33,7 +33,7 @@ local function remove_overlay()
       group = a.nvim_create_augroup("NvimTree", { clear = false }),
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          view.close()
+          a.close()
         end
       end,
     })

lua/nvim-tree/view.lua

@@ -186,7 +186,7 @@ local function save_tab_state()
   M.View.cursors[tabpage] = a.nvim_win_get_cursor(M.get_winnr())
 end
 
-function M.close()
+function M.close(all_tabpages)
   if not M.is_visible() then
     return
   end
@@ -200,8 +200,13 @@ function M.close()
       if tree_win == current_win and prev_win > 0 then
         a.nvim_set_current_win(vim.fn.win_getid(prev_win))
       end
-      if a.nvim_win_is_valid(tree_win) then
-        a.nvim_win_close(tree_win, true)
+      a.nvim_win_close(tree_win, true)
+      if all_tabpages then
+        for _, v in pairs(M.View.tabpages) do
+          if v.winnr and a.nvim_win_is_valid(v.winnr) then
+            a.nvim_win_close(v.winnr, true)
+          end
+        end
       end
       events._dispatch_on_tree_close()
       return