simplify & fix cljs.analyzer/has-extern?*, more tests

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -787,24 +787,22 @@
                  (into [tag 'prototype] (next pre))
                  pre)
                pre)]
-     (has-extern?* pre externs externs #{})))
-  ([pre externs top seen]
-   (if (empty? pre)
-     true
+     (has-extern?* pre externs externs)))
+  ([pre externs top]
+   (cond
+     (empty? pre) true
+     :else
      (let [x  (first pre)
            me (find externs x)]
        (cond
-         (seen x) true
          (not me) false
          :else
-         (let [seen' (conj seen x)
-               [x' externs'] me
+         (let [[x' externs'] me
                xmeta (meta x')]
            (if (and (= 'Function (:tag xmeta)) (:ctor xmeta))
-             (let [pre' [(:ctor xmeta)]]
-               (or (has-extern?* (into pre' (next pre)) top top seen')
-                   (has-extern?* (into (conj pre' 'prototype) (next pre)) top top seen')))
-             (recur (next pre) externs' top seen'))))))))
+             (or (has-extern?* (into '[prototype] (next pre)) externs' top)
+                 (has-extern?* (next pre) externs' top))
+             (recur (next pre) externs' top))))))))
 
 (defn has-extern?
   ([pre]

src/test/clojure/cljs/analyzer_tests.clj

@@ -8,11 +8,12 @@
 
 (ns cljs.analyzer-tests
   (:require [clojure.java.io :as io]
-            [cljs.analyzer :as a]
+            [cljs.util :as util]
             [cljs.env :as e]
             [cljs.env :as env]
+            [cljs.analyzer :as a]
             [cljs.analyzer.api :as ana-api]
-            [cljs.util :as util]
+            [cljs.closure :as closure]
             [cljs.externs :as externs])
   (:use clojure.test))
 
@@ -625,7 +626,9 @@
                     {:externs ["src/test/externs/test.js"]
                      :use-only-custom-externs true}))]
     (is (true? (a/has-extern? '[Foo] externs)))
+    (is (true? (a/has-extern? '[Foo wozMethod] externs)))
     (is (false? (a/has-extern? '[foo] externs)))
+    (is (false? (a/has-extern? '[Foo gozMethod] externs)))
     (is (true? (a/has-extern? '[baz] externs)))
     (is (false? (a/has-extern? '[Baz] externs)))))
 
@@ -658,22 +661,6 @@
           (map (comp :externs second)
             (get @test-cenv ::a/namespaces))))))
 
-  (->
-    (find (externs/externs-map
-            (closure/load-externs
-              {:externs ["src/test/externs/test.js"]
-               :use-only-custom-externs true}))
-      'baz)
-    first meta)
-
-  (->
-    (find (externs/externs-map
-            (closure/load-externs
-              {:externs ["src/test/externs/test.js"]
-               :use-only-custom-externs true}))
-      'Foo)
-    first meta)
-
   ;; works, does not generate extern
   (let [test-cenv (atom {::a/externs (externs/externs-map
                                        (closure/load-externs
@@ -689,12 +676,6 @@
           (map (comp :externs second)
             (get @test-cenv ::a/namespaces))))))
 
-  (a/has-extern?* '[baz]
-    (externs/externs-map
-      (closure/load-externs
-        {:externs ["src/test/externs/test.js"]
-         :use-only-custom-externs true})))
-
   ;; works, does not generate extern
   (let [test-cenv (atom {::a/externs (externs/externs-map
                                        (closure/load-externs