handle messages with malformed code

DaveWM · Dec 12, 2018 · 972997f · 972997f
1 parent 03dddc6
commit 972997f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/nrepl_rebl/core.clj b/src/nrepl_rebl/core.clj
@@ -24,7 +24,9 @@
 
 (defn read-string* [s]
   (when s
-    (read-string s)))
+    (try
+      (read-string s)
+      (catch Exception e nil))))
 
 
 (defrecord ReblTransport [transport handler-msg]
@@ -33,7 +35,7 @@
     (transport/recv transport timeout))
   (send [this {:keys [value] :as msg}]
     (transport/send transport msg)
-    (let [code-form (read-string* (:code handler-msg))]
+    (when-let [code-form (read-string* (:code handler-msg))]
       (when (and (some? value)
                  (not (form-from-cursive? code-form)))
         (rebl/submit code-form value)))

diff --git a/test/nrepl_rebl/core_test.clj b/test/nrepl_rebl/core_test.clj
@@ -12,7 +12,9 @@
 
 (deftest read-string*-test
   (is (nil? (read-string* nil)))
-  (is 1 (read-string* "1")))
+  (is 1 (read-string* "1"))
+  (is (nil? (read-string* "")))
+  (is (nil? (read-string* "(+ 1"))))
 
 
 (deftest wrap-rebl-has-meta