Find other places where analyze_annotation should eventually be set…

… to true.
python · tyralla · Oct 29, 2023 · Nov 13, 2023 · Nov 15, 2023 · Nov 21, 2023
commit fe0cd0a5b6deae9aad25cf8b0bc2e929c1ccfeaa
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -5375,6 +5375,7 @@ def analyze_type_application_args(self, expr: IndexExpr) -> list[Type] | None:
                 allow_placeholder=True,
                 allow_param_spec_literals=has_param_spec,
                 allow_unpack=allow_unpack,
+                analyze_annotation=True,
             )
             if analyzed is None:
                 return None
@@ -5399,7 +5400,7 @@ def visit_slice_expr(self, expr: SliceExpr) -> None:
 
     def visit_cast_expr(self, expr: CastExpr) -> None:
         expr.expr.accept(self)
-        analyzed = self.anal_type(expr.type)
+        analyzed = self.anal_type(expr.type, analyze_annotation=True)
         if analyzed is not None:
             expr.type = analyzed
 
@@ -5421,7 +5422,7 @@ def visit_reveal_expr(self, expr: RevealExpr) -> None:
     def visit_type_application(self, expr: TypeApplication) -> None:
         expr.expr.accept(self)
         for i in range(len(expr.types)):
-            analyzed = self.anal_type(expr.types[i])
+            analyzed = self.anal_type(expr.types[i], analyze_annotation=True)
             if analyzed is not None:
                 expr.types[i] = analyzed
 
@@ -6579,6 +6580,7 @@ def expr_to_analyzed_type(
             allow_unbound_tvars=allow_unbound_tvars,
             allow_param_spec_literals=allow_param_spec_literals,
             allow_unpack=allow_unpack,
+            analyze_annotation=isinstance(expr, IndexExpr),
         )
 
     def analyze_type_expr(self, expr: Expression) -> None:

diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -150,6 +150,7 @@ def analyze_type_alias(
         allow_placeholder=allow_placeholder,
         prohibit_self_type="type alias target",
         allowed_alias_tvars=allowed_alias_tvars,
+        analyze_annotation=True,
     )
     analyzer.in_dynamic_func = in_dynamic_func
     analyzer.global_scope = global_scope

diff --git a/test-data/unit/check-callable.test b/test-data/unit/check-callable.test
@@ -524,17 +524,6 @@ else:
 
 [builtins fixtures/callable.pyi]
 
-[case testBuiltinsTypeAsCallable]
-# flags: --python-version 3.7
-from __future__ import annotations
-
-reveal_type(type)  # N: Revealed type is "def (x: Any) -> builtins.type"
-_TYPE = type
-reveal_type(_TYPE)  # N: Revealed type is "def (x: Any) -> builtins.type"
-_TYPE('bar')
-
-[builtins fixtures/callable.pyi]
-
 [case testErrorMessageAboutSelf]
 # https://github.com/python/mypy/issues/11309
 class Some:

diff --git a/test-data/unit/check-newsemanal.test b/test-data/unit/check-newsemanal.test
@@ -3235,3 +3235,40 @@ class b:
 x = x[1]  # E: Cannot resolve name "x" (possible cyclic definition)
 y = 1[y]  # E: Value of type "int" is not indexable \
           # E: Cannot determine type of "y"
+
+[case testBuiltinTypeType]
+# flags: --python-version 3.10 --disallow-any-generics
+
+from typing import Any, cast, Union
+from typing_extensions import TypeAlias
+
+a: type  # E: Missing type parameters for generic type "type"
+reveal_type(a)  # N: Revealed type is "Type[Any]"
+
+b: Any
+c = cast(type, b)  # E: Missing type parameters for generic type "type"
+reveal_type(c)  # N: Revealed type is "Type[Any]"
+
+d: list[type]  # E: Missing type parameters for generic type "type"
+reveal_type(d)  # N: Revealed type is "builtins.list[Type[Any]]"
+
+class E(list[type]): ...  # E: Missing type parameters for generic type "type"
+reveal_type(E()[0])  # N: Revealed type is "Type[Any]"
+
+class F(tuple[type]): ...  # E: Missing type parameters for generic type "type"
+reveal_type(F()[0])  # N: Revealed type is "Type[Any]"
+
+class G(tuple[list[Union[type, int]], ...]): ...  # E: Missing type parameters for generic type "type"
+reveal_type(G()[0])  # N: Revealed type is "builtins.list[Union[Type[Any], builtins.int]]"
+
+h: Union[type, int]  # E: Missing type parameters for generic type "type"
+reveal_type(h)  # N: Revealed type is "Union[Type[Any], builtins.int]"
+
+i: type | int  # E: Missing type parameters for generic type "type"
+reveal_type(i)  # N: Revealed type is "Union[Type[Any], builtins.int]"
+
+j: TypeAlias = type  # E: Missing type parameters for generic type "type"
+k: j
+reveal_type(k)  # N: Revealed type is "Type[Any]"
+
+[builtins fixtures/tuple.pyi]