Use collection expressions

Author: ltrzesniewski

src/Abc.Zebus.MessageDsl.Generator.Tests/MessageDslGeneratorTests.cs

@@ -1,12 +1,11 @@
-using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
 using Moq;
 using NUnit.Framework;
-using System.Linq;
-using System.Threading;
 
 namespace Abc.Zebus.MessageDsl.Generator.Tests;
 
@@ -22,7 +21,7 @@ public void Should_generate_message_class_for_simple_dsl_file()
 
         // Act
         var runResults = CSharpGeneratorDriver.Create(new MessageDslGenerator())
-                                              .AddAdditionalTexts(ImmutableArray.Create(additionalTextMock.Object))
+                                              .AddAdditionalTexts([additionalTextMock.Object])
                                               .WithUpdatedAnalyzerConfigOptions(optionsProviderMock.Object)
                                               .RunGenerators(CSharpCompilation.Create("Tests"))
                                               .GetRunResult();
@@ -46,7 +45,7 @@ public void Should_generate_message_class_for_multiple_additional_files_with_con
 
         // Act
         var runResults = CSharpGeneratorDriver.Create(new MessageDslGenerator())
-                                              .AddAdditionalTexts(ImmutableArray.Create(additionalTextMock1.Object, additionalTextMock2.Object))
+                                              .AddAdditionalTexts([additionalTextMock1.Object, additionalTextMock2.Object])
                                               .WithUpdatedAnalyzerConfigOptions(CombineOptionProviderMocks(optionsProviderMock1.Object, optionsProviderMock2.Object).Object)
                                               .RunGenerators(CSharpCompilation.Create("Tests"))
                                               .GetRunResult();
@@ -67,7 +66,7 @@ public void Should_not_generate_message_class_for_non_message_additional_files()
 
         // Act
         var runResults = CSharpGeneratorDriver.Create(new MessageDslGenerator())
-                                              .AddAdditionalTexts(ImmutableArray.Create(additionalTextMock.Object))
+                                              .AddAdditionalTexts([additionalTextMock.Object])
                                               .WithUpdatedAnalyzerConfigOptions(optionsProviderMock.Object)
                                               .RunGenerators(CSharpCompilation.Create("Tests"))
                                               .GetRunResult();
@@ -84,7 +83,7 @@ public void Should_generate_message_class_if_ZebusMessageDslNamespace_option_is_
 
         // Act
         var runResults = CSharpGeneratorDriver.Create(new MessageDslGenerator())
-                                              .AddAdditionalTexts(ImmutableArray.Create(additionalTextMock.Object))
+                                              .AddAdditionalTexts([additionalTextMock.Object])
                                               .RunGenerators(CSharpCompilation.Create("Tests"))
                                               .GetRunResult();
 

src/Abc.Zebus.MessageDsl.Generator/Generator/MessageDslGenerator.cs

@@ -1,12 +1,12 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading;
 using Abc.Zebus.MessageDsl.Ast;
 using Microsoft.CodeAnalysis;
 
-#nullable enable
-
 namespace Abc.Zebus.MessageDsl.Generator;
 
 [Generator]
