mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 02:38:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Treat class C: ... and class C(): ... equivalently (#8659)

Browse source 
## Summary

These should be seen as identical from the `ComparableAst` perspective.
This commit is contained in:
Charlie Marsh 2023-11-13 10:03:04 -08:00 • committed by GitHub
parent a8e0d4ab4f
commit 345e1401cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ruff_python_ast/src/comparable.rs
View file

@ -363,7 +363,7 @@ impl<'a> From<&'a ast::Number> for ComparableNumber<'a> {
}
}
#[derive(Debug, PartialEq, Eq, Hash)]
#[derive(Debug, Default, PartialEq, Eq, Hash)]
pub struct ComparableArguments<'a> {
args: Vec<ComparableExpr<'a>>,
keywords: Vec<ComparableKeyword<'a>>,
@ -1051,7 +1051,7 @@ pub struct StmtClassDef<'a> {
decorator_list: Vec<ComparableDecorator<'a>>,
name: &'a str,
type_params: Option<ComparableTypeParams<'a>>,
arguments: Option<ComparableArguments<'a>>,
arguments: ComparableArguments<'a>,
body: Vec<ComparableStmt<'a>>,
}
@ -1309,7 +1309,7 @@ impl<'a> From<&'a ast::Stmt> for ComparableStmt<'a> {
range: _,
}) => Self::ClassDef(StmtClassDef {
name: name.as_str(),
arguments: arguments.as_ref().map(Into::into),
arguments: arguments.as_ref().map(Into::into).unwrap_or_default(),
body: body.iter().map(Into::into).collect(),
decorator_list: decorator_list.iter().map(Into::into).collect(),
type_params: type_params.as_ref().map(Into::into),

41
crates/ruff_python_formatter/tests/normalizer.rs
View file

@ -32,33 +32,20 @@ impl Normalizer {
impl Transformer for Normalizer {
fn visit_stmt(&self, stmt: &mut Stmt) {
match stmt {
Stmt::ClassDef(class_def) => {
// Treat `class C: ...` and `class C(): ...` equivalently.
if class_def
.arguments
.as_ref()
.is_some_and(|arguments| arguments.is_empty())
{
class_def.arguments = None;
}
}
Stmt::Delete(delete) => {
// Treat `del a, b` and `del (a, b)` equivalently.
delete.targets = delete
.targets
.clone()
.into_iter()
.flat_map(|target| {
if let Expr::Tuple(tuple) = target {
Left(tuple.elts.into_iter())
} else {
Right(std::iter::once(target))
}
})
.collect();
}
_ => {}
if let Stmt::Delete(delete) = stmt {
// Treat `del a, b` and `del (a, b)` equivalently.
delete.targets = delete
.targets
.clone()
.into_iter()
.flat_map(|target| {
if let Expr::Tuple(tuple) = target {
Left(tuple.elts.into_iter())
} else {
Right(std::iter::once(target))
}
})
.collect();
}
transformer::walk_stmt(self, stmt);