Move ConvertToAbsoluteSpan and GetAbsolutePosition to StringLineGroup

Author: prozolic

src/Markdig/Helpers/StringLineGroup.cs

@@ -2,6 +2,7 @@
 // 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.Collections;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
@@ -190,6 +191,33 @@ public void Trim()
         }
     }
 
+    internal SourceSpan ConvertToAbsoluteSpan(SourceSpan span)
+    {
+        if (span.IsEmpty || Count == 0) return span;
+
+        var startPosition = GetAbsolutePosition(span.Start);
+        var endPosition = GetAbsolutePosition(span.End);
+
+        return new SourceSpan(startPosition, endPosition);
+    }
+
+    private int GetAbsolutePosition(int position)
+    {
+        int offset = 0;
+        for (int i = 0; i < Count; i++)
+        {
+            ref StringSlice slice = ref Lines[i].Slice;
+            var lineLength = slice.Length + slice.NewLine.Length();
+
+            if (i == Count - 1 || position < offset + lineLength)
+            {
+                return slice.Start + (position - offset);
+            }
+            offset += lineLength;
+        }
+        return Lines[Count - 1].Slice.End + 1;
+    }
+
     /// <summary>
     /// Gets or sets the enumerator.
     /// </summary>

src/Markdig/Parsers/ParagraphBlockParser.cs

@@ -213,10 +213,10 @@ private static bool TryMatchLinkReferenceDefinition(ref StringLineGroup lines, B
                 // Correct the locations of each field
                 linkReferenceDefinition.Line = lines.Lines[0].Line;
 
-                linkReferenceDefinition.Span = ConvertToAbsoluteSpan(lines, linkReferenceDefinition.Span);
-                linkReferenceDefinition.LabelSpan = ConvertToAbsoluteSpan(lines, linkReferenceDefinition.LabelSpan);
-                linkReferenceDefinition.UrlSpan = ConvertToAbsoluteSpan(lines, linkReferenceDefinition.UrlSpan);
-                linkReferenceDefinition.TitleSpan = ConvertToAbsoluteSpan(lines, linkReferenceDefinition.TitleSpan);
+                linkReferenceDefinition.Span = lines.ConvertToAbsoluteSpan(linkReferenceDefinition.Span);
+                linkReferenceDefinition.LabelSpan = lines.ConvertToAbsoluteSpan(linkReferenceDefinition.LabelSpan);
+                linkReferenceDefinition.UrlSpan = lines.ConvertToAbsoluteSpan(linkReferenceDefinition.UrlSpan);
+                linkReferenceDefinition.TitleSpan = lines.ConvertToAbsoluteSpan(linkReferenceDefinition.TitleSpan);
                 lines = iterator.Remaining();
             }
             else
@@ -255,22 +255,22 @@ private static bool TryMatchLinkReferenceDefinitionTrivia(ref StringLineGroup li
                 lrd.Line = lines.Lines[0].Line;
                 var text = lines.Lines[0].Slice.Text;
 
-                triviaBeforeLabel = ConvertToAbsoluteSpan(lines, triviaBeforeLabel);
-                labelWithTrivia = ConvertToAbsoluteSpan(lines, labelWithTrivia);
-                triviaBeforeUrl = ConvertToAbsoluteSpan(lines, triviaBeforeUrl);
-                unescapedUrl = ConvertToAbsoluteSpan(lines, unescapedUrl);
-                triviaBeforeTitle = ConvertToAbsoluteSpan(lines, triviaBeforeTitle);
-                unescapedTitle = ConvertToAbsoluteSpan(lines, unescapedTitle);
-                triviaAfterTitle = ConvertToAbsoluteSpan(lines, triviaAfterTitle);
-                lrd.Span = ConvertToAbsoluteSpan(lines, lrd.Span);
+                triviaBeforeLabel = lines.ConvertToAbsoluteSpan(triviaBeforeLabel);
+                labelWithTrivia = lines.ConvertToAbsoluteSpan(labelWithTrivia);
+                triviaBeforeUrl = lines.ConvertToAbsoluteSpan(triviaBeforeUrl);
+                unescapedUrl = lines.ConvertToAbsoluteSpan(unescapedUrl);
+                triviaBeforeTitle = lines.ConvertToAbsoluteSpan(triviaBeforeTitle);
+                unescapedTitle = lines.ConvertToAbsoluteSpan(unescapedTitle);
+                triviaAfterTitle = lines.ConvertToAbsoluteSpan(triviaAfterTitle);
+                lrd.Span = lines.ConvertToAbsoluteSpan(lrd.Span);
                 lrd.TriviaBefore = new StringSlice(text, triviaBeforeLabel.Start, triviaBeforeLabel.End);
-                lrd.LabelSpan = ConvertToAbsoluteSpan(lines, lrd.LabelSpan);
+                lrd.LabelSpan = lines.ConvertToAbsoluteSpan(lrd.LabelSpan);
                 lrd.LabelWithTrivia = new StringSlice(text, labelWithTrivia.Start, labelWithTrivia.End);
                 lrd.TriviaBeforeUrl = new StringSlice(text, triviaBeforeUrl.Start, triviaBeforeUrl.End);
-                lrd.UrlSpan = ConvertToAbsoluteSpan(lines, lrd.UrlSpan);
+                lrd.UrlSpan = lines.ConvertToAbsoluteSpan(lrd.UrlSpan);
                 lrd.UnescapedUrl = new StringSlice(text, unescapedUrl.Start, unescapedUrl.End);
                 lrd.TriviaBeforeTitle = new StringSlice(text, triviaBeforeTitle.Start, triviaBeforeTitle.End);
-                lrd.TitleSpan = ConvertToAbsoluteSpan(lines, lrd.TitleSpan);
+                lrd.TitleSpan = lines.ConvertToAbsoluteSpan(lrd.TitleSpan);
                 lrd.UnescapedTitle = new StringSlice(text, unescapedTitle.Start, unescapedTitle.End);
                 lrd.TriviaAfter = new StringSlice(text, triviaAfterTitle.Start, triviaAfterTitle.End);
                 lrd.LinesBefore = paragraph.LinesBefore;
@@ -290,30 +290,4 @@ private static bool TryMatchLinkReferenceDefinitionTrivia(ref StringLineGroup li
         return atLeastOneFound;
     }
 
-    private static SourceSpan ConvertToAbsoluteSpan(StringLineGroup lines, SourceSpan span)
-    {
-        if (span.IsEmpty) return span;
-
-        var startPosition = GetAbsolutePosition(lines, span.Start);
-        var endPosition = GetAbsolutePosition(lines, span.End);
-
-        return new SourceSpan(startPosition, endPosition);
-    }
-
-    private static int GetAbsolutePosition(StringLineGroup lines, int position)
-    {
-        int offset = 0;
-        for (int i = 0; i < lines.Count; i++)
-        {
-            ref StringSlice slice = ref lines.Lines[i].Slice;
-            var lineLength = slice.Length + slice.NewLine.Length();
-
-            if (i == lines.Count - 1 || position < offset + lineLength)
-            {
-                return slice.Start + (position - offset);
-            }
-            offset += lineLength;
-        }
-        return lines.Lines[lines.Count - 1].Slice.End + 1;
-    }
 }