Undo style change to make it easier to review, feel free to add in separate PR

Author: hauntsaninja

mypy/checkexpr.py

@@ -1727,9 +1727,33 @@ def check_callable_call(
             callee = callee.copy_modified(ret_type=fresh_ret_type)
 
         if callee.is_generic():
-            callee, formal_to_actual = self.adjust_generic_callable_params_mapping(
-                callee, args, arg_kinds, arg_names, formal_to_actual, context
+            need_refresh = any(
+                isinstance(v, (ParamSpecType, TypeVarTupleType)) for v in callee.variables
             )
+            callee = freshen_function_type_vars(callee)
+            callee = self.infer_function_type_arguments_using_context(callee, context)
+            if need_refresh:
+                # Argument kinds etc. may have changed due to
+                # ParamSpec or TypeVarTuple variables being replaced with an arbitrary
+                # number of arguments; recalculate actual-to-formal map
+                formal_to_actual = map_actuals_to_formals(
+                    arg_kinds,
+                    arg_names,
+                    callee.arg_kinds,
+                    callee.arg_names,
+                    lambda i: self.accept(args[i]),
+                )
+            callee = self.infer_function_type_arguments(
+                callee, args, arg_kinds, arg_names, formal_to_actual, need_refresh, context
+            )
+            if need_refresh:
+                formal_to_actual = map_actuals_to_formals(
+                    arg_kinds,
+                    arg_names,
+                    callee.arg_kinds,
+                    callee.arg_names,
+                    lambda i: self.accept(args[i]),
+                )
 
         param_spec = callee.param_spec()
         if (
@@ -2737,44 +2761,6 @@ def check_overload_call(
             self.chk.fail(message_registry.TOO_MANY_UNION_COMBINATIONS, context)
         return result
 
-    def adjust_generic_callable_params_mapping(
-        self,
-        callee: CallableType,
-        args: list[Expression],
-        arg_kinds: list[ArgKind],
-        arg_names: Sequence[str | None] | None,
-        formal_to_actual: list[list[int]],
-        context: Context,
-    ) -> tuple[CallableType, list[list[int]]]:
-        need_refresh = any(
-            isinstance(v, (ParamSpecType, TypeVarTupleType)) for v in callee.variables
-        )
-        callee = freshen_function_type_vars(callee)
-        callee = self.infer_function_type_arguments_using_context(callee, context)
-        if need_refresh:
-            # Argument kinds etc. may have changed due to
-            # ParamSpec or TypeVarTuple variables being replaced with an arbitrary
-            # number of arguments; recalculate actual-to-formal map
-            formal_to_actual = map_actuals_to_formals(
-                arg_kinds,
-                arg_names,
-                callee.arg_kinds,
-                callee.arg_names,
-                lambda i: self.accept(args[i]),
-            )
-        callee = self.infer_function_type_arguments(
-            callee, args, arg_kinds, arg_names, formal_to_actual, need_refresh, context
-        )
-        if need_refresh:
-            formal_to_actual = map_actuals_to_formals(
-                arg_kinds,
-                arg_names,
-                callee.arg_kinds,
-                callee.arg_names,
-                lambda i: self.accept(args[i]),
-            )
-        return callee, formal_to_actual
-
     def plausible_overload_call_targets(
         self,
         arg_types: list[Type],