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

Allow variable and function with the same name in static blocks #14344

Merged
merged 10 commits into from Mar 10, 2022
Merged

Allow variable and function with the same name in static blocks #14344

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e95deb
solution to [Bug]: Parser throws when var declaration and function de…
Yokubjon-J Mar 7, 2022
523b587
removed SCOPE_FUNCTION addition in statement.js (babel-parser)
Yokubjon-J Mar 7, 2022
4c62c68
Update packages/babel-parser/src/util/scope.js
Yokubjon-J Mar 7, 2022
65e0a44
Undo unrelated changes
nicolo-ribaudo Mar 9, 2022
12baa1b
test case in new subdir
Yokubjon-J Mar 10, 2022
48b5791
import typeof.js
Yokubjon-J Mar 10, 2022
56b67a0
import typeof.js
Yokubjon-J Mar 10, 2022
3d4ae5e
import typeof.js in babel-runtime
Yokubjon-J Mar 10, 2022
aab6125
import correct typeof.js in corejs2 and 3 in esm
Yokubjon-J Mar 10, 2022
5bedc6c
removed 2 unneeded tests from es2015
Yokubjon-J Mar 10, 2022
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
2 changes: 1 addition & 1 deletion packages/babel-parser/src/util/scope.js
View file
Open in desktop
Expand Up @@ -103,7 +103,7 @@ export default class ScopeHandler<IScope: Scope = Scope> {
// > treated like var declarations rather than like lexical declarations.
treatFunctionsAsVarInScope(scope: IScope): boolean {
return !!(
scope.flags & SCOPE_FUNCTION ||
scope.flags & (SCOPE_FUNCTION | SCOPE_STATIC_BLOCK) ||
(!this.parser.inModule && scope.flags & SCOPE_PROGRAM)
);
}
Expand Down
1 change: 1 addition & 0 deletions ...ages/babel-parser/test/fixtures/es2015/class/static-block-var-and-func-same-name/input.js
View file
Open in desktop
@@ -0,0 +1 @@
class X { static { var x; function x() {} } }
70 changes: 70 additions & 0 deletions ...s/babel-parser/test/fixtures/es2015/class/static-block-var-and-func-same-name/output.json
View file
Open in desktop
@@ -0,0 +1,70 @@
{
"type": "File",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"program": {
"type": "Program",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":7,"index":7},"identifierName":"X"},
"name": "X"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":8,"end":45,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":45,"index":45}},
"body": [
{
"type": "StaticBlock",
"start":10,"end":43,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":43,"index":43}},
"body": [
{
"type": "VariableDeclaration",
"start":19,"end":25,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":25,"index":25}},
"declarations": [
{
"type": "VariableDeclarator",
"start":23,"end":24,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":24,"index":24}},
"id": {
"type": "Identifier",
"start":23,"end":24,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":24,"index":24},"identifierName":"x"},
"name": "x"
},
"init": null
}
],
"kind": "var"
},
{
"type": "FunctionDeclaration",
"start":26,"end":41,"loc":{"start":{"line":1,"column":26,"index":26},"end":{"line":1,"column":41,"index":41}},
"id": {
"type": "Identifier",
"start":35,"end":36,"loc":{"start":{"line":1,"column":35,"index":35},"end":{"line":1,"column":36,"index":36},"identifierName":"x"},
"name": "x"
},
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":39,"end":41,"loc":{"start":{"line":1,"column":39,"index":39},"end":{"line":1,"column":41,"index":41}},
"body": [],
"directives": []
}
}
]
}
]
}
}
],
"directives": []
}
}
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/es2015/class/static-block/input.js
View file
Open in desktop
@@ -0,0 +1 @@
class X { static { var x; function x() {} } }
70 changes: 70 additions & 0 deletions packages/babel-parser/test/fixtures/es2015/class/static-block/output.json
View file
Open in desktop
@@ -0,0 +1,70 @@
{
"type": "File",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"program": {
"type": "Program",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":45,"index":45}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":7,"index":7},"identifierName":"X"},
"name": "X"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":8,"end":45,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":45,"index":45}},
"body": [
{
"type": "StaticBlock",
"start":10,"end":43,"loc":{"start":{"line":1,"column":10,"index":10},"end":{"line":1,"column":43,"index":43}},
"body": [
{
"type": "VariableDeclaration",
"start":19,"end":25,"loc":{"start":{"line":1,"column":19,"index":19},"end":{"line":1,"column":25,"index":25}},
"declarations": [
{
"type": "VariableDeclarator",
"start":23,"end":24,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":24,"index":24}},
"id": {
"type": "Identifier",
"start":23,"end":24,"loc":{"start":{"line":1,"column":23,"index":23},"end":{"line":1,"column":24,"index":24},"identifierName":"x"},
"name": "x"
},
"init": null
}
],
"kind": "var"
},
{
"type": "FunctionDeclaration",
"start":26,"end":41,"loc":{"start":{"line":1,"column":26,"index":26},"end":{"line":1,"column":41,"index":41}},
"id": {
"type": "Identifier",
"start":35,"end":36,"loc":{"start":{"line":1,"column":35,"index":35},"end":{"line":1,"column":36,"index":36},"identifierName":"x"},
"name": "x"
},
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":39,"end":41,"loc":{"start":{"line":1,"column":39,"index":39},"end":{"line":1,"column":41,"index":41}},
"body": [],
"directives": []
}
}
]
}
]
}
}
],
"directives": []
}
}
6 changes: 6 additions & 0 deletions .../test/fixtures/es2022/class-private-names-duplicated/static-block-duplicate-name/input.js
View file
Open in desktop
@@ -0,0 +1,6 @@
class X {
Yokubjon-J marked this conversation as resolved.
Show resolved Hide resolved
static {
var x;
function x() {}
}
}
70 changes: 70 additions & 0 deletions ...st/fixtures/es2022/class-private-names-duplicated/static-block-duplicate-name/output.json
View file
Open in desktop
@@ -0,0 +1,70 @@
{
"type": "File",
"start":0,"end":65,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":6,"column":1,"index":65}},
"program": {
"type": "Program",
"start":0,"end":65,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":6,"column":1,"index":65}},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":65,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":6,"column":1,"index":65}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6,"index":6},"end":{"line":1,"column":7,"index":7},"identifierName":"X"},
"name": "X"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":8,"end":65,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":6,"column":1,"index":65}},
"body": [
{
"type": "StaticBlock",
"start":14,"end":63,"loc":{"start":{"line":2,"column":4,"index":14},"end":{"line":5,"column":5,"index":63}},
"body": [
{
"type": "VariableDeclaration",
"start":29,"end":35,"loc":{"start":{"line":3,"column":6,"index":29},"end":{"line":3,"column":12,"index":35}},
"declarations": [
{
"type": "VariableDeclarator",
"start":33,"end":34,"loc":{"start":{"line":3,"column":10,"index":33},"end":{"line":3,"column":11,"index":34}},
"id": {
"type": "Identifier",
"start":33,"end":34,"loc":{"start":{"line":3,"column":10,"index":33},"end":{"line":3,"column":11,"index":34},"identifierName":"x"},
"name": "x"
},
"init": null
}
],
"kind": "var"
},
{
"type": "FunctionDeclaration",
"start":42,"end":57,"loc":{"start":{"line":4,"column":6,"index":42},"end":{"line":4,"column":21,"index":57}},
"id": {
"type": "Identifier",
"start":51,"end":52,"loc":{"start":{"line":4,"column":15,"index":51},"end":{"line":4,"column":16,"index":52},"identifierName":"x"},
"name": "x"
},
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":55,"end":57,"loc":{"start":{"line":4,"column":19,"index":55},"end":{"line":4,"column":21,"index":57}},
"body": [],
"directives": []
}
}
]
}
]
}
}
],
"directives": []
}
}
2 changes: 1 addition & 1 deletion packages/babel-runtime-corejs2/helpers/esm/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
import _typeof from "./typeof.js";
import _typeof from "@babel/runtime-corejs2/helpers/typeof";
import assertThisInitialized from "./assertThisInitialized.js";
export default function _possibleConstructorReturn(self, call) {
if (call && (_typeof(call) === "object" || typeof call === "function")) {
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-runtime-corejs2/helpers/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _typeof = require("./typeof.js")["default"];
var _typeof = require("@babel/runtime-corejs2/helpers/typeof")["default"];

var assertThisInitialized = require("./assertThisInitialized.js");

Expand Down
2 changes: 1 addition & 1 deletion packages/babel-runtime-corejs3/helpers/esm/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
import _typeof from "./typeof.js";
import _typeof from "@babel/runtime-corejs3/helpers/typeof";
Yokubjon-J marked this conversation as resolved.
Show resolved Hide resolved
import assertThisInitialized from "./assertThisInitialized.js";
export default function _possibleConstructorReturn(self, call) {
if (call && (_typeof(call) === "object" || typeof call === "function")) {
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-runtime-corejs3/helpers/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _typeof = require("./typeof.js")["default"];
var _typeof = require("@babel/runtime-corejs3/helpers/typeof")["default"];

var assertThisInitialized = require("./assertThisInitialized.js");

Expand Down
2 changes: 1 addition & 1 deletion packages/babel-runtime/helpers/esm/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
import _typeof from "./typeof.js";
import _typeof from "@babel/runtime/helpers/typeof";
import assertThisInitialized from "./assertThisInitialized.js";
export default function _possibleConstructorReturn(self, call) {
if (call && (_typeof(call) === "object" || typeof call === "function")) {
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-runtime/helpers/possibleConstructorReturn.js
View file
Open in desktop
@@ -1,4 +1,4 @@
var _typeof = require("./typeof.js")["default"];
var _typeof = require("@babel/runtime/helpers/typeof")["default"];

var assertThisInitialized = require("./assertThisInitialized.js");

Expand Down