Make it possible to correctly indent snippet_block snippets #5134
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
flip1995
added
the
S-waiting-on-review
flip1995
commented
Feb 4, 2020
| @@ -261,7 +261,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Attributes { | |||
| _ => {}, | |||
| } | |||
| } | |||
| let line_span = last_line_of_span(cx, attr.span); | |||
| let line_span = first_line_of_span(cx, attr.span); | |||
There was a problem hiding this comment.
This function never returned the last line of the span, but always the first line, so I renamed it accordingly.
flip1995
force-pushed
the
snippet_block
branch
from
574d4a9 to
0c4150f
Compare
phansch
reviewed
Feb 5, 2020
| if (zero!(i % 2) || nonzero!(i % 5)) && i % 3 != 0 { | ||
| continue; | ||
| } { | ||
| println!("Blabber"); |
There was a problem hiding this comment.
This seems to be a regression as it now wraps the removed else part in a block?
There was a problem hiding this comment.
Yeah, it changed a little bit, but I would keep it that way for two reasons:
- It's too hard to align this correctly after removing the block
- Suggesting it like this prevents a bug, that could be produced by the suggestion:
let y: u32 = 23;
if x {
continue;
} else {
let y: u32 = 42;
// ...
}
println!("{}", y); // outputs 23previous, the suggestion would change the output:
let y: u32 = 23; // best case: a warning for unused var is produced
if x {
continue;
}
let y: u32 = 42;
// ...
println!("{}", y); // outputs 42now the output stays the same:
let y: u32 = 23;
if x {
continue;
}
{
let y: u32 = 42;
// ...
}
println!("{}", y); //outputs 23
flip1995
force-pushed
the
snippet_block
branch
from
0c4150f to
0fe1e3d
Compare
|
☔ The latest upstream changes (presumably #5125) made this pull request unmergeable. Please resolve the merge conflicts. |
flip1995
force-pushed
the
snippet_block
branch
from
666820a to
e23881e
Compare
|
r=me with rebase |
phansch
approved these changes
Feb 6, 2020
|
@bors r=phansch |
|
📌 Commit e23881e has been approved by |
bors
added a commit
that referenced
this pull request
Feb 6, 2020
Make it possible to correctly indent snippet_block snippets
This adds a `indent_relative_to` arg to the `{snippet,expr}_block` functions. This makes it possible to keep the correct indentation of block like suggestions.
In addition, this makes the `trim_multiline` function private and adds a `indent_of` function, to get the indentation of the first line of a span.
The suggestion of `needless_continue` cannot be made auto applicable, since it would be also necessary to remove code following the linted expression. (Well, maybe it is possible, but I don't know how to do it. Expanding the suggestion span to the last expression, that should be removed didn't work)
changelog: Improve suggestions, when blocks of code are involved
|
☀️ Test successful - checks-travis, status-appveyor |
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.
This adds a
indent_relative_toarg to the{snippet,expr}_blockfunctions. This makes it possible to keep the correct indentation of block like suggestions.In addition, this makes the
trim_multilinefunction private and adds aindent_offunction, to get the indentation of the first line of a span.The suggestion of
needless_continuecannot be made auto applicable, since it would be also necessary to remove code following the linted expression. (Well, maybe it is possible, but I don't know how to do it. Expanding the suggestion span to the last expression, that should be removed didn't work)changelog: Improve suggestions, when blocks of code are involved