bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

review comments

Browse source
This commit is contained in:
Esteban Kuber 2021-08-23 12:42:08 +00:00
parent 31d07edc94
commit 955e913612
1 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_errors/src/lib.rs
View file

@ -321,21 +321,42 @@ impl CodeSuggestion {
} }
} }
// Add a whole line highlight per line in the snippet. // Add a whole line highlight per line in the snippet.
let len = part.snippet.split('\n').next().unwrap_or(&part.snippet).len(); let len: isize = part
.snippet
.split('\n')
.next()
.unwrap_or(&part.snippet)
.chars()
.map(|c| match c {
'\t' => 4,
_ => 1,
})
.sum();
line_highlight.push(SubstitutionHighlight { line_highlight.push(SubstitutionHighlight {
start: (cur_lo.col.0 as isize + acc) as usize, start: (cur_lo.col.0 as isize + acc) as usize,
end: (cur_lo.col.0 as isize + acc + len as isize) as usize, end: (cur_lo.col.0 as isize + acc + len) as usize,
}); });
buf.push_str(&part.snippet); buf.push_str(&part.snippet);
prev_hi = sm.lookup_char_pos(part.span.hi()); let cur_hi = sm.lookup_char_pos(part.span.hi());
if prev_hi.line == cur_lo.line { if prev_hi.line == cur_lo.line {
acc += len as isize - (prev_hi.col.0 - cur_lo.col.0) as isize; // Account for the difference between the width of the current code and the
// snippet being suggested, so that the *later* suggestions are correctly
// aligned on the screen.
acc += len as isize - (cur_hi.col.0 - cur_lo.col.0) as isize;
} }
prev_hi = cur_hi;
prev_line = sf.get_line(prev_hi.line - 1); prev_line = sf.get_line(prev_hi.line - 1);
for line in part.snippet.split('\n').skip(1) { for line in part.snippet.split('\n').skip(1) {
acc = 0; acc = 0;
highlights.push(std::mem::take(&mut line_highlight)); highlights.push(std::mem::take(&mut line_highlight));
line_highlight.push(SubstitutionHighlight { start: 0, end: line.len() }); let end: usize = line
.chars()
.map(|c| match c {
'\t' => 4,
_ => 1,
})
.sum();
line_highlight.push(SubstitutionHighlight { start: 0, end });
} }
} }
highlights.push(std::mem::take(&mut line_highlight)); highlights.push(std::mem::take(&mut line_highlight));