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

move code around to consolidate checks in one place

Browse Source
This commit is contained in:
Vladimir Matveev
2014-10-27 00:17:22 -07:00
parent 365587f6bf
commit cb472eb52c
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/checker.ts
View File

@@ -7494,27 +7494,25 @@ module ts {
if (e.kind === SyntaxKind.Identifier) {
// unqualified names can refer to member that reside in different declaration of the enum so just doing name resolution won't work.
// instead pick symbol that correspond of enum declaration and later try to fetch member from the symbol
// instead pick current enum type and later try to fetch member from the type
enumType = currentType;
propertyName = (<Identifier>e).text;
}
else if (e.kind === SyntaxKind.IndexedAccess) {
if ((<IndexedAccess>e).index.kind !== SyntaxKind.StringLiteral) {
return undefined;
}
var enumType = getTypeOfNode((<IndexedAccess>e).object);
if (enumType !== currentType) {
return undefined;
}
propertyName = (<LiteralExpression>(<IndexedAccess>e).index).text;
}
else {
// left part in PropertyAccess should be resolved to the symbol of enum that declared 'member'
var enumType = getTypeOfNode((<PropertyAccess>e).left);
if (e.kind === SyntaxKind.IndexedAccess) {
if ((<IndexedAccess>e).index.kind !== SyntaxKind.StringLiteral) {
return undefined;
}
var enumType = getTypeOfNode((<IndexedAccess>e).object);
propertyName = (<LiteralExpression>(<IndexedAccess>e).index).text;
}
else {
var enumType = getTypeOfNode((<PropertyAccess>e).left);
propertyName = (<PropertyAccess>e).right.text;
}
if (enumType !== currentType) {
return undefined;
}
propertyName = (<PropertyAccess>e).right.text;
}
if (propertyName === undefined) {