Merge branch 'master' into ci-lua-language-server

Author: alex-courtis

doc/nvim-tree-lua.txt

@@ -250,9 +250,9 @@ via |nvim-tree.on_attach| e.g. >
 
     Open the tree if it is closed, and then focus on the tree.
 
-    See |nvim-tree-api.tree.focus()|
+    See |nvim-tree-api.tree.open()|
 
-    Calls: `api.tree.focus()`
+    Calls: `api.tree.open()`
 
 *:NvimTreeRefresh*
 
@@ -1587,6 +1587,7 @@ tree.close_in_all_tabs()              *nvim-tree-api.tree.close_in_all_tabs()*
 
 tree.focus()                                      *nvim-tree-api.tree.focus()*
     Focus the tree, opening it if necessary.
+    Retained for compatibility, use |tree.open()| with no arguments instead.
 
 tree.reload()                                    *nvim-tree-api.tree.reload()*
     Refresh the tree. Does nothing if closed.

lua/nvim-tree.lua

@@ -13,7 +13,6 @@ local git = require "nvim-tree.git"
 local filters = require "nvim-tree.explorer.filters"
 local modified = require "nvim-tree.modified"
 local find_file = require "nvim-tree.actions.tree.find-file"
-local open = require "nvim-tree.actions.tree.open"
 local events = require "nvim-tree.events"
 local notify = require "nvim-tree.notify"
 
@@ -23,11 +22,6 @@ local M = {
   init_root = "",
 }
 
-function M.focus()
-  open.fn()
-  view.focus()
-end
-
 --- Update the tree root to a directory or the directory containing
 --- @param path string relative or absolute
 --- @param bufnr number|nil
@@ -758,7 +752,7 @@ function M.purge_all_state()
   view.abandon_all_windows()
   if core.get_explorer() ~= nil then
     git.purge_state()
-    TreeExplorer = nil
+    core.reset_explorer()
   end
 end
 

lua/nvim-tree/api.lua

@@ -86,7 +86,7 @@ Api.tree.close_in_this_tab = wrap(require("nvim-tree.view").close_this_tab_only)
 Api.tree.close_in_all_tabs = wrap(require("nvim-tree.view").close_all_tabs)
 
 Api.tree.focus = wrap(function()
-  require("nvim-tree").focus()
+  Api.tree.open()
 end)
 
 Api.tree.reload = wrap(require("nvim-tree.actions.reloaders.reloaders").reload_explorer)

lua/nvim-tree/commands.lua

@@ -48,7 +48,7 @@ local CMDS = {
       bar = true,
     },
     command = function()
-      api.tree.focus()
+      api.tree.open()
     end,
   },
   {

lua/nvim-tree/core.lua

@@ -6,7 +6,7 @@ local log = require "nvim-tree.log"
 
 local M = {}
 
-TreeExplorer = nil
+local TreeExplorer = nil
 local first_init_done = false
 
 function M.init(foldername)
@@ -27,6 +27,10 @@ function M.get_explorer()
   return TreeExplorer
 end
 
+function M.reset_explorer()
+  TreeExplorer = nil
+end
+
 function M.get_cwd()
   return TreeExplorer and TreeExplorer.absolute_path
 end

lua/nvim-tree/live-filter.lua

@@ -11,7 +11,7 @@ local function redraw()
 end
 
 local function reset_filter(node_)
-  node_ = node_ or TreeExplorer
+  node_ = node_ or require("nvim-tree.core").get_explorer()
   Iterator.builder(node_.nodes)
     :hidden()
     :applier(function(node)
@@ -79,7 +79,7 @@ function M.apply_filter(node_)
     node.hidden = not (has_nodes or (ok and is_match))
   end
 
-  iterate(node_ or TreeExplorer)
+  iterate(node_ or require("nvim-tree.core").get_explorer())
 end
 
 local function record_char()