* handle case where we find an extern and it has a type, use the type to continue resolving

* can infer console.log again

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -1045,7 +1045,7 @@
          :else
          (let [[x' externs'] me
                info' (meta x')]
-           (if (and (= 'Function (:tag info')) (:ctor info'))
+           (if (and (:ctor info') (= 'Function (:tag info')))
              (or
                ;; then check for "static" property
                (resolve-extern (next pre) externs' top
@@ -1063,12 +1063,24 @@
                  (when-let [super (:super info')]
                    (resolve-extern (into [super] (next pre)) externs top
                      (-> ret
-                       (update :resolved conj x)
+                       (assoc :resolved [])
                        (assoc :info nil)))))
-             (recur (next pre) externs' top
-               (-> ret
-                 (update :resolved conj x)
-                 (assoc :info info'))))))))))
+
+             (or
+               ;; If the tag isn't Function, try to resolve it
+               ;; similar to the super case above
+               (let [tag (:tag info')]
+                 (when (and tag (not= 'Function tag))
+                   (resolve-extern (into [tag] (next pre)) externs top
+                     (-> ret
+                       (assoc :resolved [])
+                       (assoc :info nil)))))
+
+               ;; assume static property
+               (recur (next pre) externs' top
+                 (-> ret
+                   (update :resolved conj x)
+                   (assoc :info info')))))))))))
 
 (defn has-extern?*
   [pre externs]

src/test/clojure/cljs/externs_infer_tests.clj

@@ -49,16 +49,18 @@
     (is (= '[Number]
             (-> (ana/resolve-extern '[Number] externs) :resolved)))
     (is (= '[Number prototype valueOf]
-            (-> (ana/resolve-extern '[Number valueOf] externs) :resolved)))))
+            (-> (ana/resolve-extern '[Number valueOf] externs) :resolved)))
+    (is (= '[Console]
+            (-> (ana/resolve-extern '[console] externs) :resolved)))
+    (is (= '[Console prototype log]
+            (-> (ana/resolve-extern '[console log] externs) :resolved)))))
 
 (comment
+  (clojure.test/test-vars [#'test-resolve-extern])
 
   (def externs (externs/externs-map))
-
   ;; succeeds
   (ana/resolve-extern '[console] externs)
-
-  ;; this one fails
   (ana/resolve-extern '[console log] externs)
 
   )