Use record struct

Author: GrahamTheCoder

CodeConverter/CSharp/AdditionalInitializers.cs

@@ -4,6 +4,8 @@
 
 namespace ICSharpCode.CodeConverter.CSharp;
 
+internal record struct Assignment(ExpressionSyntax Field, SyntaxKind AssignmentKind, ExpressionSyntax Initializer, bool PostAssignment = false);
+
 internal class AdditionalInitializers
 {
     private readonly bool _shouldAddInstanceConstructor;
@@ -36,7 +38,8 @@ public IReadOnlyCollection<MemberDeclarationSyntax> WithAdditionalInitializers(L
             .Where(cds => !cds.Initializer.IsKind(SyntaxKind.ThisConstructorInitializer))
             .SplitOn(cds => cds.IsInStaticCsContext());
 
-        convertedMembers = WithAdditionalInitializers(convertedMembers, parentTypeName, AdditionalInstanceInitializers, SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PublicKeyword)), rootInstanceConstructors, _shouldAddInstanceConstructor, DesignerGeneratedInitializeComponentOrNull != null);
+        convertedMembers = WithAdditionalInitializers(convertedMembers, parentTypeName, AdditionalInstanceInitializers, SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PublicKeyword)),
+            rootInstanceConstructors, _shouldAddInstanceConstructor, DesignerGeneratedInitializeComponentOrNull != null);
 
         convertedMembers = WithAdditionalInitializers(convertedMembers, parentTypeName,
             AdditionalStaticInitializers, SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.StaticKeyword)), rootStaticConstructors, _shouldAddStaticConstructor, false);
@@ -56,10 +59,12 @@ private List<MemberDeclarationSyntax> WithAdditionalInitializers(List<MemberDecl
             if (addedConstructorRequiresInitializeComponent) {
                 statements.Add(SyntaxFactory.ExpressionStatement(SyntaxFactory.InvocationExpression(SyntaxFactory.IdentifierName("InitializeComponent"))));
             }
+
             constructors.Add(SyntaxFactory.ConstructorDeclaration(convertIdentifier)
                 .WithBody(SyntaxFactory.Block(statements.ToArray()))
                 .WithModifiers(modifiers));
         }
+
         foreach (var constructor in constructors) {
             var newConstructor = WithAdditionalInitializers(constructor, additionalInitializers);
             ReplaceOrInsertBeforeFirstConstructor(convertedMembers, constructor, newConstructor);
@@ -71,12 +76,9 @@ private List<MemberDeclarationSyntax> WithAdditionalInitializers(List<MemberDecl
     private static void ReplaceOrInsertBeforeFirstConstructor(List<MemberDeclarationSyntax> convertedMembers, ConstructorDeclarationSyntax constructor, ConstructorDeclarationSyntax newConstructor)
     {
         int existingIndex = convertedMembers.IndexOf(constructor);
-        if (existingIndex > -1)
-        {
+        if (existingIndex > -1) {
             convertedMembers[existingIndex] = newConstructor;
-        }
-        else
-        {
+        } else {
             int constructorIndex = convertedMembers.FindIndex(c => c is ConstructorDeclarationSyntax or MethodDeclarationSyntax);
             convertedMembers.Insert(constructorIndex > -1 ? constructorIndex : convertedMembers.Count, newConstructor);
         }

CodeConverter/CSharp/Assignment.cs

@@ -134,7 +134,7 @@ public bool ShouldPreferExplicitType(VBSyntax.ExpressionSyntax exp,
             if (isField && !declaredSymbol.IsStatic && !SemanticModel.IsDefinitelyStatic(vbName, vbInitValue)) {
                 if (!_typeContext.Initializers.HasInstanceConstructorsOutsideThisPart) {
                     var lhs = SyntaxFactory.IdentifierName(ConvertIdentifier(vbName.Identifier, sourceTriviaMapKind: SourceTriviaMapKind.None));
-                    _typeContext.Initializers.AdditionalInstanceInitializers.Add((lhs, CSSyntaxKind.SimpleAssignmentExpression, adjustedInitializerExpr));
+                    _typeContext.Initializers.AdditionalInstanceInitializers.Add(new(lhs, CSSyntaxKind.SimpleAssignmentExpression, adjustedInitializerExpr));
                     equalsValueClauseSyntax = null;
                 } else {
                     var returnBlock = SyntaxFactory.Block(SyntaxFactory.ReturnStatement(adjustedInitializerExpr));

CodeConverter/CSharp/CommonConversions.cs

@@ -274,7 +274,7 @@ private Assignment CreateInitializer((VBSyntax.ModifiedIdentifierSyntax n, VBSyn
         var csId = CommonConversions.ConvertIdentifier(f.n.Identifier);
         string initializerFunctionName = CommonConversions.GetInitialValueFunctionName(f.n);
         var invocation = SyntaxFactory.InvocationExpression(SyntaxFactory.IdentifierName(CommonConversions.CsEscapedIdentifier(initializerFunctionName)), SyntaxFactory.ArgumentList());
-        return (SyntaxFactory.IdentifierName(csId), CSSyntaxKind.SimpleAssignmentExpression, invocation);
+        return new(SyntaxFactory.IdentifierName(csId), CSSyntaxKind.SimpleAssignmentExpression, invocation);
     }
 
     private MemberDeclarationSyntax[] GetAdditionalDeclarations(VBSyntax.StatementSyntax member)
@@ -554,7 +554,7 @@ private IEnumerable<MemberDeclarationSyntax> CreateWithEventsMembers(SyntaxToken
             ? initializerState.AdditionalStaticInitializers
             : initializerState.AdditionalInstanceInitializers;
         foreach (var initializer in initializers) {
-            initializerCollection.Add((SyntaxFactory.IdentifierName(initializer.Key), CSSyntaxKind.SimpleAssignmentExpression, initializer.Value.Value));
+            initializerCollection.Add(new(SyntaxFactory.IdentifierName(initializer.Key), CSSyntaxKind.SimpleAssignmentExpression, initializer.Value.Value));
         }
 
         var fieldDecls = _typeContext.HandledEventsAnalysis.GetDeclarationsForFieldBackedProperty(fieldDecl,
@@ -614,8 +614,8 @@ private IReadOnlyCollection<MemberDeclarationSyntax> CreateExtraMethodMembers()
         // See GetInitialValueFunctionName
         var newMethodNames = methodsInfos.ToDictionary(l => l.Id, l => l.Prefix);
         for (int i = 0; i < _typeContext.Initializers.AdditionalInstanceInitializers.Count; i++) {
-            var (a, b, initializer) = _typeContext.Initializers.AdditionalInstanceInitializers[i];
-            _typeContext.Initializers.AdditionalInstanceInitializers[i] = (a, b, PerScopeState.ReplaceNames(initializer, newMethodNames));
+            var (a, b, initializer, _) = _typeContext.Initializers.AdditionalInstanceInitializers[i];
+            _typeContext.Initializers.AdditionalInstanceInitializers[i] = new(a, b, PerScopeState.ReplaceNames(initializer, newMethodNames));
         }
 
         return methodsInfos