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

Retain trailing comments in array expressions (#10369)

Browse Source 
* Retain trailing comments in array expressions

This is a proposed fix for https://github.com/babel/babel/issues/10368
with a simple test.

* Move lastElement in the block where it's used

* Test trailing comment after array expression

* Don't move comments after the array expression

* Retain trailing comment after the array expression
This commit is contained in:
Shrey Banga
2019-08-28 11:03:37 -07:00
committed by Huáng Jùnliàng
parent 94e47c30a9
commit 8a775a32ba
3 changed files with 747 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ 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
// or a trailing comma in array expressions as trailing comments
if (firstChild && this.state.leadingComments.length > 0) {
const lastComment = last(this.state.leadingComments);
@@ -137,6 +137,32 @@ export default class CommentsParser extends BaseParser {
}
}
}
} else if (node.type === "ArrayExpression" && node.elements.length > 0) {
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--;
}
}
const lastElement = last(node.elements);
lastElement.trailingComments = [];
while (this.state.leadingComments.length) {
const leadingComment = this.state.leadingComments.shift();
if (leadingComment.end < node.end) {
lastElement.trailingComments.push(leadingComment);
} else {
if (node.trailingComments === undefined) {
node.trailingComments = [];
}
node.trailingComments.push(leadingComment);
}
}
}
}
}