Merge branch 'master' of github.com:clojure/clojurescript

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -788,20 +788,22 @@
 (defn compile-sources
   "Takes dependency ordered list of IJavaScript compatible maps from parse-ns
   and compiles them."
-  [inputs compiler-stats opts]
-  (if (:parallel-build opts)
-    (parallel-compile-sources inputs compiler-stats opts)
-    (util/measure compiler-stats
-      "Compile sources"
-      (binding [comp/*inputs* (zipmap (map :ns inputs) inputs)]
-        (doall
-          (for [ns-info inputs]
-            ; TODO: compile-file calls parse-ns unnecessarily to get ns-info
-            ; TODO: we could mark dependent namespaces for recompile here
-            (-compile (or (:source-file ns-info)
-                          (:source-forms ns-info))
-              ; - ns-info -> ns -> cljs file relpath -> js relpath
-              (merge opts {:output-file (comp/rename-to-js (util/ns->relpath (:ns ns-info)))}))))))))
+  ([inputs opts]
+   (compile-sources inputs (:compiler-stats opts) opts))
+  ([inputs compiler-stats opts]
+   (if (:parallel-build opts)
+     (parallel-compile-sources inputs compiler-stats opts)
+     (util/measure compiler-stats
+       "Compile sources"
+       (binding [comp/*inputs* (zipmap (map :ns inputs) inputs)]
+         (doall
+           (for [ns-info inputs]
+             ; TODO: compile-file calls parse-ns unnecessarily to get ns-info
+             ; TODO: we could mark dependent namespaces for recompile here
+             (-compile (or (:source-file ns-info)
+                           (:source-forms ns-info))
+               ; - ns-info -> ns -> cljs file relpath -> js relpath
+               (merge opts {:output-file (comp/rename-to-js (util/ns->relpath (:ns ns-info)))})))))))))
 
 (defn add-goog-base
   [inputs]

src/main/clojure/cljs/compiler.cljc

@@ -930,7 +930,7 @@
                        (or (= protocol tag)
                            ;; ignore new type hints for now - David
                            (and (not (set? tag))
-                                (not ('#{any clj clj-or-nil} tag))
+                                (not ('#{any clj clj-or-nil clj-nil number string boolean function object array} tag))
                                 (when-let [ps (:protocols (ana/resolve-existing-var (dissoc env :locals) tag))]
                                   (ps protocol)))))))
         opt-not? (and (= (:name info) 'cljs.core/not)

src/test/clojure/cljs/compiler_tests.clj

@@ -3,7 +3,8 @@
   (:require [cljs.analyzer :as ana]
             [cljs.compiler :as comp]
             [cljs.env :as env]
-            [cljs.util :as util])
+            [cljs.util :as util]
+            [cljs.tagged-literals :as tags])
   (:import [java.io File]))
 
 (def aenv (assoc-in (ana/empty-env) [:ns :name] 'cljs.user))
@@ -87,6 +88,50 @@
         '(defn foo ([a]) ([a b])))))
   )
 
+(defn capture-warnings* [f]
+  (let [capture (atom [])
+        tracker (fn [warning-type env & [extra]]
+                  (when (warning-type ana/*cljs-warnings*)
+                    (let [err (ana/error-message warning-type extra)
+                          msg (ana/message env (str "WARNING: " err))]
+                      (swap! capture conj [warning-type msg]))))]
+    (ana/with-warning-handlers [tracker]
+      (f))
+    @capture))
+
+(defmacro capture-warnings [& body]
+  `(capture-warnings* (fn [] ~@body)))
+
+(deftest no-warn-on-emit-invoke-protocol-method
+  (let [define-foo #(assoc-in % [::ana/namespaces 'cljs.user :defs 'foo]
+                              {:ns 'cljs.user
+                               :name 'cljs.user/foo
+                               :fn-var true
+                               :method-params '([x])
+                               :protocol 'cljs.user/Foo})
+        aenv-with-foo (define-foo aenv)
+        cenv-with-foo (define-foo @cenv)]
+    (binding [ana/*cljs-static-fns* true]
+      (are [form]
+        (empty?
+         (capture-warnings
+          (env/with-compiler-env (atom cenv-with-foo)
+            (with-out-str
+              (comp/emit
+               (ana/analyze aenv-with-foo form))))))
+
+        '(cljs.user/foo nil)
+        '(cljs.user/foo 0)
+        '(cljs.user/foo (inc 0))
+        '(cljs.user/foo "")
+        '(cljs.user/foo true)
+        '(cljs.user/foo false)
+        '(cljs.user/foo (nil? nil))
+        '(cljs.user/foo (fn [x] x))
+        `(cljs.user/foo ~(tags/->JSValue {}))
+        `(cljs.user/foo ~(tags/->JSValue []))
+        '(cljs.user/foo (make-array 0))))))
+
 ;; CLJS-1225
 
 (comment