mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 13:24:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ty] fix incorrect member narrowing (#19802)

Browse source 
## Summary

Reported in:
https://github.com/astral-sh/ruff/pull/19795#issuecomment-3161981945

If a root expression is reassigned, narrowing on the member should be
invalidated, but there was an oversight in the current implementation.

This PR fixes that, and also removes some unnecessary handling.

## Test Plan

New tests cases in `narrow/conditionals/nested.md`.
This commit is contained in:
Shunsuke Shibayama 2025-08-08 08:04:07 +09:00 • committed by GitHub
parent f51a228f04
commit 462adfd0e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/ty_python_semantic/src/types/infer.rs
View file

@ -6758,6 +6758,17 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
.parent()
.is_some_and(|parent| parent == enclosing_scope_file_id);
let has_root_place_been_reassigned = || {
let enclosing_place_table = self.index.place_table(enclosing_scope_file_id);
enclosing_place_table
.parents(place_expr)
.any(|enclosing_root_place_id| {
enclosing_place_table
.place(enclosing_root_place_id)
.is_bound()
})
};
// If the reference is in a nested eager scope, we need to look for the place at
// the point where the previous enclosing scope was defined, instead of at the end
// of the scope. (Note that the semantic index builder takes care of only
@ -6799,28 +6810,16 @@ impl<'db, 'ast> TypeInferenceBuilder<'db, 'ast> {
// There are no visible bindings / constraint here.
// Don't fall back to non-eager place resolution.
EnclosingSnapshotResult::NotFound => {
let enclosing_place_table =
self.index.place_table(enclosing_scope_file_id);
for enclosing_root_place_id in enclosing_place_table.parents(place_expr)
{
let enclosing_root_place =
enclosing_place_table.place(enclosing_root_place_id);
if enclosing_root_place.is_bound() {
if let Place::Type(_, _) = place(
db,
enclosing_scope_id,
enclosing_root_place,
ConsideredDefinitions::AllReachable,
)
.place
{
return Place::Unbound.into();
}
}
if has_root_place_been_reassigned() {
return Place::Unbound.into();
}
continue;
}
EnclosingSnapshotResult::NoLongerInEagerContext => {}
EnclosingSnapshotResult::NoLongerInEagerContext => {
if has_root_place_been_reassigned() {
return Place::Unbound.into();
}
}
}
}