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

Track casing of r-string prefixes in the tokenizer and AST #10314

Merged
merged 11 commits into from
Mar 18, 2024
Merged

Track casing of r-string prefixes in the tokenizer and AST #10314

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b432d2
Track casing of r string prefixes in the tokenizer
AlexWaygood Mar 9, 2024
03eb789
Track casing of r prefixes in f-string AST nodes
AlexWaygood Mar 9, 2024
355aeb1
Track casing of r prefixes in StringLiteral AST nodes
AlexWaygood Mar 9, 2024
0fae040
Track casing of r prefixes in BytesLiteral AST nodes
AlexWaygood Mar 9, 2024
ee6e076
Reduce duplication -- use an enum of enums
AlexWaygood Mar 10, 2024
21e2911
Switch to `unreachable!` over `panic!`
AlexWaygood Mar 11, 2024
ea8dcda
Address review: avoid `write!()` macro where it's unnecessary
AlexWaygood Mar 18, 2024
bc3e406
Address review: make `with_prefix()` methods work even if a prefix ha…
AlexWaygood Mar 18, 2024
ca832a1
Move `prefix()` logic to the `StringPrefix` enum
AlexWaygood Mar 18, 2024
eef975e
Merge branch 'main' into r-prefix-casing
AlexWaygood Mar 18, 2024
6529776
Debug all the way down
AlexWaygood Mar 18, 2024
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
4 changes: 2 additions & 2 deletions crates/ruff_linter/src/rules/flake8_quotes/rules/avoidable_escaped_quote.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pub(crate) fn avoidable_escaped_quote(
let mut diagnostic = Diagnostic::new(AvoidableEscapedQuote, tok_range);
let fixed_contents = format!(
"{prefix}{quote}{value}{quote}",
prefix = kind.prefix_str(),
prefix = kind.prefix(),
quote = quotes_settings.inline_quotes.opposite().as_char(),
value = unescape_string(
string_contents,
Expand Down Expand Up @@ -322,7 +322,7 @@ pub(crate) fn unnecessary_escaped_quote(
let mut diagnostic = Diagnostic::new(UnnecessaryEscapedQuote, tok_range);
let fixed_contents = format!(
"{prefix}{quote}{value}{quote}",
prefix = kind.prefix_str(),
prefix = kind.prefix(),
quote = leading.as_char(),
value = unescape_string(string_contents, leading.opposite().as_char())
);
Expand Down
4 changes: 2 additions & 2 deletions crates/ruff_linter/src/rules/flake8_simplify/rules/ast_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ fn check_os_environ_subscript(checker: &mut Checker, expr: &Expr) {
value: capital_env_var.into_boxed_str(),
flags: StringLiteralFlags::default().with_prefix({
if env_var.is_unicode() {
StringLiteralPrefix::UString
StringLiteralPrefix::Unicode
} else {
StringLiteralPrefix::None
StringLiteralPrefix::Empty
}
}),
..ast::StringLiteral::default()
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/rules/pyupgrade/rules/unicode_kind_prefix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl AlwaysFixableViolation for UnicodeKindPrefix {

/// UP025
pub(crate) fn unicode_kind_prefix(checker: &mut Checker, string: &StringLiteral) {
if string.flags.is_u_string() {
if string.flags.prefix().is_unicode() {
let mut diagnostic = Diagnostic::new(UnicodeKindPrefix, string.range);
diagnostic.set_fix(Fix::safe_edit(Edit::range_deletion(TextRange::at(
string.start(),
Expand Down
Loading
Loading