feat(#1549): p will paste files from another nvim-tree instance, gp will cut/paste

doc/nvim-tree-lua.txt

@@ -142,8 +142,8 @@ Show the mappings:  `g?`
  `F`               n    Live Filter: Clear         |nvim_tree.api.filter.live.clear()|
  `f`               n    Live Filter: Start         |nvim_tree.api.filter.live.start()|
  `g?`              n    Help                       |nvim_tree.api.tree.toggle_help()|
- `gy`              n    Copy Absolute Path         |nvim_tree.api.fs.copy.absolute_path()|
- `ge`              n    Copy Basename              |nvim_tree.api.fs.copy.basename()|
+ `gy`              nx   Copy Absolute Path         |nvim_tree.api.fs.copy.absolute_path()|
+ `ge`              nx   Copy Basename              |nvim_tree.api.fs.copy.basename()|
  `H`               n    Toggle Filter: Dotfiles    |nvim_tree.api.filter.dotfiles.toggle()|
  `I`               n    Toggle Filter: Git Ignored |nvim_tree.api.filter.git.ignored.toggle()|
  `J`               n    Last Sibling               |nvim_tree.api.node.navigate.sibling.last()|
@@ -154,6 +154,8 @@ Show the mappings:  `g?`
  `o`               n    Open                       |nvim_tree.api.node.open.edit()|
  `O`               n    Open: No Window Picker     |nvim_tree.api.node.open.no_window_picker()|
  `p`               n    Paste                      |nvim_tree.api.fs.paste()|
+ `gp`              n    Paste Using Register       |nvim_tree.api.fs.paste_from_register_copying()|
+ `gx`              n    Move Using Register        |nvim_tree.api.fs.paste_from_register_cutting()|
  `P`               n    Parent Directory           |nvim_tree.api.node.navigate.parent()|
  `q`               n    Close                      |nvim_tree.api.tree.close()|
  `r`               n    Rename                     |nvim_tree.api.fs.rename()|
@@ -435,8 +437,8 @@ You are encouraged to copy these to your {on_attach} function. >lua
   vim.keymap.set("n",          "F",              api.filter.live.clear,              opts("Live Filter: Clear"))
   vim.keymap.set("n",          "f",              api.filter.live.start,              opts("Live Filter: Start"))
   vim.keymap.set("n",          "g?",             api.tree.toggle_help,               opts("Help"))
-  vim.keymap.set("n",          "gy",             api.fs.copy.absolute_path,          opts("Copy Absolute Path"))
-  vim.keymap.set("n",          "ge",             api.fs.copy.basename,               opts("Copy Basename"))
+  vim.keymap.set({ "n", "x" }, "gy",             api.fs.copy.absolute_path,          opts("Copy Absolute Path"))
+  vim.keymap.set({ "n", "x" }, "ge",             api.fs.copy.basename,               opts("Copy Basename"))
   vim.keymap.set("n",          "H",              api.filter.dotfiles.toggle,         opts("Toggle Filter: Dotfiles"))
   vim.keymap.set("n",          "I",              api.filter.git.ignored.toggle,      opts("Toggle Filter: Git Ignored"))
   vim.keymap.set("n",          "J",              api.node.navigate.sibling.last,     opts("Last Sibling"))
@@ -447,6 +449,8 @@ You are encouraged to copy these to your {on_attach} function. >lua
   vim.keymap.set("n",          "o",              api.node.open.edit,                 opts("Open"))
   vim.keymap.set("n",          "O",              api.node.open.no_window_picker,     opts("Open: No Window Picker"))
   vim.keymap.set("n",          "p",              api.fs.paste,                       opts("Paste"))
+  vim.keymap.set("n",          "gp",             api.fs.paste_from_register_copying, opts("Paste Using Register"))
+  vim.keymap.set("n",          "gx",             api.fs.paste_from_register_cutting, opts("Move Using Register"))
   vim.keymap.set("n",          "P",              api.node.navigate.parent,           opts("Parent Directory"))
   vim.keymap.set("n",          "q",              api.tree.close,                     opts("Close"))
   vim.keymap.set("n",          "r",              api.fs.rename,                      opts("Rename"))
@@ -2467,6 +2471,20 @@ paste({node})                                       *nvim_tree.api.fs.paste()*
     Parameters: ~
       • {node}  (`nvim_tree.api.Node?`)
 
+                              *nvim_tree.api.fs.paste_from_register_copying()*
+paste_from_register_copying({node_or_nodes})
+    Paste nodes from the system register as files to nvim-tree while copying.
+
+    Parameters: ~
+      • {node_or_nodes}  (`nvim_tree.api.Node|nvim_tree.api.Node[]?`)
+
+                              *nvim_tree.api.fs.paste_from_register_cutting()*
+paste_from_register_cutting({node_or_nodes})
+    Paste nodes from the system register as files to nvim-tree while cutting.
+
+    Parameters: ~
+      • {node_or_nodes}  (`nvim_tree.api.Node|nvim_tree.api.Node[]?`)
+
 print_clipboard()                         *nvim_tree.api.fs.print_clipboard()*
     Print the contents of the nvim-tree clipboard.
 

lua/nvim-tree/_meta/api/fs.lua

@@ -66,6 +66,18 @@ function nvim_tree.api.fs.cut(node) end
 ---@param node? nvim_tree.api.Node
 function nvim_tree.api.fs.paste(node) end
 
+---
+---Paste nodes from the system register as files to nvim-tree while copying.
+---
+---@param node_or_nodes? nvim_tree.api.Node | nvim_tree.api.Node[]
+function nvim_tree.api.fs.paste_from_register_copying(node_or_nodes) end
+
+---
+---Paste nodes from the system register as files to nvim-tree while cutting.
+---
+---@param node_or_nodes? nvim_tree.api.Node | nvim_tree.api.Node[]
+function nvim_tree.api.fs.paste_from_register_cutting(node_or_nodes) end
+
 ---
 ---Print the contents of the nvim-tree clipboard.
 ---

lua/nvim-tree/_meta/config/actions.lua

@@ -24,8 +24,6 @@ error("Cannot require a meta file")
 ---[nvim_tree.config.actions.remove_file]
 ---@field remove_file? nvim_tree.config.actions.remove_file
 
-
-
 --- vim [current-directory] behaviour
 ---@class nvim_tree.config.actions.change_dir
 ---

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 FileNode = require("nvim-tree.node.file")
 local Node = require("nvim-tree.node")
 
 ---@alias ClipboardAction "copy" | "cut"
@@ -43,6 +44,10 @@ function Clipboard:new(args)
   self.reg = self.explorer.opts.actions.use_system_clipboard and "+" or "1"
 end
 
+---@class PasteOptions
+---@field use_register? boolean
+---@field cut? boolean
+
 ---@param source string
 ---@param destination string
 ---@return boolean
@@ -176,10 +181,20 @@ function Clipboard:bulk_clipboard(nodes, from, to, verb)
   self.explorer.renderer:draw()
 end
 
+---@private
+---@param node_or_nodes Node|Node[]
+---@return boolean
+function Clipboard:is_nodes_array(node_or_nodes)
+  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
+    return false
+  end
+  return true
+end
+
 ---Copy one or more nodes
 ---@param node_or_nodes Node|Node[]
 function Clipboard:copy(node_or_nodes)
-  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
+  if self:is_nodes_array(node_or_nodes) == false then
     utils.array_remove(self.data.cut, node_or_nodes)
     toggle(node_or_nodes, self.data.copy)
     self.explorer.renderer:draw()
@@ -191,7 +206,7 @@ end
 ---Cut one or more nodes
 ---@param node_or_nodes Node|Node[]
 function Clipboard:cut(node_or_nodes)
-  if type(node_or_nodes) == "table" and node_or_nodes.is and node_or_nodes:is(Node) then
+  if self:is_nodes_array(node_or_nodes) == false then
     utils.array_remove(self.data.copy, node_or_nodes)
     toggle(node_or_nodes, self.data.cut)
     self.explorer.renderer:draw()
@@ -304,12 +319,37 @@ function Clipboard:resolve_conflicts(conflict, destination, action, action_fn)
     end)
 end
 
