Locking the names of base contructor arguments to the subclass inject…

…ed field names. Closes GH-7

Directory.Build.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.5.2</VersionPrefix>
+    <VersionPrefix>3.5.3</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>

src/CodegenTests/Bugs/Bug_7_InjectedFieldNamedAsBaseCtor.cs

@@ -0,0 +1,39 @@
+using JasperFx.CodeGeneration;
+using JasperFx.CodeGeneration.Model;
+using Shouldly;
+using Xunit;
+
+namespace CodegenTests.Bugs;
+
+public class Bug_7_InjectedFieldNamedAsBaseCtor
+{
+    [Fact]
+    public void ArrangeFrames_WhereInjectedFieldHasTheSameNameAsBaseClass_ShouldUseThatNameInBaseCall()
+    {
+        // Arrange
+        var generatedAssembly = GeneratedAssembly.Empty();
+        generatedAssembly.ReferenceAssembly(typeof(BaseClass).Assembly);
+        var generatedType = generatedAssembly.AddType("ChildClass", typeof(BaseClass));
+        generatedType.AllInjectedFields.Add(new InjectedField(typeof(string), "dependency"));
+
+        // Act
+        generatedType.ArrangeFrames();
+
+        // Assert
+        generatedType.AllInjectedFields[0].CtorArgDeclaration.ShouldBe("int __dependency1");
+        generatedType.AllInjectedFields[1].CtorArgDeclaration.ShouldBe("string __dependency2");
+
+        // This fails because the ctor argument was not renamed
+        generatedType.BaseConstructorArguments[0].Usage.ShouldBe("__dependency1");
+    }
+
+    public class BaseClass
+    {
+        private readonly int dependency;
+
+        public BaseClass(int dependency)
+        {
+            this.dependency = dependency;
+        }
+    }
+}

src/JasperFx.CodeGeneration/Model/InjectedField.cs

@@ -1,4 +1,5 @@
 using System;
+using JasperFx.CodeGeneration.Frames;
 using JasperFx.Core.Reflection;
 
 namespace JasperFx.CodeGeneration.Model;
@@ -39,6 +40,25 @@ public void WriteAssignment(ISourceWriter writer)
 
     public Variable ToBaseCtorVariable()
     {
-        return new Variable(ArgType, CtorArg);
+        return new BaseConstructorArgument(this);
+    }
+}
+
+public class BaseConstructorArgument : Variable
+{
+    private readonly InjectedField _field;
+
+    public BaseConstructorArgument(InjectedField field) : base(field.ArgType, field.Usage)
+    {
+        _field = field;
+    }
+
+    public override string Usage
+    {
+        get => _field.CtorArg;
+        protected set
+        {
+            // nothing
+        }
     }
 }