language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 14:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[red-knot] Improve tests relating to type inference for exception handlers (#13643)

Browse source
This commit is contained in:
Alex Waygood 2024-10-05 17:59:36 +01:00 • committed by GitHub
parent 2a365bb278
commit 7c5a7d909c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5968,19 +5968,22 @@ mod tests {
"src/a.py", "src/a.py",
" "
import re import re
from typing_extensions import reveal_type
try: try:
x x
except NameError as e: except NameError as e:
pass reveal_type(e)
except re.error as f: except re.error as f:
pass reveal_type(f)
", ",
)?; )?;
assert_public_ty(&db, "src/a.py", "e", "NameError"); assert_file_diagnostics(
assert_public_ty(&db, "src/a.py", "f", "error"); &db,
assert_file_diagnostics(&db, "src/a.py", &[]); "src/a.py",
&["Revealed type is `NameError`", "Revealed type is `error`"],
);
Ok(()) Ok(())
} }
@ -5993,21 +5996,25 @@ mod tests {
"src/a.py", "src/a.py",
" "
from nonexistent_module import foo from nonexistent_module import foo
from typing_extensions import reveal_type
try: try:
x x
except foo as e: except foo as e:
pass reveal_type(foo)
reveal_type(e)
", ",
)?; )?;
assert_file_diagnostics( assert_file_diagnostics(
&db, &db,
"src/a.py", "src/a.py",
&["Cannot resolve import `nonexistent_module`"], &[
"Cannot resolve import `nonexistent_module`",
"Revealed type is `Unknown`",
"Revealed type is `Unknown`",
],
); );
assert_public_ty(&db, "src/a.py", "foo", "Unknown");
assert_public_ty(&db, "src/a.py", "e", "Unknown");
Ok(()) Ok(())
} }
@ -6019,25 +6026,28 @@ mod tests {
db.write_dedented( db.write_dedented(
"src/a.py", "src/a.py",
" "
from typing_extensions import reveal_type
EXCEPTIONS = (AttributeError, TypeError) EXCEPTIONS = (AttributeError, TypeError)
try: try:
x x
except (RuntimeError, OSError) as e: except (RuntimeError, OSError) as e:
pass reveal_type(e)
except EXCEPTIONS as f: except EXCEPTIONS as f:
pass reveal_type(f)
", ",
)?; )?;
assert_file_diagnostics(&db, "src/a.py", &[]);
// For these TODOs we need support for `tuple` types: // For these TODOs we need support for `tuple` types:
let expected_diagnostics = &[
// TODO: Should be `RuntimeError | OSError` --Alex
"Revealed type is `@Todo`",
// TODO: Should be `AttributeError | TypeError` --Alex
"Revealed type is `@Todo`",
];
// TODO: Should be `RuntimeError | OSError` --Alex assert_file_diagnostics(&db, "src/a.py", expected_diagnostics);
assert_public_ty(&db, "src/a.py", "e", "@Todo");
// TODO: Should be `AttributeError | TypeError` --Alex
assert_public_ty(&db, "src/a.py", "e", "@Todo");
Ok(()) Ok(())
} }
@ -6049,15 +6059,16 @@ mod tests {
db.write_dedented( db.write_dedented(
"src/a.py", "src/a.py",
" "
from typing_extensions import reveal_type
try: try:
x x
except as e: except as e:
pass reveal_type(e)
", ",
)?; )?;
assert_file_diagnostics(&db, "src/a.py", &[]); assert_file_diagnostics(&db, "src/a.py", &["Revealed type is `Unknown`"]);
assert_public_ty(&db, "src/a.py", "e", "Unknown");
Ok(()) Ok(())
} }
@ -6069,19 +6080,23 @@ mod tests {
db.write_dedented( db.write_dedented(
"src/a.py", "src/a.py",
" "
from typing_extensions import reveal_type
try: try:
x x
except* BaseException as e: except* BaseException as e:
pass reveal_type(e)
", ",
)?; )?;
assert_file_diagnostics(&db, "src/a.py", &[]);
// TODO: once we support `sys.version_info` branches, // TODO: once we support `sys.version_info` branches,
// we can set `--target-version=py311` in this test // we can set `--target-version=py311` in this test
// and the inferred type will just be `BaseExceptionGroup` --Alex // and the inferred type will just be `BaseExceptionGroup` --Alex
assert_public_ty(&db, "src/a.py", "e", "Unknown | BaseExceptionGroup"); assert_file_diagnostics(
&db,
"src/a.py",
&["Revealed type is `Unknown | BaseExceptionGroup`"],
);
Ok(()) Ok(())
} }
@ -6093,21 +6108,25 @@ mod tests {
db.write_dedented( db.write_dedented(
"src/a.py", "src/a.py",
" "
from typing_extensions import reveal_type
try: try:
x x
except* OSError as e: except* OSError as e:
pass reveal_type(e)
", ",
)?; )?;
assert_file_diagnostics(&db, "src/a.py", &[]);
// TODO: once we support `sys.version_info` branches, // TODO: once we support `sys.version_info` branches,
// we can set `--target-version=py311` in this test // we can set `--target-version=py311` in this test
// and the inferred type will just be `BaseExceptionGroup` --Alex // and the inferred type will just be `BaseExceptionGroup` --Alex
// //
// TODO more precise would be `ExceptionGroup[OSError]` --Alex // TODO more precise would be `ExceptionGroup[OSError]` --Alex
assert_public_ty(&db, "src/a.py", "e", "Unknown | BaseExceptionGroup"); assert_file_diagnostics(
&db,
"src/a.py",
&["Revealed type is `Unknown | BaseExceptionGroup`"],
);
Ok(()) Ok(())
} }
@ -6119,21 +6138,25 @@ mod tests {
db.write_dedented( db.write_dedented(
"src/a.py", "src/a.py",
" "
from typing_extensions import reveal_type
try: try:
x x
except* (TypeError, AttributeError) as e: except* (TypeError, AttributeError) as e:
pass reveal_type(e)
", ",
)?; )?;
assert_file_diagnostics(&db, "src/a.py", &[]);
// TODO: once we support `sys.version_info` branches, // TODO: once we support `sys.version_info` branches,
// we can set `--target-version=py311` in this test // we can set `--target-version=py311` in this test
// and the inferred type will just be `BaseExceptionGroup` --Alex // and the inferred type will just be `BaseExceptionGroup` --Alex
// //
// TODO more precise would be `ExceptionGroup[TypeError | AttributeError]` --Alex // TODO more precise would be `ExceptionGroup[TypeError | AttributeError]` --Alex
assert_public_ty(&db, "src/a.py", "e", "Unknown | BaseExceptionGroup"); assert_file_diagnostics(
&db,
"src/a.py",
&["Revealed type is `Unknown | BaseExceptionGroup`"],
);
Ok(()) Ok(())
} }