Skip to content

Commit e75be5e

Browse files
authored
Updated code to use collection expressions (#8336)
1 parent d022df3 commit e75be5e

File tree

199 files changed

+547
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+547
-753
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,25 @@ dotnet_diagnostic.CA1511.severity = warning
166166
dotnet_diagnostic.CA1512.severity = warning
167167
# Use ObjectDisposedException throw helper.
168168
dotnet_diagnostic.CA1513.severity = warning
169+
# Use collection initializers or expressions.
170+
dotnet_diagnostic.IDE0028.severity = warning
169171
# Use range operator.
170172
dotnet_diagnostic.IDE0057.severity = warning
173+
# Use collection expression for array.
174+
dotnet_diagnostic.IDE0300.severity = warning
175+
# Use collection expression for empty.
176+
dotnet_diagnostic.IDE0301.severity = warning
177+
# Use collection expression for stackalloc.
178+
dotnet_diagnostic.IDE0302.severity = warning
179+
# Use collection expression for Create().
180+
dotnet_diagnostic.IDE0303.severity = warning
181+
# Use collection expression for builder.
182+
dotnet_diagnostic.IDE0304.severity = warning
183+
# Use collection expression for fluent.
184+
dotnet_diagnostic.IDE0305.severity = silent # see https://github.com/dotnet/roslyn/issues/70833
185+
# Use collection expression for new.
186+
dotnet_diagnostic.IDE0306.severity = warning
187+
dotnet_style_prefer_collection_expression = when_types_exactly_match
171188
# Add/remove trailing comma.
172189
dotnet_diagnostic.RCS1260.severity = warning
173190
roslynator_trailing_comma_style = omit

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal sealed class JsonSnapshotValueFormatter : ISnapshotValueFormatter, IMar
1717
DateFormatHandling = DateFormatHandling.IsoDateFormat,
1818
Culture = CultureInfo.InvariantCulture,
1919
ContractResolver = ChildFirstContractResolver.Instance,
20-
Converters = new List<JsonConverter> { new StringEnumConverter() }
20+
Converters = [new StringEnumConverter()]
2121
};
2222

2323
public bool CanHandle(object? value)

src/GreenDonut/src/GreenDonut.Data.EntityFramework/Expressions/ExpressionHelpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ public readonly struct OrderRewriterResult(
370370

371371
private sealed class OrderByRemovalRewriter : ExpressionVisitor
372372
{
373-
private readonly List<LambdaExpression> _orderExpressions = new();
374-
private readonly List<string> _orderMethods = new();
373+
private readonly List<LambdaExpression> _orderExpressions = [];
374+
private readonly List<string> _orderMethods = [];
375375
private bool _insideSelectProjection;
376376

377377
public (Expression, List<LambdaExpression>, List<string>) Rewrite(Expression expression)

src/GreenDonut/src/GreenDonut.Data.Primitives/Page.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public string CreateCursor(T item, int offset)
159159
/// <summary>
160160
/// An empty page.
161161
/// </summary>
162-
public static Page<T> Empty => new(ImmutableArray<T>.Empty, false, false, _ => string.Empty);
162+
public static Page<T> Empty => new([], false, false, _ => string.Empty);
163163

164164
/// <summary>
165165
/// Gets the enumerator for the items of this page.

src/GreenDonut/src/GreenDonut.Data/Cursors/CursorKeyParser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace GreenDonut.Data.Cursors;
88
/// </summary>
99
public sealed class CursorKeyParser : ExpressionVisitor
1010
{
11-
private readonly List<CursorKey> _keys = new();
11+
private readonly List<CursorKey> _keys = [];
1212

1313
public IReadOnlyList<CursorKey> Keys => _keys;
1414

src/GreenDonut/src/GreenDonut.Data/DefaultPredicateBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace GreenDonut.Data;
99
/// </summary>
1010
public sealed class DefaultPredicateBuilder : IPredicateBuilder
1111
{
12-
private ImmutableArray<LambdaExpression> _predicates = ImmutableArray<LambdaExpression>.Empty;
12+
private ImmutableArray<LambdaExpression> _predicates = [];
1313

1414
/// <summary>
1515
/// Initializes a new instance of <see cref="DefaultPredicateBuilder"/>.
@@ -82,5 +82,5 @@ public DefaultPredicateBuilder Branch()
8282
/// <summary>
8383
/// Gets an empty <see cref="DefaultPredicateBuilder"/>.
8484
/// </summary>
85-
public static DefaultPredicateBuilder Empty { get; } = new(ImmutableArray<LambdaExpression>.Empty);
85+
public static DefaultPredicateBuilder Empty { get; } = new([]);
8686
}

src/GreenDonut/src/GreenDonut.Data/DefaultSelectorBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace GreenDonut.Data;
99
/// </summary>
1010
public sealed class DefaultSelectorBuilder : ISelectorBuilder
1111
{
12-
private ImmutableArray<LambdaExpression> _selectors = ImmutableArray<LambdaExpression>.Empty;
12+
private ImmutableArray<LambdaExpression> _selectors = [];
1313

1414
/// <summary>
1515
/// Initializes a new instance of <see cref="DefaultSelectorBuilder"/>.
@@ -82,5 +82,5 @@ public DefaultSelectorBuilder Branch()
8282
/// <summary>
8383
/// Gets an empty <see cref="DefaultSelectorBuilder"/>.
8484
/// </summary>
85-
public static DefaultSelectorBuilder Empty { get; } = new(ImmutableArray<LambdaExpression>.Empty);
85+
public static DefaultSelectorBuilder Empty { get; } = new([]);
8686
}

src/GreenDonut/src/GreenDonut/Batch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace GreenDonut;
33
internal class Batch<TKey> where TKey : notnull
44
{
55
private readonly List<TKey> _keys = [];
6-
private readonly Dictionary<TKey, IPromise> _items = new();
6+
private readonly Dictionary<TKey, IPromise> _items = [];
77

88
public bool IsScheduled { get; set; }
99

src/GreenDonut/src/GreenDonut/PromiseCache.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public sealed class PromiseCache : IPromiseCache
1313
private readonly object _sync = new();
1414
private readonly ConcurrentDictionary<PromiseCacheKey, Entry> _map = new();
1515
private readonly ConcurrentDictionary<Type, ImmutableArray<Subscription>> _subscriptions = new();
16-
private readonly List<IPromise> _promises = new();
16+
private readonly List<IPromise> _promises = [];
1717
private readonly int _size;
1818
private readonly int _order;
1919
private List<(PromiseCacheKey? Key, IPromise Promise)>? _buffer;
@@ -233,7 +233,7 @@ public IDisposable Subscribe<T>(
233233

234234
_subscriptions.AddOrUpdate(
235235
type,
236-
_ => ImmutableArray.Create<Subscription>(subscription),
236+
_ => [subscription],
237237
(_, list) => list.Add(subscription));
238238

239239
lock (_promises)
@@ -463,7 +463,7 @@ public void Dispose()
463463
{
464464
subscriptions.AddOrUpdate(
465465
type,
466-
_ => ImmutableArray.Create(this),
466+
_ => [this],
467467
(_, list) => list.Remove(this));
468468

469469
_disposed = true;

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/CapturePagingQueryInterceptor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace GreenDonut.Data;
44

55
public sealed class CapturePagingQueryInterceptor : PagingQueryInterceptor
66
{
7-
public List<QueryInfo> Queries { get; } = new();
7+
public List<QueryInfo> Queries { get; } = [];
88

99
public override void OnBeforeExecute<T>(IQueryable<T> query)
1010
{

0 commit comments

Comments
 (0)