Skip to content

String valued members in enums #15486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahejlsberg merged 22 commits into from
May 17, 2017
Merged

String valued members in enums #15486

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8a1456f
Clean up computeEnumMemberValues function
ahejlsberg Apr 25, 2017
f61efe5
Accept new baselines
ahejlsberg Apr 25, 2017
19a1c2c
Store actual literal value in LiteralType instances
ahejlsberg Apr 26, 2017
a504022
Classify literal enum members and NumberLiteral/StringLiteral etc.
ahejlsberg Apr 28, 2017
50a37ce
Accept new baselines
ahejlsberg Apr 28, 2017
d2fdebe
Fix type-to-string handling of enum literal types
ahejlsberg Apr 28, 2017
9e7cdb4
Support string valued members in literal enums
ahejlsberg Apr 29, 2017
1f1af27
Update test
ahejlsberg Apr 29, 2017
be0fc3b
Accept new baselines
ahejlsberg Apr 29, 2017
63319d1
Treat enums with a single literal member as literal enums
ahejlsberg Apr 29, 2017
72e77a8
Accept new baselines
ahejlsberg Apr 29, 2017
106214a
Enum literal type is assignable to regular literal type with same value
ahejlsberg Apr 30, 2017
68036c5
Accept new baselines
ahejlsberg Apr 30, 2017
925d97d
Cache source and target flags in local variables
ahejlsberg Apr 30, 2017
3a96b24
Update comment
ahejlsberg Apr 30, 2017
21d8e9a
Update old test
ahejlsberg Apr 30, 2017
6548bcf
Add new tests
ahejlsberg Apr 30, 2017
640e8f5
Fix declaration emit for string valued enum members
ahejlsberg May 1, 2017
25a01c0
Accept new baselines
ahejlsberg May 1, 2017
ceb78f9
A couple of small simplifications
ahejlsberg May 1, 2017
947abf5
Merge branch 'master' into literalEnumTypes
ahejlsberg May 17, 2017
6a7b6d3
Accept new baselines
ahejlsberg May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Treat enums with a single literal member as literal enums
  • Loading branch information
@ahejlsberg
ahejlsberg committed Apr 29, 2017
commit 63319d1ed99fd7f2a4c5deb7f7599310c757a161
27 changes: 14 additions & 13 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3047,9 +3047,14 @@ namespace ts {
writeTypeReference(<TypeReference>type, nextFlags);
}
else if (type.flags & TypeFlags.EnumLiteral && !(type.flags & TypeFlags.Union)) {
buildSymbolDisplay(getParentOfSymbol(type.symbol), writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, nextFlags);
writePunctuation(writer, SyntaxKind.DotToken);
appendSymbolNameOnly(type.symbol, writer);
const parent = getParentOfSymbol(type.symbol);
buildSymbolDisplay(parent, writer, enclosingDeclaration, SymbolFlags.Type, SymbolFormatFlags.None, nextFlags);
// In a literal enum type with a single member E { A }, E and E.A denote the
// same type. We always display this type simply as E.
if (getDeclaredTypeOfSymbol(parent).flags & TypeFlags.Union) {
writePunctuation(writer, SyntaxKind.DotToken);
appendSymbolNameOnly(type.symbol, writer);
}
}
else if (getObjectFlags(type) & ObjectFlags.ClassOrInterface || type.flags & (TypeFlags.EnumLike | TypeFlags.TypeParameter)) {
// The specified symbol flags need to be reinterpreted as type flags
Expand Down Expand Up @@ -4952,23 +4957,19 @@ namespace ts {
if (declaration.kind === SyntaxKind.EnumDeclaration) {
for (const member of (<EnumDeclaration>declaration).members) {
const memberType = getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member));
getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
if (!contains(memberTypeList, memberType)) {
memberTypeList.push(memberType);
}
}
}
}
if (memberTypeList.length > 1) {
for (const declaration of symbol.declarations) {
if (declaration.kind === SyntaxKind.EnumDeclaration) {
for (const member of (<EnumDeclaration>declaration).members) {
getSymbolLinks(getSymbolOfNode(member)).declaredType = getLiteralType(getEnumMemberValue(member), enumCount, getSymbolOfNode(member));
}
}
}
if (memberTypeList.length) {
const enumType = getUnionType(memberTypeList, /*subtypeReduction*/ false, symbol, /*aliasTypeArguments*/ undefined);
enumType.flags |= TypeFlags.EnumLiteral;
enumType.symbol = symbol;
if (enumType.flags & TypeFlags.Union) {
enumType.flags |= TypeFlags.EnumLiteral;
enumType.symbol = symbol;
}
return links.declaredType = enumType;
}
}
Expand Down