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
Download Patch File Download Diff File Expand all files Collapse all files

37
src/parser/comments.js
View File

@@ -86,23 +86,34 @@ 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 (lastComment.start >= node.start) {
if (this.state.commentPreviousNode) {
for (j = 0; j < this.state.leadingComments.length; j++) {
if (this.state.leadingComments[j].end < this.state.commentPreviousNode.end) {
this.state.leadingComments.splice(j, 1);
j--;
if (firstChild.type === "ObjectProperty") {
if (lastComment.start >= node.start) {
if (this.state.commentPreviousNode) {
for (j = 0; j < this.state.leadingComments.length; j++) {
if (this.state.leadingComments[j].end < this.state.commentPreviousNode.end) {
this.state.leadingComments.splice(j, 1);
j--;
}
}
if (this.state.leadingComments.length > 0) {
firstChild.trailingComments = this.state.leadingComments;
this.state.leadingComments = [];
}
}
}
} else if (node.type === "CallExpression" && node.arguments && node.arguments.length) {
const lastArg = last(node.arguments);
if (this.state.leadingComments.length > 0) {
firstChild.trailingComments = this.state.leadingComments;
this.state.leadingComments = [];
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 = [];
}
}
}
}