Escape <> at rendenring instead of lexer

khlopko · Jun 26, 2024 · 38064d1 · 38064d1
1 parent a891c44
commit 38064d1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/Markdown/HTMLRenderer.swift b/Markdown/HTMLRenderer.swift
@@ -68,7 +68,7 @@ public struct HTMLRenderer {
         case let .p(text):
             "<p>\(text.map { render($0) }.joined())</p>"
         case let .text(value, style):
-            "<span class=\"\(style)\">\(value)</span>"
+            render(text: value, style: style)
         case let .list(blocks):
             "<ul>\(blocks.map { "<li>\(render($0))</li>" }.joined())</ul>"
         case let .code(value, info):
@@ -78,6 +78,23 @@ public struct HTMLRenderer {
         }
     }
 
+    private func render(text: String, style: TextStyle) -> String {
+        var value = text
+        for i in value.indices {
+            var newValue: String?
+            if value[i] == "<" {
+                newValue = "&lt;"
+            } else if value[i] == ">" {
+                newValue = "&gt;"
+            }
+            if let newValue {
+                value.remove(at: i)
+                value.insert(contentsOf: newValue, at: i)
+            }
+        }
+        return "<span class=\"\(style)\">\(value)</span>"
+    }
+
     private func render(code: String, lang: String?) -> String {
         let className = lang.map { " class=\"language-\($0)\"" } ?? ""
         return "<pre><code\(className)>\(code)</code></pre>"

diff --git a/Markdown/Lexer.swift b/Markdown/Lexer.swift
@@ -113,18 +113,7 @@ internal struct Lexer {
             lastPos += 1
         }
         var value = String(contents[start..<lastPos])
-        for i in value.indices {
-            var newValue: String?
-            if value[i] == "<" {
-                newValue = "&lt;"
-            } else if value[i] == ">" {
-                newValue = "&gt;"
-            }
-            if let newValue {
-                value.remove(at: i)
-                value.insert(contentsOf: newValue, at: i)
-            }
-        }
+
         return .line(value)
     }
 }