Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore multi-comparisons in `repeated-equality-comparison-target` (#6705) 

Given `foo == "a" == "b" or foo == "c"`, we were suggesting `foo in
{"a", "b", "c"}`.
This commit is contained in:
Charlie Marsh 2023-08-20 10:41:10 -04:00 committed by GitHub
parent 129b19050a
commit a742a562fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruff/resources/test/fixtures/pylint/repeated_equality_comparison_target.py vendored
View File

@ -32,3 +32,7 @@ foo not in {"a", "b", "c"} # Uses membership test already.
foo == "a" # Single comparison.
foo != "a" # Single comparison.
foo == "a" == "b" or foo == "c" # Multiple comparisons.
foo == bar == "b" or foo == "c" # Multiple comparisons.

33
crates/ruff/src/rules/pylint/rules/repeated_equality_comparison_target.rs
View File

@ -111,24 +111,27 @@ fn is_allowed_value(bool_op: BoolOp, value: &Expr) -> bool {
return false;
};
ops.iter().all(|op| {
if match bool_op {
BoolOp::Or => !matches!(op, CmpOp::Eq),
BoolOp::And => !matches!(op, CmpOp::NotEq),
} {
return false;
}
// Ignore, e.g., `foo == bar == baz`.
let [op] = ops.as_slice() else {
return false;
};
if left.is_call_expr() {
return false;
}
if match bool_op {
BoolOp::Or => !matches!(op, CmpOp::Eq),
BoolOp::And => !matches!(op, CmpOp::NotEq),
} {
return false;
}
if any(comparators.iter(), Expr::is_call_expr) {
return false;
}
if left.is_call_expr() {
return false;
}
true
})
if any(comparators.iter(), Expr::is_call_expr) {
return false;
}
true
}
/// Generate a string like `obj in (a, b, c)` or `obj not in (a, b, c)`.