Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/main/clojure/cljs/analyzer.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -917,8 +917,11 @@
([env name]
(resolve-ns-alias env name (symbol name)))
([env name not-found]
(let [sym (symbol name)]
(get (:requires (:ns env)) sym not-found))))
(let [sym (symbol name)
{:keys [requires as-aliases]} (:ns env)]
(or (get requires sym)
(get as-aliases sym)
not-found))))

(defn resolve-macro-ns-alias
([env name]
Expand Down
7 changes: 6 additions & 1 deletion src/test/cljs/cljs/ns_test.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
[cljs.test]
[cljs.ns-test.foo :refer [baz]]
[clojure.set :as s :refer [intersection] :rename {intersection itsc}]
[cljs.analyzer :as ana])
[cljs.analyzer :as ana]
[fake.ns :as-alias fake])
(:use [cljs.ns-test.bar :only [quux]]))

(def + -)
Expand Down Expand Up @@ -43,3 +44,7 @@
(is (.isArrayLike js/goog array-like))
(is (goog/isArrayLike array-like))
(is (goog-alias/isArrayLike array-like))))

(deftest test-cljs-3399
(is (= ::fake/foo :fake.ns/foo)
(= `fake/foo `fake.ns/foo)))