CLJS-1612: Resolve ns aliases in syntax quote

Author: mfikes

src/main/clojure/cljs/analyzer.cljc

@@ -2626,7 +2626,7 @@
        :default (str x))))
 
 (defn resolve-symbol [s]
-  (:name (resolve-var {:ns {:name *cljs-ns*}} s)))
+  (:name (resolve-var (assoc @env/*compiler* :ns (get-namespace *cljs-ns*)) s)))
 
 #?(:clj
    (defn forms-seq*

src/main/clojure/cljs/core.cljc

@@ -636,7 +636,7 @@
                                (core/let [gmap (gensym "map__")
                                           defaults (:or b)]
                                  (core/loop [ret (core/-> bvec (conj gmap) (conj v)
-                                                   (conj gmap) (conj `(if (implements? ISeq ~gmap) (apply hash-map ~gmap) ~gmap))
+                                                   (conj gmap) (conj `(if (implements? ISeq ~gmap) (apply cljs.core/hash-map ~gmap) ~gmap))
                                                    ((core/fn [ret]
                                                       (if (:as b)
                                                         (conj ret (:as b) gmap)
@@ -654,8 +654,8 @@
                                                 bk (val (first bes))
                                                 has-default (contains? defaults bb)]
                                        (recur (pb ret bb (if has-default
-                                                           (core/list `get gmap bk (defaults bb))
-                                                           (core/list `get gmap bk)))
+                                                           (core/list 'cljs.core/get gmap bk (defaults bb))
+                                                           (core/list 'cljs.core/get gmap bk)))
                                          (next bes)))
                                      ret))))]
                     (core/cond
@@ -1391,7 +1391,7 @@
              `(fn ~[this-sym argsym]
                 (this-as ~this-sym
                   (.apply (.-call ~this-sym) ~this-sym
-                    (.concat (array ~this-sym) (aclone ~argsym)))))
+                    (.concat (array ~this-sym) (cljs.core/aclone ~argsym)))))
              (meta form)))]
       (ifn-invoke-methods type type-sym form))))
 
@@ -1714,7 +1714,7 @@
                         `(~'-lookup [this# ~ksym else#]
                            (case ~ksym
                              ~@(mapcat (core/fn [f] [(keyword f) f]) base-fields)
-                             (get ~'__extmap ~ksym else#)))
+                             (cljs.core/get ~'__extmap ~ksym else#)))
                         'ICounted
                         `(~'-count [this#] (+ ~(count base-fields) (count ~'__extmap)))
                         'ICollection
@@ -2366,13 +2366,13 @@
        `(js/Array. ~size))
      assoc :tag 'array))
   ([type size]
-   `(make-array ~size))
+   `(cljs.core/make-array ~size))
   ([type size & more-sizes]
    (vary-meta
      `(let [dims#     (list ~@more-sizes)
-            dimarray# (make-array ~size)]
+            dimarray# (cljs.core/make-array ~size)]
         (dotimes [i# (alength dimarray#)]
-          (aset dimarray# i# (apply make-array nil dims#)))
+          (aset dimarray# i# (apply cljs.core/make-array nil dims#)))
         dimarray#)
      assoc :tag 'array)))
 
@@ -2471,7 +2471,7 @@
   array ret."
   [a idx ret expr]
   `(let [a# ~a
-         ~ret (aclone a#)]
+         ~ret (cljs.core/aclone a#)]
      (loop  [~idx 0]
        (if (< ~idx  (alength a#))
          (do
@@ -2556,7 +2556,7 @@
                prefer-table# (atom {})
                method-cache# (atom {})
                cached-hierarchy# (atom {})
-               hierarchy# (get ~options :hierarchy (cljs.core/get-global-hierarchy))]
+               hierarchy# (cljs.core/get ~options :hierarchy (cljs.core/get-global-hierarchy))]
            (cljs.core/MultiFn. (cljs.core/symbol ~mm-ns ~(name mm-name)) ~dispatch-fn ~default hierarchy#
              method-table# prefer-table# method-cache# cached-hierarchy#))))))
 

src/test/cljs/cljs/syntax_quote_test.cljs

@@ -0,0 +1,8 @@
+(ns cljs.syntax-quote-test
+  (:require [cljs.test :as test :refer-macros [deftest is]]))
+
+(deftest test-syntax-quote
+  (is (= 'cljs.syntax-quote-test/foo `foo))
+  (is (= 'cljs.test/test-vars `test/test-vars))
+  (is (= 'cljs.test/deftest `test/deftest))
+  (is (= 'cljs.test/foo `test/foo)))

src/test/cljs/test_runner.cljs

@@ -13,6 +13,7 @@
             [cljs.top-level]
             [cljs.reducers-test]
             [cljs.keyword-test]
+            [cljs.syntax-quote-test]
             [cljs.import-test]
             [cljs.ns-test.foo]
             [cljs.pprint]))
@@ -32,6 +33,7 @@
   'cljs.macro-test
   'cljs.top-level
   'cljs.keyword-test
+  'cljs.syntax-quote-test
   'cljs.ns-test
   'cljs.ns-test.foo
   'foo.ns-shadow-test

src/test/self/self_host/test.cljs

@@ -47,6 +47,23 @@
 (defn elide-env [env ast opts]
   (dissoc ast :env))
 
+(defn str-evals-to
+  "Checks that a string evaluates to an expected value."
+  ([st l expected s]
+   (str-evals-to st l expected nil))
+  ([st l expected s opts]
+   (cljs/eval-str st
+     s
+     nil
+     (merge
+       {:context :expr
+        :eval    node-eval}
+       opts)
+     (fn [{:keys [error value]}]
+       (is (nil? error))
+       (is (= expected value))
+       (inc! l)))))
+
 ;; NOTE: can't set passes because callbacks happen _inside_ binding
 ;; do so will effect other tests
 
@@ -663,6 +680,34 @@
       (is (nil? error))
       (is (= :x value)))))
 
+(deftest test-CLJS-1612
+  (async done
+    (let [st (cljs/empty-state)
+          l  (latch 10 done)]
+      (cljs/eval st '(ns foo.core
+                       (:require [bar.core :as bar]))
+        {:load (fn [{:keys [macros]} cb]
+                 (if macros
+                   (cb {:lang :clj :source "(ns bar.core) (defmacro add [a b] `(+ ~a ~b))"})
+                   (cb {:lang :clj :source "(ns bar.core (:refer-macros bar.core)) (defn sub [a b] (- a b))"})))}
+        (fn [_] (inc! l)))
+      (testing "various syntax quote patterns"
+        (str-evals-to st l 'foo.core/foo "`foo" {:ns 'foo.core})
+        (str-evals-to st l 'bar.core/sub "`bar/sub" {:ns 'foo.core})
+        (str-evals-to st l 'bar.core/add "`bar/add" {:ns 'foo.core})
+        (str-evals-to st l 'bar.core/undeclared "`bar/undeclared" {:ns 'foo.core}))
+      (testing "core macros under syntax quote"
+        (str-evals-to st l 13
+          "(do (defmulti bar (fn [x y] [x y])) 13)" {:ns 'foo.core})
+        (str-evals-to st l 17
+          "(do (deftype FnLikeB [a] IFn (-invoke [_] a)) 17)" {:ns 'foo.core})
+        (str-evals-to st l [10 4]
+          "(let [{:keys [a b] :or {b 4}} {:a 10}] [a b])" {:ns 'foo.core})
+        (str-evals-to st l [[nil]]
+          "(js->clj (make-array nil 1 1))" {:ns 'foo.core})
+        (str-evals-to st l [1 1 1 1 1]
+          "(let [an-array (int-array 5 0)] (js->clj (amap an-array idx ret (+ 1 (aget an-array idx)))))" {:ns 'foo.core})))))
+
 #_(deftest test-eval-str-with-require
   (async done
     (let [l (latch 3 done)]