Merge branch 'master' into add-line-numbers

ilevkivskyi · web-flow · commit c9018e2088cb · 2025-09-06T20:58:52.000+01:00
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -6435,7 +6435,7 @@ def visit_type_var(self, t: TypeVarType) -> bool:
 
     def visit_param_spec(self, t: ParamSpecType) -> bool:
         default = [t.default] if t.has_default() else []
-        return self.query_types([t.upper_bound, *default])
+        return self.query_types([t.upper_bound, *default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> bool:
         default = [t.default] if t.has_default() else []
diff --git a/mypy/erasetype.py b/mypy/erasetype.py
@@ -222,6 +222,7 @@ def visit_type_var_tuple(self, t: TypeVarTupleType) -> Type:
         return t
 
     def visit_param_spec(self, t: ParamSpecType) -> Type:
+        # TODO: we should probably preserve prefix here.
         if self.erase_id is None or self.erase_id(t.id):
             return self.replacement
         return t
diff --git a/mypy/fixup.py b/mypy/fixup.py
@@ -347,6 +347,7 @@ def visit_type_var(self, tvt: TypeVarType) -> None:
     def visit_param_spec(self, p: ParamSpecType) -> None:
         p.upper_bound.accept(self)
         p.default.accept(self)
+        p.prefix.accept(self)
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> None:
         t.tuple_fallback.accept(self)
diff --git a/mypy/indirection.py b/mypy/indirection.py
@@ -93,6 +93,7 @@ def visit_type_var(self, t: types.TypeVarType) -> None:
     def visit_param_spec(self, t: types.ParamSpecType) -> None:
         self._visit(t.upper_bound)
         self._visit(t.default)
+        self._visit(t.prefix)
 
     def visit_type_var_tuple(self, t: types.TypeVarTupleType) -> None:
         self._visit(t.upper_bound)
diff --git a/mypy/options.py b/mypy/options.py
@@ -74,6 +74,7 @@ class BuildType:
         "disable_memoryview_promotion",
         "strict_bytes",
         "fixed_format_cache",
+        "untyped_calls_exclude",
     }
 ) - {"debug_cache"}
 
diff --git a/mypy/server/astdiff.py b/mypy/server/astdiff.py
@@ -435,6 +435,7 @@ def visit_param_spec(self, typ: ParamSpecType) -> SnapshotItem:
             typ.flavor,
             snapshot_type(typ.upper_bound),
             snapshot_type(typ.default),
+            snapshot_type(typ.prefix),
         )
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> SnapshotItem:
diff --git a/mypy/server/astmerge.py b/mypy/server/astmerge.py
@@ -489,6 +489,7 @@ def visit_type_var(self, typ: TypeVarType) -> None:
     def visit_param_spec(self, typ: ParamSpecType) -> None:
         typ.upper_bound.accept(self)
         typ.default.accept(self)
+        typ.prefix.accept(self)
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> None:
         typ.upper_bound.accept(self)
