[flynt] Fix f-string quoting for mixed quote joiners (FLY002)
#20662
+73
−3
Conversation
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
TaKO8Ki
changed the title
ruff] Fix flynt f-string quoting for mixed quote joiners
TaKO8Ki
commented
Oct 1, 2025
| let adjusted_quote = match quote { | ||
| Quote::Single if has_single_quote && !has_double_quote => quote.opposite(), | ||
| Quote::Double if has_double_quote && !has_single_quote => quote.opposite(), | ||
| _ if has_double_quote && has_single_quote => return None, |
Contributor
Author
There was a problem hiding this comment.
If the content includes both single quote and double quote, ruff skips FLY002 for now.
I will improve this logic in a separate pull request as we discussed here.
Contributor
|
amyreese
approved these changes
Oct 3, 2025
ntBre
changed the title
ruff] Fix flynt f-string quoting for mixed quote joinersflynt] Fix f-string quoting for mixed quote joiners (FLY002)
ntBre
added
bug
dcreager
added a commit
that referenced
this pull request
Oct 3, 2025
* origin/main: [`flake8-bugbear`] Include certain guaranteed-mutable expressions: tuples, generators, and assignment expressions (`B006`) (#20024) [`flake8-comprehensions`] Clarify fix safety documentation (`C413`) (#20640) [ty] improve base conda distinction from child conda (#20675) [`ruff`] Extend FA102 with listed PEP 585-compatible APIs (#20659) [`ruff`] Handle argfile expansion errors gracefully (#20691) [`flynt`] Fix f-string quoting for mixed quote joiners (`FLY002`) (#20662) [ty] Fix file root matching for `/` [ruff,ty] Enable tracing's `log` feature [`flake8-annotations`] Fix return type annotations to handle shadowed builtin symbols (`ANN201`, `ANN202`, `ANN204`, `ANN205`, `ANN206`) (#20612) Bump 0.13.3 (#20685) Update benchmarking CI for cargo-codspeed v4 (#20686) [ty] Support single-starred argument for overload call (#20223) [ty] `~T` should never be assignable to `T` (#20606) [`pylint`] Clarify fix safety to include left-hand hashability (`PLR6201`) (#20518) [ty] No union with `Unknown` for module-global symbols (#20664) [`ty`] Reject renaming files to start with slash in Playground (#20666) [ty] Enums: allow multiple aliases to point to the same member (#20669)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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
Fixes #19837
Track quote usage across the joiner and parts to choose a safe f-string quote or skip the fix when both appear.
Test Plan
Add regression coverage to FLY002.py