This repository has been archived by the owner on Aug 31, 2023. It is now read-only.
fix(rome_js_analyze): keep comments when simplifying logical expression #3532
Conversation
This file contains 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
✅ Deploy Preview for rometools ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
ematipico
force-pushed
the
fix/simplified-logic-expression
branch
from
0bf0155 to
ec795b5
Compare
Parser conformance results on ubuntu-latestjs/262
jsx/babel
symbols/microsoft
ts/babel
ts/microsoft
|
MichaReiser
reviewed
Oct 28, 2022
crates/rome_js_analyze/src/analyzers/correctness/use_simplified_logic_expression.rs
Outdated
Show resolved
Hide resolved
MichaReiser
reviewed
Oct 28, 2022
crates/rome_js_analyze/src/analyzers/correctness/use_simplified_logic_expression.rs
Outdated
Show resolved
Hide resolved
xunilrj
reviewed
Oct 28, 2022
crates/rome_cli/tests/snapshots/main_commands_ci/ci_runs_linter_not_formatter_issue_3495.snap
Outdated
Show resolved
Hide resolved
ematipico
force-pushed
the
fix/simplified-logic-expression
branch
from
40aad9f to
74ba6be
Compare
ematipico
changed the title
MichaReiser
reviewed
Nov 1, 2022
crates/rome_js_analyze/src/analyzers/correctness/use_simplified_logic_expression.rs
Outdated
Show resolved
Hide resolved
crates/rome_js_analyze/src/analyzers/correctness/use_simplified_logic_expression.rs
Outdated
Show resolved
Hide resolved
ematipico
force-pushed
the
fix/simplified-logic-expression
branch
from
74ba6be to
1fc9dbc
Compare
MichaReiser
suggested changes
Nov 3, 2022
Comment on lines
+229
to
+230
| let mut new_token = | ||
| new_token.with_trailing_trivia(vec![(TriviaPieceKind::Whitespace, " ")]); |
There was a problem hiding this comment.
Nit
Suggested change
| let mut new_token = | |
| new_token.with_trailing_trivia(vec![(TriviaPieceKind::Whitespace, " ")]); | |
| let mut new_token = | |
| new_token.with_trailing_trivia([(TriviaPieceKind::Whitespace, " ")]); |
Comment on lines
+231
to
+232
| let right_argument_trivia = right | ||
| .syntax() |
There was a problem hiding this comment.
This won't return the right argument trivia, but instead, the trivia of the unary operator. If it returns the trivia of the right argument, it gets duplicated.
Overall, I think it is more explicit and safer to use the AST traversal methods instead because it clearly communicates the intent and ensures the transformation works correctly even if the unary expression misses an operator.
let right_unary_operator_trivia = right.operator_token().ok()?.leading_trivia().pieces();This should also be faster because it doesn't require a full traversal to find the first trivia.
| .map(|trivia| trivia.pieces()); | ||
| if let Some(mut right_argument_trivia) = right_argument_trivia { | ||
| if right_argument_trivia.any(|piece| piece.is_comments()) { | ||
| new_token = new_token.with_trailing_trivia_pieces(right_argument_trivia); |
There was a problem hiding this comment.
Is it intentional that this overrides the trivia from line 230?
| new_token.with_trailing_trivia(vec![(TriviaPieceKind::Whitespace, " ")]); | ||
| let right_argument_trivia = right | ||
| .syntax() | ||
| .first_leading_trivia() |
There was a problem hiding this comment.
What about the trailing trivia of the operator_token?
! /* comment */ b
|
This PR is stale because it has been open 14 days with no activity. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
Closes #3527
I created a new mutation API called
replace_token_transfer_trivia, which transfer the trivias from the old token, while keeping the trivia of the new token.Test Plan
Added two new test cases