Skip to content

Commit b940c05

Browse files
committed
unify (cljs.repl/doc ...) handling of js/console
- just handle everything in the final resolve branch - fixes bug where (doc console) did not work after a (refer-global ...)
1 parent acaefa1 commit b940c05

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/main/clojure/cljs/repl.cljc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,20 +1452,21 @@ itself (not its value) is returned. The reader macro #'x expands to (var x)."}})
14521452
(keyword? name)
14531453
`(cljs.repl/print-doc {:spec ~name :doc (cljs.spec.alpha/describe ~name)})
14541454

1455-
(= "js" (namespace name))
1456-
`(cljs.repl/print-doc
1457-
(quote ~(merge (select-keys (ana-api/resolve-extern name) [:doc :arglists])
1458-
{:name name})))
1459-
14601455
(ana-api/find-ns name)
14611456
`(cljs.repl/print-doc
14621457
(quote ~(select-keys (ana-api/find-ns name) [:name :doc])))
14631458

14641459
(ana-api/resolve &env name)
14651460
`(cljs.repl/print-doc
14661461
(quote ~(let [var (ana-api/resolve &env name)
1467-
m (select-keys var
1468-
[:ns :name :doc :forms :arglists :macro :url])]
1462+
ns (-> var :name namespace)
1463+
m (cond-> var
1464+
(= "js" ns)
1465+
(-> :name ana-api/resolve-extern
1466+
(select-keys [:doc :arglists])
1467+
(merge {:name name}))
1468+
(not= "js" ns)
1469+
(select-keys [:ns :name :doc :forms :arglists :macro :url]))]
14691470
(cond-> (update-in m [:name] clojure.core/name)
14701471
(:protocol-symbol var)
14711472
(assoc :protocol true

0 commit comments

Comments
 (0)