DEV: Add cljs version of re-seq-matcher

weavejester · Jun 18, 2022 · be381cd · be381cd
1 parent bedbaba
commit be381cd
Showing 1 changed file with 27 additions and 11 deletions.
diff --git a/cljfmt/src/cljfmt/core.cljc b/cljfmt/src/cljfmt/core.cljc
@@ -408,17 +408,33 @@
        (some-> zloc z/up ns-form?)
        (-> zloc z/sexpr first ns-reference-symbols)))
 
-(defn- re-seq-matcher [re charmap coll]
-  {:pre (every? charmap coll)}
-  (let [s (apply str (map charmap coll))
-        v (vec coll)
-        m (re-matcher re s)]
-    (letfn [(next-match []
-              (when (.find m)
-                {:value (subvec v (.start m) (.end m))
-                 :start  (.start m)
-                 :end    (.end m)}))]
-      (take-while some? (repeatedly next-match)))))
+#?(:cljs
+   (defn- re-seq-matcher [re charmap coll]
+     {:pre (every? charmap coll)}
+     (let [s (apply str (map charmap coll))
+           v (vec coll)
+           m (js/RegExp. re.source "g")]
+       (letfn [(next-match []
+                 (when-let [result (.exec m s)]
+                   (let [start result.index
+                         end m.lastIndex]
+                     {:value (subvec v start end)
+                      :start start
+                      :end end})))]
+         (take-while some? (repeatedly next-match)))))
+
+   :clj
+   (defn- re-seq-matcher [re charmap coll]
+     {:pre (every? charmap coll)}
+     (let [s (apply str (map charmap coll))
+           v (vec coll)
+           m (re-matcher re s)]
+       (letfn [(next-match []
+                 (when (.find m)
+                   {:value (subvec v (.start m) (.end m))
+                    :start (.start m)
+                    :end   (.end m)}))]
+         (take-while some? (repeatedly next-match))))))
 
 (defn- find-elements-with-comments [nodes]
   (re-seq-matcher #"(CNS*)*E(S*C)?"