CLJS-3242: trailing keys bug (#243)

clojure · Jan 8, 2025 · fc8522e · fc8522e
1 parent e78c6cd
commit fc8522e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/cljs/cljs/core.cljs b/src/main/cljs/cljs/core.cljs
@@ -7217,7 +7217,7 @@ reduces them without incurring seq initialization"
         (let [kv (first extra-kvs)]
           (aset ret i (-key kv))
           (aset ret (inc i) (-val kv))
-          (recur (+ 2 seed-cnt) (next extra-kvs)))
+          (recur (+ 2 i) (next extra-kvs)))
         ret))))
 
 (set! (.-createAsIfByAssoc PersistentArrayMap)

diff --git a/src/test/cljs/cljs/core_test.cljs b/src/test/cljs/cljs/core_test.cljs
@@ -2043,10 +2043,10 @@
       (is (= [11 0] (reset-vals! c 0)))
       (is (= 0 @c)))))
 
-#_(defn test-keys [& {:as opts, :keys [a b]}]
+(defn test-keys [& {:as opts, :keys [a b]}]
   [a b opts])
 
-#_(deftest test-cljs-3299-trailing-keys
+(deftest test-cljs-3299-trailing-keys
   (testing "verify proper handling of trailing keys"
     (is (= (test-keys :a 1, :b 2)
            [1 2 {:a 1, :b 2}]))
@@ -2055,4 +2055,4 @@
     (is (= (test-keys {:a 1, :b 2, :c 3})
            [1 2 {:a 1, :b 2, :c 3}]))
     (is (= (test-keys :d 4 {:a 1, :b 2, :c 3})
-           [1 nil {:d 4, :a 1, :c 3, nil nil}]))))
+           [1 2 {:d 4, :a 1, :b 2, :c 3}]))))