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

Fix comment attachment for call expressions (#575)

Browse Source
This commit is contained in:
aardito2 2017-06-18 16:57:42 -04:00 committed by Daniel Tschinder
parent e1e2c32bf3
commit ac936e315a
5 changed files with 579 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/parser/comments.js
View File

@ -86,11 +86,10 @@ export default class CommentsParser extends BaseParser {
// Attach comments that follow a trailing comma on the last
// property in an object literal or a trailing comma in function arguments
// as trailing comments
if (firstChild &&
(firstChild.type === "ObjectProperty" ||
(node.type === "CallExpression")) &&
this.state.leadingComments.length > 0) {
if (firstChild && this.state.leadingComments.length > 0) {
const lastComment = last(this.state.leadingComments);
if (firstChild.type === "ObjectProperty") {
if (lastComment.start >= node.start) {
if (this.state.commentPreviousNode) {
for (j = 0; j < this.state.leadingComments.length; j++) {
@ -106,6 +105,18 @@ export default class CommentsParser extends BaseParser {
}
}
}
} else if (node.type === "CallExpression" && node.arguments && node.arguments.length) {
const lastArg = last(node.arguments);
if (lastArg && lastComment.start >= lastArg.start && lastComment.end <= node.end) {
if (this.state.commentPreviousNode) {
if (this.state.leadingComments.length > 0) {
lastArg.trailingComments = this.state.leadingComments;
this.state.leadingComments = [];
}
}
}
}
}
if (lastChild) {

5
test/fixtures/comments/basic/switch-function-call-no-semicolon-no-default/actual.js vendored Normal file
View File

@ -0,0 +1,5 @@
switch (x) {
case 1:
console.log('1')
// comment
}

245
test/fixtures/comments/basic/switch-function-call-no-semicolon-no-default/expected.json vendored Normal file
View File

@ -0,0 +1,245 @@
{
"type": "File",
"start": 0,
"end": 60,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 60,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"sourceType": "script",
"body": [
{
"type": "SwitchStatement",
"start": 0,
"end": 60,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 1
}
},
"discriminant": {
"type": "Identifier",
"start": 8,
"end": 9,
"loc": {
"start": {
"line": 1,
"column": 8
},
"end": {
"line": 1,
"column": 9
},
"identifierName": "x"
},
"name": "x"
},
"cases": [
{
"type": "SwitchCase",
"start": 15,
"end": 43,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 3,
"column": 20
}
},
"consequent": [
{
"type": "ExpressionStatement",
"start": 27,
"end": 43,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 20
}
},
"expression": {
"type": "CallExpression",
"start": 27,
"end": 43,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 20
}
},
"callee": {
"type": "MemberExpression",
"start": 27,
"end": 38,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 15
}
},
"object": {
"type": "Identifier",
"start": 27,
"end": 34,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 11
},
"identifierName": "console"
},
"name": "console"
},
"property": {
"type": "Identifier",
"start": 35,
"end": 38,
"loc": {
"start": {
"line": 3,
"column": 12
},
"end": {
"line": 3,
"column": 15
},
"identifierName": "log"
},
"name": "log"
},
"computed": false
},
"arguments": [
{
"type": "StringLiteral",
"start": 39,
"end": 42,
"loc": {
"start": {
"line": 3,
"column": 16
},
"end": {
"line": 3,
"column": 19
}
},
"extra": {
"rawValue": "1",
"raw": "'1'"
},
"value": "1"
}
],
"trailingComments": null
},
"trailingComments": null
}
],
"test": {
"type": "NumericLiteral",
"start": 20,
"end": 21,
"loc": {
"start": {
"line": 2,
"column": 7
},
"end": {
"line": 2,
"column": 8
}
},
"extra": {
"rawValue": 1,
"raw": "1"
},
"value": 1
},
"trailingComments": [
{
"type": "CommentLine",
"value": " comment",
"start": 48,
"end": 58,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 14
}
}
}
]
}
]
}
],
"directives": []
},
"comments": [
{
"type": "CommentLine",
"value": " comment",
"start": 48,
"end": 58,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 14
}
}
}
]
}

7
test/fixtures/comments/basic/switch-function-call-no-semicolon/actual.js vendored Normal file
View File

@ -0,0 +1,7 @@
switch(x) {
case 1:
console.log('1')
// comment
default:
break;
}

298
test/fixtures/comments/basic/switch-function-call-no-semicolon/expected.json vendored Normal file
View File

@ -0,0 +1,298 @@
{
"type": "File",
"start": 0,
"end": 81,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"program": {
"type": "Program",
"start": 0,
"end": 81,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"sourceType": "script",
"body": [
{
"type": "SwitchStatement",
"start": 0,
"end": 81,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 7,
"column": 1
}
},
"discriminant": {
"type": "Identifier",
"start": 7,
"end": 8,
"loc": {
"start": {
"line": 1,
"column": 7
},
"end": {
"line": 1,
"column": 8
},
"identifierName": "x"
},
"name": "x"
},
"cases": [
{
"type": "SwitchCase",
"start": 14,
"end": 42,
"loc": {
"start": {
"line": 2,
"column": 2
},
"end": {
"line": 3,
"column": 20
}
},
"consequent": [
{
"type": "ExpressionStatement",
"start": 26,
"end": 42,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 20
}
},
"expression": {
"type": "CallExpression",
"start": 26,
"end": 42,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 20
}
},
"callee": {
"type": "MemberExpression",
"start": 26,
"end": 37,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 15
}
},
"object": {
"type": "Identifier",
"start": 26,
"end": 33,
"loc": {
"start": {
"line": 3,
"column": 4
},
"end": {
"line": 3,
"column": 11
},
"identifierName": "console"
},
"name": "console"
},
"property": {
"type": "Identifier",
"start": 34,
"end": 37,
"loc": {
"start": {
"line": 3,
"column": 12
},
"end": {
"line": 3,
"column": 15
},
"identifierName": "log"
},
"name": "log"
},
"computed": false
},
"arguments": [
{
"type": "StringLiteral",
"start": 38,
"end": 41,
"loc": {
"start": {
"line": 3,
"column": 16
},
"end": {
"line": 3,
"column": 19
}
},
"extra": {
"rawValue": "1",
"raw": "'1'"
},
"value": "1"
}
],
"trailingComments": null
},
"trailingComments": null
}
],
"test": {
"type": "NumericLiteral",
"start": 19,
"end": 20,
"loc": {
"start": {
"line": 2,
"column": 7
},
"end": {
"line": 2,
"column": 8
}
},
"extra": {
"rawValue": 1,
"raw": "1"
},
"value": 1
},
"trailingComments": [
{
"type": "CommentLine",
"value": " comment",
"start": 47,
"end": 57,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 14
}
}
}
]
},
{
"type": "SwitchCase",
"start": 60,
"end": 79,
"loc": {
"start": {
"line": 5,
"column": 2
},
"end": {
"line": 6,
"column": 10
}
},
"consequent": [
{
"type": "BreakStatement",
"start": 73,
"end": 79,
"loc": {
"start": {
"line": 6,
"column": 4
},
"end": {
"line": 6,
"column": 10
}
},
"label": null,
"leadingComments": null
}
],
"test": null,
"leadingComments": [
{
"type": "CommentLine",
"value": " comment",
"start": 47,
"end": 57,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 14
}
}
}
]
}
]
}
],
"directives": []
},
"comments": [
{
"type": "CommentLine",
"value": " comment",
"start": 47,
"end": 57,
"loc": {
"start": {
"line": 4,
"column": 4
},
"end": {
"line": 4,
"column": 14
}
}
}
]
}