Merge

iskiselev · Jul 22, 2016 · 84c476e · 84c476e
2 parents ca0eabc + 05aa209
commit 84c476e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/JSIL/DefinitelyTypedAssemblyEmitter.cs b/JSIL/DefinitelyTypedAssemblyEmitter.cs
@@ -626,7 +626,7 @@ public static bool WriteTypeReference (this JavascriptFormatter formatter, TypeR
                          * It could be improved, by we really need generic variance support or support of:
                          type T = something & I<T> (see Microsoft/TypeScript#6230)
                          */
-                        var fixedMode = (replaceMode != ReplaceMode.Instance && context == definition) ? ReplaceMode.Instance : replaceMode;
+                        var fixedMode = (replaceMode != ReplaceMode.Instance && IsCircularRef(definition, context)) ? ReplaceMode.Instance : replaceMode;
                         formatter.TRSuffix(fixedMode);
                     }
                     else {
@@ -639,6 +639,27 @@ public static bool WriteTypeReference (this JavascriptFormatter formatter, TypeR
             return true;
         }
 
+        public static bool IsCircularRef (TypeReference type, TypeDefinition context) {
+            if (type is GenericParameter) {
+                return false;
+            }
+            if (type is ArrayType) {
+                return IsCircularRef(((ArrayType) type).ElementType, context);
+            }
+            if (type is GenericInstanceType) {
+                var gt = (GenericInstanceType) type;
+                foreach (var genericArgument in gt.GenericArguments) {
+                    if (IsCircularRef(genericArgument, context)) {
+                        return true;
+                    }
+                }
+            }
+            if (type.Resolve() == context) {
+                return true;
+            };
+            return false;
+        }
+
         public static void CommaSeparatedList<T> (this JavascriptFormatter formatter, IEnumerable<T> list, Action<T> process) {
             bool first = true;
             foreach (var item in list) {

diff --git a/Tests/SimpleTestCasesForTranslatedBcl/Issue1008_MethodReturnType.cs b/Tests/SimpleTestCasesForTranslatedBcl/Issue1008_MethodReturnType.cs
@@ -7,32 +7,32 @@ public static void Main()
     {
         Expression<Action> exp = () => Method1<Test>();
         var returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(Test) == returnType ? "true" : "false");
 
         exp = () => Method1<int>();
         returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(int) == returnType ? "true" : "false");
 
         exp = () => Method2<Test>();
         returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(Holder<Test>) == returnType ? "true" : "false");
 
         exp = () => Method2<int>();
         returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(Holder<int>) == returnType ? "true" : "false");
 
         exp = () => Method3<Test>();
         returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(Test[]) == returnType ? "true" : "false");
 
         exp = () => Method3<int>();
         returnType = ((MethodCallExpression)exp.Body).Method.ReturnType;
-        Console.WriteLine(returnType.GetType().FullName);
+        Console.WriteLine(returnType.GetType().IsSubclassOf(typeof(Type)) ? "true" : "false");
         Console.WriteLine(typeof(int[]) == returnType ? "true" : "false");
     }