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

Fix declaration emit for cross-file enums (#28237)

Browse Source
This commit is contained in:
Wesley Wigham
2018-10-30 14:55:01 -07:00
committed by GitHub
parent 0481d44501
commit 4cfff8962c
6 changed files with 188 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/checker.ts
View File

@@ -3222,15 +3222,17 @@ namespace ts {
}
if (type.flags & TypeFlags.EnumLiteral && !(type.flags & TypeFlags.Union)) {
const parentSymbol = getParentOfSymbol(type.symbol)!;
const parentName = symbolToName(parentSymbol, context, SymbolFlags.Type, /*expectsIdentifier*/ false);
const enumLiteralName = getDeclaredTypeOfSymbol(parentSymbol) === type ? parentName : createQualifiedName(parentName, symbolName(type.symbol));
context.approximateLength += symbolName(type.symbol).length;
return createTypeReferenceNode(enumLiteralName, /*typeArguments*/ undefined);
const parentName = symbolToTypeNode(parentSymbol, context, SymbolFlags.Type);
const enumLiteralName = getDeclaredTypeOfSymbol(parentSymbol) === type
? parentName
: appendReferenceToType(
parentName as TypeReferenceNode | ImportTypeNode,
createTypeReferenceNode(symbolName(type.symbol), /*typeArguments*/ undefined)
);
return enumLiteralName;
}
if (type.flags & TypeFlags.EnumLike) {
const name = symbolToName(type.symbol, context, SymbolFlags.Type, /*expectsIdentifier*/ false);
context.approximateLength += symbolName(type.symbol).length;
return createTypeReferenceNode(name, /*typeArguments*/ undefined);
return symbolToTypeNode(type.symbol, context, SymbolFlags.Type);
}
if (type.flags & TypeFlags.StringLiteral) {
context.approximateLength += ((<StringLiteralType>type).value.length + 2);