Skip to content

Commit 6e0715c

Browse files
anmonteiroswannodette
authored andcommitted
CLJS-2303: Disable duplicate alias checking for self-host
1 parent 02c6d2a commit 6e0715c

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

src/main/clojure/cljs/analyzer.cljc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2746,8 +2746,9 @@
27462746
(let [merge-keys
27472747
[:use-macros :require-macros :rename-macros
27482748
:uses :requires :renames :imports]]
2749-
(when *check-alias-dupes*
2750-
(check-duplicate-aliases env ns-info' require-info))
2749+
#?(:clj
2750+
(when *check-alias-dupes*
2751+
(check-duplicate-aliases env ns-info' require-info)))
27512752
(merge
27522753
ns-info'
27532754
{:excludes excludes}

src/test/self/self_host/test.cljs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,27 @@
11911191
(is (nil? error))
11921192
(inc! l))))))
11931193

1194+
(deftest test-cljs-2303
1195+
(async done
1196+
(let [st (cljs/empty-state)
1197+
load (fn [{:keys [name macros]} cb]
1198+
(cb (when (and (= name 'cljs.x)
1199+
(not macros))
1200+
{:lang :clj
1201+
:source "(ns cljs.x)"})))
1202+
l (latch 1 done)]
1203+
(cljs.js/eval-str st "(require 'clojure.x)" nil
1204+
{:eval node-eval
1205+
:load load}
1206+
(fn [{:keys [error]}]
1207+
(is (nil? error))
1208+
(cljs.js/eval-str st "(require 'clojure.x)" nil
1209+
{:eval node-eval
1210+
:load load}
1211+
(fn [{:keys [error]}]
1212+
(is (nil? error))
1213+
(inc! l))))))))
1214+
11941215
(defn -main [& args]
11951216
(run-tests))
11961217

0 commit comments

Comments
 (0)