Reuse util in resolve_many_to_many_arguments (#2782)

Author: UnknownPlatypus

mypy_django_plugin/transformers/models.py

@@ -14,7 +14,6 @@
     AssignmentStmt,
     CallExpr,
     Context,
-    Expression,
     FakeInfo,
     NameExpr,
     RefExpr,
@@ -908,22 +907,9 @@ def resolve_many_to_many_arguments(self, call: CallExpr, /, context: Context) ->
         Inspect a 'ManyToManyField(...)' call to collect argument data on any 'to' and
         'through' arguments.
         """
-        look_for: dict[str, Expression | None] = {"to": None, "through": None}
-        # Look for 'to', being declared as the first positional argument
-        if call.arg_kinds[0].is_positional():
-            look_for["to"] = call.args[0]
-        # Look for 'through', being declared as the sixth positional argument.
-        if len(call.args) > 5 and call.arg_kinds[5].is_positional():
-            look_for["through"] = call.args[5]
-
-        # Sort out if any of the expected arguments was provided as keyword arguments
-        for arg_expr, _arg_kind, arg_name in zip(call.args, call.arg_kinds, call.arg_names, strict=False):
-            if arg_name in look_for and look_for[arg_name] is None:
-                look_for[arg_name] = arg_expr
-
-        # 'to' is a required argument of 'ManyToManyField()', we can't do anything if it's not provided
-        to_arg = look_for["to"]
+        to_arg = helpers.get_class_init_argument_by_name(call, "to")
         if to_arg is None:
+            # 'to' is a required argument of 'ManyToManyField()', we can't do anything if it's not provided
             return None
 
         # Resolve the type of the 'to' argument expression
@@ -939,7 +925,7 @@ def resolve_many_to_many_arguments(self, call: CallExpr, /, context: Context) ->
         )
 
         # Resolve the type of the 'through' argument expression
-        through_arg = look_for["through"]
+        through_arg = helpers.get_class_init_argument_by_name(call, "through")
         through = None
         if through_arg is not None:
             through_model = helpers.get_model_from_expression(