python
diff --git a/‎mypy/build.py
Lines changed: 0 additions & 1 deletion b/‎mypy/build.py
Lines changed: 0 additions & 1 deletion
diff --git a/‎mypy/errors.py
Lines changed: 10 additions & 7 deletions b/‎mypy/errors.py
Lines changed: 10 additions & 7 deletions
diff --git a/‎test-data/unit/check-kwargs.test
Lines changed: 8 additions & 2 deletions b/‎test-data/unit/check-kwargs.test
Lines changed: 8 additions & 2 deletions
@@ -253,7 +253,6 @@ def _build(sources: List[BuildSource],
 
     try:
         graph = dispatch(sources, manager)
-        manager.error_flush(manager.errors.new_messages())
         return BuildResult(manager, graph)
     finally:
         manager.log("Build finished in %.3f seconds with %d modules, and %d errors" %
 
@@ -51,6 +51,9 @@ class ErrorInfo:
     # Only report this particular messages once per program.
     only_once = False
 
+    # Actual origin of the error message
+    origin = None  # type: Tuple[str, int]
+
     # Fine-grained incremental target where this was reported
     target = None  # type: Optional[str]
 
@@ -291,13 +294,13 @@ def report(self,
                          target=self.current_target())
         self.add_error_info(info)
 
-    def _add_error_info(self, info: ErrorInfo) -> None:
-        if info.file not in self.error_info_map:
-            self.error_info_map[info.file] = []
-        self.error_info_map[info.file].append(info)
+    def _add_error_info(self, file: str, info: ErrorInfo) -> None:
+        if file not in self.error_info_map:
+            self.error_info_map[file] = []
+        self.error_info_map[file].append(info)
 
     def add_error_info(self, info: ErrorInfo) -> None:
-        (file, line) = cast(Tuple[str, int], info.origin)  # see issue 1855
+        file, line = info.origin
         if not info.blocker:  # Blockers cannot be ignored
             if file in self.ignored_lines and line in self.ignored_lines[file]:
                 # Annotation requests us to ignore all errors on this line.
@@ -309,7 +312,7 @@ def add_error_info(self, info: ErrorInfo) -> None:
             if info.message in self.only_once_messages:
                 return
             self.only_once_messages.add(info.message)
-        self._add_error_info(info)
+        self._add_error_info(file, info)
 
     def generate_unused_ignore_notes(self, file: str) -> None:
         ignored_lines = self.ignored_lines[file]
@@ -319,7 +322,7 @@ def generate_unused_ignore_notes(self, file: str) -> None:
                 info = ErrorInfo(self.import_context(), file, self.current_module(), None,
                                  None, line, -1, 'note', "unused 'type: ignore' comment",
                                  False, False)
-                self._add_error_info(info)
+                self._add_error_info(file, info)
 
     def is_typeshed_file(self, file: str) -> bool:
         # gross, but no other clear way to tell
 
@@ -390,8 +390,14 @@ A.B(x=1)  # E: Unexpected keyword argument "x" for "B"
 
 [case testUnexpectedMethodKwargFromOtherModule]
 import m
-m.A(x=1)  # E: Unexpected keyword argument "x" for "A"
+m.A(x=1)
 [file m.py]
+1+'asdf'
 class A:
-    def __init__(self) -> None:  # N: "A" defined here
+    def __init__(self) -> None:
         pass
+
+[out]
+tmp/m.py:1: error: Unsupported operand types for + ("int" and "str")
+main:2: error: Unexpected keyword argument "x" for "A"
+tmp/m.py:3: note: "A" defined here