luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[#329] ignore non-existing ns in nREPL message

Browse source
This commit is contained in:
Michiel Borkent 2020-04-05 23:31:36 +02:00
parent c785a1d1f6
commit 2272536026
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/babashka/impl/nrepl_server.clj
View file

@ -41,11 +41,10 @@
(defn eval-msg [ctx o msg #_threads] (defn eval-msg [ctx o msg #_threads]
(try (try
(let [ns-str (get msg :ns) (let [ns-str (get msg :ns)
sci-ns (when ns-str (sci-utils/namespace-object (:env ctx) (symbol ns-str) nil false))
sw (StringWriter.)] sw (StringWriter.)]
(sci/with-bindings (cond-> {sci/out sw} (sci/with-bindings (cond-> {sci/out sw}
ns-str sci-ns (assoc vars/current-ns sci-ns))
(assoc vars/current-ns
(sci-utils/namespace-object (:env ctx) (symbol ns-str) nil false)))
(when @dev? (println "current ns" (vars/current-ns-name))) (when @dev? (println "current ns" (vars/current-ns-name)))
(let [session (get msg :session "none") (let [session (get msg :session "none")
id (get msg :id "unknown")] id (get msg :id "unknown")]

9
test/babashka/impl/nrepl_server_test.clj
View file

@ -68,7 +68,14 @@
"session" session "session" session
"id" (new-id!) "id" (new-id!)
"ns" "ns0"}) "ns" "ns0"})
(is (= ":foo0" (:value (read-reply in session @id))))))) (is (= ":foo0" (:value (read-reply in session @id)))))
(testing "providing an ns value of a non-existing namespace falls back the last defined namespace"
(bencode/write-bencode os {"op" "eval"
"code" "(foo)"
"session" session
"id" (new-id!)
"ns" "unicorn"})
(is (= ":foo1" (:value (read-reply in session @id)))))))
(testing "load-file" (testing "load-file"
(bencode/write-bencode os {"op" "load-file" "file" "(ns foo) (defn foo [] :foo)" "session" session "id" (new-id!)}) (bencode/write-bencode os {"op" "load-file" "file" "(ns foo) (defn foo [] :foo)" "session" session "id" (new-id!)})
(read-reply in session @id) (read-reply in session @id)