Optimize WriteEscape

This commit is contained in:
Miha Zupan
2023-11-24 02:50:20 +01:00
parent 4f1cb9da08
commit 87aa32e1bd
2 changed files with 47 additions and 62 deletions

View File

@@ -21,6 +21,26 @@ internal static class IndexOfHelpers
return false;
}
#if !NETSTANDARD2_1_OR_GREATER
public static int IndexOfAny(this ReadOnlySpan<char> 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

View File

@@ -20,8 +20,6 @@ namespace Markdig.Renderers;
/// <seealso cref="TextRendererBase{HtmlRenderer}" />
public class HtmlRenderer : TextRendererBase<HtmlRenderer>
{
private static readonly char[] s_writeEscapeIndexOfAnyChars = new[] { '<', '>', '&', '"' };
/// <summary>
/// Initializes a new instance of the <see cref="HtmlRenderer"/> class.
/// </summary>
@@ -149,71 +147,38 @@ public class HtmlRenderer : TextRendererBase<HtmlRenderer>
{
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
{
'<' => "&lt;",
'>' => "&gt;",
'&' => "&amp;",
_ => "&quot;",
});
}
content = content.Slice(indexOfCharToEscape + 1);
}
}
}
private void WriteEscapeSlow(ReadOnlySpan<char> 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("&lt;");
}
previousOffset = i + 1;
break;
case '>':
if (!softEscape)
{
WriteRaw(content.Slice(previousOffset, i - previousOffset));
if (EnableHtmlEscape)
{
WriteRaw("&gt;");
}
previousOffset = i + 1;
}
break;
case '&':
WriteRaw(content.Slice(previousOffset, i - previousOffset));
if (EnableHtmlEscape)
{
WriteRaw("&amp;");
}
previousOffset = i + 1;
break;
case '"':
if (!softEscape)
{
WriteRaw(content.Slice(previousOffset, i - previousOffset));
if (EnableHtmlEscape)
{
WriteRaw("&quot;");
}
previousOffset = i + 1;
}
break;
}
}
WriteRaw(content.Slice(previousOffset));
}
private static readonly IdnMapping IdnMapping = new IdnMapping();
/// <summary>