bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Clean up and comment EmitterWriter.draw_code_line

Browse source
This commit is contained in:
CastilloDel 2023-02-05 18:59:31 +01:00
parent cf0279991d
commit 3dd004470d
1 changed files with 32 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

91
compiler/rustc_errors/src/emitter.rs
View file

@ -1882,9 +1882,8 @@ impl EmitterWriter {
&mut buffer, &mut buffer,
&mut row_num, &mut row_num,
&Vec::new(), &Vec::new(),
p, p + line_start,
l, l,
line_start,
show_code_change, show_code_change,
max_line_num_len, max_line_num_len,
&file_lines, &file_lines,
@ -1907,9 +1906,8 @@ impl EmitterWriter {
&mut buffer, &mut buffer,
&mut row_num, &mut row_num,
&Vec::new(), &Vec::new(),
p, p + line_start,
l, l,
line_start,
show_code_change, show_code_change,
max_line_num_len, max_line_num_len,
&file_lines, &file_lines,
@ -1925,9 +1923,8 @@ impl EmitterWriter {
&mut buffer, &mut buffer,
&mut row_num, &mut row_num,
&Vec::new(), &Vec::new(),
p, p + line_start,
l, l,
line_start,
show_code_change, show_code_change,
max_line_num_len, max_line_num_len,
&file_lines, &file_lines,
@ -1941,9 +1938,8 @@ impl EmitterWriter {
&mut buffer, &mut buffer,
&mut row_num, &mut row_num,
highlight_parts, highlight_parts,
line_pos, line_pos + line_start,
line, line,
line_start,
show_code_change, show_code_change,
max_line_num_len, max_line_num_len,
&file_lines, &file_lines,
@ -2167,49 +2163,44 @@ impl EmitterWriter {
buffer: &mut StyledBuffer, buffer: &mut StyledBuffer,
row_num: &mut usize, row_num: &mut usize,
highlight_parts: &Vec<SubstitutionHighlight>, highlight_parts: &Vec<SubstitutionHighlight>,
line_pos: usize, line_num: usize,
line: &str, line_to_add: &str,
line_start: usize,
show_code_change: DisplaySuggestion, show_code_change: DisplaySuggestion,
max_line_num_len: usize, max_line_num_len: usize,
file_lines: &FileLines, file_lines: &FileLines,
is_multiline: bool, is_multiline: bool,
) { ) {
if let DisplaySuggestion::Diff = show_code_change { if let DisplaySuggestion::Diff = show_code_change {
// Add the line number for both addition and removal to drive the point home. // We need to print more than one line if the span we need to remove is multiline.
// // For more info: https://github.com/rust-lang/rust/issues/92741
// N - fn foo<A: T>(bar: A) { let lines_to_remove = file_lines.lines.iter().take(file_lines.lines.len() - 1);
// N + fn foo(bar: impl T) { for (index, line_to_remove) in lines_to_remove.enumerate() {
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( buffer.puts(
*row_num - 1, *row_num - 1,
0, 0,
&self.maybe_anonymized(line_start + line_pos + index), &self.maybe_anonymized(line_num + index),
Style::LineNumber, Style::LineNumber,
); );
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal); buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
buffer.puts( let line = normalize_whitespace(
*row_num - 1, &file_lines.file.get_line(line_to_remove.line_index).unwrap(),
max_line_num_len + 3,
&normalize_whitespace(
&file_lines.file.get_line(line_to_remove.line_index).unwrap(),
),
Style::NoStyle,
); );
buffer.puts(*row_num - 1, max_line_num_len + 3, &line, Style::NoStyle);
*row_num += 1; *row_num += 1;
} }
let last_line = &file_lines // If the last line is exactly equal to the line we need to add, we can skip both of them.
.file // This allows us to avoid output like the following:
.get_line(file_lines.lines[number_of_lines - 1].line_index) // 2 - &
.unwrap(); // 2 + if true { true } else { false }
if last_line != line { // 3 - if true { true } else { false }
// If those lines aren't equal, we print their diff
let last_line_index = file_lines.lines[file_lines.lines.len() - 1].line_index;
let last_line = &file_lines.file.get_line(last_line_index).unwrap();
if last_line != line_to_add {
buffer.puts( buffer.puts(
*row_num - 1, *row_num - 1,
0, 0,
&self.maybe_anonymized(line_start + line_pos + number_of_lines - 1), &self.maybe_anonymized(line_num + file_lines.lines.len() - 1),
Style::LineNumber, Style::LineNumber,
); );
buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal); buffer.puts(*row_num - 1, max_line_num_len + 1, "- ", Style::Removal);
@ -2219,27 +2210,16 @@ impl EmitterWriter {
&normalize_whitespace(last_line), &normalize_whitespace(last_line),
Style::NoStyle, Style::NoStyle,
); );
buffer.puts( buffer.puts(*row_num, 0, &self.maybe_anonymized(line_num), Style::LineNumber);
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition); buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
// print the suggestion buffer.append(*row_num, &normalize_whitespace(line_to_add), Style::NoStyle);
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
} else { } else {
*row_num -= 2; *row_num -= 2;
} }
} else if is_multiline { } else if is_multiline {
buffer.puts( buffer.puts(*row_num, 0, &self.maybe_anonymized(line_num), Style::LineNumber);
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
match &highlight_parts[..] { match &highlight_parts[..] {
[SubstitutionHighlight { start: 0, end }] if *end == line.len() => { [SubstitutionHighlight { start: 0, end }] if *end == line_to_add.len() => {
buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition); buffer.puts(*row_num, max_line_num_len + 1, "+ ", Style::Addition);
} }
[] => { [] => {
@ -2249,24 +2229,17 @@ impl EmitterWriter {
buffer.puts(*row_num, max_line_num_len + 1, "~ ", Style::Addition); buffer.puts(*row_num, max_line_num_len + 1, "~ ", Style::Addition);
} }
} }
// print the suggestion buffer.append(*row_num, &normalize_whitespace(line_to_add), Style::NoStyle);
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
} else { } else {
buffer.puts( buffer.puts(*row_num, 0, &self.maybe_anonymized(line_num), Style::LineNumber);
*row_num,
0,
&self.maybe_anonymized(line_start + line_pos),
Style::LineNumber,
);
draw_col_separator(buffer, *row_num, max_line_num_len + 1); draw_col_separator(buffer, *row_num, max_line_num_len + 1);
// print the suggestion buffer.append(*row_num, &normalize_whitespace(line_to_add), Style::NoStyle);
buffer.append(*row_num, &normalize_whitespace(line), Style::NoStyle);
} }
// Colorize addition/replacements with green. // Colorize addition/replacements with green.
for &SubstitutionHighlight { start, end } in highlight_parts { for &SubstitutionHighlight { start, end } in highlight_parts {
// Account for tabs when highlighting (#87972). // Account for tabs when highlighting (#87972).
let tabs: usize = line let tabs: usize = line_to_add
.chars() .chars()
.take(start) .take(start)
.map(|ch| match ch { .map(|ch| match ch {