mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-19 20:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[ty] Fix incorrect inference of enum.auto() for enums with non-int mixins, and imprecise inference of enum.auto() for single-member enums (#20541)

Browse source 
Co-authored-by: Alex Waygood <alex.waygood@gmail.com>
This commit is contained in:
justin 2025-11-10 12:53:08 -05:00 • committed by GitHub
parent e4dc406a3d
commit f63a9f2334
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 104 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4365,6 +4365,16 @@ impl<'db> Type<'db> {
Place::bound(todo_type!("ParamSpecArgs / ParamSpecKwargs")).into()
}
Type::NominalInstance(instance)
if matches!(name_str, "value" | "_value_")
&& is_single_member_enum(db, instance.class(db).class_literal(db).0) =>
{
enum_metadata(db, instance.class(db).class_literal(db).0)
.and_then(|metadata| metadata.members.get_index(0).map(|(_, v)| *v))
.map_or(Place::Undefined, Place::bound)
.into()
}
Type::NominalInstance(..)
| Type::ProtocolInstance(..)
| Type::BooleanLiteral(..)

45
crates/ty_python_semantic/src/types/enums.rs
View file

@ -6,7 +6,7 @@ use crate::{
place::{Place, PlaceAndQualifiers, place_from_bindings, place_from_declarations},
semantic_index::{place_table, use_def_map},
types::{
ClassLiteral, DynamicType, EnumLiteralType, KnownClass, MemberLookupPolicy,
ClassBase, ClassLiteral, DynamicType, EnumLiteralType, KnownClass, MemberLookupPolicy,
StringLiteralType, Type, TypeQualifiers,
},
};
@ -68,9 +68,6 @@ pub(crate) fn enum_metadata<'db>(
return None;
}
let is_str_enum =
Type::ClassLiteral(class).is_subtype_of(db, KnownClass::StrEnum.to_subclass_of(db));
let scope_id = class.body_scope(db);
let use_def_map = use_def_map(db, scope_id);
let table = place_table(db, scope_id);
@ -141,14 +138,48 @@ pub(crate) fn enum_metadata<'db>(
// enum.auto
Some(KnownClass::Auto) => {
auto_counter += 1;
Some(if is_str_enum {
// `StrEnum`s have different `auto()` behaviour to enums inheriting from `(str, Enum)`
let auto_value_ty = if Type::ClassLiteral(class)
.is_subtype_of(db, KnownClass::StrEnum.to_subclass_of(db))
{
Type::StringLiteral(StringLiteralType::new(
db,
name.to_lowercase().as_str(),
))
} else {
Type::IntLiteral(auto_counter)
})
let custom_mixins: smallvec::SmallVec<[Option<KnownClass>; 1]> =
class
.iter_mro(db, None)
.skip(1)
.filter_map(ClassBase::into_class)
.filter(|class| {
!Type::from(*class).is_subtype_of(
db,
KnownClass::Enum.to_subclass_of(db),
)
})
.map(|class| class.known(db))
.filter(|class| {
!matches!(class, Some(KnownClass::Object))
})
.collect();
// `IntEnum`s have the same `auto()` behaviour to enums inheriting from `(int, Enum)`,
// and `IntEnum`s also have `int` in their MROs, so both cases are handled here.
//
// In general, the `auto()` behaviour for enums with non-`int` mixins is hard to predict,
// so we fall back to `Any` in those cases.
if matches!(
custom_mixins.as_slice(),
[] | [Some(KnownClass::Int)]
) {
Type::IntLiteral(auto_counter)
} else {
Type::any()
}
};
Some(auto_value_ty)
}
_ => None,