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

(ts) Raise syntax error for an abstract method that has body #12687

Merged
merged 2 commits into from Mar 2, 2021
Merged

(ts) Raise syntax error for an abstract method that has body #12687

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
7e73d65
Raise syntax error for an abstract method has body
sosukesuzuki Jan 24, 2021
f6067d8
Handle computed methods
nicolo-ribaudo Mar 1, 2021
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
22 changes: 22 additions & 0 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -60,6 +60,8 @@ type ParsingContext =
| "TypeParametersOrArguments";

const TSErrors = Object.freeze({
AbstractMethodHasImplementation:
"Method '%0' cannot have an implementation because it is marked abstract.",
ClassMethodHasDeclare: "Class methods cannot have the 'declare' modifier",
ClassMethodHasReadonly: "Class methods cannot have the 'readonly' modifier",
ConstructorHasTypeParameters:
Expand Down Expand Up @@ -2933,4 +2935,24 @@ export default (superClass: Class<Parser>): Class<Parser> =>
this.unexpected(null, tt._class);
}
}

parseMethod(...args: any[]) {
const method = super.parseMethod(...args);
if (method.abstract) {
const hasBody = this.hasPlugin("estree")
? !!method.value.body
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2x member access is a perf regression

: !!method.body;
if (hasBody) {
const { key } = method;
this.raise(
method.start,
TSErrors.AbstractMethodHasImplementation,
key.type === "Identifier"
? key.name
: `[${this.input.slice(key.start, key.end)}]`,
);
}
}
return method;
}
};
3 changes: 3 additions & 0 deletions ...s/babel-parser/test/fixtures/typescript/class/abstract-method-with-body-computed/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
abstract class Foo {
abstract [foo()]() {}
}
61 changes: 61 additions & 0 deletions ...abel-parser/test/fixtures/typescript/class/abstract-method-with-body-computed/output.json
View file
Open in desktop
@@ -0,0 +1,61 @@
{
"type": "File",
"start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: Method '[foo()]' cannot have an implementation because it is marked abstract. (2:2)"
],
"program": {
"type": "Program",
"start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":46,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"abstract": true,
"id": {
"type": "Identifier",
"start":15,"end":18,"loc":{"start":{"line":1,"column":15},"end":{"line":1,"column":18},"identifierName":"Foo"},
"name": "Foo"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":19,"end":46,"loc":{"start":{"line":1,"column":19},"end":{"line":3,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":23,"end":44,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":23}},
"abstract": true,
"static": false,
"computed": true,
"key": {
"type": "CallExpression",
"start":33,"end":38,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":17}},
"callee": {
"type": "Identifier",
"start":33,"end":36,"loc":{"start":{"line":2,"column":12},"end":{"line":2,"column":15},"identifierName":"foo"},
"name": "foo"
},
"arguments": []
},
"kind": "method",
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":42,"end":44,"loc":{"start":{"line":2,"column":21},"end":{"line":2,"column":23}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
3 changes: 3 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/class/abstract-method-with-body/input.ts
View file
Open in desktop
@@ -0,0 +1,3 @@
abstract class Foo {
abstract method() {}
}
56 changes: 56 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/class/abstract-method-with-body/output.json
View file
Open in desktop
@@ -0,0 +1,56 @@
{
"type": "File",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"errors": [
"SyntaxError: Method 'method' cannot have an implementation because it is marked abstract. (2:2)"
],
"program": {
"type": "Program",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":45,"loc":{"start":{"line":1,"column":0},"end":{"line":3,"column":1}},
"abstract": true,
"id": {
"type": "Identifier",
"start":15,"end":18,"loc":{"start":{"line":1,"column":15},"end":{"line":1,"column":18},"identifierName":"Foo"},
"name": "Foo"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":19,"end":45,"loc":{"start":{"line":1,"column":19},"end":{"line":3,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":23,"end":43,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":22}},
"abstract": true,
"static": false,
"key": {
"type": "Identifier",
"start":32,"end":38,"loc":{"start":{"line":2,"column":11},"end":{"line":2,"column":17},"identifierName":"method"},
"name": "method"
},
"computed": false,
"kind": "method",
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":41,"end":43,"loc":{"start":{"line":2,"column":20},"end":{"line":2,"column":22}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
3 changes: 2 additions & 1 deletion ...s/babel-parser/test/fixtures/typescript/class/generator-method-with-modifiers/output.json
View file
Open in desktop
Expand Up @@ -2,7 +2,8 @@
"type": "File",
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"errors": [
"SyntaxError: Abstract methods can only appear within an abstract class. (5:2)"
"SyntaxError: Abstract methods can only appear within an abstract class. (5:2)",
"SyntaxError: Method 'd' cannot have an implementation because it is marked abstract. (5:2)"
],
"program": {
"type": "Program",
Expand Down