.

Author: SimonCropp

src/Verify/Serialization/Scrubbers/CrossChunkMatcher.cs

@@ -12,19 +12,17 @@ static class CrossChunkMatcher
     /// <param name="onCrossChunk">Called for each potential cross-chunk match position</param>
     /// <param name="onWithinChunk">Called for each position within a chunk</param>
     /// <param name="getMatches">Retrieves the list of matches from the context</param>
-    /// <param name="getIndex">Gets the start index from a match</param>
     /// <param name="getLength">Gets the original length from a match</param>
     /// <param name="getValue">Gets the replacement value from a match</param>
-    public static void ReplaceAll<TContext, TMatch>(
+    public static void ReplaceAll<TContext>(
         StringBuilder builder,
         int carryoverSize,
         TContext context,
         CrossChunkHandler<TContext> onCrossChunk,
         WithinChunkHandler<TContext> onWithinChunk,
-        Func<TContext, List<TMatch>> getMatches,
-        Func<TMatch, int> getIndex,
-        Func<TMatch, int> getLength,
-        Func<TMatch, string> getValue)
+        Func<TContext, List<Match>> getMatches,
+        Func<Match, int> getLength,
+        Func<Match, string> getValue)
     {
         Span<char> carryoverBuffer = stackalloc char[carryoverSize];
         var carryoverLength = 0;
@@ -73,9 +71,9 @@ public static void ReplaceAll<TContext, TMatch>(
 
         // Apply matches in descending position order
         var matches = getMatches(context);
-        foreach (var match in matches.OrderByDescending(getIndex))
+        foreach (var match in matches.OrderByDescending(_ => _.Index))
         {
-            builder.Overwrite(getValue(match), getIndex(match), getLength(match));
+            builder.Overwrite(match.Value, match.Index, match.Length);
         }
     }
 
@@ -102,3 +100,11 @@ public delegate int WithinChunkHandler<TContext>(
         int absoluteIndex,
         TContext context);
 }
+
+
+readonly struct Match(int index, int length, string value)
+{
+    public readonly int Index = index;
+    public readonly int Length = length;
+    public readonly string Value = value;
+}

src/Verify/Serialization/Scrubbers/DateScrubber.cs

@@ -208,15 +208,14 @@ static void ReplaceInner(StringBuilder builder, string format, Counter counter,
 
         var context = new MatchContext(format, counter, culture, tryConvert, max, min);
 
-        CrossChunkMatcher.ReplaceAll<MatchContext, Match>(
+        CrossChunkMatcher.ReplaceAll<MatchContext>(
             builder,
             carryoverSize: max - 1,
             context,
             OnCrossChunk,
             OnWithinChunk,
             getMatches: c => c.Matches,
-            getIndex: m => m.Index,
-            getLength: m => m.OriginalLength,
+            getLength: m => m.Length,
             getValue: m => m.Value);
     }
 
@@ -299,11 +298,4 @@ sealed class MatchContext(
         public int MinLength { get; } = minLength;
         public List<Match> Matches { get; } = [];
     }
-
-    readonly struct Match(int index, int originalLength, string value)
-    {
-        public readonly int Index = index;
-        public readonly int OriginalLength = originalLength;
-        public readonly string Value = value;
-    }
 }

src/Verify/Serialization/Scrubbers/DirectoryReplacements_StringBuilder.cs

@@ -41,14 +41,13 @@ public static void Replace(StringBuilder builder, List<Pair> paths)
         var maxLength = paths[0].Find.Length;
         var context = new MatchContext(paths);
 
-        CrossChunkMatcher.ReplaceAll<MatchContext, Match>(
+        CrossChunkMatcher.ReplaceAll<MatchContext>(
             builder,
             carryoverSize: maxLength - 1,
             context,
             OnCrossChunk,
             OnWithinChunk,
             getMatches: c => c.Matches,
-            getIndex: m => m.Index,
             getLength: m => m.Length,
             getValue: m => m.Value);
     }
@@ -269,26 +268,20 @@ static bool IsPathMatchAt(CharSpan chunk, int chunkPos, string find)
         return true;
     }
 
-    sealed class MatchContext
+    sealed class MatchContext(List<Pair> pairs)
     {
-        public List<Pair> Pairs { get; }
+        public List<Pair> Pairs { get; } = pairs;
         public List<Match> Matches { get; } = [];
-        public int MaxLength { get; }
+        public int MaxLength { get; } = pairs.Count > 0 ? pairs[0].Find.Length : 0;
 
-        List<(int Start, int End)> _matchedRanges = [];
-
-        public MatchContext(List<Pair> pairs)
-        {
-            Pairs = pairs;
-            MaxLength = pairs.Count > 0 ? pairs[0].Find.Length : 0;
-        }
+        List<(int Start, int End)> matchedRanges = [];
 
         public void AddMatchedRange(int start, int end) =>
-            _matchedRanges.Add((start, end));
+            matchedRanges.Add((start, end));
 
         public bool IsPositionMatched(int position)
         {
-            foreach (var (start, end) in _matchedRanges)
+            foreach (var (start, end) in matchedRanges)
             {
                 if (position >= start && position < end)
                 {
@@ -302,7 +295,7 @@ public bool IsPositionMatched(int position)
         public bool OverlapsExistingMatch(int start, int length)
         {
             var end = start + length;
-            foreach (var range in _matchedRanges)
+            foreach (var range in matchedRanges)
             {
                 if (start < range.End && end > range.Start)
                 {
@@ -313,11 +306,4 @@ public bool OverlapsExistingMatch(int start, int length)
             return false;
         }
     }
-
-    readonly struct Match(int index, int length, string value)
-    {
-        public readonly int Index = index;
-        public readonly int Length = length;
-        public readonly string Value = value;
-    }
 }

src/Verify/Serialization/Scrubbers/GuidScrubber.cs

@@ -15,14 +15,13 @@ public static void ReplaceGuids(StringBuilder builder, Counter counter)
 
         var context = new MatchContext(counter);
 
-        CrossChunkMatcher.ReplaceAll<MatchContext, Match>(
+        CrossChunkMatcher.ReplaceAll<MatchContext>(
             builder,
             carryoverSize: 35,
             context,
             OnCrossChunk,
             OnWithinChunk,
             getMatches: c => c.Matches,
-            getIndex: m => m.Index,
             getLength: _ => 36,
             getValue: m => m.Value);
     }
@@ -69,7 +68,7 @@ static void OnCrossChunk(
         }
 
         var convert = context.Counter.Convert(guid);
-        context.Matches.Add(new(absoluteStartPosition, convert));
+        context.Matches.Add(new(absoluteStartPosition, 36, convert));
     }
 
     static int OnWithinChunk(
@@ -104,7 +103,7 @@ static int OnWithinChunk(
         }
 
         var convert = context.Counter.Convert(guid);
-        context.Matches.Add(new(absoluteIndex, convert));
+        context.Matches.Add(new(absoluteIndex, 36, convert));
         return 36; // Skip past the matched GUID
     }
 
@@ -127,10 +126,4 @@ sealed class MatchContext(Counter counter)
         public Counter Counter { get; } = counter;
         public List<Match> Matches { get; } = [];
     }
-
-    internal readonly struct Match(int index, string value)
-    {
-        public readonly int Index = index;
-        public readonly string Value = value;
-    }
 }