From b0bde46cc1017fa02669a77f7abd0fb862fa3844 Mon Sep 17 00:00:00 2001 From: Miha Zupan Date: Fri, 24 Nov 2023 02:39:16 +0100 Subject: [PATCH] Defer position calculations in LiteralInlineParser --- src/Markdig/Parsers/Inlines/LiteralInlineParser.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Markdig/Parsers/Inlines/LiteralInlineParser.cs b/src/Markdig/Parsers/Inlines/LiteralInlineParser.cs index 80e0c72d..023fa8c2 100644 --- a/src/Markdig/Parsers/Inlines/LiteralInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/LiteralInlineParser.cs @@ -32,14 +32,12 @@ public sealed class LiteralInlineParser : InlineParser public override bool Match(InlineProcessor processor, ref StringSlice slice) { - var text = slice.Text; + string text = slice.Text; - var startPosition = processor.GetSourcePosition(slice.Start, out int line, out int column); - - var nextStart = processor.Parsers.IndexOfOpeningCharacter(text, slice.Start + 1, slice.End); + int nextStart = processor.Parsers.IndexOfOpeningCharacter(text, slice.Start + 1, slice.End); int length; - if (nextStart < 0) + if ((uint)nextStart >= (uint)text.Length) { nextStart = slice.End + 1; length = nextStart - slice.Start; @@ -48,10 +46,10 @@ public sealed class LiteralInlineParser : InlineParser { // Remove line endings if the next char is a new line length = nextStart - slice.Start; + if (!processor.TrackTrivia) { - var nextText = text[nextStart]; - if (nextText == '\n' || nextText == '\r') + if (text[nextStart] is '\n' or '\r') { int end = nextStart - 1; while (length > 0 && text[end].IsSpace()) @@ -84,7 +82,7 @@ public sealed class LiteralInlineParser : InlineParser processor.Inline = new LiteralInline { Content = length > 0 ? newSlice : StringSlice.Empty, - Span = new SourceSpan(startPosition, processor.GetSourcePosition(endPosition)), + Span = new SourceSpan(processor.GetSourcePosition(slice.Start, out int line, out int column), processor.GetSourcePosition(endPosition)), Line = line, Column = column, };