revise clear clipboard cmd

Author: pynappo

lua/neo-tree/clipboard/sync/universal.lua

@@ -64,10 +64,6 @@ end
 ---@param filename string
 ---@return uv.uv_fs_event_t? started true if working
 function UniversalBackend:_watch_file(filename)
-  local cached = self.handles[filename]
-  if cached then
-    return cached
-  end
   local event_handle = uv.new_fs_event()
   if not event_handle then
     log.warn("Could not watch shared clipboard on file events")
@@ -76,7 +72,7 @@ function UniversalBackend:_watch_file(filename)
 
   local start_success = event_handle:start(filename, {}, function(err)
     if err then
-      log.error("File handle error:", err)
+      log.error("File handle error:", err, ", syncing will be disabled")
       event_handle:close()
       return
     end
@@ -182,8 +178,11 @@ function UniversalBackend:load(state)
     end
   end
 
-  if not self.handles[filename] then
+  local handle = self.handles[filename]
+  if not handle then
     self:_watch_file(filename)
+  elseif not handle:is_active() then
+    log.debug("Handle for", filename, "is dead")
   end
 
   local file, err = io.open(filename, "r")

lua/neo-tree/defaults.lua

@@ -423,6 +423,8 @@ local config = {
         }
       },
       ["<C-f>"] = { "scroll_preview", config = {direction = -10} },
+      ["<C-r>"] = "clear_clipboard",
+      ["<C-S-r>"] = { "clear_clipboard", config = {keep_in_cwd = true} },
       ["<C-b>"] = { "scroll_preview", config = {direction = 10} },
       ["l"] = "focus_preview",
       ["S"] = "open_split",

lua/neo-tree/sources/common/commands.lua

@@ -653,8 +653,22 @@ M.paste_from_clipboard = function(state, callback)
 end
 
 M.clear_clipboard = function(state)
-  state.clipboard = {}
-  log.info("Cleared clipboard")
+  if state.config and state.config.keep_in_cwd then
+    local cwd = assert(state.path)
+    local entries_cleared = 0
+    for path in pairs(state.clipboard) do
+      if not utils.is_subpath(cwd, path) then
+        entries_cleared = entries_cleared + 1
+        state.clipboard[path] = nil
+      end
+    end
+    log.info("Cleared out", entries_cleared, "entires from clipboard")
+  else
+    state.clipboard = {}
+    log.info("Cleared clipboard")
+  end
+  events.fire_event(events.NEO_TREE_CLIPBOARD_CHANGED, state)
+  renderer.redraw(state)
 end
 
 ---Copies a node to a new location, using typed input.

lua/neo-tree/sources/filesystem/commands.lua

@@ -14,9 +14,7 @@ local refresh = function(state)
   fs._navigate_internal(state, nil, nil, nil, false)
 end
 
-local redraw = function(state)
-  renderer.redraw(state)
-end
+local redraw = renderer.redraw
 
 M.add = function(state)
   cc.add(state, utils.wrap(fs.show_new_children, state))
@@ -65,7 +63,7 @@ end
 
 M.clear_clipboard = function(state)
   cc.clear_clipboard(state)
-  redraw()
+  redraw(state)
 end
 
 M.delete = function(state)