wip

Author: v3ceban

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

@@ -9,6 +9,7 @@ local find_file = require("nvim-tree.actions.finders.find-file").fn
 
 local Class = require("nvim-tree.classic")
 local DirectoryNode = require("nvim-tree.node.directory")
+local Node = require("nvim-tree.node")
 
 ---@alias ClipboardAction "copy" | "cut"
 ---@alias ClipboardData table<ClipboardAction, Node[]>
@@ -178,7 +179,7 @@ end
 ---Copy one or more nodes
 ---@param node_or_nodes Node|Node[]
 function Clipboard:copy(node_or_nodes)
-  if node_or_nodes.is then
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
     utils.array_remove(self.data.cut, node_or_nodes)
     toggle(node_or_nodes, self.data.copy)
     self.explorer.renderer:draw()
@@ -190,7 +191,7 @@ end
 ---Cut one or more nodes
 ---@param node_or_nodes Node|Node[]
 function Clipboard:cut(node_or_nodes)
-  if node_or_nodes.is then
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
     utils.array_remove(self.data.copy, node_or_nodes)
     toggle(node_or_nodes, self.data.cut)
     self.explorer.renderer:draw()
@@ -204,10 +205,7 @@ end
 ---@param action ClipboardAction
 function Clipboard:finish_paste(action)
   self.data[action] = {}
-  if not self.explorer.opts.filesystem_watchers.enable then
-    self.explorer:reload_explorer()
-  end
-  self.explorer.renderer:draw()
+  self.explorer:reload_explorer()
 end
 
 ---Resolve conflicting paste items with a single batch prompt.

lua/nvim-tree/actions/fs/remove-file.lua

@@ -7,6 +7,7 @@ local notify = require("nvim-tree.notify")
 
 local DirectoryLinkNode = require("nvim-tree.node.directory-link")
 local DirectoryNode = require("nvim-tree.node.directory")
+local Node = require("nvim-tree.node")
 local RootNode = require("nvim-tree.node.root")
 
 local M = {
@@ -195,7 +196,7 @@ end
 
 ---@param node_or_nodes Node|Node[]
 function M.fn(node_or_nodes)
-  if type(node_or_nodes) == "table" and node_or_nodes.is then
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
     remove_one(node_or_nodes)
   else
     remove_many(node_or_nodes)

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

@@ -6,6 +6,7 @@ local events = require("nvim-tree.events")
 
 local DirectoryLinkNode = require("nvim-tree.node.directory-link")
 local DirectoryNode = require("nvim-tree.node.directory")
+local Node = require("nvim-tree.node")
 local RootNode = require("nvim-tree.node.root")
 
 local M = {
@@ -144,7 +145,7 @@ end
 
 ---@param node_or_nodes Node|Node[]
 function M.fn(node_or_nodes)
-  if type(node_or_nodes) == "table" and node_or_nodes.is then
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
     trash_one(node_or_nodes)
   else
     trash_many(node_or_nodes)

lua/nvim-tree/help.lua

@@ -124,6 +124,16 @@ local function compute(map)
 
   table.sort(mappings, sort_fn)
 
+  -- sort mode characters for deterministic display e.g. "nx" not "xn"
+  for _, entry in ipairs(mappings) do
+    local chars = {}
+    for c in entry.mode:gmatch(".") do
+      table.insert(chars, c)
+    end
+    table.sort(chars)
+    entry.mode = table.concat(chars)
+  end
+
   -- longest lhs, mode and description
   local max_lhs = 0
   local max_mode = 0

lua/nvim-tree/marks/init.lua

@@ -10,6 +10,7 @@ local utils = require("nvim-tree.utils")
 
 local Class = require("nvim-tree.classic")
 local DirectoryNode = require("nvim-tree.node.directory")
+local Node = require("nvim-tree.node")
 
 local function get_save_path(opts)
   if type(opts.bookmarks.persist) == "string" then
@@ -117,7 +118,7 @@ end
 ---@public
 ---@param node_or_nodes Node|Node[]
 function Marks:toggle(node_or_nodes)
-  if type(node_or_nodes) == "table" and node_or_nodes.is then
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
     self:toggle_one(node_or_nodes)
   else
     for _, node in ipairs(node_or_nodes) do

lua/nvim-tree/utils.lua

@@ -488,25 +488,16 @@ end
 ---@param nodes Node[]
 ---@return Node[]
 function M.filter_descendant_nodes(nodes)
-  local dominated = {}
-  for i, a in ipairs(nodes) do
-    for j, b in ipairs(nodes) do
-      if i ~= j then
-        local prefix = b.absolute_path .. path_separator
-        if a.absolute_path:sub(1, #prefix) == prefix then
-          dominated[i] = true
-          break
-        end
+  return vim.tbl_filter(function(node)
+    local parent = node.parent
+    while parent do
+      if vim.tbl_contains(nodes, parent) then
+        return false
       end
+      parent = parent.parent
     end
-  end
-  local filtered = {}
-  for i, node in ipairs(nodes) do
-    if not dominated[i] then
-      table.insert(filtered, node)
-    end
-  end
-  return filtered
+    return true
+  end, nodes)
 end
 
 ---Build confirmation prompt strings based on default_yes config.