Implement changes

Author: rwblokzijl

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
-    M.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)
@@ -83,11 +84,6 @@ 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
@@ -443,7 +439,8 @@ local function setup_autocommands(opts)
       pattern = "NvimTree_*",
       callback = function()
         if utils.is_nvim_tree_buf(0) then
-          M.close()
+          view.close() -- TODO Choose one
+          -- view.close_this_tab_only() -- TODO Choose one
         end
       end,
     })
@@ -774,11 +771,12 @@ function M.setup(conf)
   require("nvim-tree.watcher").purge_watchers()
 
   if not M.setup_called then
-    setup_vim_commands(opts)
+    setup_vim_commands()
   end
 
   if M.setup_called and view.is_visible() then
-    M.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(false)
+    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(false)
+    view.close() -- TODO Choose one
+    -- view.close_this_tab_only() -- TODO Choose one
   end
 end
 

lua/nvim-tree/api.lua

@@ -17,7 +17,8 @@ end
 
 Api.tree.open = require("nvim-tree").open
 Api.tree.toggle = require("nvim-tree").toggle
-Api.tree.close = require("nvim-tree").close
+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(false)
+    -- 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(false)
+          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(all_tabpages)
+local function close(all_tabpages)
   if not M.is_visible() then
     return
   end
@@ -214,6 +214,14 @@ function M.close(all_tabpages)
   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
@@ -457,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