update log

Author: pynappo

lua/neo-tree/log.lua

@@ -100,6 +100,7 @@ log_maker.new = function(config)
     or table.concat({ config.plugin_short, prefix }, " ")
 
   local title_opts = { title = config.plugin_short }
+
   ---@param message string
   ---@param level vim.log.levels
   local notify = vim.schedule_wrap(function(message, level)
@@ -205,9 +206,7 @@ log_maker.new = function(config)
 
       -- Output to console
       if config.use_console and can_log_to_console then
-        vim.schedule(function()
-          notify(msg, log_level)
-        end)
+        notify(msg, log_level)
       end
     end
   end
@@ -262,6 +261,9 @@ log_maker.new = function(config)
     log.error = logfunc(Levels.ERROR, make_string)
     ---Unused, kept around for compatibility at the moment. Remove in v4.0.
     log.fatal = logfunc(Levels.FATAL, make_string)
+
+    log.notify = notify
+    log.levels = Levels
     -- tree-sitter queries recognize any .format and highlight it w/ string.format highlights
     ---@type table<string, { format: fun(fmt: string?, ...: any) }>
     log.at = {
@@ -374,8 +376,11 @@ log_maker.new = function(config)
     else
       errmsg = "assertion failed!"
     end
+    local old = config.use_console
+    config.use_console = false
     log.error(errmsg)
-    return assert(v, errmsg)
+    config.use_console = old
+    error(errmsg, 2)
   end
 
   ---@param context string

lua/neo-tree/sources/filesystem/lib/fs_actions.lua

@@ -717,7 +717,7 @@ M.trash_node = function(path, callback, noconfirm)
       return
     end
 
-    trash.trash({ path })
+    log.assert(trash.trash({ path }))
     log.info("Trashed", path)
     complete()
   end

lua/neo-tree/trash.lua

@@ -84,6 +84,7 @@ end
 
 ---@param paths string[]
 ---@return boolean success
+---@return string? err
 M.trash = function(paths)
   local cmds = M.generate_commands(paths)
   for _, command in ipairs(cmds) do
@@ -99,12 +100,11 @@ M.trash = function(paths)
         }, paths)
         log.debug("Running trash command", full_command)
         local trash_ok, output = utils.execute_command(full_command)
-        if trash_ok then
-          log.debug("Trashed", paths, "using", table.concat(command, " "))
-        else
-          log.error("Could not trash with", full_command, ":", output)
+        if not trash_ok then
+          return false, "Could not trash with " .. full_command .. ":" .. output
         end
-        return trash_ok
+        log.debug("Trashed", paths, "using", full_command)
+        return true
       end
 
       if type(command) == "function" then
@@ -117,15 +117,14 @@ M.trash = function(paths)
           -- assume it's already executable
           local trash_ok = utils.execute_command(cmd)
           if not trash_ok then
-            log.error("Error executing trash command", cmd, ", aborting operation.")
-            return false
+            return false,
+              "Error executing trash command " .. table.concat(cmd, " ") .. ", aborting operation."
           end
         end
         return true
       end
 
-      log.error("Invalid trash command:", command)
-      return false
+      return false, "Invalid trash command:" .. command
     until true
   end
   return false