make Combination play nice with recording (#1338)

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;xUnit1026;xUnit1013;CS1573;VerifyTestsProjectDir;VerifySetParameters;PolyFillTargetsForNuget</NoWarn>
-    <Version>28.1.0</Version>
+    <Version>28.1.1</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>

src/Verify.Tests/CombinationTests.RecordingTest.verified.txt

@@ -1,14 +1,18 @@
 {
-  target: {
-     1, Smith St  : 1 Smith St,
-     1, Wallace St: 1 Wallace St,
-    10, Smith St  : 10 Smith St,
-    10, Wallace St: 10 Wallace St
+   1, Smith St  : {
+    target: 1 Smith St,
+    key: recorded 1 Smith St
   },
-  key: [
-    1 Smith St,
-    1 Wallace St,
-    10 Smith St,
-    10 Wallace St
-  ]
+   1, Wallace St: {
+    target: 1 Wallace St,
+    key: recorded 1 Wallace St
+  },
+  10, Smith St  : {
+    target: 10 Smith St,
+    key: recorded 10 Smith St
+  },
+  10, Wallace St: {
+    target: 10 Wallace St,
+    key: recorded 10 Wallace St
+  }
 }

src/Verify.Tests/CombinationTests.cs

@@ -100,7 +100,7 @@ public Task RecordingTest()
             .Verify(
                 (param1, param2) =>
                 {
-                    Recording.Add("key", $"{param1} {param2}");
+                    Recording.Add("key", $"recorded {param1} {param2}");
                     return SimpleReturnMethod(param1, param2);
                 },
                 params1,

src/Verify/Combinations/CombinationRunner.cs

@@ -16,7 +16,14 @@ public CombinationRunner(bool? captureExceptions, List<IEnumerable<object?>> lis
     Task<CombinationResults> RunWithReturn<TReturn>(Func<object?[], Task<TReturn>> method) =>
         InnerRun(async keys =>
         {
-            var value = await method(keys);
+            object? value = await method(keys);
+            if (Recording.IsRecording())
+            {
+                var appends = Recording.Values().ToList();
+                value = new InfoBuilder(value, appends);
+                Recording.Clear();
+            }
+
             return (CombinationResult.ForValue(keys, value), value);
         });
 
@@ -25,6 +32,13 @@ Task<CombinationResults> RunWithVoid(Func<object?[], Task> method) =>
         InnerRun(async keys =>
         {
             await method(keys);
+            if (Recording.IsRecording())
+            {
+                var appends = Recording.Values().ToList();
+                var value = new InfoBuilder("void", appends);
+                Recording.Clear();
+                return (CombinationResult.ForValue(keys, value), null);
+            }
             return (CombinationResult.ForVoid(keys), null);
         });
 

src/Verify/Recording/Recording.cs

@@ -62,6 +62,30 @@ public static bool TryStop([NotNullWhen(true)] out IReadOnlyCollection<ToAppend>
         return true;
     }
 
+    public static IReadOnlyCollection<ToAppend> Values()
+    {
+        if (TryGetValues(out var values))
+        {
+            return values;
+        }
+
+        throw new("Recording.Start must be called prior to Recording.Values.");
+    }
+
+    public static bool TryGetValues([NotNullWhen(true)] out IReadOnlyCollection<ToAppend>? recorded)
+    {
+        var value = asyncLocal.Value;
+
+        if (value == null)
+        {
+            recorded = null;
+            return false;
+        }
+
+        recorded = value.Items;
+        return true;
+    }
+
     static State CurrentState([CallerMemberName] string caller = "")
     {
         var value = asyncLocal.Value;

src/Verify/Serialization/InfoBuilder.cs

@@ -3,7 +3,7 @@
     object? root;
     List<Item> inner = [];
 
-    public InfoBuilder(object? root, List<ToAppend> appends)
+    public InfoBuilder(object? root, IEnumerable<ToAppend> appends)
     {
         this.root = root;
         foreach (var append in appends)