Allow diagnostics to generate multi-edit fixes#3709
Merged
charliermarsh merged 3 commits intomainfrom Mar 26, 2023
Merged
Conversation
charliermarsh
force-pushed
the
charlie/multiple-edit
branch
4 times, most recently
from
5fb747f to
1fea8b6
Compare
charliermarsh
force-pushed
the
charlie/multiple-edit
branch
from
1fea8b6 to
de40c98
Compare
charliermarsh
commented
Mar 24, 2023
Member
Author
|
The test fixture updates have intentionally omitted for now, to keep this PR reviewable. (All test fixtures will change in a mechanical way, as we're moving from a single fix to a vector of fixes.) |
Contributor
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
MichaReiser
approved these changes
Mar 24, 2023
Comment on lines
+39
to
+58
| impl From<Edit> for Fix { | ||
| fn from(edit: Edit) -> Self { | ||
| Self { edits: vec![edit] } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Nit: If this is used frequently, then I recommend adding a
pub fn from_edit(edit: Edit) -> Self {
}
function to Fix to make it more explicit. I always find From implementations hard to discover.
charliermarsh
force-pushed
the
charlie/edit
branch
3 times, most recently
from
c6a8a56 to
b526d51
Compare
charliermarsh
force-pushed
the
charlie/multiple-edit
branch
4 times, most recently
from
3055da9 to
506511e
Compare
charliermarsh
force-pushed
the
charlie/multiple-edit
branch
5 times, most recently
from
726b3cd to
f22598a
Compare
charliermarsh
force-pushed
the
charlie/multiple-edit
branch
from
f22598a to
3f140ad
Compare
Contributor
|
@charliermarsh sorry to boring you on this, but this PR changes the The reason I mention this is, coc-pyright uses ruff's fix info to fix codes, but the format has been changed in this PR, coc-pyright will change to the new output format. Thank you for your work on ruff! |
Member
Author
|
@fannheyward - You're 100% right, I'm not sure how I missed that -- purely an oversight. I'll add it to |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
This PR extends the autofix API to support multiple edits by introducing a basic
Fixstruct:...and propagating those changes throughout the codebase.
To demonstrate its usefulness, the
crates/ruff/src/rules/pyupgrade/rules/replace_stdout_stderr.rsrule was also refactored to leverage this new API. (That rule needs to remove two keyword arguments, which may or may not be adjacent, and replace them withcapture_output=True. Previously, this rule required that we included all intermediary content in the text edit. Now, we can model it as a replacement and a deletion.)There are a few changes that need to be made downstream, to tools that depend on our JSON API (namely, the playground and the LSP, the latter of which can be done in a backwards-compatible way).