Skip to content

Commit a2f9e5a

Browse files
committed
reapply fix
1 parent 695f272 commit a2f9e5a

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

crates/ty_python_semantic/resources/mdtest/import/nonstandard_conventions.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -919,8 +919,7 @@ from typing import TYPE_CHECKING
919919
from mypackage.conflicted.other1 import x as x1
920920
import mypackage.conflicted.b.c
921921

922-
# error: [possibly-missing-attribute]
923-
reveal_type(mypackage.conflicted.b.c.y) # revealed: Unknown
922+
reveal_type(mypackage.conflicted.b.c.y) # revealed: int
924923
```
925924

926925
## Re-export Nameclash Problems In Functions

crates/ty_python_semantic/src/types.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12322,8 +12322,7 @@ impl<'db> ModuleLiteralType<'db> {
1232212322
let place_and_qualifiers = self
1232312323
.module(db)
1232412324
.file(db)
12325-
.map(|file| imported_symbol(db, file, name, None))
12326-
/*.map(|file| {
12325+
.map(|file| {
1232712326
imported_symbol(db, file, name, None).map_type(|ty| {
1232812327
if let Some(importing) = self.importing_file(db)
1232912328
&& let Type::ModuleLiteral(module) = ty
@@ -12333,7 +12332,7 @@ impl<'db> ModuleLiteralType<'db> {
1233312332
ty
1233412333
}
1233512334
})
12336-
})*/
12335+
})
1233712336
.unwrap_or_default();
1233812337

1233912338
if !place_and_qualifiers.is_undefined() {

0 commit comments

Comments
 (0)