Use external aliases in quickinfo and signature help return types (microsoft#24391)

weswigham · web-flow · commit 8f9c0861bc8d · 2018-05-24T15:19:57.000-07:00
* Dont include import types in quick info type names

* Add UseAliasDefinedOutsideCurrentScope flag to LS operations which were missing it
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2993,7 +2993,7 @@ namespace ts {
             }
         }
 
-        function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType, writer: EmitTextWriter = createTextWriter("")): string {
+        function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {
             const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) | NodeBuilderFlags.IgnoreErrors, writer);
             if (typeNode === undefined) return Debug.fail("should always get typenode");
             const options = { removeComments: true };
@@ -3941,7 +3941,7 @@ namespace ts {
             }
         }
 
-        function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags, writer?: EmitTextWriter): string {
+        function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer?: EmitTextWriter): string {
             return writer ? typePredicateToStringWorker(writer).getText() : usingSingleLineStringWriter(typePredicateToStringWorker);
 
             function typePredicateToStringWorker(writer: EmitTextWriter) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -1473,7 +1473,7 @@ namespace ts {
 
     export function typeToDisplayParts(typechecker: TypeChecker, type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.None): SymbolDisplayPart[] {
         return mapToDisplayParts(writer => {
-            typechecker.writeType(type, enclosingDeclaration, flags | TypeFormatFlags.MultilineObjectLiterals, writer);
+            typechecker.writeType(type, enclosingDeclaration, flags | TypeFormatFlags.MultilineObjectLiterals | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer);
         });
     }
 
diff --git a/tests/cases/fourslash/crossFileQuickInfoExportedTypeDoesNotUseImportType.ts b/tests/cases/fourslash/crossFileQuickInfoExportedTypeDoesNotUseImportType.ts
@@ -0,0 +1,19 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: b.ts
+////export interface B {}
+////export function foob(): {
+////    x: B,
+////    y: B
+////} {
+////    return null as any;
+////}
+// @Filename: a.ts
+////import { foob } from "./b";
+////const thing/*1*/ = foob(/*2*/);
+
+verify.quickInfoAt("1", "const thing: {\n    x: B;\n    y: B;\n}");
+verify.signatureHelp({
+    marker: "2",
+    text: "foob(): { x: B; y: B; }"
+});

Original file line number	Diff line number	Diff line change
`@@ -2993,7 +2993,7 @@ namespace ts {`
`2993`	`2993`	`}`
`2994`	`2994`	`}`
`2995`	`2995`
`2996`		`- function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType, writer: EmitTextWriter = createTextWriter("")): string {`
	`2996`	`+ function typeToString(type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.AllowUniqueESSymbolType \| TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer: EmitTextWriter = createTextWriter("")): string {`
`2997`	`2997`	`const typeNode = nodeBuilder.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(flags) \| NodeBuilderFlags.IgnoreErrors, writer);`
`2998`	`2998`	`if (typeNode === undefined) return Debug.fail("should always get typenode");`
`2999`	`2999`	`const options = { removeComments: true };`
`@@ -3941,7 +3941,7 @@ namespace ts {`
`3941`	`3941`	`}`
`3942`	`3942`	`}`
`3943`	`3943`
`3944`		`- function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags, writer?: EmitTextWriter): string {`
	`3944`	`+ function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer?: EmitTextWriter): string {`
`3945`	`3945`	`return writer ? typePredicateToStringWorker(writer).getText() : usingSingleLineStringWriter(typePredicateToStringWorker);`
`3946`	`3946`
`3947`	`3947`	`function typePredicateToStringWorker(writer: EmitTextWriter) {`
Original file line number	Diff line number	Diff line change
`@@ -1473,7 +1473,7 @@ namespace ts {`
`1473`	`1473`
`1474`	`1474`	`export function typeToDisplayParts(typechecker: TypeChecker, type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.None): SymbolDisplayPart[] {`
`1475`	`1475`	`return mapToDisplayParts(writer => {`
`1476`		`- typechecker.writeType(type, enclosingDeclaration, flags \| TypeFormatFlags.MultilineObjectLiterals, writer);`
	`1476`	`+ typechecker.writeType(type, enclosingDeclaration, flags \| TypeFormatFlags.MultilineObjectLiterals \| TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer);`
`1477`	`1477`	`});`
`1478`	`1478`	`}`
`1479`	`1479`