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

[red-knot] Improve type inference for except handlers where a tuple of exception classes is caught (#13646)

Browse source
This commit is contained in:
Alex Waygood 2024-10-07 16:13:06 +01:00 • committed by GitHub
parent 14ee5dbfde
commit d7484e6942
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1030,10 +1030,17 @@ impl<'db> TypeInferenceBuilder<'db> {
} else {
// TODO: anything that's a consistent subtype of
// `type[BaseException] | tuple[type[BaseException], ...]` should be valid;
// anything else should be invalid --Alex
// anything else is invalid and should lead to a diagnostic being reported --Alex
match node_ty {
Type::Any | Type::Unknown => node_ty,
Type::Class(class_ty) => Type::Instance(class_ty),
Type::Tuple(tuple) => UnionType::from_elements(
self.db,
tuple
.elements(self.db)
.iter()
.map(|ty| ty.into_class_type().map_or(Type::Todo, Type::Instance)),
),
_ => Type::Todo,
}
};
@ -6151,11 +6158,54 @@ mod tests {
",
)?;
// For these TODOs we need support for `tuple` types:
let expected_diagnostics = &[
// TODO: Should be `RuntimeError | OSError` --Alex
"Revealed type is `RuntimeError | OSError`",
"Revealed type is `AttributeError | TypeError`",
];
assert_file_diagnostics(&db, "src/a.py", expected_diagnostics);
Ok(())
}
#[test]
fn except_handler_dynamic_exceptions() -> anyhow::Result<()> {
let mut db = setup_db();
db.write_dedented(
"src/a.py",
"
from typing_extensions import reveal_type
def foo(
x: type[AttributeError],
y: tuple[type[OSError], type[RuntimeError]],
z: tuple[type[BaseException], ...]
):
try:
w
except x as e:
reveal_type(e)
except y as f:
reveal_type(f)
except z as g:
reveal_type(g)
",
)?;
let expected_diagnostics = &[
// TODO: these `__class_getitem__` diagnostics are all false positives:
// (`builtins.type` is unique at runtime
// as it can be subscripted even though it has no `__class_getitem__` method)
"Cannot subscript object of type `Literal[type]` with no `__class_getitem__` method",
"Cannot subscript object of type `Literal[type]` with no `__class_getitem__` method",
"Cannot subscript object of type `Literal[type]` with no `__class_getitem__` method",
"Cannot subscript object of type `Literal[type]` with no `__class_getitem__` method",
// Should be `AttributeError`:
"Revealed type is `@Todo`",
// TODO: Should be `AttributeError | TypeError` --Alex
// Should be `OSError | RuntimeError`:
"Revealed type is `@Todo`",
// Should be `BaseException`:
"Revealed type is `@Todo`",
];