diff --git a/mypy/dmypy/client.py b/mypy/dmypy/client.py index 8ca4f1bd7ea2..925034ef16cd 100644 --- a/mypy/dmypy/client.py +++ b/mypy/dmypy/client.py @@ -664,7 +664,6 @@ def request( try: with IPCClient(name, timeout) as client: send(client, args) - final = False while not final: response = receive(client) diff --git a/mypy/dmypy_server.py b/mypy/dmypy_server.py index d73487efe3bc..c2d526d01f71 100644 --- a/mypy/dmypy_server.py +++ b/mypy/dmypy_server.py @@ -635,7 +635,6 @@ def fine_grained_increment_follow_imports( # Process changes directly reachable from roots. messages = fine_grained_manager.update(changed, [], followed=True) - # Follow deps from changed modules (still within graph). worklist = changed.copy() while worklist: diff --git a/mypy/errors.py b/mypy/errors.py index 58ef17b69e96..5bf953441016 100644 --- a/mypy/errors.py +++ b/mypy/errors.py @@ -944,7 +944,7 @@ def find_shadow_file_mapping(self, path: str) -> str | None: return i[1] return None - def new_messages(self) -> list[str]: + def new_messages(self, formatter: ErrorFormatter | None = None) -> list[str]: """Return a string list of new error messages. Use a form suitable for displaying to the user. @@ -954,7 +954,7 @@ def new_messages(self) -> list[str]: msgs = [] for path in self.error_info_map.keys(): if path not in self.flushed_files: - msgs.extend(self.file_messages(path)) + msgs.extend(self.file_messages(path, formatter=formatter)) return msgs def targets(self) -> set[str]: diff --git a/mypy/server/update.py b/mypy/server/update.py index 9891e2417b94..332a401feab5 100644 --- a/mypy/server/update.py +++ b/mypy/server/update.py @@ -296,7 +296,9 @@ def update( if not changed_modules: # Preserve state needed for the next update. self.previous_targets_with_errors = self.manager.errors.targets() - messages = self.manager.errors.new_messages() + messages = self.manager.errors.new_messages( + formatter=self.manager.error_formatter + ) break messages = sort_messages_preserving_file_order(messages, self.previous_messages) @@ -320,7 +322,9 @@ def trigger(self, target: str) -> list[str]: ) # Preserve state needed for the next update. self.previous_targets_with_errors = self.manager.errors.targets() - self.previous_messages = self.manager.errors.new_messages().copy() + self.previous_messages = self.manager.errors.new_messages( + formatter=self.manager.error_formatter + ).copy() return self.update(changed_modules, []) def flush_cache(self) -> None: