mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-12-15 22:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use Locator-based replacement rather than Generator for UP007 (#5723)

Browse source 
## Summary

Locator-based replacement is generally preferable as we get verbatim
fixes.
This commit is contained in:
Charlie Marsh 2023-07-12 23:50:16 -04:00 • committed by GitHub
parent 19f475ae1f
commit 34b79ead3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

47
crates/ruff/src/rules/pyupgrade/rules/use_pep604_annotation.rs
View file

@ -1,8 +1,9 @@
use ruff_text_size::TextRange;
use rustpython_parser::ast::{self, Constant, Expr, Operator, Ranged};
use itertools::Itertools;
use rustpython_parser::ast::{self, Expr, Ranged};
use ruff_diagnostics::{AutofixKind, Diagnostic, Edit, Fix, Violation};
use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::source_code::Locator;
use ruff_python_semantic::analyze::typing::Pep604Operator;
use crate::checkers::ast::Checker;
@ -48,32 +49,6 @@ impl Violation for NonPEP604Annotation {
}
}
fn optional(expr: &Expr) -> Expr {
Expr::BinOp(ast::ExprBinOp {
left: Box::new(expr.clone()),
op: Operator::BitOr,
right: Box::new(Expr::Constant(ast::ExprConstant {
value: Constant::None,
kind: None,
range: TextRange::default(),
})),
range: TextRange::default(),
})
}
fn union(elts: &[Expr]) -> Expr {
if elts.len() == 1 {
elts[0].clone()
} else {
Expr::BinOp(ast::ExprBinOp {
left: Box::new(union(&elts[..elts.len() - 1])),
op: Operator::BitOr,
right: Box::new(elts[elts.len() - 1].clone()),
range: TextRange::default(),
})
}
}
/// UP007
pub(crate) fn use_pep604_annotation(
checker: &mut Checker,
@ -89,7 +64,7 @@ pub(crate) fn use_pep604_annotation(
let mut diagnostic = Diagnostic::new(NonPEP604Annotation, expr.range());
if fixable && checker.patch(diagnostic.kind.rule()) {
diagnostic.set_fix(Fix::manual(Edit::range_replacement(
checker.generator().expr(&optional(slice)),
optional(slice, checker.locator),
expr.range(),
)));
}
@ -104,14 +79,14 @@ pub(crate) fn use_pep604_annotation(
}
Expr::Tuple(ast::ExprTuple { elts, .. }) => {
diagnostic.set_fix(Fix::manual(Edit::range_replacement(
checker.generator().expr(&union(elts)),
union(elts, checker.locator),
expr.range(),
)));
}
_ => {
// Single argument.
diagnostic.set_fix(Fix::manual(Edit::range_replacement(
checker.generator().expr(slice),
checker.locator.slice(slice.range()).to_string(),
expr.range(),
)));
}
@ -121,3 +96,13 @@ pub(crate) fn use_pep604_annotation(
}
}
}
fn optional(expr: &Expr, locator: &Locator) -> String {
format!("{} | None", locator.slice(expr.range()))
}
fn union(elts: &[Expr], locator: &Locator) -> String {
elts.iter()
.map(|expr| locator.slice(expr.range()))
.join(" | ")
}