From 961bf932312da4f5a368aa6f72366ab2bd8b5c7f Mon Sep 17 00:00:00 2001 From: Daksh Bhayana Date: Wed, 12 Mar 2025 23:18:22 +0530 Subject: [PATCH 1/3] Pasing error_formmater argument in new_messages Pasing error_formmater argument in new_messages --- myfile.py | 6 ++++++ mypy/dmypy/client.py | 1 - mypy/dmypy_server.py | 1 - mypy/errors.py | 4 ++-- mypy/server/update.py | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 myfile.py diff --git a/myfile.py b/myfile.py new file mode 100644 index 000000000000..7b4787eadb63 --- /dev/null +++ b/myfile.py @@ -0,0 +1,6 @@ + + +def test(): + return 2 + + 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..d82ffbaae7a0 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) -> 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..03dc3b7cc1d8 100644 --- a/mypy/server/update.py +++ b/mypy/server/update.py @@ -296,7 +296,7 @@ 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 +320,7 @@ 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: From 97d8825b23534e07de63f40f00cdf74310c4c813 Mon Sep 17 00:00:00 2001 From: Daksh Bhayana Date: Fri, 14 Mar 2025 00:39:53 +0530 Subject: [PATCH 2/3] Pasing error_formmater argument in new_messages --- mypy/errors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mypy/errors.py b/mypy/errors.py index d82ffbaae7a0..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, formatter: ErrorFormatter = None) -> 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. From f7f09c51b77610b7521b96433b0323ccbad1c3d7 Mon Sep 17 00:00:00 2001 From: Daksh Bhayana Date: Fri, 14 Mar 2025 00:53:02 +0530 Subject: [PATCH 3/3] Removing Test File --- myfile.py | 6 ------ mypy/server/update.py | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 myfile.py diff --git a/myfile.py b/myfile.py deleted file mode 100644 index 7b4787eadb63..000000000000 --- a/myfile.py +++ /dev/null @@ -1,6 +0,0 @@ - - -def test(): - return 2 - - diff --git a/mypy/server/update.py b/mypy/server/update.py index 03dc3b7cc1d8..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(formatter=self.manager.error_formatter) + 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(formatter=self.manager.error_formatter).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: