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.

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

[pylint] Extend self-assigning-variable to multi-target assignments #8839

Merged
merged 1 commit into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
(foo, (bar, baz)) = (foo, (bar, 1))
foo: int = foo
bar: int = bar
foo = foo = bar
(foo, bar) = (foo, bar) = baz
(foo, bar) = baz = (foo, bar) = 1

# Non-errors.
foo = bar
Expand Down
11 changes: 4 additions & 7 deletions crates/ruff_linter/src/checkers/ast/analyze/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
}
}
Stmt::Assign(assign @ ast::StmtAssign { targets, value, .. }) => {
checker.enabled(Rule::NonAsciiName);
if checker.enabled(Rule::LambdaAssignment) {
if let [target] = &targets[..] {
pycodestyle::rules::lambda_assignment(checker, target, value, None, stmt);
Expand Down Expand Up @@ -1407,9 +1406,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
}
}
if checker.settings.rules.enabled(Rule::SelfAssigningVariable) {
if let [target] = targets.as_slice() {
pylint::rules::self_assigning_variable(checker, target, value);
}
pylint::rules::self_assignment(checker, assign);
}
if checker.settings.rules.enabled(Rule::TypeParamNameMismatch) {
pylint::rules::type_param_name_mismatch(checker, value, targets);
Expand Down Expand Up @@ -1479,9 +1476,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
stmt,
);
}
if checker.enabled(Rule::SelfAssigningVariable) {
pylint::rules::self_assigning_variable(checker, target, value);
}
}
if checker.enabled(Rule::SelfAssigningVariable) {
pylint::rules::self_annotated_assignment(checker, assign_stmt);
}
if checker.enabled(Rule::UnintentionalTypeAnnotation) {
flake8_bugbear::rules::unintentional_type_annotation(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use itertools::Itertools;
use ruff_python_ast::{self as ast, Expr};

use ruff_diagnostics::{Diagnostic, Violation};
Expand Down Expand Up @@ -36,36 +37,58 @@ impl Violation for SelfAssigningVariable {
}

/// PLW0127
pub(crate) fn self_assigning_variable(checker: &mut Checker, target: &Expr, value: &Expr) {
fn inner(left: &Expr, right: &Expr, diagnostics: &mut Vec<Diagnostic>) {
match (left, right) {
(
Expr::Tuple(ast::ExprTuple { elts: lhs_elts, .. }),
Expr::Tuple(ast::ExprTuple { elts: rhs_elts, .. }),
) if lhs_elts.len() == rhs_elts.len() => lhs_elts
.iter()
.zip(rhs_elts.iter())
.for_each(|(lhs, rhs)| inner(lhs, rhs, diagnostics)),
(
Expr::Name(ast::ExprName { id: lhs_name, .. }),
Expr::Name(ast::ExprName { id: rhs_name, .. }),
) if lhs_name == rhs_name => {
diagnostics.push(Diagnostic::new(
SelfAssigningVariable {
name: lhs_name.to_string(),
},
left.range(),
));
}
_ => {}
}
pub(crate) fn self_assignment(checker: &mut Checker, assign: &ast::StmtAssign) {
// Assignments in class bodies are attributes (e.g., `x = x` assigns `x` to `self.x`, and thus
// is not a self-assignment).
if checker.semantic().current_scope().kind.is_class() {
return;
}

for (left, right) in assign
.targets
.iter()
.chain(std::iter::once(assign.value.as_ref()))
.tuple_combinations()
{
visit_assignments(left, right, &mut checker.diagnostics);
}
}

/// PLW0127
pub(crate) fn self_annotated_assignment(checker: &mut Checker, assign: &ast::StmtAnnAssign) {
let Some(value) = assign.value.as_ref() else {
return;
};

// Assignments in class bodies are attributes (e.g., `x = x` assigns `x` to `self.x`, and thus
// is not a self-assignment).
if checker.semantic().current_scope().kind.is_class() {
return;
}

inner(target, value, &mut checker.diagnostics);
visit_assignments(&assign.target, value, &mut checker.diagnostics);
}

fn visit_assignments(left: &Expr, right: &Expr, diagnostics: &mut Vec<Diagnostic>) {
match (left, right) {
(
Expr::Tuple(ast::ExprTuple { elts: lhs_elts, .. }),
Expr::Tuple(ast::ExprTuple { elts: rhs_elts, .. }),
) if lhs_elts.len() == rhs_elts.len() => lhs_elts
.iter()
.zip(rhs_elts.iter())
.for_each(|(lhs, rhs)| visit_assignments(lhs, rhs, diagnostics)),
(
Expr::Name(ast::ExprName { id: lhs_name, .. }),
Expr::Name(ast::ExprName { id: rhs_name, .. }),
) if lhs_name == rhs_name => {
diagnostics.push(Diagnostic::new(
SelfAssigningVariable {
name: lhs_name.to_string(),
},
left.range(),
));
}
_ => {}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ self_assigning_variable.py:24:1: PLW0127 Self-assignment of variable `foo`
24 | foo: int = foo
| ^^^ PLW0127
25 | bar: int = bar
26 | foo = foo = bar
|

self_assigning_variable.py:25:1: PLW0127 Self-assignment of variable `bar`
Expand All @@ -355,8 +356,56 @@ self_assigning_variable.py:25:1: PLW0127 Self-assignment of variable `bar`
24 | foo: int = foo
25 | bar: int = bar
| ^^^ PLW0127
26 |
27 | # Non-errors.
26 | foo = foo = bar
27 | (foo, bar) = (foo, bar) = baz
|

self_assigning_variable.py:26:1: PLW0127 Self-assignment of variable `foo`
|
24 | foo: int = foo
25 | bar: int = bar
26 | foo = foo = bar
| ^^^ PLW0127
27 | (foo, bar) = (foo, bar) = baz
28 | (foo, bar) = baz = (foo, bar) = 1
|

self_assigning_variable.py:27:2: PLW0127 Self-assignment of variable `foo`
|
25 | bar: int = bar
26 | foo = foo = bar
27 | (foo, bar) = (foo, bar) = baz
| ^^^ PLW0127
28 | (foo, bar) = baz = (foo, bar) = 1
|

self_assigning_variable.py:27:7: PLW0127 Self-assignment of variable `bar`
|
25 | bar: int = bar
26 | foo = foo = bar
27 | (foo, bar) = (foo, bar) = baz
| ^^^ PLW0127
28 | (foo, bar) = baz = (foo, bar) = 1
|

self_assigning_variable.py:28:2: PLW0127 Self-assignment of variable `foo`
|
26 | foo = foo = bar
27 | (foo, bar) = (foo, bar) = baz
28 | (foo, bar) = baz = (foo, bar) = 1
| ^^^ PLW0127
29 |
30 | # Non-errors.
|

self_assigning_variable.py:28:7: PLW0127 Self-assignment of variable `bar`
|
26 | foo = foo = bar
27 | (foo, bar) = (foo, bar) = baz
28 | (foo, bar) = baz = (foo, bar) = 1
| ^^^ PLW0127
29 |
30 | # Non-errors.
|


Loading