Fix some fine-grained incremental bugs with newly imported files

Author: msullivan

mypy/server/update.py

@@ -223,7 +223,7 @@ def update(self, changed_modules: List[Tuple[str, str]]) -> List[str]:
             messages, remaining, (next_id, next_path), blocker = result
             changed_modules = [(id, path) for id, path in changed_modules
                                if id != next_id]
-            changed_modules = dedupe_modules(changed_modules + remaining)
+            changed_modules = dedupe_modules(remaining + changed_modules)
             if blocker:
                 self.blocking_error = (next_id, next_path)
                 self.stale = changed_modules
@@ -282,7 +282,7 @@ def update_single(self, module: str, path: str) -> Tuple[List[str],
         propagate_changes_using_dependencies(manager, graph, self.deps, triggered,
                                              {module},
                                              self.previous_targets_with_errors,
-                                             graph)
+                                             self.manager.modules)
 
         # Preserve state needed for the next update.
         self.previous_targets_with_errors = manager.errors.targets()
@@ -406,7 +406,10 @@ def update_single_isolated(module: str,
         remaining_modules = changed_modules
         # The remaining modules haven't been processed yet so drop them.
         for id, _ in remaining_modules:
-            del manager.modules[id]
+            if id in old_modules:
+                manager.modules[id] = old_modules[id]
+            else:
+                del manager.modules[id]
             del graph[id]
         if DEBUG:
             print('--> %r (newly imported)' % module)

test-data/unit/fine-grained-modules.test

@@ -631,3 +631,50 @@ x = 1
 [delete a/b.py.2]
 [out]
 ==
+
+[case testAddImport]
+import what.b
+[file aaa/__init__.py]
+[file aaa/z.py]
+def foo(x: int) -> None:
+    pass
+[file aaa/z.py.2]
+import config
+def foo() -> None:
+    pass
+[file what/__init__.py]
+[file what/b.py]
+import config
+import aaa.z
+def main() -> None:
+    aaa.z.foo(5)
+[file what/b.py.2]
+import aaa.z
+def main() -> None:
+    aaa.z.foo()
+[file config.py]
+[out]
+==
+
+[case testAddImport2]
+import what.b
+[file aaa/__init__.py]
+[file aaa/z.py]
+def foo(x: int) -> None:
+    pass
+[file aaa/z.py.2]
+def foo() -> None:
+    pass
+[file what/__init__.py]
+[file what/b.py]
+import aaa.z
+def main() -> None:
+    aaa.z.foo(5)
+[file what/b.py.2]
+import config
+import aaa.z
+def main() -> None:
+    aaa.z.foo()
+[file config.py]
+[out]
+==