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

Fix object type literal regression

Browse Source
This commit is contained in:
Nathan Yee 2015-11-20 13:31:17 -08:00
parent c93f454549
commit 40a2a2584d
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/diagnosticMessages.json
View File

@ -783,7 +783,7 @@
"category": "Error",
"code": 1245
},
"An interface property cannot have an initializer.": {
"An object type property cannot have an initializer.": {
"category": "Error",
"code": 1246
},

18
src/compiler/parser.ts
View File

@ -2230,7 +2230,6 @@ namespace ts {
const fullStart = scanner.getStartPos();
const name = parsePropertyName();
const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
const modifiers = parseModifiers();
if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.LessThanToken) {
const method = <MethodSignature>createNode(SyntaxKind.MethodSignature, fullStart);
@ -2251,21 +2250,8 @@ namespace ts {
// Although interfaces cannot not have initializers, we attempt to parse an initializer
// so we can report that an interface cannot have an initializer.
//
// For instance properties specifically, since they are evaluated inside the constructor,
// we do *not * want to parse yield expressions, so we specifically turn the yield context
// off. The grammar would look something like this:
//
// MemberVariableDeclaration[Yield]:
// AccessibilityModifier_opt PropertyName TypeAnnotation_opt Initialiser_opt[In];
// AccessibilityModifier_opt static_opt PropertyName TypeAnnotation_opt Initialiser_opt[In, ?Yield];
//
// The checker may still error in the static case to explicitly disallow the yield expression.
const initializer = modifiers && modifiers.flags & NodeFlags.Static
? allowInAnd(parseNonParameterInitializer)
: doOutsideOfContext(ParserContextFlags.Yield | ParserContextFlags.DisallowIn, parseNonParameterInitializer);
if (initializer !== undefined) {
parseErrorAtCurrentToken(Diagnostics.An_interface_property_cannot_have_an_initializer);
if (token === SyntaxKind.EqualsToken && lookAhead(() => parseNonParameterInitializer()) !== undefined) {
parseErrorAtCurrentToken(Diagnostics.An_object_type_property_cannot_have_an_initializer);
}
parseTypeMemberSemicolon();