diff --git a/src/Markdig/Polyfills/IndexOfHelpers.cs b/src/Markdig/Polyfills/IndexOfHelpers.cs index 109892f4..bca57be3 100644 --- a/src/Markdig/Polyfills/IndexOfHelpers.cs +++ b/src/Markdig/Polyfills/IndexOfHelpers.cs @@ -21,6 +21,26 @@ internal static class IndexOfHelpers return false; } + +#if !NETSTANDARD2_1_OR_GREATER + public static int IndexOfAny(this ReadOnlySpan span, string values) + { + for (int i = 0; i < span.Length; i++) + { + char c = span[i]; + + foreach (char v in values) + { + if (c == v) + { + return i; + } + } + } + + return -1; + } +#endif } #endif \ No newline at end of file diff --git a/src/Markdig/Renderers/HtmlRenderer.cs b/src/Markdig/Renderers/HtmlRenderer.cs index 1b41b339..f3522580 100644 --- a/src/Markdig/Renderers/HtmlRenderer.cs +++ b/src/Markdig/Renderers/HtmlRenderer.cs @@ -20,8 +20,6 @@ namespace Markdig.Renderers; /// public class HtmlRenderer : TextRendererBase { - private static readonly char[] s_writeEscapeIndexOfAnyChars = new[] { '<', '>', '&', '"' }; - /// /// Initializes a new instance of the class. /// @@ -149,71 +147,38 @@ public class HtmlRenderer : TextRendererBase { if (!content.IsEmpty) { - int nextIndex = content.IndexOfAny(s_writeEscapeIndexOfAnyChars); - if (nextIndex == -1) + WriteIndent(); + + while (true) { - Write(content); - } - else - { - WriteEscapeSlow(content, softEscape); + int indexOfCharToEscape = softEscape + ? content.IndexOfAny('<', '&') + : content.IndexOfAny("<>&\""); + + if ((uint)indexOfCharToEscape >= (uint)content.Length) + { + WriteRaw(content); + return; + } + + WriteRaw(content.Slice(0, indexOfCharToEscape)); + + if (EnableHtmlEscape) + { + WriteRaw(content[indexOfCharToEscape] switch + { + '<' => "<", + '>' => ">", + '&' => "&", + _ => """, + }); + } + + content = content.Slice(indexOfCharToEscape + 1); } } } - private void WriteEscapeSlow(ReadOnlySpan content, bool softEscape = false) - { - WriteIndent(); - - int previousOffset = 0; - for (int i = 0; i < content.Length; i++) - { - switch (content[i]) - { - case '<': - WriteRaw(content.Slice(previousOffset, i - previousOffset)); - if (EnableHtmlEscape) - { - WriteRaw("<"); - } - previousOffset = i + 1; - break; - case '>': - if (!softEscape) - { - WriteRaw(content.Slice(previousOffset, i - previousOffset)); - if (EnableHtmlEscape) - { - WriteRaw(">"); - } - previousOffset = i + 1; - } - break; - case '&': - WriteRaw(content.Slice(previousOffset, i - previousOffset)); - if (EnableHtmlEscape) - { - WriteRaw("&"); - } - previousOffset = i + 1; - break; - case '"': - if (!softEscape) - { - WriteRaw(content.Slice(previousOffset, i - previousOffset)); - if (EnableHtmlEscape) - { - WriteRaw("""); - } - previousOffset = i + 1; - } - break; - } - } - - WriteRaw(content.Slice(previousOffset)); - } - private static readonly IdnMapping IdnMapping = new IdnMapping(); ///