Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve quotes in generated f-strings #15794

Merged
merged 13 commits into from
Jan 29, 2025
Merged

Preserve quotes in generated f-strings #15794

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8488a4e
remove effectively unused is_spec argument to unparse_f_string_value
ntBre Jan 28, 2025
23ed586
separate parse_f_string and parse_f_string_specifier and pass quote
ntBre Jan 28, 2025
ed46f7c
avoid to_string
ntBre Jan 28, 2025
aff34a5
use Checker's default quote style for new f-string in FLY002
ntBre Jan 28, 2025
8a6208e
update Generator quote tests again
ntBre Jan 28, 2025
25deb4f
pass along the quote from Checker::default_string_flags for f-string
ntBre Jan 28, 2025
47d9ff2
delete now-unused Generator::quote field and related uses
ntBre Jan 28, 2025
1442618
macro is down to one case
ntBre Jan 28, 2025
9dade43
FStringFlags docs, no default, add Checker::default_fstring_flags
ntBre Jan 28, 2025
6bfebce
tidy up
ntBre Jan 28, 2025
cb474df
Box::from over into
ntBre Jan 28, 2025
d9ee56c
combine deduplicated set_quote tests with quote tests
ntBre Jan 29, 2025
ca8f5f0
add SIM108 test for preserving quotes
ntBre Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tidy up
  • Loading branch information
@ntBre
ntBre committed Jan 28, 2025
commit 6bfebce9caea3f84e65c69c620898745017ebfc4
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/rules/flynt/rules/static_join_to_fstring.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use itertools::Itertools;
use crate::fix::edits::pad;
use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Edit, Fix};
use ruff_macros::{derive_message_formats, ViolationMetadata};
use ruff_python_ast::{self as ast, Arguments, Expr, };
use ruff_python_ast::{self as ast, Arguments, Expr};
use ruff_text_size::{Ranged, TextRange};

use crate::checkers::ast::Checker;
Expand Down
3 changes: 1 addition & 2 deletions crates/ruff_python_codegen/src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,7 @@ impl<'a> Generator<'a> {
self.unparse_string_literal(string_literal);
}
ast::FStringPart::FString(f_string) => {
let quote = f_string.flags.quote_style();
self.unparse_f_string(&f_string.elements, quote);
self.unparse_f_string(&f_string.elements, f_string.flags.quote_style());
}
}
}
Expand Down
Loading