cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: assign comment to ObjectProperty only when inside an ObjectExpression (#10292)

Browse Source 
Fixes #10230
This commit is contained in:
Huáng Jùnliàng 2019-08-13 14:49:16 -04:00 committed by Brian Ng
parent 22df2ae244
commit 75090f10e5
3 changed files with 247 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/babel-parser/src/parser/comments.js
View File

@ -91,7 +91,7 @@ export default class CommentsParser extends BaseParser {
const lastComment = last(this.state.leadingComments);
if (firstChild.type === "ObjectProperty") {
if (lastComment.start >= node.start) {
if (lastComment.start >= node.start && lastComment.end <= node.end) {
if (this.state.commentPreviousNode) {
for (j = 0; j < this.state.leadingComments.length; j++) {
if (

7
packages/babel-parser/test/fixtures/comments/regression/10230/input.js vendored Normal file
View File

@ -0,0 +1,7 @@
A = {
a: 42,
// One
}
// Two
B

239
packages/babel-parser/test/fixtures/comments/regression/10230/output.json vendored Normal file
View File

@ -0,0 +1,239 @@
{
"type": "File",
"start": 0,
"end": 35,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 35,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"sourceType": "script",
"interpreter": null,
"body": [
{
"type": "ExpressionStatement",
"start": 0,
"end": 25,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"expression": {
"type": "AssignmentExpression",
"start": 0,
"end": 25,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 4,
"column": 1
}
},
"operator": "=",
"left": {
"type": "Identifier",
"start": 0,
"end": 1,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 1
},
"identifierName": "A"
},
"name": "A"
},
"right": {
"type": "ObjectExpression",
"start": 4,
"end": 25,
"loc": {
"start": {
"line": 1,
"column": 4
},
"end": {
"line": 4,
"column": 1
}
},
"properties": [
{
"type": "ObjectProperty",
"start": 8,
"end": 13,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 7
}
},
"method": false,
"key": {
"type": "Identifier",
"start": 8,
"end": 9,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 2,
"column": 3
},
"identifierName": "a"
},
"name": "a"
},
"computed": false,
"shorthand": false,
"value": {
"type": "NumericLiteral",
"start": 11,
"end": 13,
"loc": {
"start": {
"line": 2,
"column": 5
},
"end": {
"line": 2,
"column": 7
}
},
"extra": {
"rawValue": 42,
"raw": "42"
},
"value": 42
}
}
]
}
}
},
{
"type": "ExpressionStatement",
"start": 34,
"end": 35,
"loc": {
"start": {
"line": 7,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"expression": {
"type": "Identifier",
"start": 34,
"end": 35,
"loc": {
"start": {
"line": 7,
"column": 0
},
"end": {
"line": 7,
"column": 1
},
"identifierName": "B"
},
"name": "B"
},
"leadingComments": [
{
"type": "CommentLine",
"value": " Two",
"start": 27,
"end": 33,
"loc": {
"start": {
"line": 6,
"column": 0
},
"end": {
"line": 6,
"column": 6
}
}
}
]
}
],
"directives": []
},
"comments": [
{
"type": "CommentLine",
"value": " One",
"start": 17,
"end": 23,
"loc": {
"start": {
"line": 3,
"column": 2
},
"end": {
"line": 3,
"column": 8
}
}
},
{
"type": "CommentLine",
"value": " Two",
"start": 27,
"end": 33,
"loc": {
"start": {
"line": 6,
"column": 0
},
"end": {
"line": 6,
"column": 6
}
}
}
]
}