CLJS-1928: Self-host: Macro namespace alias in keyword

Also consult macros namespaces in
analysis cache when setting up alias
map.

Author: mfikes

src/main/cljs/cljs/js.cljs

@@ -177,7 +177,10 @@
 
 (defn- current-alias-map
   []
-  (get-in @env/*compiler* [:cljs.analyzer/namespaces ana/*cljs-ns* :requires]))
+  (->> (merge (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :requires])
+         (get-in @env/*compiler* [::ana/namespaces ana/*cljs-ns* :require-macros]))
+    (remove (fn [[k v]] (= k v)))
+    (into {})))
 
 ;; -----------------------------------------------------------------------------
 ;; Analyze

src/test/cljs/cljs/keyword_macros.clj

@@ -0,0 +1,5 @@
+(ns cljs.keyword-macros)
+
+(defmacro add
+  [a b]
+  `(+ ~a ~b))

src/test/cljs/cljs/keyword_test.cljs

@@ -7,12 +7,12 @@
 ;; You must not remove this notice, or any other, from this software.
 
 (ns cljs.keyword-test
-  (:require-macros [clojure.core :as cc]
+  (:require-macros [cljs.keyword-macros :as macros]
                    [cljs.test :refer [deftest is]])
   (:require [cljs.keyword-other :as other]
             [cljs.test]))
 
 (deftest test-keyword
   (is (= ::bar :cljs.keyword-test/bar))
   (is (= ::other/foo :cljs.keyword-other/foo))
-  (is (= ::cc/foo :clojure.core/foo)))
+  (is (= ::macros/foo :cljs.keyword-macros/foo)))

src/test/self/self_parity/test.cljs

@@ -283,7 +283,7 @@
                    [foo.ns-shadow-test]
                    [cljs.top-level]
                    [cljs.reducers-test]
-                   #_[cljs.keyword-test]
+                   [cljs.keyword-test]
                    [cljs.import-test]
                    [cljs.ns-test.foo]
                    [cljs.pprint]
@@ -318,7 +318,7 @@
                'cljs.binding-test
                'cljs.macro-test
                'cljs.top-level
-               #_'cljs.keyword-test
+               'cljs.keyword-test
                #_'cljs.ns-test
                'cljs.ns-test.foo
                'foo.ns-shadow-test