language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 05:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[red-knot] Fix .to_instance() for union types (#13319)

Browse source
This commit is contained in:
Alex Waygood 2024-09-10 18:41:45 -04:00 • committed by GitHub
parent b93d0ab57c
commit a7b8cc08f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/red_knot_python_semantic/src/types.rs
View file

@ -445,12 +445,28 @@ impl<'db> Type<'db> {
} }
#[must_use] #[must_use]
pub fn to_instance(&self) -> Type<'db> { pub fn to_instance(&self, db: &'db dyn Db) -> Type<'db> {
match self { match self {
Type::Any => Type::Any, Type::Any => Type::Any,
Type::Unknown => Type::Unknown, Type::Unknown => Type::Unknown,
Type::Unbound => Type::Unknown,
Type::Never => Type::Never,
Type::Class(class) => Type::Instance(*class), Type::Class(class) => Type::Instance(*class),
_ => Type::Unknown, // TODO type errors Type::Union(union) => union.map(db, |element| element.to_instance(db)),
// TODO: we can probably do better here: --Alex
Type::Intersection(_) => Type::Unknown,
// TODO: calling `.to_instance()` on any of these should result in a diagnostic,
// since they already indicate that the object is an instance of some kind:
Type::BooleanLiteral(_)
| Type::BytesLiteral(_)
| Type::Function(_)
| Type::Instance(_)
| Type::Module(_)
| Type::IntLiteral(_)
| Type::StringLiteral(_)
| Type::Tuple(_)
| Type::LiteralString
| Type::None => Type::Unknown,
} }
} }

24
crates/red_knot_python_semantic/src/types/infer.rs
View file

@ -1457,9 +1457,11 @@ impl<'db> TypeInferenceBuilder<'db> {
ast::Number::Int(n) => n ast::Number::Int(n) => n
.as_i64() .as_i64()
.map(Type::IntLiteral) .map(Type::IntLiteral)
.unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance()), .unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance(self.db)),
ast::Number::Float(_) => builtins_symbol_ty(self.db, "float").to_instance(), ast::Number::Float(_) => builtins_symbol_ty(self.db, "float").to_instance(self.db),
ast::Number::Complex { .. } => builtins_symbol_ty(self.db, "complex").to_instance(), ast::Number::Complex { .. } => {
builtins_symbol_ty(self.db, "complex").to_instance(self.db)
}
} }
} }
@ -1573,7 +1575,7 @@ impl<'db> TypeInferenceBuilder<'db> {
} }
// TODO generic // TODO generic
builtins_symbol_ty(self.db, "list").to_instance() builtins_symbol_ty(self.db, "list").to_instance(self.db)
} }
fn infer_set_expression(&mut self, set: &ast::ExprSet) -> Type<'db> { fn infer_set_expression(&mut self, set: &ast::ExprSet) -> Type<'db> {
@ -1584,7 +1586,7 @@ impl<'db> TypeInferenceBuilder<'db> {
} }
// TODO generic // TODO generic
builtins_symbol_ty(self.db, "set").to_instance() builtins_symbol_ty(self.db, "set").to_instance(self.db)
} }
fn infer_dict_expression(&mut self, dict: &ast::ExprDict) -> Type<'db> { fn infer_dict_expression(&mut self, dict: &ast::ExprDict) -> Type<'db> {
@ -1596,7 +1598,7 @@ impl<'db> TypeInferenceBuilder<'db> {
} }
// TODO generic // TODO generic
builtins_symbol_ty(self.db, "dict").to_instance() builtins_symbol_ty(self.db, "dict").to_instance(self.db)
} }
/// Infer the type of the `iter` expression of the first comprehension. /// Infer the type of the `iter` expression of the first comprehension.
@ -2067,22 +2069,22 @@ impl<'db> TypeInferenceBuilder<'db> {
(Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => n (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => n
.checked_add(m) .checked_add(m)
.map(Type::IntLiteral) .map(Type::IntLiteral)
.unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance()), .unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance(self.db)),
(Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Sub) => n (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Sub) => n
.checked_sub(m) .checked_sub(m)
.map(Type::IntLiteral) .map(Type::IntLiteral)
.unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance()), .unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance(self.db)),
(Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mult) => n (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mult) => n
.checked_mul(m) .checked_mul(m)
.map(Type::IntLiteral) .map(Type::IntLiteral)
.unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance()), .unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance(self.db)),
(Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Div) => n (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Div) => n
.checked_div(m) .checked_div(m)
.map(Type::IntLiteral) .map(Type::IntLiteral)
.unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance()), .unwrap_or_else(|| builtins_symbol_ty(self.db, "int").to_instance(self.db)),
(Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mod) => n (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mod) => n
.checked_rem(m) .checked_rem(m)
@ -2311,7 +2313,7 @@ impl<'db> TypeInferenceBuilder<'db> {
name.ctx name.ctx
); );
self.infer_name_expression(name).to_instance() self.infer_name_expression(name).to_instance(self.db)
} }
ast::Expr::NoneLiteral(_literal) => Type::None, ast::Expr::NoneLiteral(_literal) => Type::None,