mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-23 11:54:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ty] Allow a class to inherit from an intersection if the intersection contains a dynamic type and the intersection is not disjoint from type (#18055)

Browse source
This commit is contained in:
Alex Waygood 2025-05-12 19:07:11 -04:00 • committed by GitHub
parent c7b6108cb8
commit 41fa082414
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ty_python_semantic/src/types.rs
View file

@ -543,6 +543,13 @@ impl<'db> Type<'db> {
Self::Dynamic(DynamicType::Unknown)
}
pub(crate) fn into_dynamic(self) -> Option<DynamicType> {
match self {
Type::Dynamic(dynamic_type) => Some(dynamic_type),
_ => None,
}
}
pub fn object(db: &'db dyn Db) -> Self {
KnownClass::Object.to_instance(db)
}

13
crates/ty_python_semantic/src/types/class_base.rs
View file

@ -107,8 +107,19 @@ impl<'db> ClassBase<'db> {
{
Self::try_from_type(db, todo_type!("GenericAlias instance"))
}
Type::Intersection(inter) => {
let dynamic_element = inter
.positive(db)
.iter()
.find_map(|elem| elem.into_dynamic())?;
if ty.is_disjoint_from(db, KnownClass::Type.to_instance(db)) {
None
} else {
Some(ClassBase::Dynamic(dynamic_element))
}
}
Type::Union(_) => None, // TODO -- forces consideration of multiple possible MROs?
Type::Intersection(_) => None, // TODO -- probably incorrect?
Type::NominalInstance(_) => None, // TODO -- handle `__mro_entries__`?
Type::PropertyInstance(_) => None,
Type::Never