Skip to content

Commit

Permalink
Address reviewed points
Browse files Browse the repository at this point in the history
  • Loading branch information
@sosukesuzuki
sosukesuzuki committed Nov 18, 2020
1 parent ffa7f50 commit f4fba0b
Show file tree
Hide file tree
Showing 7 changed files with 400 additions and 15 deletions.
14 changes: 6 additions & 8 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Expand Up @@ -159,14 +159,12 @@ export default (superClass: Class<Parser>): Class<Parser> =>
// TODO: Would be nice to avoid lookahead. Want a hasLineBreakUpNext() method...
this.next();
return (
!this.hasPrecedingLineBreak() &&
!this.match(tt.parenL) &&
!this.match(tt.parenR) &&
!this.match(tt.colon) &&
!this.match(tt.eq) &&
!this.match(tt.question) &&
!this.match(tt.bang) &&
!this.match(tt.relational)
this.match(tt.bracketL) ||
this.match(tt.braceL) ||
this.match(tt.star) ||
this.match(tt.ellipsis) ||
this.match(tt.hash) ||
this.isLiteralPropertyName()
);
}

Expand Down
9 changes: 9 additions & 0 deletions ...ages/babel-parser/test/fixtures/typescript/class/generator-method-with-modifiers/input.ts
View file
@@ -0,0 +1,9 @@
class C {
private *a() {}
public *b() {}
static *c() {}
abstract *d() {}
readonly *e() {}
declare *f() {}
protected *g() {}
}
189 changes: 189 additions & 0 deletions ...s/babel-parser/test/fixtures/typescript/class/generator-method-with-modifiers/output.json
View file
@@ -0,0 +1,189 @@
{
"type": "File",
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"program": {
"type": "Program",
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"C"},
"name": "C"
},
"superClass": null,
"body": {
"type": "ClassBody",
"start":8,"end":139,"loc":{"start":{"line":1,"column":8},"end":{"line":9,"column":1}},
"body": [
{
"type": "ClassMethod",
"start":12,"end":27,"loc":{"start":{"line":2,"column":2},"end":{"line":2,"column":17}},
"accessibility": "private",
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":21,"end":22,"loc":{"start":{"line":2,"column":11},"end":{"line":2,"column":12},"identifierName":"a"},
"name": "a"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":25,"end":27,"loc":{"start":{"line":2,"column":15},"end":{"line":2,"column":17}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":30,"end":44,"loc":{"start":{"line":3,"column":2},"end":{"line":3,"column":16}},
"accessibility": "public",
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":38,"end":39,"loc":{"start":{"line":3,"column":10},"end":{"line":3,"column":11},"identifierName":"b"},
"name": "b"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":42,"end":44,"loc":{"start":{"line":3,"column":14},"end":{"line":3,"column":16}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":47,"end":61,"loc":{"start":{"line":4,"column":2},"end":{"line":4,"column":16}},
"static": true,
"kind": "method",
"key": {
"type": "Identifier",
"start":55,"end":56,"loc":{"start":{"line":4,"column":10},"end":{"line":4,"column":11},"identifierName":"c"},
"name": "c"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":59,"end":61,"loc":{"start":{"line":4,"column":14},"end":{"line":4,"column":16}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":64,"end":80,"loc":{"start":{"line":5,"column":2},"end":{"line":5,"column":18}},
"abstract": true,
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":74,"end":75,"loc":{"start":{"line":5,"column":12},"end":{"line":5,"column":13},"identifierName":"d"},
"name": "d"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":78,"end":80,"loc":{"start":{"line":5,"column":16},"end":{"line":5,"column":18}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":83,"end":99,"loc":{"start":{"line":6,"column":2},"end":{"line":6,"column":18}},
"readonly": true,
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":93,"end":94,"loc":{"start":{"line":6,"column":12},"end":{"line":6,"column":13},"identifierName":"e"},
"name": "e"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":97,"end":99,"loc":{"start":{"line":6,"column":16},"end":{"line":6,"column":18}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":102,"end":117,"loc":{"start":{"line":7,"column":2},"end":{"line":7,"column":17}},
"declare": true,
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":111,"end":112,"loc":{"start":{"line":7,"column":11},"end":{"line":7,"column":12},"identifierName":"f"},
"name": "f"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":115,"end":117,"loc":{"start":{"line":7,"column":15},"end":{"line":7,"column":17}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":120,"end":137,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":19}},
"accessibility": "protected",
"static": false,
"kind": "method",
"key": {
"type": "Identifier",
"start":131,"end":132,"loc":{"start":{"line":8,"column":13},"end":{"line":8,"column":14},"identifierName":"g"},
"name": "g"
},
"computed": false,
"id": null,
"generator": true,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":135,"end":137,"loc":{"start":{"line":8,"column":17},"end":{"line":8,"column":19}},
"body": [],
"directives": []
}
}
]
}
}
],
"directives": []
}
}
4 changes: 4 additions & 0 deletions ...-parser/test/fixtures/typescript/class/method-modifier-name-with-type-parameters/input.ts
View file
Expand Up @@ -2,4 +2,8 @@ class C {
declare<T>() {}
readonly<T>() {}
abstract<T>() {}
static<T>() {}
private<T>() {}
public<T>() {}
protected<T>() {}
}
140 changes: 136 additions & 4 deletions ...rser/test/fixtures/typescript/class/method-modifier-name-with-type-parameters/output.json
View file
@@ -1,15 +1,15 @@
{
"type": "File",
"start":0,"end":67,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":1}},
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"program": {
"type": "Program",
"start":0,"end":67,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":1}},
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"sourceType": "module",
"interpreter": null,
"body": [
{
"type": "ClassDeclaration",
"start":0,"end":67,"loc":{"start":{"line":1,"column":0},"end":{"line":5,"column":1}},
"start":0,"end":139,"loc":{"start":{"line":1,"column":0},"end":{"line":9,"column":1}},
"id": {
"type": "Identifier",
"start":6,"end":7,"loc":{"start":{"line":1,"column":6},"end":{"line":1,"column":7},"identifierName":"C"},
Expand All @@ -18,7 +18,7 @@
"superClass": null,
"body": {
"type": "ClassBody",
"start":8,"end":67,"loc":{"start":{"line":1,"column":8},"end":{"line":5,"column":1}},
"start":8,"end":139,"loc":{"start":{"line":1,"column":8},"end":{"line":9,"column":1}},
"body": [
{
"type": "ClassMethod",
Expand Down Expand Up @@ -118,6 +118,138 @@
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":68,"end":82,"loc":{"start":{"line":5,"column":2},"end":{"line":5,"column":16}},
"kind": "method",
"computed": false,
"key": {
"type": "Identifier",
"start":68,"end":74,"loc":{"start":{"line":5,"column":2},"end":{"line":5,"column":8},"identifierName":"static"},
"name": "static"
},
"static": false,
"typeParameters": {
"type": "TSTypeParameterDeclaration",
"start":74,"end":77,"loc":{"start":{"line":5,"column":8},"end":{"line":5,"column":11}},
"params": [
{
"type": "TSTypeParameter",
"start":75,"end":76,"loc":{"start":{"line":5,"column":9},"end":{"line":5,"column":10}},
"name": "T"
}
]
},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":80,"end":82,"loc":{"start":{"line":5,"column":14},"end":{"line":5,"column":16}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":85,"end":100,"loc":{"start":{"line":6,"column":2},"end":{"line":6,"column":17}},
"static": false,
"key": {
"type": "Identifier",
"start":85,"end":92,"loc":{"start":{"line":6,"column":2},"end":{"line":6,"column":9},"identifierName":"private"},
"name": "private"
},
"computed": false,
"kind": "method",
"typeParameters": {
"type": "TSTypeParameterDeclaration",
"start":92,"end":95,"loc":{"start":{"line":6,"column":9},"end":{"line":6,"column":12}},
"params": [
{
"type": "TSTypeParameter",
"start":93,"end":94,"loc":{"start":{"line":6,"column":10},"end":{"line":6,"column":11}},
"name": "T"
}
]
},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":98,"end":100,"loc":{"start":{"line":6,"column":15},"end":{"line":6,"column":17}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":103,"end":117,"loc":{"start":{"line":7,"column":2},"end":{"line":7,"column":16}},
"static": false,
"key": {
"type": "Identifier",
"start":103,"end":109,"loc":{"start":{"line":7,"column":2},"end":{"line":7,"column":8},"identifierName":"public"},
"name": "public"
},
"computed": false,
"kind": "method",
"typeParameters": {
"type": "TSTypeParameterDeclaration",
"start":109,"end":112,"loc":{"start":{"line":7,"column":8},"end":{"line":7,"column":11}},
"params": [
{
"type": "TSTypeParameter",
"start":110,"end":111,"loc":{"start":{"line":7,"column":9},"end":{"line":7,"column":10}},
"name": "T"
}
]
},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":115,"end":117,"loc":{"start":{"line":7,"column":14},"end":{"line":7,"column":16}},
"body": [],
"directives": []
}
},
{
"type": "ClassMethod",
"start":120,"end":137,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":19}},
"static": false,
"key": {
"type": "Identifier",
"start":120,"end":129,"loc":{"start":{"line":8,"column":2},"end":{"line":8,"column":11},"identifierName":"protected"},
"name": "protected"
},
"computed": false,
"kind": "method",
"typeParameters": {
"type": "TSTypeParameterDeclaration",
"start":129,"end":132,"loc":{"start":{"line":8,"column":11},"end":{"line":8,"column":14}},
"params": [
{
"type": "TSTypeParameter",
"start":130,"end":131,"loc":{"start":{"line":8,"column":12},"end":{"line":8,"column":13}},
"name": "T"
}
]
},
"id": null,
"generator": false,
"async": false,
"params": [],
"body": {
"type": "BlockStatement",
"start":135,"end":137,"loc":{"start":{"line":8,"column":17},"end":{"line":8,"column":19}},
"body": [],
"directives": []
}
}
]
}
Expand Down

0 comments on commit f4fba0b

Please sign in to comment.