Fix method/constructor parameter name matching (#4600)

Relax the matching to account for the type name containing the fully qualified type name for customized methods/ctors.
microsoft · Oct 3, 2024 · fa10eac · fa10eac
1 parent a5e8fad
commit fa10eac
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/...ges/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs b/...ges/http-client-csharp/generator/Microsoft.Generator.CSharp/src/Providers/TypeProvider.cs
@@ -425,7 +425,7 @@ private static bool IsMatch(MethodSignatureBase customMethod, MethodSignatureBas
 
             for (int i = 0; i < customMethod.Parameters.Count; i++)
             {
-                if (customMethod.Parameters[i].Type.Name != method.Parameters[i].Type.Name)
+                if (!customMethod.Parameters[i].Type.Name.EndsWith(method.Parameters[i].Type.Name))
                 {
                     return false;
                 }

diff --git a/...rator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs b/...rator/Microsoft.Generator.CSharp/test/Providers/ModelProviders/ModelCustomizationTests.cs
@@ -329,23 +329,30 @@ await MockHelpers.LoadMockPluginAsync(
         [Test]
         public async Task CanReplaceConstructor()
         {
+            var subModel = InputFactory.Model(
+                "subModel",
+                usage: InputModelTypeUsage.Input,
+                properties: new[] { InputFactory.Property("SubProperty", InputPrimitiveType.Int32) });
+
             var plugin = await MockHelpers.LoadMockPluginAsync(
                 inputModelTypes: new[] {
                     InputFactory.Model(
                         "mockInputModel",
                         // use Input so that we generate a public ctor
                         usage: InputModelTypeUsage.Input,
-                        properties: new[] { InputFactory.Property("Prop1", InputPrimitiveType.String) })
+                        properties: new[]
+                        {
+                            InputFactory.Property("Prop1", InputPrimitiveType.String),
+                            InputFactory.Property("SubModel", subModel)
+                        })
                 },
                 compilation: async () => await Helpers.GetCompilationFromDirectoryAsync());
             var csharpGen = new CSharpGen();
 
             await csharpGen.ExecuteAsync();
 
-            // The generated code should only contain the single internal ctor containing the properties
-            var ctor = plugin.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel").Constructors.Single();
-            Assert.IsTrue(ctor.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Internal));
-            Assert.AreEqual("prop1", ctor.Signature.Parameters.First().Name);
+            // The generated code should not contain any ctors
+            Assert.IsEmpty(plugin.Object.OutputLibrary.TypeProviders.Single(t => t.Name == "MockInputModel").Constructors);
         }
 
         [Test]

diff --git a/...s/ModelProviders/TestData/ModelCustomizationTests/CanReplaceConstructor/MockInputModel.cs b/...s/ModelProviders/TestData/ModelCustomizationTests/CanReplaceConstructor/MockInputModel.cs
@@ -7,4 +7,12 @@ public partial class MockInputModel
     internal MockInputModel()
     {
     }
+
+    internal MockInputModel(string prop1, SubModel? subModel, IDictionary<string, BinaryData> serializedAdditionalRawData)
+    {
+    }
+}
+
+public readonly partial struct SubModel
+{
 }