[#45] Fix hanging CIDER

Author: borkdude

src/babashka/nrepl/impl/server.clj

@@ -164,12 +164,12 @@
 
 (defn lookup [ctx msg os mapping-type {:keys [debug] :as opts}]
   (let [ns-str (:ns msg)
-        sym-str (or (:sym msg) (:symbol msg))
-        sci-ns (when ns-str
-                 (the-sci-ns ctx (symbol ns-str)))]
+        sym-str (or (:sym msg) (:symbol msg))]
     (try
-      (sci/binding [sci/ns (or sci-ns @sci/ns)]
-        (let [m (sci/eval-string* ctx (format "
+      (let [sci-ns (when ns-str
+                     (the-sci-ns ctx (symbol ns-str)))]
+        (sci/binding [sci/ns (or sci-ns @sci/ns)]
+          (let [m (sci/eval-string* ctx (format "
 (let [ns '%s
       full-sym '%s]
   (when-let [v (ns-resolve ns full-sym)]
@@ -179,25 +179,25 @@
        :name (:name m)
        :ns (some-> m :ns ns-name)
        :val @v))))" ns-str sym-str))
-              doc (:doc m)
-              reply (case mapping-type
-                      :eldoc (cond->
-                                 {"ns" (:ns m)
-                                  "name" (:name m)
-                                  "eldoc" (mapv #(mapv str %) (:arglists m))
-                                  "type" (cond
-                                           (ifn? (:val m)) "function"
-                                           :else "variable")
-                                  "status" #{"done"}}
-                               doc (assoc "docstring" doc))
-                      :lookup (cond->
-                                  {"ns" (:ns m)
-                                   "name" (:name m)
-                                   "arglists-str" (forms-join (:arglists m))
-                                   "status" #{"done"}}
-                                doc (assoc "doc" doc)))]
-          (utils/send os
-                      (utils/response-for msg reply) opts)))
+                doc (:doc m)
+                reply (case mapping-type
+                        :eldoc (cond->
+                                   {"ns" (:ns m)
+                                    "name" (:name m)
+                                    "eldoc" (mapv #(mapv str %) (:arglists m))
+                                    "type" (cond
+                                             (ifn? (:val m)) "function"
+                                             :else "variable")
+                                    "status" #{"done"}}
+                                 doc (assoc "docstring" doc))
+                        :lookup (cond->
+                                    {"ns" (:ns m)
+                                     "name" (:name m)
+                                     "arglists-str" (forms-join (:arglists m))
+                                     "status" #{"done"}}
+                                  doc (assoc "doc" doc)))]
+            (utils/send os
+                        (utils/response-for msg reply) opts))))
       (catch Throwable e
         (when debug (println e))
         (let [status (cond-> #{"done"}

test/babashka/nrepl/server_test.clj

@@ -315,6 +315,12 @@
               (let [eldoc (read-eldoc eldoc)]
                 (is (= '((x)) eldoc))
                 (is (= "function" type)))))
+          (testing "issue-45"
+            (bencode/write-bencode os {"op" "eldoc" "ns" "non-existing-ns"
+                                       "sym" "->>"
+                                       "session" session "id" (new-id!)})
+            (let [{:keys [status]} (read-reply in session @id)]
+              (is (= ["no-eldoc" "done"] status))))
           (testing "user-defined macro"
             (bencode/write-bencode os {"op" "eval"
                                        "ns" "user"