Fix line/col in TextWithMarkers

mhutch · Sep 5, 2024 · e5c608d · e5c608d
1 parent c7b108f
commit e5c608d
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/Core.Tests/Utils/TextWithMarkers.cs b/Core.Tests/Utils/TextWithMarkers.cs
@@ -446,19 +446,20 @@ public static TextWithMarkers Parse (string textWithMarkers, params char[] marke
 		for (int i = 0; i < textWithMarkers.Length; i++) {
 			var c = textWithMarkers[i];
 
+			int markerId = Array.IndexOf (markerChars, c);
+			if (markerId > -1) {
+				markerIndices[markerId].Add (new (sb.Length, line, col));
+				continue;
+			}
+
 			if (c == '\n') {
 				line++;
 				col = 0;
 			} else {
 				col++;
 			}
 
-			int markerId = Array.IndexOf (markerChars, c);
-			if (markerId > -1) {
-				markerIndices[markerId].Add (new (sb.Length, line, col));
-			} else {
-				sb.Append (c);
-			}
+			sb.Append (c);
 		}
 
 		return new (sb.ToString (), markerChars, markerIndices);
@@ -487,18 +488,19 @@ public static TextWithMarkers Parse (string textWithMarkers, char markerChar)
 		for (int i = 0; i < textWithMarkers.Length; i++) {
 			var c = textWithMarkers[i];
 
-			if(c == '\n') {
+			if (c == markerChar) {
+				markerIndices.Add (new (sb.Length, line, col));
+				continue;
+			}
+
+			if (c == '\n') {
 				line++;
 				col = 0;
 			} else {
 				col++;
 			}
 
-			if (c == markerChar) {
-				markerIndices.Add (new (sb.Length, line, col));
-			} else {
-				sb.Append (c);
-			}
+			sb.Append (c);
 		}
 
 		return new (sb.ToString (), [markerChar], [markerIndices]);