microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-06 15:03:14 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix inTypeAlias logic

Browse Source
This commit is contained in:
Arthur Ozga
2017-05-05 12:39:47 -07:00
parent 1774c67afa
commit d2bda47e80
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/checker.ts
View File

@@ -2297,7 +2297,6 @@ namespace ts {
InFirstTypeArgument: boolean; // Writing first type argument of the instantiated type
// TODO: ???
InTypeAlias: boolean; // Writing type in type alias declaration
checkAlias: boolean;
symbolStack: Symbol[] | undefined;
}
@@ -2310,7 +2309,6 @@ namespace ts {
InElementType: false,
InFirstTypeArgument: false,
InTypeAlias: false,
checkAlias: true,
symbolStack: undefined
};
}
@@ -2319,6 +2317,8 @@ namespace ts {
const InElementType = context.InElementType;
// TODO: why doesn't tts unset the flag?
context.InElementType = false;
const inTypeAlias = context.InTypeAlias;
context.InTypeAlias = false;
// TODO: should be assert?
if (!type) {
@@ -2406,12 +2406,11 @@ namespace ts {
return createTypeReferenceNode(name, /*typeArguments*/ undefined);
}
if (!context.InTypeAlias && context.checkAlias && type.aliasSymbol) {
if (!inTypeAlias && type.aliasSymbol) {
const name = symbolToName(type.aliasSymbol, /*expectsIdentifier*/ false, context);
const typeArgumentNodes = type.aliasTypeArguments && mapToTypeNodeArray(type.aliasTypeArguments, /*addInElementTypeFlag*/ false);
return createTypeReferenceNode(name, typeArgumentNodes);
}
context.checkAlias = false;
if (type.flags & (TypeFlags.Union | TypeFlags.Intersection)) {
const types = type.flags & TypeFlags.Union ? formatUnionTypes((<UnionType>type).types) : (<IntersectionType>type).types;