Update other affected tests

Author: sterliakov

mypy/checkexpr.py

@@ -2441,18 +2441,13 @@ def check_argument_count(
                         self.msg.fail("ParamSpec.kwargs should only be passed once", context)
                         ok = False
         if missing_contiguous_pos_block:
-            if ArgKind.ARG_STAR2 in actual_kinds:
-                # To generate a correct message, expand kwargs manually. If a name was
-                # missing from the call but doesn't belong to continuous positional prefix,
-                # it was already reported as a missing kwarg. All args before first prefix
-                # item are guaranteed to have been passed positionally.
-                names_to_use = [None] * missing_contiguous_pos_block[0] + [
-                    name
-                    for i, name in enumerate(callee.arg_names)
-                    if name is not None and i not in missing_contiguous_pos_block
-                ]
-            else:
-                names_to_use = actual_names
+            # To generate a correct message, expand kwargs manually. If a name was
+            # missing from the call but doesn't belong to continuous positional prefix,
+            # it was already reported as a missing kwarg. All args before first prefix
+            # item are guaranteed to have been passed positionally.
+            passed_or_reported_names = callee.arg_names[missing_contiguous_pos_block[-1] + 1 :]
+            assert None not in passed_or_reported_names
+            names_to_use = [None] * missing_contiguous_pos_block[0] + passed_or_reported_names
             self.msg.too_few_arguments(callee, context, names_to_use)
             if object_type and callable_name and "." in callable_name:
                 self.missing_classvar_callable_note(object_type, callable_name, context)

test-data/unit/check-errorcodes.test

@@ -242,7 +242,8 @@ g()  # E: Missing named argument "x" for "g"  [call-arg]
 
 def h(x: int, y: int, z: int) -> None: pass
 h(y=1, z=1)  # E: Missing positional argument "x" in call to "h"  [call-arg]
-h(y=1)  # E: Missing positional arguments "x", "z" in call to "h"  [call-arg]
+h(y=1)  # E: Missing named argument "z" for "h"  [call-arg] \
+        # E: Missing positional argument "x" in call to "h"  [call-arg]
 
 [case testErrorCodeArgType]
 def f(x: int) -> None: pass

test-data/unit/check-python312.test

@@ -889,7 +889,7 @@ def h(x: int, y: str) -> None: pass
 
 g(h, 1, y='x')
 g(h, 1, x=1)  # E: "g" gets multiple values for keyword argument "x" \
-              # E: Missing positional argument "y" in call to "g"
+              # E: Missing named argument "y" for "g"
 
 class C[**P, T]:
     def m(self, *args: P.args, **kwargs: P.kwargs) -> T: ...

test-data/unit/check-python38.test

@@ -154,7 +154,7 @@ f(0, 0, kw=0)
 f(0, p_or_kw=0, kw=0)
 f(p=0, p_or_kw=0, kw=0)  # E: Unexpected keyword argument "p" for "f"
 f(0, **d)
-f(**d)  # E: Missing positional argument "p_or_kw" in call to "f"
+f(**d)  # E: Too few arguments for "f"
 [builtins fixtures/dict.pyi]
 
 [case testPEP570Signatures1]

test-data/unit/check-typeddict.test

@@ -1596,7 +1596,7 @@ f1(**a)
 f2(**a) # E: Argument "y" to "f2" has incompatible type "str"; expected "int"
 f3(**a) # E: Argument "x" to "f3" has incompatible type "int"; expected "B"
 f4(**a) # E: Extra argument "y" from **args for "f4"
-f5(**a) # E: Missing positional arguments "y", "z" in call to "f5"
+f5(**a) # E: Missing named argument "z" for "f5"
 f6(**a) # E: Extra argument "y" from **args for "f6"
 f1(1, **a) # E: "f1" gets multiple values for keyword argument "x"
 [builtins fixtures/dict.pyi]