Modify the Clojure test pretty printer to show the full output AND th…

…e diff
Olical · Apr 19, 2024 · 51e4023 · 51e4023
1 parent 7bef668
commit 51e4023
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/fnl/conjure/client/clojure/nrepl/server.fnl b/fnl/conjure/client/clojure/nrepl/server.fnl
@@ -255,21 +255,20 @@
                  "    (println \"\nFAIL in\" (clojure.test/testing-vars-str m))"
                  "    (when (seq clojure.test/*testing-contexts*) (println (clojure.test/testing-contexts-str)))"
                  "    (when-let [message (:message m)] (println message))"
-                 "    (if (and (seq? (:actual m))"
-                 "             (= #'clojure.core/not (resolve (first (:actual m))))"
-                 "             (seq? (second (:actual m)))"
-                 "             (= #'clojure.core/= (resolve (first (second (:actual m)))))"
-                 "             (= 3 (count (second (:actual m)))))"
+                 "    (print \"expected:\" (with-out-str (pp/pprint (:expected m))))"
+                 "    (print \"  actual:\" (with-out-str (pp/pprint (:actual m))))"
+                 "    (when (and (seq? (:actual m))"
+                 "               (= #'clojure.core/not (resolve (first (:actual m))))"
+                 "               (seq? (second (:actual m)))"
+                 "               (= #'clojure.core/= (resolve (first (second (:actual m)))))"
+                 "               (= 3 (count (second (:actual m)))))"
                  "      (let [[missing extra _] (clojure.data/diff (second (second (:actual m))) (last (second (:actual m))))"
-                 "             missing-str (with-out-str (pp/pprint missing))"
-                 "             missing-lines (clojure.string/split-lines missing-str)"
-                 "             extra-str (with-out-str (pp/pprint extra))"
-                 "             extra-lines (clojure.string/split-lines extra-str)]"
-                 "        (when (some? missing) (doseq [m missing-lines] (println \"-\" m)))"
-                 "        (when (some? extra) (doseq [e extra-lines] (println \"+\" e))))"
-                 "      (do"
-                 "        (print \"expected:\" (with-out-str (pp/pprint (:expected m))))"
-                 "        (print \"  actual:\" (with-out-str (pp/pprint (:actual m))))))))"
+                 "            missing-str (with-out-str (pp/pprint missing))"
+                 "            missing-lines (clojure.string/split-lines missing-str)"
+                 "            extra-str (with-out-str (pp/pprint extra))"
+                 "            extra-lines (clojure.string/split-lines extra-str)]"
+                 "        (when (some? missing) (doseq [m missing-lines] (println \"- \" m)))"
+                 "        (when (some? extra) (doseq [e extra-lines] (println \"+ \" e)))))))"
 
                  "(in-ns initial-ns)"])}
       (when cb

diff --git a/lua/conjure/client/clojure/nrepl/server.lua b/lua/conjure/client/clojure/nrepl/server.lua