Merge pull request #54 from vmachacek/master

Add method override for WithBaseCall
dansiegel · Dec 15, 2024 · fbdd547 · fbdd547
2 parents 9133bcf + 75bfda0
commit fbdd547
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 9 deletions.
diff --git a/src/CodeGenHelpers/ConstructorBuilder.cs b/src/CodeGenHelpers/ConstructorBuilder.cs
@@ -101,29 +101,35 @@ public ConstructorBuilder WithThisCall()
         }
 
         public ConstructorBuilder WithThisCall(Dictionary<string, string> parameters)
+        {
+            WithThisCall(parameters.Select(f => (f.Key, f.Value)));
+            return this;
+        }
+
+        public ConstructorBuilder WithThisCall(IEnumerable<(string Type, string Name)> parameters)
         {
             foreach(var parameter in parameters)
             {
-                this.AddParameter(parameter.Key, parameter.Value);
+                this.AddParameter(parameter.Type, parameter.Name);
             }
 
             _baseCall = () =>
             {
-                var output = parameters.Select(x => x.Value);
+                var output = parameters.Select(x => x.Name);
                 return $": this({string.Join(", ", output)})";
             };
             return this;
         }
 
         public ConstructorBuilder WithThisCall(IEnumerable<IParameterSymbol> parameters)
         {
-            var dict = new Dictionary<string, string>();
+            var list = new List<(string Type, string Name)>();
             foreach (var parameter in parameters ?? Array.Empty<IParameterSymbol>())
             {
                 AddNamespaceImport(parameter.Type);
-                dict.Add(parameter.Type.Name, parameter.Name);
+                list.Add((parameter.Type.Name, parameter.Name));
             }
-            return WithThisCall(dict);
+            return WithThisCall(list);
         }
 
         public ConstructorBuilder WithThisCall(IMethodSymbol baseConstructor)
@@ -138,27 +144,33 @@ public ConstructorBuilder WithBaseCall()
         }
 
         public ConstructorBuilder WithBaseCall(Dictionary<string, string> parameters)
+        {
+            WithBaseCall(parameters.Select(f => (f.Value, f.Key)));
+            return this;
+        }
+
+        public ConstructorBuilder WithBaseCall(IEnumerable<(string Type, string Name)> parameters)
         {
             foreach (var parameter in parameters)
             {
-                this.AddParameter(parameter.Key, parameter.Value);
+                this.AddParameter(parameter.Type, parameter.Name);
             }
 
             _baseCall = () =>
             {
-                var output = parameters.Select(x => x.Value);
+                var output = parameters.Select(x => x.Name);
                 return $": base({string.Join(", ", output)})";
             };
             return this;
         }
 
         public ConstructorBuilder WithBaseCall(IEnumerable<IParameterSymbol> parameters)
         {
-            var dict = new Dictionary<string, string>();
+            var dict = new List<(string Type, string Name)>();
             foreach (var parameter in parameters ?? Array.Empty<IParameterSymbol>())
             {
                 AddNamespaceImport(parameter.Type);
-                dict.Add(parameter.Type.Name, parameter.Name);
+                dict.Add((parameter.Type.Name, parameter.Name));
             }
             return WithBaseCall(dict);
         }

diff --git a/tests/CodeGenHelpers.Tests/SampleCode/CanPassMultipleParametersOfSameType.cs b/tests/CodeGenHelpers.Tests/SampleCode/CanPassMultipleParametersOfSameType.cs
@@ -0,0 +1,19 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodeGenHelpers.SampleCode
+{
+    partial class CanPassMultipleParametersOfSameType
+    {
+         CanPassMultipleParametersOfSameType(string str1, string str2)
+            : base(str1, str2)
+        {
+        }
+    }
+}
diff --git a/tests/CodeGenHelpers.Tests/Tests/ConstructorBuilderTests.cs b/tests/CodeGenHelpers.Tests/Tests/ConstructorBuilderTests.cs
@@ -0,0 +1,27 @@
+using Xunit;
+using Xunit.Abstractions;
+
+namespace CodeGenHelpers.Tests;
+
+public class ConstructorBuilderTests : TestBase
+{
+    public ConstructorBuilderTests(ITestOutputHelper testOutput)
+        : base(testOutput)
+    {
+    }
+
+    [Fact]
+    public void CanPassMultipleParametersOfSameType()
+    {
+        var builder = CodeBuilder.Create(Namespace)
+            .AddClass("CanPassMultipleParametersOfSameType");
+
+        builder.AddConstructor().WithBaseCall(new[]
+        {
+            ("string", "str1"),
+            ("string", "str2"),
+        });
+
+        MakeAssertion(builder);
+    }
+}