Use wrap form to hide pr-str from error output

nrepl · Sep 29, 2014 · 8955a77 · 8955a77
1 parent 1acf499
commit 8955a77
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/cemerick/piggieback.clj b/src/cemerick/piggieback.clj
@@ -135,17 +135,20 @@
                '~expr
                @#'*cljs-repl-options*)))
 
+(defn wrap-form
+  [form]
+  (if (and (seq? form) (= 'ns (first form)))
+    form
+    (list 'cljs.core.pr-str form)))
+
 (defn load-stream [repl-env filename res]
   (let [env (ana/empty-env)]
     (when-let [forms (seq (ana/forms-seq res filename))]
       (doseq [form (butlast forms)]
         (let [env (assoc env :ns (ana/get-namespace ana/*cljs-ns*))]
           (cljsrepl/evaluate-form repl-env env filename form)))
-      (let [env (assoc env :ns (ana/get-namespace ana/*cljs-ns*))
-            expr (last forms)]
-        (->> (if (= 'ns (first expr)) expr (list 'cljs.core.pr-str expr))
-             (cljsrepl/evaluate-form repl-env env filename)
-             read-value)))))
+      (let [env (assoc env :ns (ana/get-namespace ana/*cljs-ns*))]
+        (read-value (cljsrepl/evaluate-form repl-env env filename (last forms) wrap-form))))))
 
 (defn- load-file-contents
   [repl-env code file-path file-name]