Fix manager types scope

mypy.ini

@@ -2,7 +2,8 @@
 allow_redefinition = True
 check_untyped_defs = True
 ignore_missing_imports = True
-incremental = True
+# Incremental mode causes false-negatives
+incremental = False
 strict_optional = True
 show_traceback = True
 warn_no_return = False

mypy_django_plugin/lib/helpers.py

@@ -369,11 +369,10 @@ def bind_or_analyze_type(t: MypyType, api: SemanticAnalyzer, module_name: Option
     That should hopefully give a bound type."""
     if isinstance(t, UnboundType) and module_name is not None:
         node = api.lookup_fully_qualified_or_none(module_name + "." + t.name)
-        if node is None:
-            return None
-        return node.type
-    else:
-        return api.anal_type(t)
+        if node is not None and node.type is not None:
+            return node.type
+
+    return api.anal_type(t)
 
 
 def copy_method_to_another_class(

mypy_django_plugin/transformers/models.py

@@ -212,7 +212,11 @@ def create_new_model_parametrized_manager(self, name: str, base_manager_info: Ty
             # replace self type with new class, if copying method
             if isinstance(sym.node, FuncDef):
                 helpers.copy_method_to_another_class(
-                    new_cls_def_context, self_type=custom_manager_type, new_method_name=name, method_node=sym.node
+                    new_cls_def_context,
+                    self_type=custom_manager_type,
+                    new_method_name=name,
+                    method_node=sym.node,
+                    original_module_name=base_manager_info.module_name,
                 )
                 continue
 

tests/typecheck/managers/test_managers.yml

@@ -423,3 +423,22 @@
                 class MyModel(models.Model):
 
                    objects = MyModelManager()
+
+-   case: regression_manager_scope_foreign
+    main: |
+        from myapp.models import MyModel
+        reveal_type(MyModel.on_site)  # N: Revealed type is "myapp.models.MyModel_CurrentSiteManager[myapp.models.MyModel]"
+    installed_apps:
+        - myapp
+        - django.contrib.sites
+    files:
+        -   path: myapp/__init__.py
+        -   path: myapp/models.py
+            content: |
+                from django.db import models
+                from django.contrib.sites.models import Site
+                from django.contrib.sites.managers import CurrentSiteManager
+
+                class MyModel(models.Model):
+                    site = models.ForeignKey(Site, on_delete=models.CASCADE)
+                    on_site = CurrentSiteManager()