microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-16 07:13:45 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Simplify literal/unique symbol widening

Browse Source
This commit is contained in:
Ron Buckton
2017-11-10 14:42:24 -08:00
parent d0fb7e42eb
commit b9dbf5d13b
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/compiler/checker.ts
View File

@@ -10666,16 +10666,6 @@ namespace ts {
type;
}
function getWidenedLiteralLikeType(type: Type): Type {
return type.flags & TypeFlags.EnumLiteral ? getBaseTypeOfEnumLiteralType(<LiteralType>type) :
type.flags & TypeFlags.StringLiteral && type.flags & TypeFlags.FreshLiteral ? stringType :
type.flags & TypeFlags.NumberLiteral && type.flags & TypeFlags.FreshLiteral ? numberType :
type.flags & TypeFlags.BooleanLiteral ? booleanType :
type.flags & TypeFlags.UniqueESSymbol ? esSymbolType :
type.flags & TypeFlags.Union ? getUnionType(sameMap((<UnionType>type).types, getWidenedLiteralLikeType)) :
type;
}
function getWidenedLiteralType(type: Type): Type {
return type.flags & TypeFlags.EnumLiteral ? getBaseTypeOfEnumLiteralType(<LiteralType>type) :
type.flags & TypeFlags.StringLiteral && type.flags & TypeFlags.FreshLiteral ? stringType :
@@ -10692,12 +10682,13 @@ namespace ts {
}
function getWidenedLiteralLikeTypeForContextualType(type: Type, contextualType: Type) {
const widenLiterals = !isLiteralContextualType(contextualType);
const widenSymbols = !isUniqueESSymbolContextualType(contextualType);
return widenLiterals && widenSymbols ? getWidenedLiteralLikeType(type) :
widenLiterals ? getWidenedLiteralType(type) :
widenSymbols ? getWidenedUniqueESSymbolType(type) :
type;
if (!isLiteralContextualType(contextualType)) {
type = getWidenedLiteralType(type);
}
if (!isUniqueESSymbolContextualType(contextualType)) {
type = getWidenedUniqueESSymbolType(type);
}
return type;
}
/**