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

Move initializer checks into checkGrammarProperty

Browse source
This commit is contained in:
Nathan Yee 2015-11-27 22:17:35 -08:00
parent 6c755c90db
commit d9d67d9003
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/compiler/checker.ts
View file

@ -15735,16 +15735,6 @@ namespace ts {
}
}
// Report an error if an interface property has an initializer
if (node.members) {
const members = <NodeArray<PropertySignature>>node.members;
for (const element of members) {
if (element.initializer) {
return grammarErrorOnFirstToken(element.initializer, Diagnostics.An_interface_property_cannot_have_an_initializer);
}
}
}
return false;
}
@ -16095,18 +16085,6 @@ namespace ts {
}
}
if (node.type) {
const typeLiteralNode = <TypeLiteralNode>node.type;
if (typeLiteralNode.members) {
for (const element of typeLiteralNode.members) {
const propertySignature = <PropertySignature>element;
if (propertySignature.initializer) {
return grammarErrorOnNode(propertySignature.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer);
}
}
}
}
const checkLetConstNames = languageVersion >= ScriptTarget.ES6 && (isLet(node) || isConst(node));
// 1. LexicalDeclaration : LetOrConst BindingList ;
@ -16249,11 +16227,17 @@ namespace ts {
if (checkGrammarForNonSymbolComputedProperty(node.name, Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
return true;
}
if (node.initializer) {
return grammarErrorOnNode(node.initializer, Diagnostics.An_interface_property_cannot_have_an_initializer);
}
}
else if (node.parent.kind === SyntaxKind.TypeLiteral) {
if (checkGrammarForNonSymbolComputedProperty(node.name, Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
return true;
}
if (node.initializer) {
return grammarErrorOnNode(node.initializer, Diagnostics.An_object_type_literal_property_cannot_have_an_initializer);
}
}
if (isInAmbientContext(node) && node.initializer) {