@@ -83,7 +83,7 @@ private record SourceGenerationInput(
 
     private class SourceGenerationResult(SourceGenerationInput input)
     {
-        private readonly List<Diagnostic> _diagnostics = new();
+        private readonly List<Diagnostic> _diagnostics = [];
 
         public AdditionalText InputFile { get; } = input.InputFile;
         public IReadOnlyList<Diagnostic> Diagnostics => _diagnostics;

src/Abc.Zebus.MessageDsl.Tests/MessageDsl/ParsedContractsTests.cs

@@ -770,7 +770,7 @@ public void should_parse_nested_classes()
         var contracts = ParseValid("Foo.Bar.Baz();");
         var message = contracts.Messages.ExpectedSingle();
         message.Name.ShouldEqual("Baz");
-        message.ContainingClasses.ShouldEqual(new TypeName[] { "Foo", "Bar" });
+        message.ContainingClasses.ShouldEqual(["Foo", "Bar"]);
     }
 
     [Test]

src/Abc.Zebus.MessageDsl.sln

@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A0123301
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		..\.github\workflows\build.yml = ..\.github\workflows\build.yml
+		..\.editorconfig = ..\.editorconfig
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Abc.Zebus.MessageDsl.Build", "Abc.Zebus.MessageDsl.Build\Abc.Zebus.MessageDsl.Build.csproj", "{D7C3B2A7-F5EA-4BD1-95FF-0736EF745160}"

src/Abc.Zebus.MessageDsl/Ast/AttributeSet.cs

@@ -15,7 +15,7 @@ public class AttributeSet : AstNode, IList<AttributeDefinition>
     public IEnumerable<AttributeDefinition> GetAttributes(TypeName attributeType)
     {
         if (Attributes.Count == 0)
-            return Enumerable.Empty<AttributeDefinition>();
+            return [];
 
         attributeType = AttributeDefinition.NormalizeAttributeTypeName(attributeType);
         return Attributes.Where(attr => Equals(attr.TypeName, attributeType));

src/Abc.Zebus.MessageDsl/Ast/EnumDefinition.cs

@@ -12,7 +12,7 @@ public class EnumDefinition : AstNode, IMemberNode
     public string Name { get; set; } = string.Empty;
     public TypeName UnderlyingType { get; set; } = "int";
     public AccessModifier AccessModifier { get; set; }
-    public AttributeSet Attributes { get; } = new();
+    public AttributeSet Attributes { get; } = [];
     public IList<EnumMemberDefinition> Members { get; } = new List<EnumMemberDefinition>();
 
     internal bool UseInferredValues { get; set; }

src/Abc.Zebus.MessageDsl/Ast/EnumMemberDefinition.cs

@@ -4,7 +4,7 @@ public class EnumMemberDefinition : AstNode, INamedNode
 {
     public string Name { get; set; } = string.Empty;
     public string? Value { get; set; }
-    public AttributeSet Attributes { get; } = new();
+    public AttributeSet Attributes { get; } = [];
 
     internal string? InferredValueAsString { get; set; }
     internal object? InferredValueAsNumber { get; set; }

src/Abc.Zebus.MessageDsl/Ast/MessageDefinition.cs

@@ -16,7 +16,7 @@ public class MessageDefinition : AstNode, IClassNode
 
     public IList<ParameterDefinition> Parameters { get; } = new List<ParameterDefinition>();
     public IList<TypeName> BaseTypes { get; } = new List<TypeName>();
-    public AttributeSet Attributes { get; } = new();
+    public AttributeSet Attributes { get; } = [];
 
     public MemberOptions Options
     {
@@ -48,7 +48,7 @@ public MessageType Type
         }
     }
 
-    internal List<ReservationRange> ReservedRanges { get; } = new();
+    internal List<ReservationRange> ReservedRanges { get; } = [];
 
     public override string ToString()
         => Name;

src/Abc.Zebus.MessageDsl/Ast/ParameterDefinition.cs

@@ -8,7 +8,7 @@ public class ParameterDefinition : AstNode, INamedNode
     public bool IsMarkedOptional { get; set; }
     public string? DefaultValue { get; set; }
     public bool IsWritableProperty { get; set; }
-    public AttributeSet Attributes { get; private set; } = new();
+    public AttributeSet Attributes { get; private set; } = [];
 
     internal bool IsDiscarded { get; set; }
 

src/Abc.Zebus.MessageDsl/Ast/TypeName.cs

@@ -36,13 +36,13 @@ public sealed class TypeName : IEquatable<TypeName>
 
     private static readonly Dictionary<string, string> _clrTypeToAlias;
 
-    private static readonly HashSet<string> _knownBclTypes = new()
-    {
+    private static readonly HashSet<string> _knownBclTypes =
+    [
         "TimeSpan",
         "DateTime",
         "Guid",
         "Decimal"
-    };
+    ];
 
     private static readonly Dictionary<string, string> _protoTypeNameMap = new()
     {
@@ -56,16 +56,15 @@ public sealed class TypeName : IEquatable<TypeName>
         { "String", "string" },
     };
 
-    private static readonly HashSet<string> _packableProtoBufTypes = new()
-    {
+    private static readonly HashSet<string> _packableProtoBufTypes = [
         "double", "float", "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64", "bool"
-    };
+    ];
 
-    private static readonly HashSet<string> _knownValueTypes = new()
-    {
+    private static readonly HashSet<string> _knownValueTypes =
+    [
         "bool", "byte", "sbyte", "char", "decimal", "double", "float", "int", "uint", "long", "ulong", "short", "ushort",
         "TimeSpan", "DateTime", "Guid"
-    };
+    ];
 
     private static readonly HashSet<string> _csharpNonTypeKeywords = CSharpSyntax.EnumerateCSharpKeywords().Except(_aliasTypeMap.Keys).ToHashSet();