fix: assists no longer break indentation #14752
Merged
Conversation
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
rustbot
added
the
S-waiting-on-review
ponyii
commented
May 6, 2023
| @@ -42,7 +42,8 @@ pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext<'_>) -> Opt | |||
| .next(); | |||
| match derive_attr { | |||
| None => { | |||
| builder.insert_snippet(cap, node_start, "#[derive($0)]\n"); | |||
| let indent_level = IndentLevel::from_node(nominal.syntax()); | |||
| builder.insert_snippet(cap, node_start, format!("#[derive($0)]\n{indent_level}")); | |||
There was a problem hiding this comment.
NB If there's a comment, it will be considered a part of nominal: Adt, so indent_level will be the comment's indent. If this comment and the line containing ADT name have different indents, the indent of later will be changed.
Thus it might be better to calculate here the indent of the ADT name. On the other hand, this assist is expected only to preserve correct indentation, not to fix incorrect one.
ponyii
changed the title
generate_derive no longer breaks indentationgenerate_derive no longer breaks indentation
ponyii
changed the title
generate_derive no longer breaks indentation
ponyii
force-pushed
the
fix/generate_derive_breaks_indentation
branch
from
b075364 to
e07d638
Compare
…dentation no longer
Veykril
approved these changes
May 24, 2023
|
@bors r+ |
|
☀️ Test successful - checks-actions |
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.
Fixes #14674
These are ad hoc patches for a number of assists that can produce incorrectly indented code, namely:
Some general solution is required in future, as the same problem arises in many other assists, e.g.
(the list is incomplete)