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 lazy scope narrowing (#19744)

Browse source 
## Summary

This is a follow-up to #19321.

Narrowing constraints introduced in a class scope were not applied even
when they can be applied in lazy nested scopes. This PR fixes so that
they are now applied.
Conversely, there were cases where narrowing constraints were being
applied in places where they should not, so it is also fixed.

## Test Plan

Some TODOs in `narrow/conditionals/nested.md` are now work correctly.
This commit is contained in:
Shunsuke Shibayama 2025-08-05 12:32:08 +09:00 • committed by GitHub
parent 64bcc8db2f
commit 351121c5c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ty_python_semantic/resources/mdtest/narrow/conditionals/nested.md
View file

@ -363,11 +363,12 @@ def f(x: str | Literal[1] | None):
x = None
def _():
# No narrowing is performed on unresolved references.
# error: [unresolved-reference]
if x is not None:
def _():
if x != 1:
reveal_type(x) # revealed: Never
reveal_type(x) # revealed: None
x = None
def f(const: str | Literal[1] | None):
@ -375,8 +376,7 @@ def f(const: str | Literal[1] | None):
if const is not None:
def _():
if const != 1:
# TODO: should be `str`
reveal_type(const) # revealed: str | None
reveal_type(const) # revealed: str
class D:
if const != 1:

4
crates/ty_python_semantic/src/semantic_index/builder.rs
View file

@ -356,7 +356,9 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
for nested_symbol in self.place_tables[popped_scope_id].symbols() {
// For the same reason, symbols declared as nonlocal or global are not recorded.
// Also, if the enclosing scope allows its members to be modified from elsewhere, the snapshot will not be recorded.
if self.scopes[enclosing_scope_id].visibility().is_public() {
// (In the case of class scopes, class variables can be modified from elsewhere, but this has no effect in nested scopes,
// as class variables are not visible to them)
if self.scopes[enclosing_scope_id].kind().is_module() {
continue;
}

4
crates/ty_python_semantic/src/semantic_index/scope.rs
View file

@ -251,6 +251,10 @@ impl ScopeKind {
matches!(self, ScopeKind::Class)
}
pub(crate) const fn is_module(self) -> bool {
matches!(self, ScopeKind::Module)
}
pub(crate) const fn is_type_parameter(self) -> bool {
matches!(self, ScopeKind::Annotation | ScopeKind::TypeAlias)
}

3
crates/ty_python_semantic/src/semantic_index/symbol.rs
View file

@ -36,6 +36,7 @@ bitflags! {
const IS_DECLARED = 1 << 2;
const MARKED_GLOBAL = 1 << 3;
const MARKED_NONLOCAL = 1 << 4;
/// true if the symbol is assigned more than once, or if it is assigned even though it is already in use
const IS_REASSIGNED = 1 << 5;
}
}
@ -92,7 +93,7 @@ impl Symbol {
}
pub(super) fn mark_bound(&mut self) {
if self.is_bound() {
if self.is_bound() || self.is_used() {
self.insert_flags(SymbolFlags::IS_REASSIGNED);
}