diff --git a/mypy/server/deps.py b/mypy/server/deps.py
@@ -1037,10 +1037,8 @@ def visit_type_var(self, typ: TypeVarType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
+        triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
         for val in typ.values:
             triggers.extend(self.get_type_triggers(val))
         return triggers
@@ -1049,22 +1047,17 @@ def visit_param_spec(self, typ: ParamSpecType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
         triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
+        triggers.extend(self.get_type_triggers(typ.prefix))
         return triggers
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
         triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
         return triggers
 
     def visit_unpack_type(self, typ: UnpackType) -> list[str]:
diff --git a/mypy/type_visitor.py b/mypy/type_visitor.py
@@ -525,7 +525,7 @@ def visit_type_var(self, t: TypeVarType, /) -> bool:
         return self.query_types([t.upper_bound, t.default] + t.values)
 
     def visit_param_spec(self, t: ParamSpecType, /) -> bool:
-        return self.query_types([t.upper_bound, t.default])
+        return self.query_types([t.upper_bound, t.default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType, /) -> bool:
         return self.query_types([t.upper_bound, t.default])
diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -2615,7 +2615,7 @@ def visit_type_var(self, t: TypeVarType) -> None:
         self.process_types([t.upper_bound, t.default] + t.values)
 
     def visit_param_spec(self, t: ParamSpecType) -> None:
-        self.process_types([t.upper_bound, t.default])
+        self.process_types([t.upper_bound, t.default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> None:
         self.process_types([t.upper_bound, t.default])
diff --git a/mypy/typetraverser.py b/mypy/typetraverser.py
@@ -64,6 +64,7 @@ def visit_type_var(self, t: TypeVarType, /) -> None:
         t.default.accept(self)
 
     def visit_param_spec(self, t: ParamSpecType, /) -> None:
+        # TODO: do we need to traverse prefix here?
         t.default.accept(self)
 
     def visit_parameters(self, t: Parameters, /) -> None:
diff --git a/test-data/unit/check-incremental.test b/test-data/unit/check-incremental.test
@@ -6866,6 +6866,24 @@ if int():
 [out2]
 main:6: error: Incompatible types in assignment (expression has type "str", variable has type "int")
 
+[case testUntypedCallsExcludeAffectsCache]
+# flags: --disallow-untyped-calls --untyped-calls-exclude=mod.Super
+# flags2: --disallow-untyped-calls --untyped-calls-exclude=mod
+# flags3: --disallow-untyped-calls --untyped-calls-exclude=mod.Super
+import mod
+[file mod.py]
+class Super:
+    def draw(self):
+        ...
+class Class(Super):
+    ...
+Class().draw()
+[out]
+tmp/mod.py:6: error: Call to untyped function "draw" in typed context
+[out2]
+[out3]
+tmp/mod.py:6: error: Call to untyped function "draw" in typed context
+
 [case testMethodMakeBoundIncremental]
 from a import A
 a = A()
@@ -6915,3 +6933,70 @@ tmp/b.py:1: note: "lol" defined here
 [out2]
 tmp/a.py:2: error: Unexpected keyword argument "uhhhh" for "lol"
 tmp/b.py:1: note: "lol" defined here
+
+[case testIncrementalNoCrashOnParamSpecPrefixUpdateMethod]
+import impl
+[file impl.py]
+from typing_extensions import ParamSpec
+from lib import Sub
+
+P = ParamSpec("P")
+class Impl(Sub[P]):
+    def test(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        self.meth(1, *args, **kwargs)
+
+[file impl.py.2]
+from typing_extensions import ParamSpec
+from lib import Sub
+
+P = ParamSpec("P")
+class Impl(Sub[P]):
+    def test(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        self.meth("no", *args, **kwargs)
+
+[file lib.py]
+from typing import Generic
+from typing_extensions import ParamSpec, Concatenate
+
+P = ParamSpec("P")
+class Base(Generic[P]):
+    def meth(self, *args: P.args, **kwargs: P.kwargs) -> None: ...
+class Sub(Base[Concatenate[int, P]]): ...
+[builtins fixtures/paramspec.pyi]
+[out]
+[out2]
+tmp/impl.py:7: error: Argument 1 to "meth" of "Base" has incompatible type "str"; expected "int"
+
+[case testIncrementalNoCrashOnParamSpecPrefixUpdateMethodAlias]
+import impl
+[file impl.py]
+from typing_extensions import ParamSpec
+from lib import Sub
+
+P = ParamSpec("P")
+class Impl(Sub[P]):
+    def test(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        self.alias(1, *args, **kwargs)
+
+[file impl.py.2]
+from typing_extensions import ParamSpec
+from lib import Sub
+
+P = ParamSpec("P")
+class Impl(Sub[P]):
+    def test(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        self.alias("no", *args, **kwargs)
+
+[file lib.py]
+from typing import Generic
+from typing_extensions import ParamSpec, Concatenate
+
+P = ParamSpec("P")
+class Base(Generic[P]):
+    def meth(self, *args: P.args, **kwargs: P.kwargs) -> None: ...
+    alias = meth
+class Sub(Base[Concatenate[int, P]]): ...
+[builtins fixtures/paramspec.pyi]
+[out]
+[out2]
+tmp/impl.py:7: error: Argument 1 has incompatible type "str"; expected "int"
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
@@ -11499,3 +11499,36 @@ class A:
 [out]
 ==
 main:3: error: Too few arguments
+
+[case testFineGrainedParamSpecPrefixUpdateMethod]
+import impl
+[file impl.py]
+from typing_extensions import ParamSpec
+from lib import Sub
+
+P = ParamSpec("P")
+class Impl(Sub[P]):
+    def test(self, *args: P.args, **kwargs: P.kwargs) -> None:
+        self.meth(1, *args, **kwargs)
+
+[file lib.py]
+from typing import Generic
+from typing_extensions import ParamSpec, Concatenate
+
+P = ParamSpec("P")
+class Base(Generic[P]):
+    def meth(self, *args: P.args, **kwargs: P.kwargs) -> None: ...
+class Sub(Base[Concatenate[int, P]]): ...
+
+[file lib.py.2]
+from typing import Generic
+from typing_extensions import ParamSpec, Concatenate
+
+P = ParamSpec("P")
+class Base(Generic[P]):
+    def meth(self, *args: P.args, **kwargs: P.kwargs) -> None: ...
+class Sub(Base[Concatenate[str, P]]): ...
+[builtins fixtures/paramspec.pyi]
+[out]
+==
+impl.py:7: error: Argument 1 to "meth" of "Base" has incompatible type "int"; expected "str"

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ class BuildType:`
`74`	`74`	`"disable_memoryview_promotion",`
`75`	`75`	`"strict_bytes",`
`76`	`76`	`"fixed_format_cache",`
	`77`	`+ "untyped_calls_exclude",`
`77`	`78`	`}`
`78`	`79`	`) - {"debug_cache"}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ def visit_param_spec(self, typ: ParamSpecType) -> SnapshotItem:`
`435`	`435`	`typ.flavor,`
`436`	`436`	`snapshot_type(typ.upper_bound),`
`437`	`437`	`snapshot_type(typ.default),`
	`438`	`+ snapshot_type(typ.prefix),`
`438`	`439`	`)`
`439`	`440`
`440`	`441`	`def visit_type_var_tuple(self, typ: TypeVarTupleType) -> SnapshotItem:`