From 7b7ddae31b02cf6e2f261f2159f46057b4082078 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Tue, 30 Jul 2024 13:27:22 -0400
Subject: [PATCH] try and use named arguments from caller for matching name
 (#2294)

---
 mypy_django_plugin/lib/helpers.py       |  7 +++++++
 tests/typecheck/fields/test_related.yml | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/mypy_django_plugin/lib/helpers.py b/mypy_django_plugin/lib/helpers.py
index 19f0a28a4..2d7d5bd80 100644
--- a/mypy_django_plugin/lib/helpers.py
+++ b/mypy_django_plugin/lib/helpers.py
@@ -10,6 +10,7 @@
 from mypy.nodes import (
     GDEF,
     MDEF,
+    ArgKind,
     AssignmentStmt,
     Block,
     ClassDef,
@@ -182,6 +183,12 @@ def get_call_argument_by_name(ctx: Union[FunctionContext, MethodContext], name:
     Return the expression for the specific argument.
     This helper should only be used with non-star arguments.
     """
+    # try and pull the named argument from the caller first
+    for kinds, argnames, args in zip(ctx.arg_kinds, ctx.arg_names, ctx.args):
+        for kind, argname, arg in zip(kinds, argnames, args):
+            if kind == ArgKind.ARG_NAMED and argname == name:
+                return arg
+
     if name not in ctx.callee_arg_names:
         return None
     idx = ctx.callee_arg_names.index(name)
diff --git a/tests/typecheck/fields/test_related.yml b/tests/typecheck/fields/test_related.yml
index 7d5db036b..5ffb2eef9 100644
--- a/tests/typecheck/fields/test_related.yml
+++ b/tests/typecheck/fields/test_related.yml
@@ -800,6 +800,31 @@
                 class User(AbstractUser):
                     pass
 
+-   case: nullable_foreign_key_with_init_overridden
+    main: |
+        from myapp.models import A
+        reveal_type(A.objects.get().b)  # N: Revealed type is "Union[myapp.models.B, None]"
+    installed_apps:
+        -   myapp
+    files:
+        -   path: myapp/__init__.py
+        -   path: myapp/models.py
+            content: |
+                from typing import Any, TypeVar
+                from django.db import models
+
+                _ST = TypeVar("_ST", contravariant=True)
+                _GT = TypeVar("_GT", covariant=True)
+
+                class FK(models.ForeignKey[_ST, _GT]):
+                    def __init__(self, *args: Any, **kwargs: Any) -> None:
+                        kwargs.setdefault('on_delete', models.CASCADE)
+                        super().__init__(*args, **kwargs)
+
+                class B(models.Model): ...
+
+                class A(models.Model):
+                    b = FK(B, null=True, on_delete=models.CASCADE)
 
 -   case: related_manager_is_a_subclass_of_default_manager
     main: |