Some cleanup

Author: distantcam

src/AutoCtor.Shared/AutoConstructSourceGenerator/Emitter.cs

@@ -96,16 +96,16 @@ private static (SourceText?, ParameterList?) GenerateSource(
             {
                 if (type.BaseCtorParameters != null)
                 {
-                    parametersBuilder.AddBaseParameters(type.BaseCtorParameters);
+                    parametersBuilder.SetBaseParameters(type.BaseCtorParameters);
                 }
                 else if (baseParameters != null)
                 {
-                    parametersBuilder.AddBaseParameters(baseParameters);
+                    parametersBuilder.SetBaseParameters(baseParameters);
                 }
             }
             if (postCtorMethod.HasValue)
             {
-                parametersBuilder.AddPostCtorParameters(postCtorMethod.Value.Parameters);
+                parametersBuilder.SetPostCtorParameters(postCtorMethod.Value.Parameters);
             }
             var parameters = parametersBuilder.Build(context);
 
@@ -125,7 +125,8 @@ private static (SourceText?, ParameterList?) GenerateSource(
 
                 source.AppendIndent()
                     .Append($"public {type.Name}({parameters.CtorParameterDeclarations:commaindent})")
-                    .Append(parameters.HasBaseParameters, $" : base({parameters.BaseParameters:commaindent})")
+                    .Append(parameters.HasBaseParameters,
+                        $" : base({parameters.BaseParameters:commaindent})")
                     .AppendLine();
 
                 using (source.StartBlock())
@@ -144,7 +145,8 @@ private static (SourceText?, ParameterList?) GenerateSource(
 
                         source.AppendIndent()
                             .Append($"{item.IdentifierName} = {parameter}")
-                            .Append(addGuard, $" ?? throw new global::System.ArgumentNullException(\"{parameter}\")")
+                            .Append(addGuard,
+                                $" ?? throw new global::System.ArgumentNullException(\"{parameter}\")")
                             .Append(";")
                             .AppendLine();
                     }
@@ -158,7 +160,10 @@ private static (SourceText?, ParameterList?) GenerateSource(
             return (source, parameters);
         }
 
-        private static ITypeSymbol FindTypeForArgument(ITypeSymbol type, EquatableList<EquatableTypeSymbol> parameters, EquatableList<EquatableTypeSymbol> arguments)
+        private static ITypeSymbol FindTypeForArgument(
+            ITypeSymbol type,
+            EquatableList<EquatableTypeSymbol> parameters,
+            EquatableList<EquatableTypeSymbol> arguments)
         {
             if (type is not ITypeParameterSymbol)
                 return type;
@@ -173,7 +178,10 @@ private static ITypeSymbol FindTypeForArgument(ITypeSymbol type, EquatableList<E
             return type;
         }
 
-        private static ITypeSymbol SetGenerics(ITypeSymbol type, EquatableList<EquatableTypeSymbol> parameters, EquatableList<EquatableTypeSymbol> arguments)
+        private static ITypeSymbol SetGenerics(
+            ITypeSymbol type,
+            EquatableList<EquatableTypeSymbol> parameters,
+            EquatableList<EquatableTypeSymbol> arguments)
         {
             if (type is ITypeParameterSymbol typeParam)
             {

src/AutoCtor.Shared/Models/ParameterList.cs

@@ -13,10 +13,10 @@ internal class ParameterListBuilder(IEnumerable<MemberModel> fields, IEnumerable
     private IEnumerable<ParameterModel> _baseParameters = [];
     private IEnumerable<ParameterModel> _postCtorParameters = [];
 
-    public void AddBaseParameters(IEnumerable<ParameterModel> baseParameters)
+    public void SetBaseParameters(IEnumerable<ParameterModel> baseParameters)
         => _baseParameters = baseParameters;
 
-    public void AddPostCtorParameters(IEnumerable<ParameterModel> postCtorParameters)
+    public void SetPostCtorParameters(IEnumerable<ParameterModel> postCtorParameters)
         => _postCtorParameters = postCtorParameters;
 
     public ParameterList Build(EmitterContext context)
@@ -44,33 +44,15 @@ public ParameterList Build(EmitterContext context)
                 && (p.RefKind == RefKind.Ref || p.RefKind == RefKind.Out)))
                 continue;
 
-            var p = new ParameterModel(
-                RefKind: RefKind.None,
-                Name: m.FriendlyName,
-                ErrorName: m.ErrorName,
-                KeyedService: m.KeyedService,
-                HasExplicitDefaultValue: false,
-                ExplicitDefaultValue: string.Empty,
-                IsOutOrRef: false,
-                Locations: m.Locations,
-                Type: m.Type);
+            var p = ParameterModel.Create(m);
             GetUniqueName(p, nameHash, uniqueNames, out var name);
             parameterModels.Add(p);
 
             parametersMap.Add(m, name);
         }
         foreach (var m in properties)
         {
-            var p = new ParameterModel(
-                RefKind: RefKind.None,
-                Name: m.FriendlyName,
-                ErrorName: m.ErrorName,
-                KeyedService: m.KeyedService,
-                HasExplicitDefaultValue: false,
-                ExplicitDefaultValue: string.Empty,
-                IsOutOrRef: false,
-                Locations: m.Locations,
-                Type: m.Type);
+            var p = ParameterModel.Create(m);
             GetUniqueName(p, nameHash, uniqueNames, out var name);
             parameterModels.Add(p);
 

src/AutoCtor.Shared/Models/ParameterModel.cs

@@ -46,6 +46,20 @@ public static ParameterModel Create(IParameterSymbol parameter)
         );
     }
 
+    public static ParameterModel Create(MemberModel member)
+    {
+        return new ParameterModel(
+            RefKind: RefKind.None,
+            Name: member.FriendlyName,
+            ErrorName: member.ErrorName,
+            KeyedService: member.KeyedService,
+            HasExplicitDefaultValue: false,
+            ExplicitDefaultValue: string.Empty,
+            IsOutOrRef: false,
+            Locations: member.Locations,
+            Type: member.Type);
+    }
+
     public bool Equals(ParameterModel other)
     {
         return EqualityComparer<string>.Default.Equals(Name, other.Name)

src/AutoCtor.Tests/Examples/PostCtorOptionalWithBase.ExamplesGeneratedCode#PostCtorOptionalWithBase.g.verified.cs

@@ -9,8 +9,8 @@ partial class PostCtorOptionalWithBase
 {
 	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute]
 	[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-	public PostCtorOptionalWithBase(string value) : base(value)
+	public PostCtorOptionalWithBase(string value, string value0 = "dfault") : base(value)
 	{
-		Initialize(value);
+		Initialize(value0);
 	}
 }