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

fix: Exclude catch clause from let identifier error #10559

Merged
merged 5 commits into from Oct 17, 2019
Merged

fix: Exclude catch clause from let identifier error #10559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd04de3
Exclude catch clause from let identifier error
zant Oct 15, 2019
ecba7a5
Disallow let binding based on parameter
zant Oct 16, 2019
a14341c
Add test
zant Oct 16, 2019
7eb1a77
Remove unused getter
zant Oct 16, 2019
6c1afd0
Update packages/babel-parser/src/parser/statement.js
zant Oct 16, 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
7 changes: 5 additions & 2 deletions packages/babel-parser/src/parser/lval.js
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ import type {
import type { Pos, Position } from "../util/location";
import { isStrictBindReservedWord } from "../util/identifier";
import { NodeUtils } from "./node";
import { type BindingTypes, BIND_NONE, BIND_LEXICAL } from "../util/scopeflags";
import { type BindingTypes, BIND_NONE } from "../util/scopeflags";

export default class LValParser extends NodeUtils {
// Forward-declaration: defined in expression.js
Expand Down Expand Up @@ -348,6 +348,7 @@ export default class LValParser extends NodeUtils {
bindingType: BindingTypes = BIND_NONE,
checkClashes: ?{ [key: string]: boolean },
contextDescription: string,
disallowLetBinding?: boolean,
): void {
switch (expr.type) {
case "Identifier":
Expand Down Expand Up @@ -383,7 +384,7 @@ export default class LValParser extends NodeUtils {
checkClashes[key] = true;
}
}
if (bindingType === BIND_LEXICAL && expr.name === "let") {
if (disallowLetBinding && expr.name === "let") {
this.raise(
expr.start,
"'let' is not allowed to be used as a name in 'let' or 'const' declarations.",
Expand All @@ -408,6 +409,7 @@ export default class LValParser extends NodeUtils {
bindingType,
checkClashes,
"object destructuring pattern",
disallowLetBinding,
);
}
break;
Expand All @@ -420,6 +422,7 @@ export default class LValParser extends NodeUtils {
bindingType,
checkClashes,
"array destructuring pattern",
disallowLetBinding,
);
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/babel-parser/src/parser/statement.js
View file
Open in desktop
Expand Up @@ -1021,6 +1021,7 @@ export default class StatementParser extends ExpressionParser {
kind === "var" ? BIND_VAR : BIND_LEXICAL,
undefined,
"variable declaration",
kind !== "var",
);
}

Expand Down
10 changes: 9 additions & 1 deletion packages/babel-parser/src/plugins/estree.js
View file
Open in desktop
Expand Up @@ -108,6 +108,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
bindingType: BindingTypes = BIND_NONE,
checkClashes: ?{ [key: string]: boolean },
contextDescription: string,
disallowLetBinding?: boolean,
): void {
switch (expr.type) {
case "ObjectPattern":
Expand All @@ -117,11 +118,18 @@ export default (superClass: Class<Parser>): Class<Parser> =>
bindingType,
checkClashes,
"object destructuring pattern",
disallowLetBinding,
);
});
break;
default:
super.checkLVal(expr, bindingType, checkClashes, contextDescription);
super.checkLVal(
expr,
bindingType,
checkClashes,
contextDescription,
disallowLetBinding,
);
}
}

Expand Down
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/es2015/let/let-at-catch-block/input.js
View file
Open in desktop
@@ -0,0 +1,3 @@
try {} catch (err) {
let let;
}
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/es2015/let/let-at-catch-block/options.json
View file
Open in desktop
@@ -0,0 +1,3 @@
{
"throws": "'let' is not allowed to be used as a name in 'let' or 'const' declarations. (2:6)"
}
1 change: 1 addition & 0 deletions packages/babel-parser/test/fixtures/es2015/let/try-catch-let/input.js
View file
Open in desktop
@@ -0,0 +1 @@
try {} catch (let) {}
117 changes: 117 additions & 0 deletions packages/babel-parser/test/fixtures/es2015/let/try-catch-let/output.json
View file
Open in desktop
@@ -0,0 +1,117 @@
{
"type": "File",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"program": {
"type": "Program",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "TryStatement",
"start": 0,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 21
}
},
"block": {
"type": "BlockStatement",
"start": 4,
"end": 6,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 1,
"column": 6
}
},
"body": [],
"directives": []
},
"handler": {
"type": "CatchClause",
"start": 7,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 21
}
},
"param": {
"type": "Identifier",
"start": 14,
"end": 17,
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 17
},
"identifierName": "let"
},
"name": "let"
},
"body": {
"type": "BlockStatement",
"start": 19,
"end": 21,
"loc": {
"start": {
"line": 1,
"column": 19
},
"end": {
"line": 1,
"column": 21
}
},
"body": [],
"directives": []
}
},
"finalizer": null
}
],
"directives": []
}
}