CLJ-1703 - Make Throwable->map public and pretty print #error

Signed-off-by: Stuart Halloway <[email protected]>

Author: puredanger

src/clj/clojure/core_print.clj

@@ -413,7 +413,7 @@
 (defmethod print-method StackTraceElement [^StackTraceElement o ^Writer w]
   (print-method [(symbol (.getClassName o)) (symbol (.getMethodName o)) (.getFileName o) (.getLineNumber o)] w))
 
-(defn- throwable-as-map [^Throwable o]
+(defn Throwable->map [^Throwable o]
   (let [base (fn [^Throwable t]
                {:type (class t)
                 :message (.getLocalizedMessage t)
@@ -427,8 +427,33 @@
            :trace (vec (.getStackTrace (or ^Throwable (last via) o)))}))
 
 (defn- print-throwable [^Throwable o ^Writer w]
-  (.write w "#error")
-  (print-method (throwable-as-map o) w))
+  (.write w "#error {\n :cause ")
+  (let [{:keys [cause via trace]} (Throwable->map o)
+        print-via #(do (.write w "{:type ")
+		               (print-method (:type %) w)
+					   (.write w "\n   :message ")
+					   (print-method (:message %) w)
+					   (.write w "\n   :at ")
+					   (print-method (:at %) w)
+					   (.write w "}"))]
+    (print-method cause w)
+    (when via
+      (.write w "\n :via\n [")
+      (when-let [fv (first via)]
+	    (print-via fv)
+        (doseq [v (rest via)]
+          (.write w "\n  ")
+		  (print-via v)))
+      (.write w "]"))
+    (when trace
+      (.write w "\n :trace\n [")
+      (when-let [ft (first trace)]
+        (print-method ft w)
+        (doseq [t (rest trace)]
+          (.write w "\n  ")
+          (print-method t w)))
+      (.write w "]")))
+  (.write w "}"))
 
 (defmethod print-method Throwable [^Throwable o ^Writer w]
   (print-throwable o w))