Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion mypy/checkexpr.py
Original file line number Diff line number Diff line change
Expand Up @@ -2292,15 +2292,39 @@ def infer_function_type_arguments_both_sides(
arg_types = self.infer_arg_types_in_context(
pass2_callee_type, args, arg_kinds, formal_to_actual
)
# Preserve inferred ParamSpecs when selecting overloads in the second pass.
# Using the original Callable[P, T] could select an incompatible overload,
# but ordinary type variables must remain free to infer narrower types.
infer_callee_type = initial_callee_type
if any(isinstance(v, ParamSpecType) for v in type_vars):
infer_callee_type = self.apply_generic_arguments(
initial_callee_type,
[
a if isinstance(v, ParamSpecType) else None
for v, a in zip(type_vars, solid_inferred_args)
],
context,
)
initial_formal_to_actual = map_actuals_to_formals(
arg_kinds,
arg_names,
infer_callee_type.arg_kinds,
infer_callee_type.arg_names,
lambda a: self.accept(args[a]),
)
inferred_args, _ = infer_function_type_arguments(
initial_callee_type,
infer_callee_type,
arg_types,
arg_kinds,
arg_names,
initial_formal_to_actual,
context=self.argument_infer_context(),
extra_constraints=constraints,
)
inferred_by_id = dict(zip((v.id for v in infer_callee_type.variables), inferred_args))
inferred_args = [
inferred_by_id.get(v.id, a) for v, a in zip(type_vars, solid_inferred_args)
]

# Only use two-side inference if it is fully successful,
# otherwise, fallback to return type context as a tiebreaker.
Expand Down
23 changes: 23 additions & 0 deletions test-data/unit/check-parameter-specification.test
Original file line number Diff line number Diff line change
Expand Up @@ -2848,3 +2848,26 @@ def test(x: C[I]) -> list[int]: ...
ci: C[int]
f: list[int] = apply(test, ci)
[builtins fixtures/paramspec.pyi]

[case testTwoSidedInferenceWithParamSpecOverload]
from typing import Callable, TypeVar, overload
from typing_extensions import ParamSpec

P = ParamSpec("P")
T = TypeVar("T")

def apply(func: Callable[P, T], *args: P.args, **kwargs: P.kwargs) -> list[T]: ...
def consume(value: list[T]) -> T: ...

@overload
def func(value: int, required: str) -> int: ...
@overload
def func(value: int, *, optional: int = 0) -> int: ...
def func(value: int, required: str = "", *, optional: int = 0) -> int: ...

reveal_type(consume(apply(func, 1))) # N: Revealed type is "builtins.int"
reveal_type(consume(apply(func, 1, optional=0))) # N: Revealed type is "builtins.int"
reveal_type(consume(apply(func, 1, ""))) # N: Revealed type is "builtins.int"
result = apply(func, 1)
reveal_type(consume(result)) # N: Revealed type is "builtins.int"
[builtins fixtures/paramspec.pyi]
Loading