Expand type references recursively in cache key

sandersn · sandersn · commit c9d081eed49a · 2017-09-01T09:55:38.000-07:00
This means that `A&lt;B&lt;T, C&lt;U&gt;&gt;&gt;` will include the keys for `B` and `C`
now.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9782,8 +9782,8 @@ namespace ts {
             return type.flags & TypeFlags.TypeParameter && !getConstraintFromTypeParameter(<TypeParameter>type);
         }
 
-        function isTypeReferenceWithGenericArguments(type: Type) {
-            return getObjectFlags(type) & ObjectFlags.Reference && some((<TypeReference>type).typeArguments, isUnconstrainedTypeParameter);
+        function isTypeReferenceWithGenericArguments(type: Type): type is TypeReference {
+            return getObjectFlags(type) & ObjectFlags.Reference && some((<TypeReference>type).typeArguments, t => isUnconstrainedTypeParameter(t) || isTypeReferenceWithGenericArguments(t));
         }
 
         /**
@@ -9801,6 +9801,9 @@ namespace ts {
                     }
                     result += "=" + index;
                 }
+                else if (isTypeReferenceWithGenericArguments(t)) {
+                    result += "<" + getTypeReferenceId(t, typeParameters) + ">";
+                }
                 else {
                     result += "-" + t.id;
                 }
@@ -10050,7 +10053,7 @@ namespace ts {
                 getUnionType(types, /*subtypeReduction*/ true);
         }
 
-        function isArrayType(type: Type): boolean {
+        function isArrayType(type: Type): type is TypeReference {
             return getObjectFlags(type) & ObjectFlags.Reference && (<TypeReference>type).target === globalArrayType;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -9782,8 +9782,8 @@ namespace ts {`
`9782`	`9782`	`return type.flags & TypeFlags.TypeParameter && !getConstraintFromTypeParameter(<TypeParameter>type);`
`9783`	`9783`	`}`
`9784`	`9784`
`9785`		`- function isTypeReferenceWithGenericArguments(type: Type) {`
`9786`		`- return getObjectFlags(type) & ObjectFlags.Reference && some((<TypeReference>type).typeArguments, isUnconstrainedTypeParameter);`
	`9785`	`+ function isTypeReferenceWithGenericArguments(type: Type): type is TypeReference {`
	`9786`	`+ return getObjectFlags(type) & ObjectFlags.Reference && some((<TypeReference>type).typeArguments, t => isUnconstrainedTypeParameter(t) \|\| isTypeReferenceWithGenericArguments(t));`
`9787`	`9787`	`}`
`9788`	`9788`
`9789`	`9789`	`/**`
`@@ -9801,6 +9801,9 @@ namespace ts {`
`9801`	`9801`	`}`
`9802`	`9802`	`result += "=" + index;`
`9803`	`9803`	`}`
	`9804`	`+ else if (isTypeReferenceWithGenericArguments(t)) {`
	`9805`	`+ result += "<" + getTypeReferenceId(t, typeParameters) + ">";`
	`9806`	`+ }`
`9804`	`9807`	`else {`
`9805`	`9808`	`result += "-" + t.id;`
`9806`	`9809`	`}`
`@@ -10050,7 +10053,7 @@ namespace ts {`
`10050`	`10053`	`getUnionType(types, /subtypeReduction/ true);`
`10051`	`10054`	`}`
`10052`	`10055`
`10053`		`- function isArrayType(type: Type): boolean {`
	`10056`	`+ function isArrayType(type: Type): type is TypeReference {`
`10054`	`10057`	`return getObjectFlags(type) & ObjectFlags.Reference && (<TypeReference>type).target === globalArrayType;`
`10055`	`10058`	`}`
`10056`	`10059`