Move HTML-encoding code together

ltrzesniewski · Nov 29, 2023 · 25be9cf · 25be9cf
1 parent c36c33e
commit 25be9cf
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 51 deletions.
diff --git a/src/RazorBlade.Library/HtmlHelper.cs b/src/RazorBlade.Library/HtmlHelper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
 using System.Text;
 
 namespace RazorBlade;
@@ -60,7 +61,7 @@ public string Encode(object? value)
                 '>'   => "&gt;",
                 '"'   => "&quot;",
                 '\''  => "&#x27;",
-                var c => c.ToString() // Won't happen
+                var c => c.ToString() // Unreachable
             });
 
             valueSpan = valueSpan[(idx + 1)..];
@@ -79,6 +80,49 @@ public string Encode(object? value)
                           .Replace(">", "&gt;")
                           .Replace("\"", "&quot;")
                           .Replace("\'", "&#x27;");
+#endif
+    }
+
+    /// <summary>
+    /// HTML-encodes the provided value to the writer.
+    /// </summary>
+    /// <param name="value">Value to HTML-encode.</param>
+    /// <param name="writer">Destination writer.</param>
+    internal static void Encode(object? value, TextWriter writer)
+    {
+        var valueString = value?.ToString();
+        if (valueString is null or "")
+            return;
+
+#if NET6_0_OR_GREATER
+        var valueSpan = valueString.AsSpan();
+
+        while (true)
+        {
+            var idx = valueSpan.IndexOfAny(_charsToEscape);
+            if (idx < 0)
+                break;
+
+            if (idx != 0)
+                writer.Write(valueSpan[..idx]);
+
+            writer.Write(valueSpan[idx] switch
+            {
+                '&'   => "&amp;",
+                '<'   => "&lt;",
+                '>'   => "&gt;",
+                '"'   => "&quot;",
+                '\''  => "&#x27;",
+                var c => c.ToString() // Unreachable
+            });
+
+            valueSpan = valueSpan[(idx + 1)..];
+        }
+
+        if (valueSpan.Length != 0)
+            writer.Write(valueSpan);
+#else
+        writer.Write(Instance.Encode(valueString));
 #endif
     }
 }
diff --git a/src/RazorBlade.Library/HtmlTemplate.cs b/src/RazorBlade.Library/HtmlTemplate.cs
@@ -13,12 +13,6 @@ namespace RazorBlade;
 /// </remarks>
 public abstract class HtmlTemplate : RazorTemplate
 {
-#if NET8_0_OR_GREATER
-    private static readonly System.Buffers.SearchValues<char> _charsToEscape = System.Buffers.SearchValues.Create("&<>\"\'");
-#elif NET6_0_OR_GREATER
-    private const string _charsToEscape = "&<>\"\'";
-#endif
-
     private AttributeInfo _currentAttribute;
 
     // ReSharper disable once RedundantDisableWarningComment
@@ -39,51 +33,9 @@ protected internal HtmlString Raw(object? value)
     protected internal override void Write(object? value)
     {
         if (value is IEncodedContent encodedContent)
-        {
             encodedContent.WriteTo(Output);
-            return;
-        }
-
-        var valueString = value?.ToString();
-        if (valueString is null or "")
-            return;
-
-#if NET6_0_OR_GREATER
-        var valueSpan = valueString.AsSpan();
-
-        while (true)
-        {
-            var idx = valueSpan.IndexOfAny(_charsToEscape);
-            if (idx < 0)
-                break;
-
-            if (idx != 0)
-                Output.Write(valueSpan[..idx]);
-
-            Output.Write(valueSpan[idx] switch
-            {
-                '&'   => "&amp;",
-                '<'   => "&lt;",
-                '>'   => "&gt;",
-                '"'   => "&quot;",
-                '\''  => "&#x27;",
-                var c => c.ToString() // Won't happen
-            });
-
-            valueSpan = valueSpan[(idx + 1)..];
-        }
-
-        if (valueSpan.Length != 0)
-            Output.Write(valueSpan);
-#else
-        Output.Write(
-            valueString.Replace("&", "&amp;")
-                       .Replace("<", "&lt;")
-                       .Replace(">", "&gt;")
-                       .Replace("\"", "&quot;")
-                       .Replace("\'", "&#x27;")
-        );
-#endif
+        else
+            HtmlHelper.Encode(value, Output);
     }
 
     /// <inheritdoc />