Skip to content

Commit 33cefec

Browse files
mfikesswannodette
authored andcommitted
CLJS-2283: Regression with js-obj and gobject alias
1 parent 90dbbf8 commit 33cefec

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/main/clojure/cljs/core.cljc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,8 +2552,8 @@
25522552
(js-obj* '())
25532553
`(let [~@(apply concat (clojure.set/map-invert expr->local))
25542554
~obj ~(js-obj* (filter-on-keys core/string? kvs))]
2555-
~@(map (core/fn [[k v]] `(gobject/set ~obj ~k ~v)) sym-pairs)
2556-
~@(map (core/fn [[k v]] `(gobject/set ~obj ~v ~(core/get kvs k))) expr->local)
2555+
~@(map (core/fn [[k v]] `(goog.object/set ~obj ~k ~v)) sym-pairs)
2556+
~@(map (core/fn [[k v]] `(goog.object/set ~obj ~v ~(core/get kvs k))) expr->local)
25572557
~obj))))
25582558

25592559
(core/defmacro alength [a]

src/test/cljs/cljs/macro_test.cljs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
(is (= '(if true (do 1)) (macroexpand-1 '(when true 1))))
2020
(is (= 1 (macroexpand '1)))
2121
(is (= '(if true (do 1)) (macroexpand '(when true 1)))))
22+
23+
(deftest test-cljs-2283
24+
(is (= ":a" (first (js-keys (js-obj :a 1))))))

0 commit comments

Comments
 (0)