Skip to content

Commit 78f59f3

Browse files
committed
* externs: parse @extends into :super
* add test case
1 parent 0c5ecd7 commit 78f59f3

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/main/clojure/cljs/externs.clj

+3-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
{:tag (get-tag ty)}
7474
(if (or (.isConstructor info) (.isInterface info))
7575
(let [qname (symbol (.. node getFirstChild getQualifiedName))]
76-
(cond-> {:tag 'Function}
76+
(cond-> (merge {:tag 'Function}
77+
(when (.hasBaseType info)
78+
{:super (get-tag (.getBaseType info))}))
7779
(.isConstructor info) (merge {:ctor qname})
7880
(.isInterface info) (merge {:iface qname})))
7981
(if (or (.hasReturnType info)

src/test/clojure/cljs/externs_parsing_tests.clj

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
(:require [cljs.closure :as closure]
1111
[cljs.externs :as externs]
1212
[clojure.java.io :as io]
13-
[clojure.test :as test :refer [deftest is]]))
13+
[clojure.test :as test :refer [deftest is]])
14+
(:import [com.google.javascript.jscomp CommandLineRunner]))
1415

1516
(deftest cljs-3121
1617
(let [externs (externs/parse-externs
@@ -34,6 +35,16 @@
3435
(is (= 'any (get-in ns [:defs 'get :ret-tag])))
3536
(is (= 'array (get-in ns [:defs 'getKeys :ret-tag])))))
3637

38+
(deftest test-parse-super
39+
(let [info (->
40+
(filter
41+
(fn [s]
42+
(= "externs.zip//w3c_dom2.js" (.getName s)))
43+
(CommandLineRunner/getDefaultExterns))
44+
first externs/parse-externs externs/index-externs
45+
(find 'HTMLDocument) first meta)]
46+
(is (= 'Document (:super info)))))
47+
3748
(comment
3849

3950
(externs/parse-externs

0 commit comments

Comments
 (0)