Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use scope flags to check arguments #10801

Merged
merged 2 commits into from
Dec 5, 2019
Merged

Use scope flags to check arguments #10801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bde7e8
chore: add test case
JLHwung Dec 3, 2019
dd005fb
use scope flags to check arguments
JLHwung Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/babel-parser/src/parser/expression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2208,7 +2208,11 @@ export default class ExpressionParser extends LValParser {
}
}

if (this.state.inClassProperty && word === "arguments") {
if (
this.scope.inClass &&
!this.scope.inNonArrowFunction &&
word === "arguments"
) {
this.raise(
startLoc,
"'arguments' is not allowed in class field initializer",
Expand Down
5 changes: 4 additions & 1 deletion packages/babel-parser/src/util/scope.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ export default class ScopeHandler<IScope: Scope = Scope> {
get allowDirectSuper() {
return (this.currentThisScope().flags & SCOPE_DIRECT_SUPER) > 0;
}
get inClass() {
return (this.currentThisScope().flags & SCOPE_CLASS) > 0;
}
get inNonArrowFunction() {
return (this.currentThisScope().flags & SCOPE_FUNCTION) > 0;
}
Expand Down Expand Up @@ -199,7 +202,7 @@ export default class ScopeHandler<IScope: Scope = Scope> {
}
}

// Could be useful for `this`, `new.target`, `super()`, `super.property`, and `super[property]`.
// Could be useful for `arguments`, `this`, `new.target`, `super()`, `super.property`, and `super[property]`.
// $FlowIgnore
currentThisScope(): IScope {
for (let i = this.scopeStack.length - 1; ; i--) {
Expand Down
5 changes: 5 additions & 0 deletions ...xperimental/class-properties/arguments-in-nested-class-decorator-call-expression/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function fn() {
class A {
foo = class B { @bar(arguments) foo };
}
}
3 changes: 3 additions & 0 deletions ...imental/class-properties/arguments-in-nested-class-decorator-call-expression/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["classProperties", ["decorators", { "decoratorsBeforeExport": false }]]
}
328 changes: 328 additions & 0 deletions ...rimental/class-properties/arguments-in-nested-class-decorator-call-expression/output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,328 @@
{
"type": "File",
"start": 0,
"end": 76,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"errors": [
"SyntaxError: 'arguments' is not allowed in class field initializer (3:25)"
],
"program": {
"type": "Program",
"start": 0,
"end": 76,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "FunctionDeclaration",
"start": 0,
"end": 76,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"id": {
"type": "Identifier",
"start": 9,
"end": 11,
"loc": {
"start": {
"line": 1,
"column": 9
},
"end": {
"line": 1,
"column": 11
},
"identifierName": "fn"
},
"name": "fn"
},
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start": 14,
"end": 76,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 5,
"column": 1
}
},
"body": [
{
"type": "ClassDeclaration",
"start": 18,
"end": 74,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 4,
"column": 3
}
},
"id": {
"type": "Identifier",
"start": 24,
"end": 25,
"loc": {
"start": {
"line": 2,
"column": 8
},
"end": {
"line": 2,
"column": 9
},
"identifierName": "A"
},
"name": "A"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 26,
"end": 74,
"loc": {
"start": {
"line": 2,
"column": 10
},
"end": {
"line": 4,
"column": 3
}
},
"body": [
{
"type": "ClassProperty",
"start": 32,
"end": 70,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 42
}
},
"static": false,
"key": {
"type": "Identifier",
"start": 32,
"end": 35,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 7
},
"identifierName": "foo"
},
"name": "foo"
},
"computed": false,
"value": {
"type": "ClassExpression",
"start": 38,
"end": 69,
"loc": {
"start": {
"line": 3,
"column": 10
},
"end": {
"line": 3,
"column": 41
}
},
"id": {
"type": "Identifier",
"start": 44,
"end": 45,
"loc": {
"start": {
"line": 3,
"column": 16
},
"end": {
"line": 3,
"column": 17
},
"identifierName": "B"
},
"name": "B"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start": 46,
"end": 69,
"loc": {
"start": {
"line": 3,
"column": 18
},
"end": {
"line": 3,
"column": 41
}
},
"body": [
{
"type": "ClassProperty",
"start": 48,
"end": 67,
"loc": {
"start": {
"line": 3,
"column": 20
},
"end": {
"line": 3,
"column": 39
}
},
"decorators": [
{
"type": "Decorator",
"start": 48,
"end": 63,
"loc": {
"start": {
"line": 3,
"column": 20
},
"end": {
"line": 3,
"column": 35
}
},
"expression": {
"type": "CallExpression",
"start": 49,
"end": 63,
"loc": {
"start": {
"line": 3,
"column": 21
},
"end": {
"line": 3,
"column": 35
}
},
"callee": {
"type": "Identifier",
"start": 49,
"end": 52,
"loc": {
"start": {
"line": 3,
"column": 21
},
"end": {
"line": 3,
"column": 24
},
"identifierName": "bar"
},
"name": "bar"
},
"arguments": [
{
"type": "Identifier",
"start": 53,
"end": 62,
"loc": {
"start": {
"line": 3,
"column": 25
},
"end": {
"line": 3,
"column": 34
},
"identifierName": "arguments"
},
"name": "arguments"
}
]
}
}
],
"static": false,
"key": {
"type": "Identifier",
"start": 64,
"end": 67,
"loc": {
"start": {
"line": 3,
"column": 36
},
"end": {
"line": 3,
"column": 39
},
"identifierName": "foo"
},
"name": "foo"
},
"computed": false,
"value": null
}
]
}
}
}
]
}
}
],
"directives": []
}
}
],
"directives": []
}
}
5 changes: 5 additions & 0 deletions ...bel-parser/test/fixtures/experimental/class-properties/arguments-in-nested-class/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function fn() {
class A {
foo = class B { bar() { arguments } };
}
}
3 changes: 3 additions & 0 deletions ...parser/test/fixtures/experimental/class-properties/arguments-in-nested-class/options.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["classProperties"]
}