Make classpath-namespaces resilient to faulty ns decl, fixes clojure-…

…emacs#158
mk · May 9, 2022 · 6d6b717 · 6d6b717
1 parent c0e24f7
commit 6d6b717
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/orchard/namespace.clj b/src/orchard/namespace.clj
@@ -31,7 +31,8 @@
         (cond
           (#{::eof ::fail} found) nil
           (and (list? found)
-               (-> found first #{`ns 'ns}))
+               (-> found first #{`ns 'ns})
+               (symbol? (second found)))
           (second found)
           :else (recur))))))
 

diff --git a/test/orchard/namespace_test.clj b/test/orchard/namespace_test.clj
@@ -62,6 +62,9 @@
       (testing "when multiple ns forms are present"
         (spit url "(ns ns1) (ns ns2) (ns ns3)")
         (is (= 'ns1 (sut/read-namespace uri))))
+      (testing "when ns form is invalid"
+        (spit url "(ns (:require [clojure.string]))")
+        (is (nil? (sut/read-namespace uri))))
       (testing "of top-level forms only"
         (spit url "(comment (ns ns1)) (ns ns2) (ns ns3)")
         (is (= 'ns2 (sut/read-namespace uri))))