Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
410 changes: 410 additions & 0 deletions crates/ty_python_semantic/resources/mdtest/enums.md

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions crates/ty_python_semantic/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4243,6 +4243,13 @@ impl<'db> Type<'db> {
}
}

if let Some(length) = self
.as_enum_literal()
.and_then(|literal| enums::flag_literal_len(db, literal))
{
return Some(Type::int_literal(length));
}

let return_ty = match self.try_call_dunder(
db,
"__len__",
Expand Down Expand Up @@ -5144,6 +5151,7 @@ impl<'db> Type<'db> {
.to_class_literal(db)
.to_class_type(db)
.is_some_and(|enum_class| class.is_subclass_of(db, enum_class))
&& enums::enum_uses_standard_metaclass_call(db, class_literal)
{
return fallback_bindings();
}
Expand Down
17 changes: 13 additions & 4 deletions crates/ty_python_semantic/src/types/bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ use crate::{
CallArguments, CallDunderError, ClassType, CycleDetector, KnownClass, KnownInstanceType,
LiteralValueTypeKind, SubclassOfInner, Type, TypeContext, TypeVarBoundOrConstraints,
UnionType, call::CallErrorKind, constraints::ConstraintSetBuilder, context::InferContext,
diagnostic::UNSUPPORTED_BOOL_CONVERSION, typed_dict::TypedDictField,
diagnostic::UNSUPPORTED_BOOL_CONVERSION, enums::flag_literal_truthiness,
typed_dict::TypedDictField,
},
};
use ty_python_core::Truthiness;
Expand Down Expand Up @@ -306,9 +307,17 @@ impl<'db> Type<'db> {

Type::LiteralValue(literal) => match literal.kind() {
LiteralValueTypeKind::LiteralString => Truthiness::Ambiguous,
LiteralValueTypeKind::Enum(enum_type) => enum_type
.enum_class_instance(db)
.try_bool_impl(db, allow_short_circuit, visitor)?,
LiteralValueTypeKind::Enum(enum_type) => {
if let Some(truthiness) = flag_literal_truthiness(db, enum_type) {
Truthiness::from(truthiness)
} else {
enum_type.enum_class_instance(db).try_bool_impl(
db,
allow_short_circuit,
visitor,
)?
}
}

LiteralValueTypeKind::Int(num) => Truthiness::from(num.as_i64() != 0),
LiteralValueTypeKind::Bool(bool) => Truthiness::from(bool),
Expand Down
8 changes: 4 additions & 4 deletions crates/ty_python_semantic/src/types/call/bind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2065,12 +2065,12 @@ impl<'db> Bindings<'db> {
if let [Some(ty)] = overload.parameter_types() {
let return_ty = match ty {
Type::ClassLiteral(class) => {
if let Some(metadata) = enums::enum_metadata(db, *class) {
if let Some(metadata) = enums::enum_metadata(db, *class)
&& let Some(members) = metadata.canonical_member_names()
{
Type::heterogeneous_tuple(
db,
metadata
.members
.keys()
members
.map(|member| Type::string_literal(db, member)),
)
} else {
Expand Down
4 changes: 2 additions & 2 deletions crates/ty_python_semantic/src/types/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::types::callable::{CallableFunctionProvenance, CallableTypeKind};
use crate::types::constraints::{
ConstraintSet, ConstraintSetBuilder, IteratorConstraintsExtension,
};
use crate::types::enums::enum_metadata;
use crate::types::enums::{enum_metadata, enum_uses_standard_metaclass_call};
use crate::types::function::{AbstractMethodKind, DataclassTransformerParams};
use crate::types::generics::{
GenericContext, InferableTypeVars, Specialization, walk_specialization,
Expand Down Expand Up @@ -1985,7 +1985,7 @@ impl<'db> ClassType<'db> {
// `Color("red")`, instead of the overloaded signature of `EnumMeta.__call__` which also accounts
// for dynamic Enum creation.
let is_actual_enum = enum_metadata(db, self.class_literal(db)).is_some();
if !is_actual_enum {
if !is_actual_enum || !enum_uses_standard_metaclass_call(db, self.class_literal(db)) {
return CallableTypes::one(metaclass_dunder_call_function.into_callable_type(db));
}
}
Expand Down
9 changes: 8 additions & 1 deletion crates/ty_python_semantic/src/types/class/enum_literal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::types::Type;
use crate::types::class::known::KnownClass;
use crate::types::class::{ClassLiteral, ClassType, MemberLookupPolicy};
use crate::types::class_base::ClassBase;
use crate::types::enums::FlagBoundary;
use crate::types::member::Member;
use crate::types::mro::{DynamicMroError, Mro};
use ty_python_core::definition::Definition;
Expand All @@ -21,6 +22,7 @@ pub struct EnumSpec<'db> {
#[returns(deref)]
pub(crate) members: Box<[(Name, Type<'db>)]>,
pub(crate) has_known_members: bool,
pub(crate) boundary: FlagBoundary,
}

impl<'db> EnumSpec<'db> {
Expand All @@ -40,7 +42,12 @@ impl<'db> EnumSpec<'db> {
})
.collect::<Option<Box<_>>>()?;

Some(Self::new(db, members, self.has_known_members(db)))
Some(Self::new(
db,
members,
self.has_known_members(db),
self.boundary(db),
))
}
}

Expand Down
Loading
Loading