Merge branch 'master' into master

Author: xundaoxd

doc/nvim-tree-lua.txt

@@ -494,6 +494,7 @@ applying configuration.
         },
         open_file = {
           quit_on_open = false,
+          eject = true,
           resize_window = true,
           window_picker = {
             enable = true,
@@ -1148,7 +1149,6 @@ Configuration options for trashing.
     *nvim-tree.trash.cmd*
     The command used to trash items (must be installed on your system).
     The default is shipped with glib2 which is a common linux package.
-    Only available for UNIX.
       Type: `string`, Default: `"gio trash"`
 
 *nvim-tree.actions*
@@ -1204,9 +1204,12 @@ Configuration for various actions.
 
         *nvim-tree.actions.open_file.quit_on_open*
         Closes the explorer when opening a file.
-        It will also disable preventing a buffer overriding the tree.
           Type: `boolean`, Default: `false`
 
+        *nvim-tree.actions.open_file.eject*
+        Prevent new opened file from opening in the same window as the tree.
+          Type: `boolean`, Default: `true`
+
         *nvim-tree.actions.open_file.resize_window*  (previously `view.auto_resize`)
         Resizes the tree when opening a file.
           Type: `boolean`, Default: `true`
@@ -2293,7 +2296,7 @@ macOS
   system.
 
 Windows WSL and PowerShell
-- Trash is unavailable
+- Trash is synchronized
 - Executable file detection is disabled as this is non-performant and can
   freeze nvim
 - Some filesystem watcher error related to permissions will not be reported

lua/nvim-tree.lua

@@ -196,8 +196,13 @@ local function setup_autocommands(opts)
   create_nvim_tree_autocmd("BufWipeout", {
     pattern = "NvimTree_*",
     callback = function()
-      if utils.is_nvim_tree_buf(0) then
+      if not utils.is_nvim_tree_buf(0) then
+        return
+      end
+      if opts.actions.open_file.eject then
         view._prevent_buffer_override()
+      else
+        view.abandon_current_window()
       end
     end,
   })
@@ -545,6 +550,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
     },
     open_file = {
       quit_on_open = false,
+      eject = true,
       resize_window = true,
       window_picker = {
         enable = true,

lua/nvim-tree/actions/fs/trash.lua

@@ -30,7 +30,7 @@ function M.fn(node)
   end
 
   -- configs
-  if utils.is_unix then
+  if utils.is_unix or utils.is_windows then
     if M.config.trash.cmd == nil then
       M.config.trash.cmd = "trash"
     end
@@ -55,11 +55,15 @@ function M.fn(node)
 
   -- trashes a path (file or folder)
   local function trash_path(on_exit)
-    vim.fn.jobstart(M.config.trash.cmd .. ' "' .. node.absolute_path .. '"', {
-      detach = true,
+    local need_sync_wait = utils.is_windows
+    local job = vim.fn.jobstart(M.config.trash.cmd .. ' "' .. node.absolute_path .. '"', {
+      detach = not need_sync_wait,
       on_exit = on_exit,
       on_stderr = on_stderr,
     })
+    if need_sync_wait then
+      vim.fn.jobwait { job }
+    end
   end
 
   local function do_trash()

lua/nvim-tree/explorer/node.lua

@@ -111,7 +111,7 @@ function M.get_git_status(node)
 end
 
 function M.is_git_ignored(node)
-  return node.git_status and node.git_status.file == "!!"
+  return node and node.git_status and node.git_status.file == "!!"
 end
 
 function M.node_destroy(node)

lua/nvim-tree/explorer/reload.lua

@@ -30,7 +30,7 @@ end
 
 local function update_parent_statuses(node, project, root)
   while project and node and node.absolute_path ~= root do
-    explorer_node.update_git_status(node, false, project)
+    explorer_node.update_git_status(node, explorer_node.is_git_ignored(node.parent), project)
     node = node.parent
   end
 end