revert line number change

Author: KevinRK29

mypy/messages.py

@@ -44,7 +44,6 @@
     ArgKind,
     CallExpr,
     Context,
-    Decorator,
     Expression,
     FuncDef,
     IndexExpr,
@@ -1144,14 +1143,6 @@ def no_variant_matches_arguments(
 
                 msg = f'Unexpected keyword argument "{kwarg_name}"' + for_func
 
-                if matching_variant is not None and matching_variant.definition is not None:
-                    defn = matching_variant.definition
-                    if isinstance(defn, Decorator):
-                        func_line = defn.func.line
-                    else:
-                        func_line = defn.line
-                    msg += f" defined on line {func_line}"
-
                 if matches:
                     msg += f"; did you mean {pretty_seq(matches, 'or')}?"
                 self.fail(msg, context, code=code)

mypy/semanal.py

@@ -493,10 +493,6 @@ def __init__(
         # since it's possible that the name will be there once the namespace is complete.
         self.incomplete_namespaces = incomplete_namespaces
         self.all_exports: list[str] = []
-        # Map from module id to list of explicitly exported names (i.e. names in __all__).
-        # This is used by stubgen/stubtest, DO NOT use for any other purposes as it is
-        # not populated on incremental runs (nor in parallel mode).
-        self.export_map: dict[str, list[str]] = {}
         self.plugin = plugin
         # If True, process function definitions. If False, don't. This is used
         # for processing module top levels in fine-grained incremental mode.
@@ -724,7 +720,6 @@ def refresh_top_level(self, file_node: MypyFile) -> None:
         if file_node.fullname == "typing_extensions":
             self.add_typing_extension_aliases(file_node)
         self.adjust_public_exports()
-        self.export_map[self.cur_mod_id] = self.all_exports
         self.all_exports = []
 
     def add_implicit_module_attrs(self, file_node: MypyFile) -> None:
@@ -4061,7 +4056,11 @@ def check_and_set_up_type_alias(self, s: AssignmentStmt) -> bool:
         type_params: TypeVarLikeList | None
         all_type_params_names: list[str] | None
         if self.check_type_alias_type_call(s.rvalue, name=lvalue.name):
-            rvalue = s.rvalue.args[1]
+            rvalue = (
+                s.rvalue.args[1]
+                if s.rvalue.arg_kinds[1] == ARG_POS
+                else s.rvalue.args[s.rvalue.arg_names.index("value")]
+            )
             pep_695 = True
             type_params, all_type_params_names = self.analyze_type_alias_type_params(s.rvalue)
         else:
@@ -4249,7 +4248,9 @@ def check_type_alias_type_call(self, rvalue: Expression, *, name: str) -> TypeGu
             return False
         if not self.check_typevarlike_name(rvalue, name, rvalue):
             return False
-        if rvalue.arg_kinds.count(ARG_POS) != 2:
+        if rvalue.arg_kinds.count(ARG_POS) != (
+            2 - ("value" in rvalue.arg_names) - ("name" in rvalue.arg_names)
+        ):
             return False
 
         return True

test-data/unit/check-expressions.test

@@ -2574,7 +2574,7 @@ def f(foobar: str) -> None: ...
 def f(foobar: Union[int, str]) -> None:
     pass
 
-f(fobar=1) # E: Unexpected keyword argument "fobar" for overloaded function "f" defined on line 4; did you mean "foobar"?
+f(fobar=1) # E: Unexpected keyword argument "fobar" for overloaded function "f"; did you mean "foobar"?
 f(random=[1,2,3]) # E: Unexpected keyword argument "random" for overloaded function "f" \
                   # N: Possible overload variants: \
                   # N:     def f(foobar: int) -> None \