Switch to C# Collection Expressions. (#6845)

Author: michaelstaib

src/CookieCrumble/src/CookieCrumble/Formatters/ExecutionResultSnapshotValueFormatter.cs

@@ -105,7 +105,7 @@ public void WriteResponse(IBufferWriter<byte> snapshot)
                 "You must first set the initial response before you can apply patches.");
         }
 
-        using var writer = new Utf8JsonWriter(snapshot, new JsonWriterOptions { Indented = true });
+        using var writer = new Utf8JsonWriter(snapshot, new JsonWriterOptions { Indented = true, });
 
         _json.Remove("hasNext");
 

src/CookieCrumble/src/CookieCrumble/Formatters/JsonSnapshotValueFormatter.cs

@@ -17,7 +17,7 @@ internal sealed class JsonSnapshotValueFormatter : ISnapshotValueFormatter
             DateFormatHandling = DateFormatHandling.IsoDateFormat,
             Culture = CultureInfo.InvariantCulture,
             ContractResolver = ChildFirstContractResolver.Instance,
-            Converters = new List<JsonConverter> { new StringEnumConverter() },
+            Converters = new List<JsonConverter> { new StringEnumConverter(), },
         };
 
     public bool CanHandle(object? value)

src/CookieCrumble/src/CookieCrumble/Snapshot.cs

@@ -35,7 +35,7 @@ public class Snapshot
         });
     private static readonly JsonSnapshotValueFormatter _defaultFormatter = new();
 
-    private readonly List<SnapshotSegment> _segments = new();
+    private readonly List<SnapshotSegment> _segments = [];
     private readonly string _fileName;
     private string _extension;
     private string? _postFix;

src/CookieCrumble/test/CookieCrumble.Tests/SnapshotTests.cs

@@ -48,8 +48,8 @@ public void SnapshotBuilder()
     {
         var snapshot = new Snapshot();
         snapshot.Add(new MyClass());
-        snapshot.Add(new MyClass { Foo = "Bar" });
-        snapshot.Add(new MyClass { Foo = "Baz" });
+        snapshot.Add(new MyClass { Foo = "Bar", });
+        snapshot.Add(new MyClass { Foo = "Baz", });
         snapshot.Match();
     }
 
@@ -58,8 +58,8 @@ public async Task SnapshotBuilderAsync()
     {
         var snapshot = new Snapshot();
         snapshot.Add(new MyClass());
-        snapshot.Add(new MyClass { Foo = "Bar" });
-        snapshot.Add(new MyClass { Foo = "Baz" });
+        snapshot.Add(new MyClass { Foo = "Bar", });
+        snapshot.Add(new MyClass { Foo = "Baz", });
         await snapshot.MatchAsync();
     }
 
@@ -68,8 +68,8 @@ public void SnapshotBuilder_Segment_Name()
     {
         var snapshot = new Snapshot();
         snapshot.Add(new MyClass());
-        snapshot.Add(new MyClass { Foo = "Bar" }, "Bar:");
-        snapshot.Add(new MyClass { Foo = "Baz" });
+        snapshot.Add(new MyClass { Foo = "Bar", }, "Bar:");
+        snapshot.Add(new MyClass { Foo = "Baz", });
         snapshot.Match();
     }
 
@@ -78,8 +78,8 @@ public void SnapshotBuilder_Segment_Name_All()
     {
         var snapshot = new Snapshot();
         snapshot.Add(new MyClass(), "Segment 1:");
-        snapshot.Add(new MyClass { Foo = "Bar" }, "Segment 2:");
-        snapshot.Add(new MyClass { Foo = "Baz" }, "Segment 3:");
+        snapshot.Add(new MyClass { Foo = "Bar", }, "Segment 2:");
+        snapshot.Add(new MyClass { Foo = "Baz", }, "Segment 3:");
         snapshot.Match();
     }
 
@@ -88,9 +88,9 @@ public void SnapshotBuilder_Segment_Custom_Serializer_For_Segment()
     {
         var snapshot = new Snapshot();
         snapshot.Add(new MyClass());
-        snapshot.Add(new MyClass { Foo = "Baz" }, "Bar:", new CustomSerializer());
-        snapshot.Add(new MyClass { Foo = "Baz" });
-        snapshot.Add(new MyClass { Foo = "Baz" });
+        snapshot.Add(new MyClass { Foo = "Baz", }, "Bar:", new CustomSerializer());
+        snapshot.Add(new MyClass { Foo = "Baz", });
+        snapshot.Add(new MyClass { Foo = "Baz", });
         snapshot.Match();
     }
 
