bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #124370 - ShE3py:substitution-part-offset, r=fee1-dead

Browse source 
Fix substitution parts having a shifted underline in some cases

If two suggestions parts are side by side, the underline's offset:
(WIP PR as an example, not yet pushed)
```
error: expected a pattern, found an expression
 --> ./main.rs:4:9
  |
4 |         1 + 2 => 3
  |         ^^^^^ arbitrary expressions are not allowed in patterns
  |
help: check the value in an arm guard
  |
4 |         n if n == 1 + 2 => 3
  |         ~     +++++++++++++
```
The emitter didn't take into account that the string had shrunk/grown if two substitution parts were side-by-side (surprisingly, there was only one case in the ui testsuite.)

```
help: check the value in an arm guard
  |
4 |         n if n == 1 + 2 => 3
  |         ~ +++++++++++++
```

``@rustbot`` label +A-suggestion-diagnostics
This commit is contained in:
Matthias Krüger 2024-04-27 20:46:07 +02:00 • committed by GitHub
commit 52ce43e9ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2019,7 +2019,7 @@ impl HumanEmitter {
let offset: isize = offsets let offset: isize = offsets
.iter() .iter()
.filter_map( .filter_map(
|(start, v)| if span_start_pos <= *start { None } else { Some(v) }, |(start, v)| if span_start_pos < *start { None } else { Some(v) },
) )
.sum(); .sum();
let underline_start = (span_start_pos + start) as isize + offset; let underline_start = (span_start_pos + start) as isize + offset;
@ -2028,7 +2028,7 @@ impl HumanEmitter {
let padding: usize = max_line_num_len + 3; let padding: usize = max_line_num_len + 3;
for p in underline_start..underline_end { for p in underline_start..underline_end {
if let DisplaySuggestion::Underline = show_code_change { if let DisplaySuggestion::Underline = show_code_change {
// If this is a replacement, underline with `^`, if this is an addition // If this is a replacement, underline with `~`, if this is an addition
// underline with `+`. // underline with `+`.
buffer.putc( buffer.putc(
row_num, row_num,