Merge pull request #234 from tomjkidd/issue-231

Fix Issue 231
clj-commons · Sep 29, 2019 · 829056f · 829056f
2 parents f9b9546 + 2c7b4a2
commit 829056f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/kibit/src/kibit/check/reader.clj b/kibit/src/kibit/check/reader.clj
@@ -90,6 +90,7 @@
 (defmethod derive-aliases 'ns
   [[_ _ns & ns-asserts]]
   (->> ns-asserts
+       (remove #(or (string? %) (map? %)))
        (group-by (comp keyword name first))
        ((juxt :require :require-macros))
        (apply concat)

diff --git a/kibit/test/kibit/test/check_reader.clj b/kibit/test/kibit/test/check_reader.clj
@@ -5,6 +5,17 @@
 (deftest derive-aliases-test
   (are [expected-alias-map ns-form]
       (= expected-alias-map (reader/derive-aliases ns-form))
+      '{foo foo.bar.baz} '(ns derive.test.one
+                            "This is a namespace string, which should not cause problems"
+                            {:author "Alice"
+                             :purpose "Make sure that attr-map also doesn't cause problems"}
+                            (:require [foo.bar.baz :as foo]))
+      '{foo foo.bar.baz} '(ns ^{:doc "Docstring as metadata"}
+                              derive.test.one
+                            (:require [foo.bar.baz :as foo]))
+      '{foo foo.bar.baz} '(ns ^:metadata-x derive.test.one
+                            (:require [foo.bar.baz :as foo]))
+
       '{foo foo.bar.baz} '(ns derive.test.one
                             (:require [foo.bar.baz :as foo]))
       '{foo foo.bar.baz