revert unnecessary changes for the purpose of this PR

Author: mtshiba

crates/ty_python_semantic/resources/corpus/divergent.py

@@ -57,6 +57,9 @@ def unwrap(value):
     else:
         raise TypeError()
 
+# TODO: If this is commented out, that is, if `infer_scope_types` is called before `infer_return_type`, it will panic.
+reveal_type(unwrap(Foo()))
+
 def descent(x: int, y: int):
     if x > y:
         y, x = descent(y, x)
@@ -67,3 +70,6 @@ def descent(x: int, y: int):
         return (0, 1)
     else:
         return descent(x-1, y-1)
+
+# TODO: If this is commented out, that is, if `infer_scope_types` is called before `infer_return_type`, it will panic.
+reveal_type(descent(5, 3))

crates/ty_python_semantic/resources/mdtest/attributes.md

@@ -2281,24 +2281,6 @@ class B:
 
 reveal_type(B().x)  # revealed: Unknown | Literal[1]
 reveal_type(A().x)  # revealed: Unknown | Literal[1]
-
-class Base:
-    def flip(self) -> "Sub":
-        return Sub()
-
-class Sub(Base):
-    # TODO invalid override error
-    def flip(self) -> "Base":
-        return Base()
-
-class C2:
-    def __init__(self, x: Sub):
-        self.x = x
-
-    def replace_with(self, other: "C2"):
-        self.x = other.x.flip()
-
-reveal_type(C2(Sub()).x)  # revealed: Unknown | Base
 ```
 
 This case additionally tests our union/intersection simplification logic:

crates/ty_python_semantic/resources/mdtest/cycle.md

@@ -31,28 +31,3 @@ p = Point()
 reveal_type(p.x)  # revealed: Unknown | int
 reveal_type(p.y)  # revealed: Unknown | int
 ```
-
-## Self-referential bare type alias
-
-```py
-A = list["A" | None]
-
-def f(x: A):
-    # TODO: should be `list[A | None]`?
-    reveal_type(x)  # revealed: list[Divergent]
-    # TODO: should be `A | None`?
-    reveal_type(x[0])  # revealed: Divergent
-```
-
-## Self-referential type variables
-
-```py
-from typing import Generic, TypeVar
-
-B = TypeVar("B", bound="Base")
-
-# TODO: no error
-# error: [invalid-argument-type] "`typing.TypeVar | typing.TypeVar` is not a valid argument to `Generic`"
-class Base(Generic[B]):
-    pass
-```

crates/ty_python_semantic/src/dunder_all.rs

@@ -6,8 +6,8 @@ use ruff_python_ast::name::Name;
 use ruff_python_ast::statement_visitor::{StatementVisitor, walk_stmt};
 use ruff_python_ast::{self as ast};
 
-use crate::semantic_index::global_scope;
-use crate::types::{Truthiness, Type, infer_scope_expression_type};
+use crate::semantic_index::{SemanticIndex, semantic_index};
+use crate::types::{Truthiness, Type, TypeContext, infer_expression_types};
 use crate::{Db, ModuleName, resolve_module};
 
 #[allow(clippy::ref_option)]
@@ -31,7 +31,8 @@ pub(crate) fn dunder_all_names(db: &dyn Db, file: File) -> Option<FxHashSet<Name
     let _span = tracing::trace_span!("dunder_all_names", file=?file.path(db)).entered();
 
     let module = parsed_module(db, file).load(db);
-    let mut collector = DunderAllNamesCollector::new(db, file);
+    let index = semantic_index(db, file);
+    let mut collector = DunderAllNamesCollector::new(db, file, index);
     collector.visit_body(module.suite());
     collector.into_names()
 }
@@ -41,6 +42,9 @@ struct DunderAllNamesCollector<'db> {
     db: &'db dyn Db,
     file: File,
 
+    /// The semantic index for the module.
+    index: &'db SemanticIndex<'db>,
+
     /// The origin of the `__all__` variable in the current module, [`None`] if it is not defined.
     origin: Option<DunderAllOrigin>,
 
@@ -53,10 +57,11 @@ struct DunderAllNamesCollector<'db> {
 }
 
 impl<'db> DunderAllNamesCollector<'db> {
-    fn new(db: &'db dyn Db, file: File) -> Self {
+    fn new(db: &'db dyn Db, file: File, index: &'db SemanticIndex<'db>) -> Self {
         Self {
             db,
             file,
+            index,
             origin: None,
             invalid: false,
             names: FxHashSet::default(),
@@ -177,7 +182,8 @@ impl<'db> DunderAllNamesCollector<'db> {
     ///
     /// This function panics if `expr` was not marked as a standalone expression during semantic indexing.
     fn standalone_expression_type(&self, expr: &ast::Expr) -> Type<'db> {
-        infer_scope_expression_type(self.db, global_scope(self.db, self.file), expr)
+        infer_expression_types(self.db, self.index.expression(expr), TypeContext::default())
+            .expression_type(expr)
     }
 
     /// Evaluate the given expression and return its truthiness.

crates/ty_python_semantic/src/semantic_model.rs

@@ -12,7 +12,7 @@ use crate::semantic_index::definition::Definition;
 use crate::semantic_index::scope::FileScopeId;
 use crate::semantic_index::semantic_index;
 use crate::types::ide_support::all_declarations_and_bindings;
-use crate::types::{Type, binding_type, infer_scope_expression_type};
+use crate::types::{Type, binding_type, infer_scope_types};
 
 pub struct SemanticModel<'db> {
     db: &'db dyn Db,
@@ -363,7 +363,7 @@ impl HasType for ast::ExprRef<'_> {
         let file_scope = index.expression_scope_id(self);
         let scope = file_scope.to_scope_id(model.db, model.file);
 
-        infer_scope_expression_type(model.db, scope, *self)
+        infer_scope_types(model.db, scope).expression_type(*self)
     }
 }