[Fix clojure-emacs/cider#1362] Handle properly macroexpansion exceptions

clojure-emacs · Oct 17, 2015 · 585b416 · 585b416
1 parent 9ddbbc2
commit 585b416
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/cider/nrepl/middleware/macroexpand.clj b/src/cider/nrepl/middleware/macroexpand.clj
@@ -66,14 +66,14 @@
 
 (defn macroexpansion-reply
   [{:keys [transport expander code ns display-namespaces print-meta] :as msg}]
-  (let [expansion (macroexpansion expander code ns display-namespaces print-meta)]
-    (try
+  (try
+    (let [expansion (macroexpansion expander code ns display-namespaces print-meta)]
       (transport/send
        transport
-       (response-for msg :expansion expansion :status :done))
-      (catch Exception e
-        (transport/send
-         transport (response-for msg (u/err-info e :macroexpand-error)))))))
+       (response-for msg :expansion expansion :status :done)))
+    (catch Exception e
+      (transport/send
+       transport (response-for msg (u/err-info e :macroexpand-error))))))
 
 (defn wrap-macroexpand
   "Middleware that provides macroexpansion ops."