Fully qualify type names to prevent types with the same name from bei…

…ng seen as identical - Updated the test to show that nested generics work correctly - Added test to ensure same-named generic parameters are distinguishable from one another
codecentric · Sep 1, 2024 · 85c5aa7 · 85c5aa7
1 parent c660b14
commit 85c5aa7
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 15 deletions.
diff --git a/AutomaticInterface/AutomaticInterface/Builder.cs b/AutomaticInterface/AutomaticInterface/Builder.cs
@@ -16,7 +16,8 @@ public static class Builder
             genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
             memberOptions: SymbolDisplayMemberOptions.IncludeParameters,
             parameterOptions: SymbolDisplayParameterOptions.IncludeType
-                | SymbolDisplayParameterOptions.IncludeParamsRefOut
+                | SymbolDisplayParameterOptions.IncludeParamsRefOut,
+            typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces
         );
 
     private static readonly SymbolDisplayFormat TypeDisplayFormat =

diff --git a/AutomaticInterface/Tests/GeneratorTests.cs b/AutomaticInterface/Tests/GeneratorTests.cs
@@ -1788,20 +1788,29 @@ public partial interface IDemoClass
     }
 
     [Fact]
-    public void WorksWithGenericParameterOverloads()
+    public void WorksWithGenericParameterOverloadsWithIdenticalTypeNames()
     {
         const string code = """
 
             using AutomaticInterface;
 
-            namespace AutomaticInterfaceExample;
-
-            [GenerateAutomaticInterface]
-            public class DemoClass
+            namespace AutomaticInterfaceExample
             {
-                public void AMethod(Func<int> getValue) {}
-                
-                public void AMethod(Func<float> getValue) {}
+                namespace Types1 {
+                    public class Model;
+                }
+
+                namespace Types2 {
+                    public class Model;
+                }
+
+                [GenerateAutomaticInterface]
+                public class DemoClass
+                {
+                    public void AMethod(Func<Task<Types1.Model>> getValue) {}
+                    
+                    public void AMethod(Func<Task<Types2.Model>> getValue) {}
+                }
             }
 
             """;
@@ -1815,19 +1824,16 @@ public void AMethod(Func<float> getValue) {}
             // </auto-generated>
             //--------------------------------------------------------------------------------------------------
 
-            using System.CodeDom.Compiler;
-            using AutomaticInterface;
-
             namespace AutomaticInterfaceExample
             {
-                [GeneratedCode("AutomaticInterface", "")]
+                [global::System.CodeDom.Compiler.GeneratedCode("AutomaticInterface", "")]
                 public partial interface IDemoClass
                 {
                     /// <inheritdoc />
-                    void AMethod(Func<int> getValue);
+                    void AMethod(Func<Task<global::AutomaticInterfaceExample.Types1.Model>> getValue);
                     
                     /// <inheritdoc />
-                    void AMethod(Func<float> getValue);
+                    void AMethod(Func<Task<global::AutomaticInterfaceExample.Types2.Model>> getValue);
                     
                 }
             }
@@ -1836,6 +1842,52 @@ public partial interface IDemoClass
         GenerateCode(code).Should().Be(expected);
     }
 
+    [Fact]
+    public void WorksWithGenericParameterOverloads()
+    {
+        const string code = """
+
+                            using AutomaticInterface;
+
+                            namespace AutomaticInterfaceExample;
+
+                            [GenerateAutomaticInterface]
+                            public class DemoClass
+                            {
+                                public void AMethod(Func<Task<int>> getValue) {}
+                                
+                                public void AMethod(Func<Task<float>> getValue) {}
+                            }
+
+                            """;
+
+        const string expected = """
+                                //--------------------------------------------------------------------------------------------------
+                                // <auto-generated>
+                                //     This code was generated by a tool.
+                                //
+                                //     Changes to this file may cause incorrect behavior and will be lost if the code is regenerated.
+                                // </auto-generated>
+                                //--------------------------------------------------------------------------------------------------
+
+                                namespace AutomaticInterfaceExample
+                                {
+                                    [global::System.CodeDom.Compiler.GeneratedCode("AutomaticInterface", "")]
+                                    public partial interface IDemoClass
+                                    {
+                                        /// <inheritdoc />
+                                        void AMethod(Func<Task<int>> getValue);
+                                        
+                                        /// <inheritdoc />
+                                        void AMethod(Func<Task<float>> getValue);
+                                        
+                                    }
+                                }
+
+                                """;
+        GenerateCode(code).Should().Be(expected);
+    }
+
     [Fact]
     public void WorksWithEventOverrides()
     {