#3452: Transform field initializers in structs only if no record and no primary ctor.

Author: siegfriedpammer

ICSharpCode.Decompiler/CSharp/Transforms/TransformFieldAndConstructorInitializers.cs

@@ -50,7 +50,7 @@ public void Run(AstNode node, TransformContext context)
 			{
 				// If we're viewing some set of members (fields are direct children of SyntaxTree),
 				// we also need to handle those:
-				HandleInstanceFieldInitializers(node.Children, context.CurrentTypeDefinition);
+				HandleInstanceFieldInitializers(node.Children, null, context.CurrentTypeDefinition);
 				HandleStaticFieldInitializers(node.Children, context.CurrentTypeDefinition);
 
 				node.AcceptVisitor(this);
@@ -173,7 +173,7 @@ public override void VisitTypeDeclaration(TypeDeclaration typeDeclaration)
 			var currentTypeDefinition = (ITypeDefinition)typeDeclaration.GetSymbol();
 
 			// Handle initializers on instance fields
-			HandleInstanceFieldInitializers(typeDeclaration.Members, currentTypeDefinition);
+			HandleInstanceFieldInitializers(typeDeclaration.Members, typeDeclaration, currentTypeDefinition);
 
 			// Now convert base constructor calls to initializers:
 			base.VisitTypeDeclaration(typeDeclaration);
@@ -200,10 +200,11 @@ static bool ChainsWithThis(ConstructorDeclaration ctor)
 			return true;
 		}
 
-		void HandleInstanceFieldInitializers(IEnumerable<AstNode> members, ITypeDefinition currentTypeDefinition)
+		void HandleInstanceFieldInitializers(IEnumerable<AstNode> members, EntityDeclaration entityDeclaration, ITypeDefinition currentTypeDefinition)
 		{
-			if (currentTypeDefinition is { Kind: TypeKind.Struct, IsRecord: false }
-				&& !context.Settings.StructDefaultConstructorsAndFieldInitializers)
+			if (!context.Settings.StructDefaultConstructorsAndFieldInitializers
+				&& currentTypeDefinition is { Kind: TypeKind.Struct, IsRecord: false }
+				&& entityDeclaration is TypeDeclaration { HasPrimaryConstructor: false })
 			{
 				return;
 			}