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

Merge pull request #3772 from Microsoft/allowModifier

Browse source 
Allow modifier on class member for classDeclaration/classExpression inside function
This commit is contained in:
Yui 2015-07-08 14:34:41 -07:00
parent aaf0f78553 8e15a42632
commit 42bff6bc77
9 changed files with 155 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/compiler/checker.ts
View file

@ -11448,31 +11448,18 @@ namespace ts {
forEach(node.declarationList.declarations, checkSourceElement);
}
function checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node: Node) {
if (node.modifiers) {
if (inBlockOrObjectLiteralExpression(node)) {
if (isAsyncFunctionLike(node)) {
if (node.modifiers.length > 1) {
return grammarErrorOnFirstToken(node, Diagnostics.Modifiers_cannot_appear_here);
}
}
else {
function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node: Node) {
// We only disallow modifier on a method declaration if it is a property of object-literal-expression
if (node.modifiers && node.parent.kind === SyntaxKind.ObjectLiteralExpression){
if (isAsyncFunctionLike(node)) {
if (node.modifiers.length > 1) {
return grammarErrorOnFirstToken(node, Diagnostics.Modifiers_cannot_appear_here);
}
}
}
}
function inBlockOrObjectLiteralExpression(node: Node) {
while (node) {
if (node.kind === SyntaxKind.Block || node.kind === SyntaxKind.ObjectLiteralExpression) {
return true;
else {
return grammarErrorOnFirstToken(node, Diagnostics.Modifiers_cannot_appear_here);
}
node = node.parent;
}
return false;
}
function checkExpressionStatement(node: ExpressionStatement) {
@ -15030,7 +15017,7 @@ namespace ts {
}
function checkGrammarMethod(node: MethodDeclaration) {
if (checkGrammarDisallowedModifiersInBlockOrObjectLiteralExpression(node) ||
if (checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) ||
checkGrammarFunctionLikeDeclaration(node) ||
checkGrammarForGenerator(node)) {
return true;

25
tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.js Normal file
View file

@ -0,0 +1,25 @@
//// [modifierOnClassDeclarationMemberInFunction.ts]
function f() {
class C {
public baz = 1;
static foo() { }
public bar() { }
}
}
//// [modifierOnClassDeclarationMemberInFunction.js]
function f() {
var C = (function () {
function C() {
this.baz = 1;
}
C.foo = function () { };
C.prototype.bar = function () { };
return C;
})();
}
//// [modifierOnClassDeclarationMemberInFunction.d.ts]
declare function f(): void;

18
tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.symbols Normal file
View file

@ -0,0 +1,18 @@
=== tests/cases/conformance/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction.ts ===
function f() {
>f : Symbol(f, Decl(modifierOnClassDeclarationMemberInFunction.ts, 0, 0))
class C {
>C : Symbol(C, Decl(modifierOnClassDeclarationMemberInFunction.ts, 1, 14))
public baz = 1;
>baz : Symbol(baz, Decl(modifierOnClassDeclarationMemberInFunction.ts, 2, 13))
static foo() { }
>foo : Symbol(C.foo, Decl(modifierOnClassDeclarationMemberInFunction.ts, 3, 23))
public bar() { }
>bar : Symbol(bar, Decl(modifierOnClassDeclarationMemberInFunction.ts, 4, 24))
}
}

19
tests/baselines/reference/modifierOnClassDeclarationMemberInFunction.types Normal file
View file

@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction.ts ===
function f() {
>f : () => void
class C {
>C : C
public baz = 1;
>baz : number
>1 : number
static foo() { }
>foo : () => void
public bar() { }
>bar : () => void
}
}

25
tests/baselines/reference/modifierOnClassExpressionMemberInFunction.js Normal file
View file

@ -0,0 +1,25 @@
//// [modifierOnClassExpressionMemberInFunction.ts]
function g() {
var x = class C {
public prop1 = 1;
private foo() { }
static prop2 = 43;
}
}
//// [modifierOnClassExpressionMemberInFunction.js]
function g() {
var x = (function () {
function C() {
this.prop1 = 1;
}
C.prototype.foo = function () { };
C.prop2 = 43;
return C;
})();
}
//// [modifierOnClassExpressionMemberInFunction.d.ts]
declare function g(): void;

19
tests/baselines/reference/modifierOnClassExpressionMemberInFunction.symbols Normal file
View file

@ -0,0 +1,19 @@
=== tests/cases/conformance/classes/classExpressions/modifierOnClassExpressionMemberInFunction.ts ===
function g() {
>g : Symbol(g, Decl(modifierOnClassExpressionMemberInFunction.ts, 0, 0))
var x = class C {
>x : Symbol(x, Decl(modifierOnClassExpressionMemberInFunction.ts, 2, 7))
>C : Symbol(C, Decl(modifierOnClassExpressionMemberInFunction.ts, 2, 11))
public prop1 = 1;
>prop1 : Symbol(C.prop1, Decl(modifierOnClassExpressionMemberInFunction.ts, 2, 21))
private foo() { }
>foo : Symbol(C.foo, Decl(modifierOnClassExpressionMemberInFunction.ts, 3, 25))
static prop2 = 43;
>prop2 : Symbol(C.prop2, Decl(modifierOnClassExpressionMemberInFunction.ts, 4, 25))
}
}

22
tests/baselines/reference/modifierOnClassExpressionMemberInFunction.types Normal file
View file

@ -0,0 +1,22 @@
=== tests/cases/conformance/classes/classExpressions/modifierOnClassExpressionMemberInFunction.ts ===
function g() {
>g : () => void
var x = class C {
>x : typeof C
>class C { public prop1 = 1; private foo() { } static prop2 = 43; } : typeof C
>C : typeof C
public prop1 = 1;
>prop1 : number
>1 : number
private foo() { }
>foo : () => void
static prop2 = 43;
>prop2 : number
>43 : number
}
}

9
tests/cases/conformance/classes/classDeclarations/modifierOnClassDeclarationMemberInFunction.ts Normal file
View file

@ -0,0 +1,9 @@
// @declaration: true
function f() {
class C {
public baz = 1;
static foo() { }
public bar() { }
}
}

10
tests/cases/conformance/classes/classExpressions/modifierOnClassExpressionMemberInFunction.ts Normal file
View file

@ -0,0 +1,10 @@
// @declaration: true
// @declaration: true
function g() {
var x = class C {
public prop1 = 1;
private foo() { }
static prop2 = 43;
}
}