Write chars, instead of strings, where possible

This commit is contained in:
Jason Nelson
2021-03-12 11:01:06 -08:00
parent 0c9b5dddc9
commit c9ba236dbc
18 changed files with 53 additions and 39 deletions

View File

@@ -15,7 +15,7 @@ namespace Markdig.Extensions.CustomContainers
{
protected override void Write(HtmlRenderer renderer, CustomContainerInline obj)
{
renderer.Write("<span").WriteAttributes(obj).Write(">");
renderer.Write("<span").WriteAttributes(obj).Write('>');
renderer.WriteChildren(obj);
renderer.Write("</span>");
}

View File

@@ -18,7 +18,7 @@ namespace Markdig.Extensions.CustomContainers
renderer.EnsureLine();
if (renderer.EnableHtmlForBlock)
{
renderer.Write("<div").WriteAttributes(obj).Write(">");
renderer.Write("<div").WriteAttributes(obj).Write('>');
}
// We don't escape a CustomContainer
renderer.WriteChildren(obj);

View File

@@ -41,7 +41,7 @@ namespace Markdig.Extensions.DefinitionLists
hasOpendd = false;
countdd = 0;
}
renderer.Write("<dt").WriteAttributes(definitionTerm).Write(">");
renderer.Write("<dt").WriteAttributes(definitionTerm).Write('>');
renderer.WriteLeafInline(definitionTerm);
renderer.WriteLine("</dt>");
}
@@ -49,7 +49,7 @@ namespace Markdig.Extensions.DefinitionLists
{
if (!hasOpendd)
{
renderer.Write("<dd").WriteAttributes(definitionItem).Write(">");
renderer.Write("<dd").WriteAttributes(definitionItem).Write('>');
countdd = 0;
hasOpendd = true;
}

View File

@@ -16,7 +16,7 @@ namespace Markdig.Extensions.Figures
protected override void Write(HtmlRenderer renderer, FigureCaption obj)
{
renderer.EnsureLine();
renderer.Write("<figcaption").WriteAttributes(obj).Write(">");
renderer.Write("<figcaption").WriteAttributes(obj).Write('>');
renderer.WriteLeafInline(obj);
renderer.WriteLine("</figcaption>");
}

View File

@@ -144,7 +144,7 @@ namespace Markdig.Extensions.MediaLinks
var htmlAttributes = GetHtmlAttributes(linkInline);
renderer.Write("<iframe src=\"");
renderer.WriteEscapeUrl(iframeUrl);
renderer.Write("\"");
renderer.Write('"');
if (!string.IsNullOrEmpty(Options.Width))
htmlAttributes.AddPropertyIfNotExist("width", Options.Width);

View File

@@ -18,7 +18,7 @@ namespace Markdig.Extensions.Tables
protected override void Write(HtmlRenderer renderer, Table table)
{
renderer.EnsureLine();
renderer.Write("<table").WriteAttributes(table).WriteLine(">");
renderer.Write("<table").WriteAttributes(table).WriteLine('>');
bool hasBody = false;
bool hasAlreadyHeader = false;
@@ -109,7 +109,7 @@ namespace Markdig.Extensions.Tables
}
}
renderer.WriteAttributes(cell);
renderer.Write(">");
renderer.Write('>');
var previousImplicitParagraph = renderer.ImplicitParagraph;
if (cell.Count == 1)

View File

@@ -48,7 +48,7 @@ namespace Markdig.Renderers.Html
renderer.Write("<div")
.WriteAttributes(obj.TryGetAttributes(),
cls => cls.StartsWith(infoPrefix, StringComparison.Ordinal) ? cls.Substring(infoPrefix.Length) : cls)
.Write(">");
.Write('>');
}
renderer.WriteLeafRawLines(obj, true, true, true);
@@ -77,7 +77,7 @@ namespace Markdig.Renderers.Html
renderer.WriteAttributes(obj);
}
renderer.Write(">");
renderer.Write('>');
}
renderer.WriteLeafRawLines(obj, true, true);

View File

@@ -31,7 +31,7 @@ namespace Markdig.Renderers.Html
if (renderer.EnableHtmlForBlock)
{
renderer.Write("<").Write(headingText).WriteAttributes(obj).Write(">");
renderer.Write("<").Write(headingText).WriteAttributes(obj).Write('>');
}
renderer.WriteLeafInline(obj);

View File

@@ -68,7 +68,7 @@ namespace Markdig.Renderers.Html.Inlines
renderer.Write($" rel=\"{Rel}\"");
}
renderer.Write(">");
renderer.Write('>');
}
renderer.WriteEscape(obj.Url);

View File

@@ -16,7 +16,7 @@ namespace Markdig.Renderers.Html.Inlines
{
if (renderer.EnableHtmlForInline)
{
renderer.Write("<code").WriteAttributes(obj).Write(">");
renderer.Write("<code").WriteAttributes(obj).Write('>');
}
if (renderer.EnableHtmlEscape)
{

View File

@@ -39,12 +39,12 @@ namespace Markdig.Renderers.Html.Inlines
if (renderer.EnableHtmlForInline)
{
tag = GetTag(obj);
renderer.Write("<").Write(tag).WriteAttributes(obj).Write(">");
renderer.Write("<").Write(tag).WriteAttributes(obj).Write('>');
}
renderer.WriteChildren(obj);
if (renderer.EnableHtmlForInline)
{
renderer.Write("</").Write(tag).Write(">");
renderer.Write("</").Write(tag).Write('>');
}
}

View File

@@ -48,7 +48,7 @@ namespace Markdig.Renderers.Html.Inlines
{
renderer.Write(link.IsImage ? "<img src=\"" : "<a href=\"");
renderer.WriteEscapeUrl(link.GetDynamicUrl != null ? link.GetDynamicUrl() ?? link.Url : link.Url);
renderer.Write("\"");
renderer.Write('"');
renderer.WriteAttributes(link);
}
if (link.IsImage)
@@ -63,7 +63,7 @@ namespace Markdig.Renderers.Html.Inlines
renderer.EnableHtmlForInline = wasEnableHtmlForInline;
if (renderer.EnableHtmlForInline)
{
renderer.Write("\"");
renderer.Write('"');
}
}
@@ -71,7 +71,7 @@ namespace Markdig.Renderers.Html.Inlines
{
renderer.Write(" title=\"");
renderer.WriteEscape(link.Title);
renderer.Write("\"");
renderer.Write('"');
}
if (link.IsImage)
@@ -89,7 +89,7 @@ namespace Markdig.Renderers.Html.Inlines
{
renderer.Write($" rel=\"{Rel}\"");
}
renderer.Write(">");
renderer.Write('>');
}
renderer.WriteChildren(link);
if (renderer.EnableHtmlForInline)

