Avoid removing all contents when formatting file with syntax error #314
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Remaining work involves:
|
|
We could consider applying an additional safe guard, but I'm not sure when return codes are intentionally non-zero diff --git a/ruff_lsp/server.py b/ruff_lsp/server.py
index e1e6091..437827f 100755
--- a/ruff_lsp/server.py
+++ b/ruff_lsp/server.py
@@ -1142,7 +1142,7 @@ def _result_to_workspace_edit(
document: Document, result: RunResult | None
) -> WorkspaceEdit | None:
"""Converts a run result to a WorkspaceEdit."""
- if result is None:
+ if result is None or result.exit_code != 0:
return None
if document.kind is DocumentKind.Text: |
| result = await _run_format_on_document(document) | ||
| if result is None: | ||
| if result is None or result.exit_code != 0: |
There was a problem hiding this comment.
I think we should also add this to _lint_document_impl for good measure.
There was a problem hiding this comment.
I think the patch in #314 (comment) would apply to all uses
There was a problem hiding this comment.
Ahh you're right, we might exit 1 on lint errors.
There was a problem hiding this comment.
(In fact pretty sure we do.)
charliermarsh
approved these changes
Nov 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Exploring a resolution to astral-sh/ruff-vscode#336
It looks like at v0.0.42...v0.0.43#diff-9cc81288343e2240bb3387d88ab41ebf706e40c86af24cf96bad8919a48d5cceL762-L763 we no longer exit early if stdout is empty. This pull request does not restore that logic, but rather adds a return code check and exits if there is a bad return code.
Summary
ruff formatTest Plan