Finish todos and add close_all_tabs

Author: rwblokzijl

lua/nvim-tree.lua

@@ -70,8 +70,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() -- TODO Choose one
-    -- view.close_this_tab_only() -- TODO Choose one
+    view.close()
   else
     local previous_buf = vim.api.nvim_get_current_buf()
     M.open(cwd)
@@ -439,8 +438,7 @@ local function setup_autocommands(opts)
       pattern = "NvimTree_*",
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          view.close() -- TODO Choose one
-          -- view.close_this_tab_only() -- TODO Choose one
+          view.close()
         end
       end,
     })
@@ -775,8 +773,7 @@ function M.setup(conf)
   end
 
   if M.setup_called and view.is_visible() then
-    view.close() -- TODO Choose one
-    -- view.close_this_tab_only() -- TODO Choose one
+    view.close_all_tabs()
     view.abandon_current_window()
   end
 

lua/nvim-tree/actions/dispatch.lua

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

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

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

lua/nvim-tree/api.lua

@@ -18,7 +18,8 @@ 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.close_in_this_tab = require("nvim-tree.view").close_this_tab_only
+Api.tree.close_in_all_tabs = require("nvim-tree.view").close_all_tabs
 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,8 +117,7 @@ function M.open(cwd)
     core.init(cwd or vim.loop.cwd())
   end
   if should_hijack_current_buf() then
-    -- view.close() -- TODO Choose one
-    view.close_this_tab_only() -- TODO Choose one
+    view.close_this_tab_only()
     view.open_in_current_win()
     renderer.draw()
   else

lua/nvim-tree/live-filter.lua

@@ -31,8 +31,7 @@ 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() -- TODO Choose one
-          -- view.close_this_tab_only() -- TODO Choose one
+          view.close()
         end
       end,
     })

lua/nvim-tree/view.lua

@@ -218,6 +218,10 @@ function M.close_this_tab_only()
   close(false)
 end
 
+function M.close_all_tabs()
+  close(true)
+end
+
 function M.close()
   close(M.View.open_on_tab)
 end