Use nrepl.middleware.caught

Author: cichli

src/cider/nrepl.clj

@@ -5,6 +5,7 @@
    [cider.nrepl.middleware.pprint :as pprint]
    [cider.nrepl.print-method]
    [nrepl.middleware :refer [set-descriptor!]]
+   [nrepl.middleware.caught :refer [wrap-caught]]
    [nrepl.middleware.session :refer [session]]
    [nrepl.middleware.pr-values :refer [pr-values]]
    [nrepl.server :as nrepl-server]))
@@ -228,7 +229,7 @@
            in the `:inspect` slot will cause the last value returned by eval to
            be inspected. Returns a string representation of the resulting
            inspector's state in the `:value` slot."
-    :requires #{"clone" #'pr-values}
+    :requires #{"clone" #'pr-values #'wrap-caught}
     :expects #{"eval"}
     :handles {"inspect-pop"
               {:doc "Moves one level up in the inspector stack."

src/cider/nrepl/middleware/inspect.clj

@@ -3,6 +3,7 @@
    [cider.nrepl.middleware.util.cljs :as cljs]
    [cider.nrepl.middleware.util.error-handling :refer [base-error-response
                                                        with-safe-transport]]
+   [nrepl.middleware.caught :as caught]
    [nrepl.misc :refer [response-for]]
    [nrepl.transport :as transport]
    [orchard.inspect :as inspect])
@@ -40,9 +41,9 @@
             ;; If the eval errored, propagate the exception as error in the
             ;; inspector middleware, so that the client CIDER code properly
             ;; renders it instead of silently ignoring it.
-            (contains? (:status response) :eval-error)
-            (let [e (or (@session #'*e)
-                        (Exception. (or (:ex response) "")))
+            (and (contains? (:status response) :eval-error)
+                 (contains? response ::caught/throwable))
+            (let [e (::caught/throwable response)
                   resp (base-error-response msg e :inspect-eval-error :done)]
               (.send transport resp))