Retain trailing comments in array expressions#10369
Merged
JLHwung merged 5 commits intobabel:masterfrom Aug 28, 2019
Merged
Conversation
This is a proposed fix for babel#10368 with a simple test.
Collaborator
|
Build successful! You can test your changes in the REPL here: https://babeljs.io/repl/build/11403/ |
nicolo-ribaudo
approved these changes
Aug 27, 2019
Member
nicolo-ribaudo
left a comment
There was a problem hiding this comment.
I see some opportunity for code reuse here, but wanted to keep the changes isolated.
If you think that it's worth it, please open a PR after that this one is merged!
JLHwung
reviewed
Aug 27, 2019
JLHwung
reviewed
Aug 27, 2019
JLHwung
reviewed
Aug 27, 2019
packages/babel-parser/test/fixtures/comments/basic/array-expression-trailing-comma/input.js
Outdated
Show resolved
Hide resolved
JLHwung
reviewed
Aug 27, 2019
| }, | ||
| { | ||
| "type": "CommentLine", | ||
| "value": " Three", |
Contributor
There was a problem hiding this comment.
🤔 I think Three should not be the trailing comment of the string literal, instead it should be of the array expression.
Contributor
Author
There was a problem hiding this comment.
Ah good catch. I'll try fixing that.
JLHwung
approved these changes
Aug 28, 2019
Contributor
There was a problem hiding this comment.
@banga Thanks.
I think that the CallExpression arguments may also be affected, but we could open a new PR to address that. And ideally we can refactor to have CallExpression and ArrayExpression shared the same routines.
fn(
a,
b,
/* comment */
)
/* outer */
Contributor
Author
|
Yeah, sounds good |
banga
added a commit
to banga/babel
that referenced
this pull request
Aug 28, 2019
* Retain trailing comments in array expressions This is a proposed fix for babel#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
Contributor
Contributor
Author
|
Thanks! Will do in a couple of days. |
banga
pushed a commit
to banga/babel
that referenced
this pull request
Aug 31, 2019
Following up from babel#10369 - Unify the logic for adjusting trailing comments into a separate function - Use it for all three cases, which fixes a bug for ObjectExpressions and CallExpressions - Update tests to check for the fixed bug
JLHwung
pushed a commit
that referenced
this pull request
Sep 3, 2019
* Refactor trailing comment adjustment Following up from #10369 - Unify the logic for adjusting trailing comments into a separate function - Use it for all three cases, which fixes a bug for ObjectExpressions and CallExpressions - Update tests to check for the fixed bug * Fix tests - Only modify trailingComments if necessary - Update snapshots of a couple of affected tests * Drop the underscore in adjustCommentsAfterTrailingComma_ * Handle ArrayPattern * Handle ObjectPattern * Handle import and export declarations These have to be handled a bit differently, because the node is visited after the and before the declaration. So we intercept when we are going from the last specifier to the source node. * Remove unnecessary check
This was referenced Sep 17, 2019
This was referenced Oct 3, 2019
This was referenced Oct 5, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a proposed fix for #10368
with a simple test.
This is based on the fix from #8488 but for array expressions. I see some opportunity for code reuse here, but wanted to keep the changes isolated.