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

Revert "[ty] Detect illegal non-enum attribute accesses in Literal annotation"

Browse source 
This reverts commit cbc8c08016.
This commit is contained in:
David Peter 2025-07-22 09:19:44 +02:00
parent cbc8c08016
commit 30683e3a93
3 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ty_python_semantic/resources/mdtest/annotations/literal.md
View file

@ -51,13 +51,6 @@ invalid4: Literal[
hello, # error: [invalid-type-form]
(1, 2, 3), # error: [invalid-type-form]
]
class NotAnEnum:
x: int = 1
# error: [invalid-type-form]
def _(invalid: Literal[NotAnEnum.x]) -> None:
reveal_type(invalid) # revealed: Unknown
```
## Shortening unions of literals

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

@ -240,10 +240,3 @@ pub(crate) fn enum_member_literals<'a, 'db: 'a>(
pub(crate) fn is_single_member_enum<'db>(db: &'db dyn Db, class: ClassLiteral<'db>) -> bool {
enum_metadata(db, class).is_some_and(|metadata| metadata.members.len() == 1)
}
pub(crate) fn is_enum_class<'db>(db: &'db dyn Db, ty: Type<'db>) -> bool {
match ty {
Type::ClassLiteral(class_literal) => enum_metadata(db, class_literal).is_some(),
_ => false,
}
}

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

@ -102,7 +102,6 @@ use crate::types::diagnostic::{
report_invalid_generator_function_return_type, report_invalid_return_type,
report_possibly_unbound_attribute,
};
use crate::types::enums::{enum_metadata, is_enum_class};
use crate::types::function::{
FunctionDecorators, FunctionLiteral, FunctionType, KnownFunction, OverloadLiteral,
};
@ -10034,19 +10033,14 @@ impl<'db> TypeInferenceBuilder<'db, '_> {
// For enum values
ast::Expr::Attribute(ast::ExprAttribute { value, attr, .. }) => {
let value_ty = self.infer_expression(value);
if is_enum_class(self.db(), value_ty) {
let ty = value_ty
.member(self.db(), &attr.id)
.place
.ignore_possibly_unbound()
.unwrap_or(Type::unknown());
self.store_expression_type(parameters, ty);
ty
} else {
self.store_expression_type(parameters, Type::unknown());
return Err(vec![parameters]);
}
// TODO: Check that value type is enum otherwise return None
let ty = value_ty
.member(self.db(), &attr.id)
.place
.ignore_possibly_unbound()
.unwrap_or(Type::unknown());
self.store_expression_type(parameters, ty);
ty
}
// for negative and positive numbers
ast::Expr::UnaryOp(u)