Merge pull request #30 from robb/scan-first

Scan String before escaping
robb · Jun 28, 2021 · 58bf32d · 58bf32d
2 parents 209e8a9 + 7e01603
commit 58bf32d
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/Sources/Swim/String+XML.swift b/Sources/Swim/String+XML.swift
@@ -2,14 +2,29 @@ import Foundation
 
 extension String {
     func addingXMLEncoding() -> String {
+        guard unicodeScalars.contains(where: \.needsEscaping) else {
+            return self
+        }
+
         var result = ""
         result.reserveCapacity(count)
-        return unicodeScalars.reduce(into: result, { $0.append($1.named_escapingIfNeeded) })
+        return unicodeScalars.reduce(into: result, { $0.append($1.escapingIfNeeded) })
     }
 }
 
 extension UnicodeScalar {
-    fileprivate var named_escapingIfNeeded: String {
+    fileprivate var needsEscaping: Bool {
+        switch value {
+        case ("&" as Unicode.Scalar).value, ("<" as Unicode.Scalar).value,
+             (">" as Unicode.Scalar).value, ("\'" as Unicode.Scalar).value,
+             ("\"" as Unicode.Scalar).value:
+            return true
+        default:
+            return false
+        }
+    }
+
+    fileprivate var escapingIfNeeded: String {
         switch value {
         case ("&" as Unicode.Scalar).value:
             return "&amp;"