Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Passing error_formatter in new_messages method of Error Class #18801

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion mypy/dmypy/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,6 @@ def request(
try:
with IPCClient(name, timeout) as client:
send(client, args)

final = False
while not final:
response = receive(client)
Expand Down
1 change: 0 additions & 1 deletion mypy/dmypy_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions mypy/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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]:
Expand Down
8 changes: 6 additions & 2 deletions mypy/server/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down