Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown #97798
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
rustbot
added
T-compiler
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
|
I'm ok with the results, need to look at the impl, particularly to check that it'll be graceful when handling more than 2 suggested changes in a single suggestion. |
estebank
reviewed
Jun 6, 2022
compiler/rustc_errors/src/emitter.rs
Outdated
Comment on lines
1841
to
1845
| let print_line = |line_pos: usize, | ||
| line: &str, | ||
| highlight_parts: &Vec<SubstitutionHighlight>, | ||
| buffer: &mut StyledBuffer, | ||
| row_num: &mut usize| { |
There was a problem hiding this comment.
Maybe moving this to its own method might help with readability.
There was a problem hiding this comment.
I tried, but I'm not sure if it's better, there are a lot of variables / state that needs to be passed around.
WaffleLapkin
force-pushed
the
allow_for_suggestions_that_are_quite_far_away_from_each_other
branch
from
e991594
to
1961d9e
Compare
estebank
reviewed
Jun 14, 2022
| draw_col_separator(&mut buffer, row_num, max_line_num_len + 1); | ||
| let mut unhighlighted_lines = Vec::new(); | ||
| for (line_pos, (line, highlight_parts)) in lines.by_ref().zip(highlights).enumerate() { | ||
| debug!(%line_pos, %line, ?highlight_parts); |
There was a problem hiding this comment.
First time I see this, what does % do? 🤯
There was a problem hiding this comment.
It uses Display instead of Debug :D
|
@bors r+ |
|
📌 Commit 1961d9e has been approved by |
bors
added
S-waiting-on-bors
We can modify clippy directly from this repo as well. |
Oh, nice! Didn't know about that. |
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 15, 2022
…that_are_quite_far_away_from_each_other, r=estebank Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: rust-lang#97759 (comment). I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result. Here is an example of how this changes the output: Before: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | 5 | 6 | 7 | 8 | ... ``` After: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | ... 31| 32~ } }; | ``` r? `@estebank` `@rustbot` label +A-diagnostics +A-suggestion-diagnostics
|
Failed in rollup: https://github.com/rust-lang/rust/runs/6897040285?check_suite_focus=true |
bors
added
S-waiting-on-author
!(a & b) = !a | !b
Previously we only show at most 6 lines of suggestions and, if the
suggestions are more than 6 lines apart, we've just showed ... at the
end. This is probably fine, but quite confusing in my opinion.
This commit is an attempt to show ... in places where there is nothing
to suggest instead, for example:
Before:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
5 |
6 |
7 |
8 |
...
```
After:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
...
31|
32~ } };
|
```
I'm not sure if I succeeded
WaffleLapkin
force-pushed
the
allow_for_suggestions_that_are_quite_far_away_from_each_other
branch
from
1961d9e
to
e502b9a
Compare
|
I think it should be fine now |
|
@bors r=estebank |
|
📌 Commit e502b9a has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 17, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#95392 (std: Stabilize feature try_reserve_2 ) - rust-lang#97798 (Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown) - rust-lang#97844 (Windows: No panic if function not (yet) available) - rust-lang#98013 (Subtype FRU fields first in `type_changing_struct_update`) - rust-lang#98191 (Remove the rest of unnecessary `to_string`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
WaffleLapkin
deleted the
allow_for_suggestions_that_are_quite_far_away_from_each_other
branch
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 28, 2022
…suggestion_highlight_lines, r=flip1995 Remove `MAX_SUGGESTION_HIGHLIGHT_LINES` After rust-lang#97798 the `MAX_SUGGESTION_HIGHLIGHT_LINES` constant doesn't really make sense since we always show full suggestions. This PR removes last usages of the constant and the constant itself. r? `@flip1995` (this mostly does changes in clippy)
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Jun 28, 2022
…suggestion_highlight_lines, r=flip1995 Remove `MAX_SUGGESTION_HIGHLIGHT_LINES` After rust-lang#97798 the `MAX_SUGGESTION_HIGHLIGHT_LINES` constant doesn't really make sense since we always show full suggestions. This PR removes last usages of the constant and the constant itself. r? ``@flip1995`` (this mostly does changes in clippy)
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2022
…that_are_quite_far_away_from_each_other, r=estebank Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: rust-lang#97759 (comment). I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result. Here is an example of how this changes the output: Before: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | 5 | 6 | 7 | 8 | ... ``` After: ```text help: consider enclosing expression in a block | 3 ~ 'l: { match () { () => break 'l, 4 | ... 31| 32~ } }; | ``` r? `@estebank` `@rustbot` label +A-diagnostics +A-suggestion-diagnostics
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 is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: #97759 (comment).
I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result.
Here is an example of how this changes the output:
Before:
After:
r? @estebank
@rustbot label +A-diagnostics +A-suggestion-diagnostics