Fix quickinfo display of deferred mapped types

sandersn · sandersn · commit b9fb4cce8809 · 2018-01-03T16:26:23.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3685,7 +3685,10 @@ namespace ts {
                         writePunctuation(writer, SyntaxKind.SemicolonToken);
                         writer.writeLine();
                     }
-                    buildIndexSignatureDisplay(resolved.stringIndexInfo, writer, IndexKind.String, enclosingDeclaration, globalFlags, symbolStack);
+                    const stringIndexInfo = resolved.objectFlags & ObjectFlags.Deferred && resolved.stringIndexInfo ?
+                        createIndexInfo(emptyObjectType, resolved.stringIndexInfo.isReadonly, resolved.stringIndexInfo.declaration) :
+                        resolved.stringIndexInfo;
+                    buildIndexSignatureDisplay(stringIndexInfo, writer, IndexKind.String, enclosingDeclaration, globalFlags, symbolStack);
                     buildIndexSignatureDisplay(resolved.numberIndexInfo, writer, IndexKind.Number, enclosingDeclaration, globalFlags, symbolStack);
                     for (const p of resolved.properties) {
                         if (globalFlags & TypeFormatFlags.WriteClassExpressionAsTypeLiteral) {
@@ -3696,7 +3699,7 @@ namespace ts {
                                 writer.reportPrivateInBaseOfClassExpression(symbolName(p));
                             }
                         }
-                        const t = getTypeOfSymbol(p);
+                        const t = getCheckFlags(p) & CheckFlags.Deferred ? emptyObjectType : getTypeOfSymbol(p);
                         if (p.flags & (SymbolFlags.Function | SymbolFlags.Method) && !getPropertiesOfObjectType(t).length) {
                             const signatures = getSignaturesOfType(t, SignatureKind.Call);
                             for (const signature of signatures) {
@@ -11325,7 +11328,7 @@ namespace ts {
                     return undefined;
                 }
             }
-            const deferred = createObjectType(ObjectFlags.Deferred | ObjectFlags.Anonymous, undefined) as DeferredMappedType;
+            const deferred = createObjectType(ObjectFlags.Deferred | ObjectFlags.Anonymous, /*symbol*/ undefined) as DeferredMappedType;
             deferred.source = source;
             deferred.mappedType = target;
             return deferred;

Original file line number	Diff line number	Diff line change
`@@ -3685,7 +3685,10 @@ namespace ts {`
`3685`	`3685`	`writePunctuation(writer, SyntaxKind.SemicolonToken);`
`3686`	`3686`	`writer.writeLine();`
`3687`	`3687`	`}`
`3688`		`- buildIndexSignatureDisplay(resolved.stringIndexInfo, writer, IndexKind.String, enclosingDeclaration, globalFlags, symbolStack);`
	`3688`	`+ const stringIndexInfo = resolved.objectFlags & ObjectFlags.Deferred && resolved.stringIndexInfo ?`
	`3689`	`+ createIndexInfo(emptyObjectType, resolved.stringIndexInfo.isReadonly, resolved.stringIndexInfo.declaration) :`
	`3690`	`+ resolved.stringIndexInfo;`
	`3691`	`+ buildIndexSignatureDisplay(stringIndexInfo, writer, IndexKind.String, enclosingDeclaration, globalFlags, symbolStack);`
`3689`	`3692`	`buildIndexSignatureDisplay(resolved.numberIndexInfo, writer, IndexKind.Number, enclosingDeclaration, globalFlags, symbolStack);`
`3690`	`3693`	`for (const p of resolved.properties) {`
`3691`	`3694`	`if (globalFlags & TypeFormatFlags.WriteClassExpressionAsTypeLiteral) {`
`@@ -3696,7 +3699,7 @@ namespace ts {`
`3696`	`3699`	`writer.reportPrivateInBaseOfClassExpression(symbolName(p));`
`3697`	`3700`	`}`
`3698`	`3701`	`}`
`3699`		`- const t = getTypeOfSymbol(p);`
	`3702`	`+ const t = getCheckFlags(p) & CheckFlags.Deferred ? emptyObjectType : getTypeOfSymbol(p);`
`3700`	`3703`	`if (p.flags & (SymbolFlags.Function \| SymbolFlags.Method) && !getPropertiesOfObjectType(t).length) {`
`3701`	`3704`	`const signatures = getSignaturesOfType(t, SignatureKind.Call);`
`3702`	`3705`	`for (const signature of signatures) {`
`@@ -11325,7 +11328,7 @@ namespace ts {`
`11325`	`11328`	`return undefined;`
`11326`	`11329`	`}`
`11327`	`11330`	`}`
`11328`		`- const deferred = createObjectType(ObjectFlags.Deferred \| ObjectFlags.Anonymous, undefined) as DeferredMappedType;`
	`11331`	`+ const deferred = createObjectType(ObjectFlags.Deferred \| ObjectFlags.Anonymous, /symbol/ undefined) as DeferredMappedType;`
`11329`	`11332`	`deferred.source = source;`
`11330`	`11333`	`deferred.mappedType = target;`
`11331`	`11334`	`return deferred;`