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.

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

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

Merged
merged 10 commits into from Mar 10, 2022
2 changes: 1 addition & 1 deletion packages/babel-parser/src/util/scope.js
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
@@ -0,0 +1,6 @@
class X {
Yokubjon-J marked this conversation as resolved.
Show resolved Hide resolved
static {
var x;
function x() {}
}
}
@@ -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": []
}
}