Skip to content

Fix suggestions rendering when the diff span is multiline #107671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 7, 2023
Merged

Fix suggestions rendering when the diff span is multiline #107671

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf02799
Fix suggestions rendering when the span is multiline
CastilloDel Feb 4, 2023
3dd0044
Clean up and comment EmitterWriter.draw_code_line
CastilloDel Feb 5, 2023
9cdc075
Add UI test for issue #92741
CastilloDel Feb 5, 2023
039f70e
Add more test cases to tests/ui/issues/issue-92741.rs
CastilloDel Feb 6, 2023
f0830c0
Add `run-rustfix` to tests/ui/issues/issue-92741.rs
CastilloDel Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 63 additions & 17 deletions compiler/rustc_errors/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2175,30 +2175,69 @@ impl EmitterWriter {
file_lines: &FileLines,
is_multiline: bool,
) {
// Print the span column to avoid confusion
buffer.puts(*row_num, 0, &self.maybe_anonymized(line_start + line_pos), Style::LineNumber);
if let DisplaySuggestion::Diff = show_code_change {
// Add the line number for both addition and removal to drive the point home.
//
// N - fn foo<A: T>(bar: A) {
// N + fn foo(bar: impl T) {
let number_of_lines = file_lines.lines.len();
for (index, line_to_remove) in
file_lines.lines.iter().take(number_of_lines - 1).enumerate()
{
buffer.puts(
*row_num - 1,
0,
&self.maybe_anonymized(line_start + line_pos + index),
Style::LineNumber,
);
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
buffer.puts(
*row_num - 1,
max_line_num_len + 3,
&normalize_whitespace(
&file_lines.file.get_line(line_to_remove.line_index).unwrap(),
),
Style::NoStyle,
);
*row_num += 1;
}
let last_line = &file_lines
.file
.get_line(file_lines.lines[number_of_lines - 1].line_index)
.unwrap();
if last_line != line {
buffer.puts(
*row_num - 1,
0,
&self.maybe_anonymized(line_start + line_pos + number_of_lines - 1),
Style::LineNumber,
);
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
buffer.puts(
*row_num - 1,
max_line_num_len + 3,
&normalize_whitespace(last_line),
Style::NoStyle,
);
buffer.puts(
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
// print the suggestion
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
} else {
*row_num -= 2;
}
} else if is_multiline {
buffer.puts(
*row_num - 1,
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
buffer.puts(
*row_num - 1,
max_line_num_len + 3,
&normalize_whitespace(
&file_lines.file.get_line(file_lines.lines[line_pos].line_index).unwrap(),
),
Style::NoStyle,
);
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
} else if is_multiline {
match &highlight_parts[..] {
[SubstitutionHighlight { start: 0, end }] if *end == line.len() => {
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
Expand All @@ -2210,13 +2249,20 @@ impl EmitterWriter {
buffer.puts(*row_num, max_line_num_len + 1, "~ ", Style::Addition);
}
}
// print the suggestion
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
} else {
buffer.puts(
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
draw_col_separator(buffer, *row_num, max_line_num_len + 1);
// print the suggestion
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
}

// print the suggestion
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);

// Colorize addition/replacements with green.
for &SubstitutionHighlight { start, end } in highlight_parts {
// Account for tabs when highlighting (#87972).
Expand Down