@@ -100,15 +100,15 @@ public void SnapshotBuilder_Segment_Custom_Global_Serializer()
         Snapshot.RegisterFormatter(new CustomSerializer());
 
         var snapshot = new Snapshot();
-        snapshot.Add(new MyClass { Foo = "123" });
+        snapshot.Add(new MyClass { Foo = "123", });
         snapshot.Match();
     }
 
     [Fact]
     public void SnapshotBuilder_GraphQL_Segment()
     {
         var snapshot = new Snapshot();
-        snapshot.Add(new MyClass { Foo = "def" });
+        snapshot.Add(new MyClass { Foo = "def", });
         snapshot.Add(Utf8GraphQLParser.Parse("{ abc }"));
         snapshot.Match();
     }
@@ -121,7 +121,7 @@ public class MyClass
     public class CustomSerializer : ISnapshotValueFormatter
     {
         public bool CanHandle(object? value)
-            => value is MyClass { Foo: "123" };
+            => value is MyClass { Foo: "123", };
 
         public void Format(IBufferWriter<byte> snapshot, object? value)
         {

src/GreenDonut/src/Core/Batch.cs

@@ -5,7 +5,7 @@ namespace GreenDonut;
 
 internal class Batch<TKey> where TKey : notnull
 {
-    private readonly List<TKey> _keys = new();
+    private readonly List<TKey> _keys = [];
     private readonly Dictionary<TKey, object> _items = new();
 
     public int Size => _keys.Count;

src/GreenDonut/src/Core/CacheDataLoader.cs

@@ -15,7 +15,7 @@ protected CacheDataLoader(DataLoaderOptions? options = null)
         : base(
             AutoBatchScheduler.Default,
             options is null
-                ? new DataLoaderOptions { MaxBatchSize = 1 }
+                ? new DataLoaderOptions { MaxBatchSize = 1, }
                 : CreateLocalOptions(options))
     { }
 

src/GreenDonut/src/Core/TaskCache.cs

@@ -144,7 +144,7 @@ private Entry AddNewEntry(TaskCacheKey key, Task value)
     {
         lock (_sync)
         {
-            var entry = new Entry { Key = key, Value = value };
+            var entry = new Entry { Key = key, Value = value, };
             AppendEntryUnsafe(entry);
             ClearSpaceForNewEntryUnsafe();
             return entry;

src/GreenDonut/test/Core.Tests/DataLoaderTests.cs

@@ -33,7 +33,7 @@ public void ClearAllEntries()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         var loader = new DataLoader<string, string>(fetch, batchScheduler, options);
 
         loader.Set("Foo", Task.FromResult("Bar"));
@@ -200,7 +200,7 @@ public async Task LoadParamsResult()
             .CreateFetch<string, string>("Bar");
         var batchScheduler = new ManualBatchScheduler();
         var loader = new DataLoader<string, string>(fetch, batchScheduler);
-        var keys = new[] { "Foo" };
+        var keys = new[] { "Foo", };
 
         // act
         var loadResult = loader.LoadAsync(keys);
@@ -252,7 +252,7 @@ public async Task LoadCollectionResult()
         var fetch = CreateFetch<string, string>("Bar");
         var batchScheduler = new ManualBatchScheduler();
         var loader = new DataLoader<string, string>(fetch, batchScheduler);
-        var keys = new List<string> { "Foo" };
+        var keys = new List<string> { "Foo", };
 
         // act
         var loadResult = loader.LoadAsync(keys, CancellationToken.None);
@@ -271,7 +271,7 @@ public async Task LoadCollectionResultTwice()
         var loader = new DataLoader<string, string>(
             fetch,
             batchScheduler);
-        var keys = new List<string> { "Foo" };
+        var keys = new List<string> { "Foo", };
 
         (await loader.LoadAsync(keys, CancellationToken.None)).MatchSnapshot();
 
@@ -295,7 +295,7 @@ public async Task LoadCollectionResultNoCache()
             {
                 Caching = false,
             });
-        var keys = new List<string> { "Foo" };
+        var keys = new List<string> { "Foo", };
 
         // act
         var loadResult = loader.LoadAsync(keys, CancellationToken.None);
@@ -337,7 +337,7 @@ ValueTask Fetch(
 
         var batchScheduler = new ManualBatchScheduler();
         var loader = new DataLoader<string, string>(Fetch, batchScheduler);
-        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux" };
+        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux", };
 
         // act
         var loadResult = loader.LoadAsync(requestKeys);
@@ -382,7 +382,7 @@ ValueTask Fetch(
 
         var batchScheduler = new ManualBatchScheduler();
         var loader = new DataLoader<string, string>(Fetch, batchScheduler);
-        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux" };
+        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux", };
 
         // act
         Task Verify() => loader.LoadAsync(requestKeys);
@@ -406,7 +406,7 @@ public async Task LoadBatchingError()
         var expectedException = new Exception("Foo");
         var batchScheduler = new ManualBatchScheduler();
         var loader = new DataLoader<string, string>(Fetch, batchScheduler);
-        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux" };
+        var requestKeys = new[] { "Foo", "Bar", "Baz", "Qux", };
 
         ValueTask Fetch(
             IReadOnlyList<string> keys,
@@ -552,7 +552,7 @@ public void RemoveEntry()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         var loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         var key = "Foo";
 
@@ -604,7 +604,7 @@ public void SetNewCacheEntry()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         var loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         var key = "Foo";
         var value = Task.FromResult("Bar");
@@ -623,7 +623,7 @@ public void SetTwice()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         var loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         var key = "Foo";
         var first = Task.FromResult("Bar");
@@ -730,7 +730,7 @@ public async Task IDataLoaderLoadParamsResult()
         var fetch = CreateFetch<string, string>("Bar");
         var batchScheduler = new ManualBatchScheduler();
         IDataLoader loader = new DataLoader<string, string>(fetch, batchScheduler);
-        var keys = new object[] { "Foo" };
+        var keys = new object[] { "Foo", };
 
         // act
         var loadResult = loader.LoadAsync(keys);
@@ -780,7 +780,7 @@ public async Task IDataLoaderLoadCollectionResult()
         var fetch = CreateFetch<string, string>("Bar");
         var batchScheduler = new ManualBatchScheduler();
         IDataLoader loader = new DataLoader<string, string>(fetch, batchScheduler);
-        var keys = new List<object> { "Foo" };
+        var keys = new List<object> { "Foo", };
 
         // act
         var loadResult = loader.LoadAsync(keys);
@@ -832,7 +832,7 @@ public void IDataLoaderRemoveEntry()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         IDataLoader loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         object key = "Foo";
 
@@ -901,7 +901,7 @@ public void IDataLoaderSetNewCacheEntry()
         var fetch = CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         IDataLoader loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         object key = "Foo";
         var value = Task.FromResult<object>("Bar");
@@ -920,7 +920,7 @@ public void IDataLoaderSetTwice()
         var fetch = TestHelpers.CreateFetch<string, string>();
         var batchScheduler = new ManualBatchScheduler();
         var cache = new TaskCache(10);
-        var options = new DataLoaderOptions { Cache = cache };
+        var options = new DataLoaderOptions { Cache = cache, };
         IDataLoader loader = new DataLoader<string, string>(fetch, batchScheduler, options);
         const string key = "Foo";
         var first = Task.FromResult((object)"Bar");

src/GreenDonut/test/Core.Tests/ResultTests.cs

@@ -243,7 +243,7 @@ public void ExplicitResolve(string value)
     public void ExplicitResolveList()
     {
         // arrange
-        var value = new[] { "Foo", "Bar", "Baz" };
+        var value = new[] { "Foo", "Bar", "Baz", };
 
         // act
         var result = Result<IReadOnlyCollection<string>>.Resolve(value);

src/GreenDonut/test/Core.Tests/TaskCacheTests.cs

@@ -37,11 +37,11 @@ public void Size(int cacheSize, int expectedCacheSize)
         Assert.Equal(expectedCacheSize, result);
     }
 
-    [InlineData(new[] { "Foo" }, 1)]
-    [InlineData(new[] { "Foo", "Bar" }, 2)]
-    [InlineData(new[] { "Foo", "Bar", "Baz" }, 3)]
+    [InlineData(new[] { "Foo", }, 1)]
+    [InlineData(new[] { "Foo", "Bar", }, 2)]
+    [InlineData(new[] { "Foo", "Bar", "Baz", }, 3)]
     [InlineData(new[] { "Foo", "Bar", "Baz", "Qux", "Quux", "Corge",
-        "Grault", "Graply", "Waldo", "Fred", "Plugh", "xyzzy" }, 10)]
+        "Grault", "Graply", "Waldo", "Fred", "Plugh", "xyzzy", }, 10)]
     [Theory(DisplayName = "Usage: Should return the expected cache usage")]
     public void Usage(string[] values, int expectedUsage)
     {