From bd2bb9863122555f85e46e8bdd93a2554f81382b Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Fri, 12 Mar 2021 10:49:26 -0800 Subject: [PATCH 01/14] Compare strings using StringComparison.Ordinal --- src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs | 6 +++--- src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs | 4 ++-- src/Markdig/Helpers/CompactPrefixTree.cs | 8 ++++---- src/Markdig/Renderers/Html/CodeBlockRenderer.cs | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs b/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs index 9b851635..696db984 100644 --- a/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs +++ b/src/Markdig/Extensions/MediaLinks/HostProviderBuilder.cs @@ -92,8 +92,8 @@ namespace Markdig.Extensions.MediaLinks } var queryParams = SplitQuery(uri); return BuildYouTubeIframeUrl( - queryParams.FirstOrDefault(p => p.StartsWith("v="))?.Substring(2), - queryParams.FirstOrDefault(p => p.StartsWith("t="))?.Substring(2) + queryParams.FirstOrDefault(p => p.StartsWith("v=", StringComparison.Ordinal))?.Substring(2), + queryParams.FirstOrDefault(p => p.StartsWith("t=", StringComparison.Ordinal))?.Substring(2) ); } @@ -101,7 +101,7 @@ namespace Markdig.Extensions.MediaLinks { return BuildYouTubeIframeUrl( uri.AbsolutePath.Substring(1), - SplitQuery(uri).FirstOrDefault(p => p.StartsWith("t="))?.Substring(2) + SplitQuery(uri).FirstOrDefault(p => p.StartsWith("t=", StringComparison.Ordinal))?.Substring(2) ); } diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs index 4319e91a..3fef8173 100644 --- a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs +++ b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs @@ -57,7 +57,7 @@ namespace Markdig.Extensions.MediaLinks { // see https://tools.ietf.org/html/rfc3986#section-4.2 // since relative uri doesn't support many properties, "http" is used as a placeholder here. - if (linkInline.Url.StartsWith("//") && Uri.TryCreate("http:" + linkInline.Url, UriKind.Absolute, out uri)) + if (linkInline.Url.StartsWith("//", StringComparison.Ordinal) && Uri.TryCreate("http:" + linkInline.Url, UriKind.Absolute, out uri)) { isSchemaRelative = true; } @@ -101,7 +101,7 @@ namespace Markdig.Extensions.MediaLinks Options.ExtensionToMimeType.TryGetValue(path.Substring(lastDot), out string? mimeType)) { var htmlAttributes = GetHtmlAttributes(linkInline); - var isAudio = mimeType.StartsWith("audio"); + var isAudio = mimeType.StartsWith("audio", StringComparison.Ordinal); var tagType = isAudio ? "audio" : "video"; renderer.Write($"<{tagType}"); diff --git a/src/Markdig/Helpers/CompactPrefixTree.cs b/src/Markdig/Helpers/CompactPrefixTree.cs index 03a93362..b9729ef4 100644 --- a/src/Markdig/Helpers/CompactPrefixTree.cs +++ b/src/Markdig/Helpers/CompactPrefixTree.cs @@ -519,7 +519,7 @@ namespace Markdig.Helpers Debug.Assert(key.Length != previousKey.Length); if (previousKey.Length < key.Length) // If the input was sorted, this should be hit { - Debug.Assert(key.StartsWith(previousKey)); + Debug.Assert(key.StartsWith(previousKey, StringComparison.Ordinal)); node.ChildChar = key[i]; node.MatchIndex = previousMatchIndex; EnsureTreeCapacity(TreeSize + 1); @@ -533,7 +533,7 @@ namespace Markdig.Helpers else // if key.Length < previousKey.Length { Debug.Assert(key.Length < previousKey.Length); - Debug.Assert(previousKey.StartsWith(key)); + Debug.Assert(previousKey.StartsWith(key, StringComparison.Ordinal)); node.ChildChar = previousKey[i]; node.MatchIndex = Count; EnsureTreeCapacity(TreeSize + 1); @@ -583,7 +583,7 @@ namespace Markdig.Helpers else { // This node has a child char, therefore we either don't have a match attached or that match is simply a prefix of the current key - Debug.Assert(node.MatchIndex == -1 || key.StartsWith(_matches[node.MatchIndex].Key)); + Debug.Assert(node.MatchIndex == -1 || key.StartsWith(_matches[node.MatchIndex].Key, StringComparison.Ordinal)); // Set this pair as the current node's first element in the Children list node.Children = _childrenIndex; @@ -641,7 +641,7 @@ namespace Markdig.Helpers // It's not a duplicate but shares key.Length characters, therefore it's longer // This will never occur if the input was sorted Debug.Assert(previousMatch.Key.Length > key.Length); - Debug.Assert(previousMatch.Key.StartsWith(key)); + Debug.Assert(previousMatch.Key.StartsWith(key, StringComparison.Ordinal)); Debug.Assert(node.ChildChar == 0 && node.Children == -1); // It is a leaf node diff --git a/src/Markdig/Renderers/Html/CodeBlockRenderer.cs b/src/Markdig/Renderers/Html/CodeBlockRenderer.cs index a4b84faa..906ce4be 100644 --- a/src/Markdig/Renderers/Html/CodeBlockRenderer.cs +++ b/src/Markdig/Renderers/Html/CodeBlockRenderer.cs @@ -47,7 +47,7 @@ namespace Markdig.Renderers.Html { renderer.Write(" cls.StartsWith(infoPrefix) ? cls.Substring(infoPrefix.Length) : cls) + cls => cls.StartsWith(infoPrefix, StringComparison.Ordinal) ? cls.Substring(infoPrefix.Length) : cls) .Write(">"); } From 0c9b5dddc9609c6e86eb10d2f194b8573481ef1d Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Fri, 12 Mar 2021 10:50:18 -0800 Subject: [PATCH 02/14] Use is (not) pattern to match constant strings --- src/Markdig/Parsers/ListBlockParser.cs | 2 +- src/Markdig/Renderers/Html/ListRenderer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Markdig/Parsers/ListBlockParser.cs b/src/Markdig/Parsers/ListBlockParser.cs index a4ec5d90..0906faae 100644 --- a/src/Markdig/Parsers/ListBlockParser.cs +++ b/src/Markdig/Parsers/ListBlockParser.cs @@ -262,7 +262,7 @@ namespace Markdig.Parsers if ((block ?? state.LastBlock) is ParagraphBlock previousParagraph) { if (state.IsBlankLine || - state.IsOpen(previousParagraph) && listInfo.BulletType == '1' && listInfo.OrderedStart != "1") + state.IsOpen(previousParagraph) && listInfo.BulletType == '1' && listInfo.OrderedStart is not "1") { state.GoToColumn(initColumn); state.TriviaStart = savedTriviaStart; // restore changed TriviaStart state diff --git a/src/Markdig/Renderers/Html/ListRenderer.cs b/src/Markdig/Renderers/Html/ListRenderer.cs index d41c55c9..269d6050 100644 --- a/src/Markdig/Renderers/Html/ListRenderer.cs +++ b/src/Markdig/Renderers/Html/ListRenderer.cs @@ -25,7 +25,7 @@ namespace Markdig.Renderers.Html renderer.Write(" type=\"").Write(listBlock.BulletType).Write("\""); } - if (listBlock.OrderedStart != null && (listBlock.OrderedStart != "1")) + if (listBlock.OrderedStart != null && (listBlock.OrderedStart is not "1")) { renderer.Write(" start=\"").Write(listBlock.OrderedStart).Write("\""); } From c9ba236dbcddc8672a04f3c31316a8a8e04202d2 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Fri, 12 Mar 2021 11:01:06 -0800 Subject: [PATCH 03/14] Write chars, instead of strings, where possible --- .../HtmlCustomContainerInlineRenderer.cs | 2 +- .../HtmlCustomContainerRenderer.cs | 2 +- .../DefinitionLists/HtmlDefinitionListRenderer.cs | 4 ++-- .../Figures/HtmlFigureCaptionRenderer.cs | 2 +- .../Extensions/MediaLinks/MediaLinkExtension.cs | 2 +- src/Markdig/Extensions/Tables/HtmlTableRenderer.cs | 4 ++-- src/Markdig/Renderers/Html/CodeBlockRenderer.cs | 4 ++-- src/Markdig/Renderers/Html/HeadingRenderer.cs | 2 +- .../Html/Inlines/AutolinkInlineRenderer.cs | 2 +- .../Renderers/Html/Inlines/CodeInlineRenderer.cs | 2 +- .../Html/Inlines/EmphasisInlineRenderer.cs | 4 ++-- .../Renderers/Html/Inlines/LinkInlineRenderer.cs | 8 ++++---- src/Markdig/Renderers/Html/ListRenderer.cs | 10 +++++----- src/Markdig/Renderers/HtmlRenderer.cs | 12 ++++++------ .../Renderers/Normalize/CodeBlockRenderer.cs | 6 +++--- .../Normalize/Inlines/LinkInlineRenderer.cs | 2 +- .../Renderers/Normalize/NormalizeRenderer.cs | 10 +++++----- src/Markdig/Renderers/TextRendererBase.cs | 14 ++++++++++++++ 18 files changed, 53 insertions(+), 39 deletions(-) diff --git a/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerInlineRenderer.cs b/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerInlineRenderer.cs index 9e2aaf90..74318e26 100644 --- a/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerInlineRenderer.cs +++ b/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerInlineRenderer.cs @@ -15,7 +15,7 @@ namespace Markdig.Extensions.CustomContainers { protected override void Write(HtmlRenderer renderer, CustomContainerInline obj) { - renderer.Write(""); + renderer.Write("'); renderer.WriteChildren(obj); renderer.Write(""); } diff --git a/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerRenderer.cs b/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerRenderer.cs index a6dd58f8..a04149a7 100644 --- a/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerRenderer.cs +++ b/src/Markdig/Extensions/CustomContainers/HtmlCustomContainerRenderer.cs @@ -18,7 +18,7 @@ namespace Markdig.Extensions.CustomContainers renderer.EnsureLine(); if (renderer.EnableHtmlForBlock) { - renderer.Write(""); + renderer.Write("'); } // We don't escape a CustomContainer renderer.WriteChildren(obj); diff --git a/src/Markdig/Extensions/DefinitionLists/HtmlDefinitionListRenderer.cs b/src/Markdig/Extensions/DefinitionLists/HtmlDefinitionListRenderer.cs index 36ccb8b0..8854ab3f 100644 --- a/src/Markdig/Extensions/DefinitionLists/HtmlDefinitionListRenderer.cs +++ b/src/Markdig/Extensions/DefinitionLists/HtmlDefinitionListRenderer.cs @@ -41,7 +41,7 @@ namespace Markdig.Extensions.DefinitionLists hasOpendd = false; countdd = 0; } - renderer.Write(""); + renderer.Write("'); renderer.WriteLeafInline(definitionTerm); renderer.WriteLine(""); } @@ -49,7 +49,7 @@ namespace Markdig.Extensions.DefinitionLists { if (!hasOpendd) { - renderer.Write(""); + renderer.Write("'); countdd = 0; hasOpendd = true; } diff --git a/src/Markdig/Extensions/Figures/HtmlFigureCaptionRenderer.cs b/src/Markdig/Extensions/Figures/HtmlFigureCaptionRenderer.cs index a3d5555e..cb4713f1 100644 --- a/src/Markdig/Extensions/Figures/HtmlFigureCaptionRenderer.cs +++ b/src/Markdig/Extensions/Figures/HtmlFigureCaptionRenderer.cs @@ -16,7 +16,7 @@ namespace Markdig.Extensions.Figures protected override void Write(HtmlRenderer renderer, FigureCaption obj) { renderer.EnsureLine(); - renderer.Write(""); + renderer.Write("'); renderer.WriteLeafInline(obj); renderer.WriteLine(""); } diff --git a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs index 3fef8173..93541624 100644 --- a/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs +++ b/src/Markdig/Extensions/MediaLinks/MediaLinkExtension.cs @@ -144,7 +144,7 @@ namespace Markdig.Extensions.MediaLinks var htmlAttributes = GetHtmlAttributes(linkInline); renderer.Write("