Merge pull request #207 from luontola/fix-accidental-escaping

Fix literal child elements being escaped
weavejester · Jan 4, 2024 · 4d7303c · 4d7303c
2 parents 67c3cfa + 2239b96
commit 4d7303c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/src/hiccup/compiler.clj b/src/hiccup/compiler.clj
@@ -356,11 +356,11 @@
 (defmethod compile-element ::default
   [element]
   `(render-element
-     [~(first element)
-      ~@(for [x (rest element)]
-          (if (vector? x)
-            (compile-element x)
-            x))]))
+    [~(first element)
+     ~@(for [x (rest element)]
+         (if (vector? x)
+           (util/raw-string (compile-element x))
+           x))]))
 
 (defn- compile-seq
   "Compile a sequence of data-structures into HTML."

diff --git a/test/hiccup/compiler_test.clj b/test/hiccup/compiler_test.clj
@@ -1,6 +1,15 @@
 (ns hiccup.compiler-test
   (:require [clojure.test :refer :all]
-            [hiccup2.core :refer [html]]))
+            [clojure.walk :as walk]
+            [hiccup2.core :refer [html]])
+  (:import (hiccup.util RawString)))
+
+(defn- extract-strings [code]
+  (->> (tree-seq coll? seq code)
+       (filter #(or (string? %)
+                    (instance? RawString %)))
+       (map str)
+       (set)))
 
 (deftest test-compile-element-literal-tag
   ;; `compile-element ::literal-tag` behavior varies based on the following
@@ -93,21 +102,19 @@
            "<p>x</p>")))
 
   (testing "runtime tag with child elements"
-    ;; FIXME: this should return "<p><span>x</span></p>"
     (is (= (str (html {:mode :xhtml} [(identity :p) [:span "x"]]))
-           "<p>&lt;span&gt;x&lt;/span&gt;</p>"))
+           (str (html {:mode :xhtml} [(identity :p) (identity [:span "x"])]))
+           "<p><span>x</span></p>"))
     (is (= (str (html {:mode :html} [(identity :p) [:span "x"]]))
-           "<p>&lt;span&gt;x&lt;/span&gt;</p>"))
+           (str (html {:mode :html} [(identity :p) (identity [:span "x"])]))
+           "<p><span>x</span></p>"))
     (is (= (str (html {:mode :xml} [(identity :p) [:span "x"]]))
-           "<p>&lt;span&gt;x&lt;/span&gt;</p>"))
+           (str (html {:mode :xml} [(identity :p) (identity [:span "x"])]))
+           "<p><span>x</span></p>"))
     (is (= (str (html {:mode :sgml} [(identity :p) [:span "x"]]))
-           "<p>&lt;span&gt;x&lt;/span&gt;</p>"))
+           (str (html {:mode :sgml} [(identity :p) (identity [:span "x"])]))
+           "<p><span>x</span></p>")))
 
-    (is (= (str (html {:mode :xhtml} [(identity :p) (identity [:span "x"])]))
-           "<p><span>x</span></p>"))
-    (is (= (str (html {:mode :html} [(identity :p) (identity [:span "x"])]))
-           "<p><span>x</span></p>"))
-    (is (= (str (html {:mode :xml} [(identity :p) (identity [:span "x"])]))
-           "<p><span>x</span></p>"))
-    (is (= (str (html {:mode :sgml} [(identity :p) (identity [:span "x"])]))
-           "<p><span>x</span></p>"))))
+  (testing "compiles literal child elements"
+    (let [code (walk/macroexpand-all `(html [(identity :p) [:span "x"]]))]
+      (is (= (extract-strings code) #{"" "<span>x</span>"})))))