maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Implement #5173

Browse source 
Give more helpful error when trying to set default values on an
interface
This commit is contained in:
Nathan Yee 2015-11-20 08:30:50 -08:00
parent 883b8d9347
commit c93f454549
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/diagnosticMessages.json
View file

@ -783,6 +783,10 @@
"category": "Error",
"code": 1245
},
"An interface property cannot have an initializer.": {
"category": "Error",
"code": 1246
},
"'with' statements are not allowed in an async function block.": {
"category": "Error",
@ -2418,7 +2422,7 @@
"Not all code paths return a value.": {
"category": "Error",
"code": 7030
},
},
"You cannot rename this element.": {
"category": "Error",
"code": 8000

21
src/compiler/parser.ts
View file

@ -2230,6 +2230,7 @@ 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);
@ -2247,6 +2248,26 @@ namespace ts {
property.name = name;
property.questionToken = questionToken;
property.type = parseTypeAnnotation();
// 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);
}
parseTypeMemberSemicolon();
return finishNode(property);
}