fix(jsii-dotnet-generator): Use FQ type returns in conflict. (#258)

costleya · Elad Ben-Israel · commit a78784ad5bb8 · 2018-10-10T07:19:34.000+03:00
Use fully-qualified types in return values when there is a conflict. Fixes #252
diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/SymbolMap.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/SymbolMap.cs
@@ -1,11 +1,12 @@
-﻿using Amazon.JSII.JsonModel.Spec;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using Amazon.JSII.JsonModel.Spec;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using Type = Amazon.JSII.JsonModel.Spec.Type;
+using TypeKind = Amazon.JSII.JsonModel.Spec.TypeKind;
 
 namespace Amazon.JSII.Generator
 {
@@ -53,7 +54,7 @@ TypeMetadata GetMetadata(Type type)
             {
                 switch (type.Kind)
                 {
-                    case JsonModel.Spec.TypeKind.Class:
+                    case TypeKind.Class:
                     {
                         var classType = (ClassType) type;
                         if (classType.IsAbstract)
@@ -62,11 +63,11 @@ TypeMetadata GetMetadata(Type type)
                         }
                         return new ClassTypeMetadata((ClassType)type, assembly);
                     }
-                    case JsonModel.Spec.TypeKind.Enum:
+                    case TypeKind.Enum:
                     {
                         return new EnumTypeMetadata((EnumType)type, assembly);   
                     }
-                    case JsonModel.Spec.TypeKind.Interface:
+                    case TypeKind.Interface:
                     {
                         return new InterfaceTypeMetadata((InterfaceType)type, assembly);   
                     }
@@ -415,7 +416,7 @@ public TypeSyntax GetTypeSyntax(TypeReference typeReference)
             {
                 Type type = GetTypeFromFullyQualifiedName(typeReference.FullyQualifiedName);
 
-                return SF.ParseTypeName(GetName(type));
+                return SF.ParseTypeName(GetName(type, true));
             }
 
             throw new ArgumentException("Invalid type reference", nameof(typeReference));
diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs
@@ -20,9 +20,9 @@ protected UseCalcBase(DeputyProps props): base(props)
         }
 
         [JsiiMethod("hello", "{\"fqn\":\"@scope/jsii-calc-base.Base\"}", "[]")]
-        public virtual Base Hello()
+        public virtual Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base Hello()
         {
-            return InvokeInstanceMethod<Base>(new object[]{});
+            return InvokeInstanceMethod<Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base>(new object[]{});
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-using Amazon.JSII.JsonModel.Spec;`
`2`		`-using Microsoft.CodeAnalysis;`
`3`		`-using Microsoft.CodeAnalysis.CSharp.Syntax;`
`4`		`-using System;`
	`1`	`+using System;`
`5`	`2`	`using System.Collections.Generic;`
`6`	`3`	`using System.Linq;`
	`4`	`+using Amazon.JSII.JsonModel.Spec;`
	`5`	`+using Microsoft.CodeAnalysis;`
	`6`	`+using Microsoft.CodeAnalysis.CSharp.Syntax;`
`7`	`7`	`using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;`
`8`	`8`	`using Type = Amazon.JSII.JsonModel.Spec.Type;`
	`9`	`+using TypeKind = Amazon.JSII.JsonModel.Spec.TypeKind;`
`9`	`10`
`10`	`11`	`namespace Amazon.JSII.Generator`
`11`	`12`	`{`
`@@ -53,7 +54,7 @@ TypeMetadata GetMetadata(Type type)`
`53`	`54`	`{`
`54`	`55`	`switch (type.Kind)`
`55`	`56`	`{`
`56`		`- case JsonModel.Spec.TypeKind.Class:`
	`57`	`+ case TypeKind.Class:`
`57`	`58`	`{`
`58`	`59`	`var classType = (ClassType) type;`
`59`	`60`	`if (classType.IsAbstract)`
`@@ -62,11 +63,11 @@ TypeMetadata GetMetadata(Type type)`
`62`	`63`	`}`
`63`	`64`	`return new ClassTypeMetadata((ClassType)type, assembly);`
`64`	`65`	`}`
`65`		`- case JsonModel.Spec.TypeKind.Enum:`
	`66`	`+ case TypeKind.Enum:`
`66`	`67`	`{`
`67`	`68`	`return new EnumTypeMetadata((EnumType)type, assembly);`
`68`	`69`	`}`
`69`		`- case JsonModel.Spec.TypeKind.Interface:`
	`70`	`+ case TypeKind.Interface:`
`70`	`71`	`{`
`71`	`72`	`return new InterfaceTypeMetadata((InterfaceType)type, assembly);`
`72`	`73`	`}`
`@@ -415,7 +416,7 @@ public TypeSyntax GetTypeSyntax(TypeReference typeReference)`
`415`	`416`	`{`
`416`	`417`	`Type type = GetTypeFromFullyQualifiedName(typeReference.FullyQualifiedName);`
`417`	`418`
`418`		`- return SF.ParseTypeName(GetName(type));`
	`419`	`+ return SF.ParseTypeName(GetName(type, true));`
`419`	`420`	`}`
`420`	`421`
`421`	`422`	`throw new ArgumentException("Invalid type reference", nameof(typeReference));`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ protected UseCalcBase(DeputyProps props): base(props)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[JsiiMethod("hello", "{\"fqn\":\"@scope/jsii-calc-base.Base\"}", "[]")]`
`23`		`- public virtual Base Hello()`
	`23`	`+ public virtual Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base Hello()`
`24`	`24`	`{`
`25`		`- return InvokeInstanceMethod<Base>(new object[]{});`
	`25`	`+ return InvokeInstanceMethod<Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Base>(new object[]{});`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`