+--- Transforms the copied absolute paths on register to node
+---@private
+function Clipboard:get_nodes_from_reg()
+  local content = vim.fn.getreg(self.reg)
+
+  if #content == 0 then
+    return
+  end
+
+  local nodes = {}
+  local absolute_paths = vim.split(content:sub(1, #content), ",")
+
+  for _, absolute_path in ipairs(absolute_paths) do
+    local node_args = { absolute_path = absolute_path, name = vim.fn.fnamemodify(absolute_path, ":t"), explorer = self.explorer }
+    if absolute_path:sub(-1) == "/" then
+      node_args.name = vim.fn.fnamemodify(absolute_path:sub(1, -2), ":t")
+      table.insert(nodes, DirectoryNode(node_args))
+    else
+      table.insert(nodes, FileNode(node_args))
+    end
+  end
+  return nodes
+end
+
 ---Paste cut or copy with batch conflict resolution.
 ---@private
 ---@param node Node
 ---@param action ClipboardAction
 ---@param action_fn ClipboardActionFn
-function Clipboard:do_paste(node, action, action_fn)
+---@param opts? PasteOptions
+function Clipboard:do_paste(node, action, action_fn, opts)
   if node.name == ".." then
     node = self.explorer
   else
@@ -318,7 +358,7 @@ function Clipboard:do_paste(node, action, action_fn)
       node = dir:last_group_node()
     end
   end
-  local clip = self.data[action]
+  local clip = opts and opts.use_register and self:get_nodes_from_reg() or self.data[action]
   if #clip == 0 then
     return
   end
@@ -386,11 +426,12 @@ end
 
 ---Paste cut (if present) or copy (if present)
 ---@param node Node
-function Clipboard:paste(node)
-  if self.data.cut[1] ~= nil then
-    self:do_paste(node, "cut", do_cut)
-  elseif self.data.copy[1] ~= nil then
-    self:do_paste(node, "copy", do_copy)
+---@param opts? PasteOptions
+function Clipboard:paste(node, opts)
+  if self.data.cut[1] ~= nil or opts and opts.use_register and opts.cut then
+    self:do_paste(node, "cut", do_cut, opts)
+  elseif self.data.copy[1] ~= nil or opts and opts.use_register then
+    self:do_paste(node, "copy", do_copy, opts)
   end
 end
 
@@ -413,7 +454,8 @@ function Clipboard:print_clipboard()
 end
 
 ---@param content string
-function Clipboard:copy_to_reg(content)
+---@param msg? string
+function Clipboard:copy_to_reg(content, msg)
   -- manually firing TextYankPost does not set vim.v.event
   -- workaround: create a scratch buffer with the clipboard contents and send a yank command
   local temp_buf = vim.api.nvim_create_buf(false, true)
@@ -423,7 +465,7 @@ function Clipboard:copy_to_reg(content)
   end)
   vim.api.nvim_buf_delete(temp_buf, {})
 
-  notify.info(string.format("Copied %s to %s clipboard!", content, self.clipboard_name))
+  notify.info(msg or string.format("Copied %s to %s clipboard!", content, self.clipboard_name))
 end
 
 ---@param node Node
@@ -437,15 +479,22 @@ function Clipboard:copy_filename(node)
   end
 end
 
----@param node Node
-function Clipboard:copy_basename(node)
-  if node.name == ".." then
-    -- root
-    self:copy_to_reg(vim.fn.fnamemodify(self.explorer.absolute_path, ":t:r"))
+---@param node_or_nodes Node|Node[]
+function Clipboard:copy_basename(node_or_nodes)
+  local content = ""
+  if self:is_nodes_array(node_or_nodes) == false or #node_or_nodes == 1 then
+    local node = #node_or_nodes == 1 and node_or_nodes[0] or node_or_nodes
+    content = node:get_basename()
   else
-    -- node
-    self:copy_to_reg(vim.fn.fnamemodify(node.name, ":r"))
+    for i, node in ipairs(node_or_nodes) do
+      if i == 1 then
+        content = node:get_basename()
+      else
+        content = content .. "," .. node:get_basename()
+      end
+    end
   end
+  self:copy_to_reg(content)
 end
 
 ---@param node Node
@@ -470,15 +519,37 @@ function Clipboard:copy_path(node)
   end
 end
 
+---@private
 ---@param node Node
-function Clipboard:copy_absolute_path(node)
+---@return string
+function Clipboard:get_absolute_path(node)
   if node.name == ".." then
     node = self.explorer
   end
 
   local absolute_path = node.absolute_path
-  local content = node.nodes ~= nil and utils.path_add_trailing(absolute_path) or absolute_path
-  self:copy_to_reg(content)
+  return node.nodes ~= nil and utils.path_add_trailing(absolute_path) or absolute_path
+end
+
+---@param node_or_nodes Node|Node[]
+function Clipboard:copy_absolute_path(node_or_nodes)
+  local content = ""
+  local is_single = self:is_nodes_array(node_or_nodes) == false or #node_or_nodes == 1
+  if is_single then
+    local node = #node_or_nodes == 1 and node_or_nodes[0] or node_or_nodes
+    content = self:get_absolute_path(node)
+  else
+    node_or_nodes = utils.filter_descendant_nodes(node_or_nodes)
+    for i, node in ipairs(node_or_nodes) do
+      if i == 1 then
+        content = self:get_absolute_path(node)
+      else
+        content = content .. "," .. self:get_absolute_path(node)
+      end
+    end
+  end
+
+  self:copy_to_reg(content, string.format("%s paths copied to register", is_single and 1 or #node_or_nodes))
 end
 
 ---Node is cut. Will not be copied.

lua/nvim-tree/api/impl.lua

@@ -155,14 +155,16 @@ function M.hydrate_post_setup(api)
   api.filter.toggle                            = e_(function(e) e.filters:toggle() end)
 
   api.fs.clear_clipboard                       = e_(function(e) e.clipboard:clear_clipboard() end)
-  api.fs.copy.absolute_path                    = en(function(e, n) e.clipboard:copy_absolute_path(n) end)
-  api.fs.copy.basename                         = en(function(e, n) e.clipboard:copy_basename(n) end)
+  api.fs.copy.absolute_path                    = ev(function(e, n) e.clipboard:copy_absolute_path(n) end)
+  api.fs.copy.basename                         = ev(function(e, n) e.clipboard:copy_basename(n) end)
   api.fs.copy.filename                         = en(function(e, n) e.clipboard:copy_filename(n) end)
   api.fs.copy.node                             = ev(function(e, n) e.clipboard:copy(n) end)
   api.fs.copy.relative_path                    = en(function(e, n) e.clipboard:copy_path(n) end)
   api.fs.create                                = _n(function(n) require("nvim-tree.actions.fs.create-file").fn(n) end)
   api.fs.cut                                   = ev(function(e, n) e.clipboard:cut(n) end)
   api.fs.paste                                 = en(function(e, n) e.clipboard:paste(n) end)
+  api.fs.paste_from_register_copying           = en(function(e, n) e.clipboard:paste(n, { use_register = true }) end)
+  api.fs.paste_from_register_cutting           = en(function(e, n) e.clipboard:paste(n, { use_register = true, cut = true }) end)
   api.fs.print_clipboard                       = e_(function(e) e.clipboard:print_clipboard() end)
   api.fs.remove                                = _v(function(n) require("nvim-tree.actions.fs.remove-file").fn(n) end)
   api.fs.rename                                = _n(function(n) require("nvim-tree.actions.fs.rename-file").rename_node(n) end)

lua/nvim-tree/keymap.lua

@@ -90,8 +90,8 @@ function M.on_attach_default(bufnr)
   vim.keymap.set("n",          "F",              api.filter.live.clear,              opts("Live Filter: Clear"))
   vim.keymap.set("n",          "f",              api.filter.live.start,              opts("Live Filter: Start"))
   vim.keymap.set("n",          "g?",             api.tree.toggle_help,               opts("Help"))
-  vim.keymap.set("n",          "gy",             api.fs.copy.absolute_path,          opts("Copy Absolute Path"))
-  vim.keymap.set("n",          "ge",             api.fs.copy.basename,               opts("Copy Basename"))
+  vim.keymap.set({ "n", "x" }, "gy",             api.fs.copy.absolute_path,          opts("Copy Absolute Path"))
+  vim.keymap.set({ "n", "x" }, "ge",             api.fs.copy.basename,               opts("Copy Basename"))
   vim.keymap.set("n",          "H",              api.filter.dotfiles.toggle,         opts("Toggle Filter: Dotfiles"))
   vim.keymap.set("n",          "I",              api.filter.git.ignored.toggle,      opts("Toggle Filter: Git Ignored"))
   vim.keymap.set("n",          "J",              api.node.navigate.sibling.last,     opts("Last Sibling"))
@@ -102,6 +102,8 @@ function M.on_attach_default(bufnr)
   vim.keymap.set("n",          "o",              api.node.open.edit,                 opts("Open"))
   vim.keymap.set("n",          "O",              api.node.open.no_window_picker,     opts("Open: No Window Picker"))
   vim.keymap.set("n",          "p",              api.fs.paste,                       opts("Paste"))
+  vim.keymap.set("n",          "gp",             api.fs.paste_from_register_copying, opts("Paste Using Register"))
+  vim.keymap.set("n",          "gx",             api.fs.paste_from_register_cutting, opts("Move Using Register"))
   vim.keymap.set("n",          "P",              api.node.navigate.parent,           opts("Parent Directory"))
   vim.keymap.set("n",          "q",              api.tree.close,                     opts("Close"))
   vim.keymap.set("n",          "r",              api.fs.rename,                      opts("Rename"))

lua/nvim-tree/node/init.lua

@@ -159,4 +159,14 @@ function Node:expand(expand_opts)
   end
 end
 
+function Node:get_basename()
+  if self.name == ".." then
+    -- root
+    return vim.fn.fnamemodify(self.explorer.absolute_path, ":t:r")
+  else
+    -- node
+    return vim.fn.fnamemodify(self.name, ":r")
+  end
+end
+
 return Node