Merge pull request #18 from JarrodCTaylor/lookbehind-regex

Fix unsupported cljs lookbehind regex in code inherited from Puget

Author: plexus

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- Fix unsupported cljs lookbehind regex in code inherited from Puget
+
 ## Added
 
 ## Fixed

src/lambdaisland/deep_diff2/puget/color/html.cljc

@@ -65,7 +65,9 @@
       (reduce (fn [acc span]
                 (case (first span)
                   nil acc
-                  \& (let [[escaped span] (str/split span #"(?<=;)" 2)
+                  \& (let [semicolon-pos ((fnil inc 0) (str/index-of span \;))
+                           escaped (subs span 0 semicolon-pos)
+                           span (subs span semicolon-pos)
                            acc (conj acc [:escaped escaped])]
                        (if (seq span)
                          (conj acc span)

test/lambdaisland/deep_diff2/puget_test.cljc

@@ -0,0 +1,18 @@
+(ns lambdaisland.deep-diff2.puget-test
+  (:require [clojure.test :refer [deftest testing is]]
+            [lambdaisland.deep-diff2.puget.color.html :as sut]))
+
+(deftest puget-html-test
+  (testing "properly escape html"
+    (let [input ["<ul id=someList><li class=red>Item 1</li><li>Item 2</li></ul>"]
+          expected-result  [[:span
+                             [:escaped "&lt;"] "ul id=someList" [:escaped "&gt;"]
+                             [:escaped "&lt;"] "li class=red" [:escaped "&gt;"]
+                             "Item 1"
+                             [:escaped "&lt;"] "/li" [:escaped "&gt;"]
+                             [:escaped "&lt;"] "li" [:escaped "&gt;"]
+                             "Item 2"
+                             [:escaped "&lt;"] "/li" [:escaped "&gt;"]
+                             [:escaped "&lt;"] "/ul" [:escaped "&gt;"]]]]
+      (is (= expected-result (sut/escape-html-document input))))))
+