language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-12-04 09:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't flag redefined-while-unused in if branches (#9418)

Browse source 
## Summary

On `main`, we flag redefinitions in cases like:

```python
import os

x = 1

if x > 0:
    import os
```

That is, we consider these to be in the "same branch", since they're not
in disjoint branches. This matches Flake8's behavior, but it seems to
lead to false positives.
This commit is contained in:
Charlie Marsh 2024-01-08 17:06:55 -05:00 • committed by GitHub
parent f419af494f
commit 985f1d10f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ruff_python_semantic/src/model.rs
View file

@ -1163,11 +1163,11 @@ impl<'a> SemanticModel<'a> {
false
}
/// Returns `true` if `left` and `right` are on different branches of an `if`, `match`, or
/// Returns `true` if `left` and `right` are in the same branches of an `if`, `match`, or
/// `try` statement.
///
/// This implementation assumes that the statements are in the same scope.
pub fn different_branches(&self, left: NodeId, right: NodeId) -> bool {
pub fn same_branch(&self, left: NodeId, right: NodeId) -> bool {
// Collect the branch path for the left statement.
let left = self
.nodes
@ -1184,10 +1184,7 @@ impl<'a> SemanticModel<'a> {
.flat_map(|branch_id| self.branches.ancestor_ids(*branch_id))
.collect::<Vec<_>>();
!left
.iter()
.zip(right.iter())
.all(|(left, right)| left == right)
left == right
}
/// Returns `true` if the given expression is an unused variable, or consists solely of