CLJS-2010: refer-clojure :rename throws on valid invocations

Author: anmonteiro

src/main/clojure/cljs/analyzer.cljc

@@ -2058,15 +2058,15 @@
                         (let [refs (second fs)]
                           (cond
                             (not (or (and (= kw :exclude) (sequential? refs) (every? symbol? refs))
-                                   (and (= kw :rename) (map? refs) (every? #(every? symbol? %) refs))))
+                                     (and (= kw :rename) (map? refs) (every? #(every? symbol? %) refs))))
                             (recur fs ret true)
 
                             (= kw :exclude)
                             (recur (nnext fs) (update-in ret [:excludes] into refs) false)
 
                             (= kw :rename)
                             (recur (nnext fs) (update-in ret [:renames] merge refs) false)))
-                        (recur fs ret true )))
+                        (recur fs ret true)))
 
                     :else ret))]
             (merge-with into s xs)))
@@ -2238,7 +2238,7 @@
             (if (keyword? quoted-spec-or-kw)
               quoted-spec-or-kw
               (as-> (second quoted-spec-or-kw) spec
-                (if (vector? spec) spec [spec]))))]
+                (if (or (vector? spec) (map? spec)) spec [spec]))))]
     (map canonicalize specs)))
 
 (defn canonicalize-import-specs [specs]

src/test/clojure/cljs/analyzer_tests.clj

@@ -490,7 +490,9 @@
   (is (= (a/canonicalize-specs '(:require (quote [clojure.set :as set])))
          '(:require [clojure.set :as set])))
   (is (= (a/canonicalize-specs '(:require (quote clojure.set)))
-         '(:require [clojure.set]))))
+         '(:require [clojure.set])))
+  (is (= (a/canonicalize-specs '(:refer-clojure :exclude '[map] :rename '{map core-map}))
+         '(:refer-clojure :exclude [map] :rename {map core-map}))))
 
 (deftest test-canonicalize-import-specs
   (is (= (a/canonicalize-import-specs '(:import (quote [goog Uri])))
@@ -556,6 +558,10 @@
                 Integer goog.math.Integer})))
       (let [test-env (a/empty-env)
             parsed (a/analyze test-env '(refer-clojure :exclude '[map mapv]))]
+        (is (= (-> parsed :excludes)
+              '#{map mapv})))
+      (let [test-env (a/empty-env)
+            parsed (a/analyze test-env '(refer-clojure :exclude '[map mapv] :rename '{mapv core-mapv}))]
         (is (= (-> parsed :excludes)
               '#{map mapv})))))
   (testing "arguments to require should be quoted"
@@ -861,4 +867,4 @@
             (map (comp :externs second)
               (get @test-cenv ::a/namespaces)))))))
 
-  )
+  )