View File

@@ -22,21 +22,21 @@ namespace Markdig.Renderers.Html
renderer.Write("<ol");
if (listBlock.BulletType != '1')
{
renderer.Write(" type=\"").Write(listBlock.BulletType).Write("\"");
renderer.Write(" type=\"").Write(listBlock.BulletType).Write('"');
}
if (listBlock.OrderedStart != null && (listBlock.OrderedStart is not "1"))
{
renderer.Write(" start=\"").Write(listBlock.OrderedStart).Write("\"");
renderer.Write(" start=\"").Write(listBlock.OrderedStart).Write('"');
}
renderer.WriteAttributes(listBlock);
renderer.WriteLine(">");
renderer.WriteLine('>');
}
else
{
renderer.Write("<ul");
renderer.WriteAttributes(listBlock);
renderer.WriteLine(">");
renderer.WriteLine('>');
}
}
@@ -49,7 +49,7 @@ namespace Markdig.Renderers.Html
renderer.EnsureLine();
if (renderer.EnableHtmlForBlock)
{
renderer.Write("<li").WriteAttributes(listItem).Write(">");
renderer.Write("<li").WriteAttributes(listItem).Write('>');
}
renderer.WriteChildren(listItem);

View File

@@ -360,7 +360,7 @@ namespace Markdig.Renderers
if (attributes.Id != null)
{
Write(" id=\"").WriteEscape(attributes.Id).Write("\"");
Write(" id=\"").WriteEscape(attributes.Id).Write('"');
}
if (attributes.Classes is { Count: > 0 })
@@ -371,21 +371,21 @@ namespace Markdig.Renderers
var cssClass = attributes.Classes[i];
if (i > 0)
{
Write(" ");
Write(' ');
}
WriteEscape(classFilter != null ? classFilter(cssClass) : cssClass);
}
Write("\"");
Write('"');
}
if (attributes.Properties is { Count: > 0 })
{
foreach (var property in attributes.Properties)
{
Write(" ").Write(property.Key);
Write("=").Write("\"");
Write(' ').Write(property.Key);
Write("=\"");
WriteEscape(property.Value ?? "");
Write("\"");
Write('"');
}
}

View File

@@ -2,8 +2,8 @@
// This file is licensed under the BSD-Clause 2 license.
// See the license.txt file in the project root for more information.
using Markdig.Syntax;
using System;
using Markdig.Syntax;
namespace Markdig.Renderers.Normalize
{
@@ -28,14 +28,14 @@ namespace Markdig.Renderers.Normalize
}
if (!string.IsNullOrEmpty(fencedCodeBlock.Arguments))
{
renderer.Write(" ").Write(fencedCodeBlock.Arguments);
renderer.Write(' ').Write(fencedCodeBlock.Arguments);
}
/* TODO do we need this causes a empty space and would render html attributes to markdown.
var attributes = obj.TryGetAttributes();
if (attributes != null)
{
renderer.Write(" ");
renderer.Write(' ');
renderer.Write(attributes);
}
*/

View File

@@ -48,7 +48,7 @@ namespace Markdig.Renderers.Normalize.Inlines
{
renderer.Write(" \"");
renderer.Write(link.Title.Replace(@"""", @"\"""));
renderer.Write("\"");
renderer.Write('"');
}
renderer.Write(')');

View File

@@ -87,7 +87,7 @@ namespace Markdig.Renderers.Normalize
// if (attributes.Id != null)
// {
// Write(" id=\"").WriteEscape(attributes.Id).Write("\"");
// Write(" id=\"").WriteEscape(attributes.Id).Write('"');
// }
// if (attributes.Classes != null && attributes.Classes.Count > 0)
@@ -102,19 +102,19 @@ namespace Markdig.Renderers.Normalize
// }
// WriteEscape(cssClass);
// }
// Write("\"");
// Write('"');
// }
// if (attributes.Properties != null && attributes.Properties.Count > 0)
// {
// foreach (var property in attributes.Properties)
// {
// Write(" ").Write(property.Key);
// Write(' ').Write(property.Key);
// if (property.Value != null)
// {
// Write("=").Write("\"");
// Write('=').Write('"');
// WriteEscape(property.Value);
// Write("\"");
// Write('"');
// }
// }
// }

View File

@@ -326,6 +326,20 @@ namespace Markdig.Renderers
return (T) this;
}
/// <summary>
/// Writes a content followed by a newline.
/// </summary>
/// <param name="content">The content.</param>
/// <returns>This instance</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public T WriteLine(char content)
{
WriteIndent();
previousWasLine = true;
Writer.WriteLine(content);
return (T)this;
}
/// <summary>
/// Writes the inlines of a leaf inline.
/// </summary>