Repository navigation
Remove empty strings when converting to f-string (UP032) - #11524
Merged
Merged
Conversation
dhruvmanila
commented
May 24, 2024
Comment on lines
-470
to
-478
| if !lexer::lex_starts_at(rest, Mode::Expression, prev_end) | ||
| .flatten() | ||
| .all(|(token, _)| match token { | ||
| Tok::Comment(_) | Tok::Newline | Tok::NonLogicalNewline | Tok::Indent | Tok::Dedent => { | ||
| true | ||
| for (range, conversion) in patches { | ||
| let fstring = match conversion { | ||
| FStringConversion::Convert(fstring) => Some(fstring), | ||
| FStringConversion::EmptyLiteral => None, | ||
| FStringConversion::Literal => { | ||
| // Convert escaped curly brackets e.g. `{{` to `{` in literal string parts | ||
| Some(curly_unescape(checker.locator().slice(range)).to_string()) | ||
| } | ||
| Tok::String { value, .. } => value.is_empty(), | ||
| _ => false, | ||
| }) |
Member
Author
There was a problem hiding this comment.
The main reason for this PR is to remove this little lexer usage which uses the owned data from String token.
Contributor
|
snowsignal
approved these changes
May 24, 2024
dhruvmanila
enabled auto-merge (squash)
May 27, 2024 04:59
dhruvmanila
disabled auto-merge
May 27, 2024 05:00
UP032)
dhruvmanila
enabled auto-merge (squash)
May 27, 2024 05:00
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Summary
This PR brings back the functionality to remove empty strings when converting to an f-string in
UP032.For context, #8712 added this functionality to remove trailing empty strings but it got removed in #8697 possibly unexpectedly so.
There's one difference which is that this PR will remove any empty strings and not just trailing ones. For example,
Test Plan
Run
cargo insta testand update the snapshots.