Merge pull request #15 from rameel/cleanup

Refactor TextHelper to unify line and column calculation

Author: rameel

src/Ramstack.Parsing/ParseContext.cs

@@ -278,8 +278,7 @@ public readonly override string ToString() =>
     /// </returns>
     internal static string GenerateErrorMessage(ReadOnlySpan<char> source, int position, string message)
     {
-        var line = TextHelper.GetLine(source, position);
-        var column = TextHelper.GetColumn(source, position);
+        var (line, column) = TextHelper.GetLineColumn(source, position);
         return $"({line}:{column}) {message}";
     }
 }

src/Ramstack.Parsing/Utilities/TextHelper.cs

@@ -6,58 +6,39 @@ namespace Ramstack.Parsing.Utilities;
 internal static class TextHelper
 {
     /// <summary>
-    /// Returns the line number for the specified index in the given source string.
+    /// Calculates the line and column numbers for the specified index in the specified character span.
     /// </summary>
-    /// <param name="source">The source string.</param>
-    /// <param name="index">The index in the source string for which to determine the line number.</param>
+    /// <param name="source">The character span representing the text content.</param>
+    /// <param name="index">The index within the span for which to determine the line and column numbers.</param>
     /// <returns>
-    /// The line number corresponding to the specified index.
+    /// A tuple containing the line and column numbers corresponding to the specified index.
     /// </returns>
-    public static int GetLine(ReadOnlySpan<char> source, int index)
+    public static (int Line, int Column) GetLineColumn(ReadOnlySpan<char> source, int index)
     {
         var line = 1;
+        var column = 1;
 
-        if (index >= source.Length)
-            index = source.Length - 1;
+        if ((uint)index < (uint)source.Length)
+            source = source[..index];
 
-        while (true)
+        for (var i = 0; i < source.Length; i++)
         {
-            if ((uint)index >= (uint)source.Length)
-                break;
+            column++;
 
-            if (source[index] == '\n')
+            if (source[i] == '\n')
+            {
                 line++;
+                column = 1;
+            }
+            else if (source[i] == '\r' && i + 1 < source.Length && source[i + 1] == '\n')
+            {
+                i++;
 
-            index--;
-        }
-
-        return line;
-    }
-
-    /// <summary>
-    /// Returns the column number for the specified index in the given source string.
-    /// </summary>
-    /// <param name="source">The source string.</param>
-    /// <param name="index">The index in the source string for which to determine the column number.</param>
-    /// <returns>
-    /// The column number corresponding to the specified index.
-    /// </returns>
-    public static int GetColumn(ReadOnlySpan<char> source, int index)
-    {
-        var column = 1;
-        index--;
-
-        if (index >= source.Length)
-            index = source.Length - 1;
-
-        while ((uint)index < (uint)source.Length
-            && source[index] != '\n'
-            && source[index] != '\r')
-        {
-            column++;
-            index--;
+                line++;
+                column = 1;
+            }
         }
 
-        return column;
+        return (line, column);
     }
 }