Bump Orchard to 0.31.1

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## master (unreleased)
 
-* Bump `orchard` to [0.31.0](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0310-2025-03-14).
+* Bump `orchard` to [0.31.1](https://github.com/clojure-emacs/orchard/blob/master/CHANGELOG.md#0311-2025-03-19).
   - Info: recognize printed Java classes/methods and munged Clojure functions in stacktrace outputs.
   - Add dedicated renderers for exceptions in inspector and debugger.
 * [#919](https://github.com/clojure-emacs/cider-nrepl/pull/919): Move exception analysis to Orchard.

project.clj

@@ -21,7 +21,7 @@
             :url "http://www.eclipse.org/legal/epl-v10.html"}
   :scm {:name "git" :url "https://github.com/clojure-emacs/cider-nrepl"}
   :dependencies [[nrepl/nrepl "1.3.1" :exclusions [org.clojure/clojure]]
-                 [cider/orchard "0.31.0" :exclusions [org.clojure/clojure]]
+                 [cider/orchard "0.31.1" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [thunknyc/profile "0.5.2"]
                  ^:inline-dep [mvxcvi/puget "1.3.4" :exclusions [org.clojure/clojure]]
                  ^:inline-dep [fipp ~fipp-version] ; can be removed in unresolved-tree mode

src/cider/nrepl/middleware/debug.clj

@@ -216,7 +216,7 @@ this map (identified by a key), and will `dissoc` it afterwards."}
                     (when-not (instance? ThreadDeath root-ex#)
                       (debugger-send
                        {:status :eval-error
-                        :causes [(let [causes# (stacktrace/analyze e# (::print/print-fn *msg*))]
+                        :causes [(let [causes# (stacktrace/analyze e#)]
                                    (when (coll? causes#) (last causes#)))]})))
                   error#))]
      (if (= error# ~sym)
@@ -288,11 +288,11 @@ this map (identified by a key), and will `dissoc` it afterwards."}
   (debugger-send
    {:status :stack
     :causes (if (instance? Throwable value)
-              (stacktrace/analyze value (::print/print-fn *msg*))
+              (stacktrace/analyze value)
               [{:class      "StackTrace"
                 :message    "Harmless user-requested stacktrace"
                 :stacktrace (-> (Exception. "Dummy")
-                                (stacktrace/analyze (::print/print-fn *msg*))
+                                stacktrace/analyze
                                 last :stacktrace)}])}))
 
 (def debug-commands

src/cider/nrepl/middleware/reload.clj

@@ -38,7 +38,7 @@
       :else        (reload opts))))
 
 (defn- reload-reply
-  [{:keys [::print/print-fn transport session id] :as msg}]
+  [{:keys [session id] :as msg}]
   (let [{:keys [exec]} (meta session)]
     (exec id
           (fn []
@@ -51,7 +51,7 @@
                 (respond-to msg {:status :ok}))
               (catch Throwable error
                 (respond-to msg {:status :error
-                                 :error  (stacktrace/analyze error print-fn)})
+                                 :error  (stacktrace/analyze error)})
                 (binding [*msg* msg
                           *err* (print/replying-PrintWriter :err msg {})]
                   (repl-caught error)))))

src/cider/nrepl/middleware/stacktrace.clj

@@ -21,10 +21,10 @@
 
 (defn- analyze-last-stacktrace
   "Analyze the last exception."
-  [{:keys [session ::print/print-fn] :as msg}]
+  [{:keys [session] :as msg}]
   (let [last-exception (@session #'*e)]
     (swap! session assoc #'*last-exception* last-exception) ;; note that *e can change later, so this entry isn't redundant
-    (send-analysis msg (stacktrace/analyze last-exception print-fn))))
+    (send-analysis msg (stacktrace/analyze last-exception))))
 
 (defn- handle-analyze-last-stacktrace-op
   "Handle the analyze last stacktrace op."

src/cider/nrepl/middleware/test.clj

@@ -474,14 +474,14 @@
             (respond-to msg :status :done)))))
 
 (defn handle-stacktrace-op
-  [{:keys [ns var index session id ::print/print-fn] :as msg}]
+  [{:keys [ns var index session id] :as msg}]
   (let [{:keys [exec]} (meta session)]
     (exec id
           (fn []
             (with-bindings (assoc @session #'ie/*msg* msg)
               (let [[ns var] (map misc/as-sym [ns var])]
                 (if-let [e (get-in @results [ns var index :error])]
-                  (doseq [cause (stacktrace/analyze e print-fn)]
+                  (doseq [cause (stacktrace/analyze e)]
                     (respond-to msg cause))
                   (respond-to msg :status :no-error)))))
           (fn []

src/cider/nrepl/middleware/util/error_handling.clj

@@ -3,53 +3,35 @@
   errors/exceptions that might arise from doing so."
   (:refer-clojure :exclude [error-handler])
   (:require
+   [clojure.main]
    [clojure.set :as set]
+   [clojure.stacktrace]
    [clojure.walk :as walk]
    [nrepl.middleware.caught :as caught]
    [nrepl.middleware.print :as print]
    [nrepl.misc :refer [response-for]]
-   [nrepl.transport :as transport])
+   [nrepl.transport :as transport]
+   [orchard.stacktrace :as stacktrace])
   (:import
    java.io.InputStream
    clojure.lang.RT
    (nrepl.transport Transport)))
 
-(def ^:private print-cause-trace
-  (delay
-    (requiring-resolve 'clojure.stacktrace/print-cause-trace)))
-
-(def ^:private analyze-causes
-  (delay
-    (requiring-resolve 'orchard.stacktrace/analyze)))
-
 ;;; UTILITY FUNCTIONS
 
-(defn error-summary
-  "Takes a `java.lang.Exception` as `ex` and returns a map summarizing
-  the exception. If present, the varargs are converted to a set and
-  used as the value for the :status key."
-  [ex & statuses]
-  (merge {:ex (str (class ex))
-          :err (with-out-str (@print-cause-trace ex))
-          :root-ex (-> (#'clojure.main/root-cause ex) class str)}
-         (when statuses {:status (set statuses)})))
-
-(defn pp-stacktrace
-  "Takes a `java.lang.Exception` as `ex` and a pretty-print function
-  as `print-fn`, then returns a pretty-printed version of the
-  exception that can be rendered by CIDER's stacktrace viewer."
-  [ex print-fn]
-  {:pp-stacktrace (@analyze-causes ex print-fn)})
-
 (defn base-error-response
   "Takes a CIDER-nREPL message as `msg`, an Exception `ex`, and a
   non-collection vararg of `statuses`.  This will return the standard
   response for CIDER-nREPL sync-op errors that can be rendered by
   CIDER's stacktrace viewer. N.B., statuses such as `:done` and
   `:<op-name>-error` are NOT automatically added"
   [msg ex & statuses]
-  (response-for msg (merge (apply error-summary ex statuses)
-                           (pp-stacktrace ex (::print/print-fn msg)))))
+  (response-for
+   msg (merge {:ex (str (class ex))
+               :err (with-out-str (clojure.stacktrace/print-cause-trace ex))
+               :root-ex (str (class (clojure.main/root-cause ex)))
+               :pp-stacktrace (stacktrace/analyze ex)}
+              (when statuses {:status (set statuses)}))))
 
 (defn- normalize-status
   "Accepts various representations of an nREPL reply message's status

src/cider/nrepl/middleware/util/reload.clj

@@ -9,12 +9,9 @@
    [orchard.misc :as misc]
    [orchard.stacktrace :as stacktrace]))
 
-(defn error-reply
-  [{:keys [error error-ns]}
-   {:keys [::print/print-fn] :as msg}]
-
+(defn error-reply [{:keys [error error-ns]} msg]
   (respond-to msg (cond-> {:status :error}
-                    error (assoc :error (stacktrace/analyze error print-fn))
+                    error (assoc :error (stacktrace/analyze error))
                     error-ns (assoc :error-ns error-ns)))
 
   (binding [*msg* msg