Skip to content

Commit 697c85a

Browse files
estebankestebank
committed
Only underline suggestion if it is not the only code being shown
1 parent eb478e2 commit 697c85a

16 files changed

+98
-43
lines changed

‎src/librustc_errors/emitter.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -1078,17 +1078,14 @@ impl EmitterWriter {
10781078

10791079
let suggestions = suggestion.splice_lines(cm.borrow());
10801080
let span_start_pos = cm.lookup_char_pos(primary_sub.span.lo);
1081-
let span_end_pos = cm.lookup_char_pos(primary_sub.span.hi);
10821081
let line_start = span_start_pos.line;
10831082
draw_col_separator_no_space(&mut buffer, 1, max_line_num_len + 1);
10841083
let mut row_num = 2;
1085-
for complete in suggestions.iter().take(MAX_SUGGESTIONS) {
1084+
for (&(ref complete, show_underline), ref sub) in suggestions
1085+
.iter().zip(primary_sub.substitutions.iter()).take(MAX_SUGGESTIONS)
1086+
{
10861087
let mut line_pos = 0;
10871088
// Only show underline if there's a single suggestion and it is a single line
1088-
let show_underline = complete.lines().count() == 1
1089-
&& span_start_pos.line == span_end_pos.line
1090-
&& primary_sub.substitutions.len() == 1;
1091-
10921089
let mut lines = complete.lines();
10931090
for line in lines.by_ref().take(MAX_HIGHLIGHT_LINES) {
10941091
// Print the span column to avoid confusion
@@ -1099,11 +1096,13 @@ impl EmitterWriter {
10991096
// print the suggestion
11001097
draw_col_separator(&mut buffer, row_num, max_line_num_len + 1);
11011098
buffer.append(row_num, line, Style::NoStyle);
1099+
line_pos += 1;
11021100
row_num += 1;
1101+
// Only show an underline in the suggestions if the suggestion is not the
1102+
// entirety of the code being shown and the displayed code is not multiline.
11031103
if show_underline {
11041104
draw_col_separator(&mut buffer, row_num, max_line_num_len + 1);
1105-
1106-
let sub_len = primary_sub.substitutions[0].trim_right().len();
1105+
let sub_len = sub.trim_right().len();
11071106
let underline_start = span_start_pos.col.0;
11081107
let underline_end = span_start_pos.col.0 + sub_len;
11091108
for p in underline_start..underline_end {
@@ -1114,19 +1113,19 @@ impl EmitterWriter {
11141113
}
11151114
row_num += 1;
11161115
}
1117-
line_pos += 1;
11181116
}
11191117

11201118
// if we elided some lines, add an ellipsis
11211119
if let Some(_) = lines.next() {
1122-
buffer.append(row_num, "...", Style::NoStyle);
1123-
} else if !show_underline && suggestions.len() <= MAX_SUGGESTIONS {
1120+
buffer.puts(row_num, max_line_num_len - 1, "...", Style::LineNumber);
1121+
} else if !show_underline {
11241122
draw_col_separator_no_space(&mut buffer, row_num, max_line_num_len + 1);
1123+
row_num += 1;
11251124
}
11261125
}
11271126
if suggestions.len() > MAX_SUGGESTIONS {
11281127
let msg = format!("and {} other candidates", suggestions.len() - MAX_SUGGESTIONS);
1129-
buffer.append(row_num, &msg, Style::NoStyle);
1128+
buffer.puts(row_num, 0, &msg, Style::NoStyle);
11301129
}
11311130
emit_to_destination(&buffer.render(), level, &mut self.dst)?;
11321131
}

‎src/librustc_errors/lib.rs

+17-6
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ impl CodeSuggestion {
114114
self.substitution_parts.iter().map(|sub| sub.span)
115115
}
116116

117-
/// Returns the assembled code suggestions.
118-
pub fn splice_lines(&self, cm: &CodeMapper) -> Vec<String> {
117+
/// Returns the assembled code suggestions and wether they should be shown with an underline.
118+
pub fn splice_lines(&self, cm: &CodeMapper) -> Vec<(String, bool)> {
119119
use syntax_pos::{CharPos, Loc, Pos};
120120

121121
fn push_trailing(buf: &mut String,
@@ -138,7 +138,7 @@ impl CodeSuggestion {
138138
}
139139

140140
if self.substitution_parts.is_empty() {
141-
return vec![String::new()];
141+
return vec![(String::new(), false)];
142142
}
143143

144144
let mut primary_spans: Vec<_> = self.substitution_parts
@@ -175,14 +175,25 @@ impl CodeSuggestion {
175175
prev_hi.col = CharPos::from_usize(0);
176176

177177
let mut prev_line = fm.get_line(lines.lines[0].line_index);
178-
let mut bufs = vec![String::new(); self.substitutions()];
178+
let mut bufs = vec![(String::new(), false); self.substitutions()];
179179

180180
for (sp, substitutes) in primary_spans {
181181
let cur_lo = cm.lookup_char_pos(sp.lo);
182-
for (buf, substitute) in bufs.iter_mut().zip(substitutes) {
182+
for (&mut (ref mut buf, ref mut underline), substitute) in bufs.iter_mut()
183+
.zip(substitutes) {
183184
if prev_hi.line == cur_lo.line {
184185
push_trailing(buf, prev_line.as_ref(), &prev_hi, Some(&cur_lo));
186+
187+
// Only show an underline in the suggestions if the suggestion is not the
188+
// entirety of the code being shown and the displayed code is not multiline.
189+
if prev_line.as_ref().unwrap().trim().len() > 0
190+
&& !substitute.ends_with('\n')
191+
&& substitute.lines().count() == 1
192+
{
193+
*underline = true;
194+
}
185195
} else {
196+
*underline = false;
186197
push_trailing(buf, prev_line.as_ref(), &prev_hi, None);
187198
// push lines between the previous and current span (if any)
188199
for idx in prev_hi.line..(cur_lo.line - 1) {
@@ -200,7 +211,7 @@ impl CodeSuggestion {
200211
prev_hi = cm.lookup_char_pos(sp.hi);
201212
prev_line = fm.get_line(prev_hi.line - 1);
202213
}
203-
for buf in &mut bufs {
214+
for &mut (ref mut buf, _) in &mut bufs {
204215
// if the replacement already ends with a newline, don't print the next line
205216
if !buf.ends_with('\n') {
206217
push_trailing(buf, prev_line.as_ref(), &prev_hi, None);

‎src/libsyntax/json.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ impl DiagnosticCode {
359359

360360
impl JsonEmitter {
361361
fn render(&self, suggestion: &CodeSuggestion) -> Vec<String> {
362-
suggestion.splice_lines(&*self.cm)
362+
suggestion.splice_lines(&*self.cm).iter().map(|line| line.0.to_owned()).collect()
363363
}
364364
}
365365

‎src/test/ui/block-result/unexpected-return-on-unit.stderr

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ error[E0308]: mismatched types
77
= note: expected type `()`
88
found type `usize`
99
help: did you mean to add a semicolon here?
10-
| foo();
10+
|
11+
19 | foo();
12+
| ^
1113
help: possibly return type missing here?
12-
| fn bar() -> usize {
14+
|
15+
18 | fn bar() -> usize {
16+
| ^^^^^^^^
1317

1418
error: aborting due to previous error
1519

‎src/test/ui/issue-22644.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,18 @@ fn main() {
1414

1515
println!("{}", a as usize > b);
1616
println!("{}", a as usize < b);
17-
println!("{}", a as usize < 4);
17+
println!("{}", a
18+
as
19+
usize
20+
<
21+
4);
22+
println!("{}", a
23+
24+
25+
as
26+
27+
28+
usize
29+
<
30+
5);
1831
}

‎src/test/ui/issue-22644.stderr

+28-8
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,37 @@ help: if you want to compare the casted value then write:
1212
| ^^^^^^^^^^^^
1313

1414
error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison
15-
--> $DIR/issue-22644.rs:17:33
15+
--> $DIR/issue-22644.rs:21:20
1616
|
17-
17 | println!("{}", a as usize < 4);
18-
| - ^ interpreted as generic argument
19-
| |
20-
| not interpreted as comparison
17+
20 | <
18+
| - not interpreted as comparison
19+
21 | 4);
20+
| ^ interpreted as generic argument
2121
|
2222
help: if you want to compare the casted value then write:
2323
|
24-
17 | println!("{}", (a as usize) < 4);
25-
| ^^^^^^^^^^^^
24+
17 | println!("{}", (a
25+
18 | as
26+
19 | usize)
27+
|
28+
29+
error: `<` is interpreted as a start of generic arguments for `usize`, not a comparison
30+
--> $DIR/issue-22644.rs:30:20
31+
|
32+
29 | <
33+
| - not interpreted as comparison
34+
30 | 5);
35+
| ^ interpreted as generic argument
36+
|
37+
help: if you want to compare the casted value then write:
38+
|
39+
22 | println!("{}", (a
40+
23 |
41+
24 |
42+
25 | as
43+
26 |
44+
27 |
45+
...
2646

27-
error: aborting due to 2 previous errors
47+
error: aborting due to 3 previous errors
2848

‎src/test/ui/resolve/enums-are-namespaced-xc.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0425]: cannot find value `A` in module `namespaced_enums`
77
help: possible candidate is found in another module, you can import it into scope
88
|
99
12 | use namespaced_enums::Foo::A;
10-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
|
1111

1212
error[E0425]: cannot find function `B` in module `namespaced_enums`
1313
--> $DIR/enums-are-namespaced-xc.rs:18:31
@@ -18,7 +18,7 @@ error[E0425]: cannot find function `B` in module `namespaced_enums`
1818
help: possible candidate is found in another module, you can import it into scope
1919
|
2020
12 | use namespaced_enums::Foo::B;
21-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
21+
|
2222

2323
error[E0422]: cannot find struct, variant or union type `C` in module `namespaced_enums`
2424
--> $DIR/enums-are-namespaced-xc.rs:21:31
@@ -29,7 +29,7 @@ error[E0422]: cannot find struct, variant or union type `C` in module `namespace
2929
help: possible candidate is found in another module, you can import it into scope
3030
|
3131
12 | use namespaced_enums::Foo::C;
32-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32+
|
3333

3434
error: aborting due to 3 previous errors
3535

‎src/test/ui/resolve/issue-16058.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ error[E0574]: expected struct, variant or union type, found enum `Result`
77
help: possible better candidates are found in other modules, you can import them into scope
88
|
99
12 | use std::fmt::Result;
10+
|
1011
12 | use std::io::Result;
12+
|
1113
12 | use std::thread::Result;
1214
|
1315

‎src/test/ui/resolve/issue-17518.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0422]: cannot find struct, variant or union type `E` in this scope
77
help: possible candidate is found in another module, you can import it into scope
88
|
99
11 | use SomeEnum::E;
10-
| ^^^^^^^^^^^^^^^^
10+
|
1111

1212
error: aborting due to previous error
1313

‎src/test/ui/resolve/issue-21221-1.stderr

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ error[E0405]: cannot find trait `Mul` in this scope
77
help: possible candidates are found in other modules, you can import them into scope
88
|
99
11 | use mul1::Mul;
10+
|
1011
11 | use mul2::Mul;
12+
|
1113
11 | use std::ops::Mul;
1214
|
1315

@@ -20,9 +22,13 @@ error[E0412]: cannot find type `Mul` in this scope
2022
help: possible candidates are found in other modules, you can import them into scope
2123
|
2224
11 | use mul1::Mul;
25+
|
2326
11 | use mul2::Mul;
27+
|
2428
11 | use mul3::Mul;
29+
|
2530
11 | use mul4::Mul;
31+
|
2632
and 2 other candidates
2733

2834
error[E0405]: cannot find trait `ThisTraitReallyDoesntExistInAnyModuleReally` in this scope
@@ -40,7 +46,7 @@ error[E0405]: cannot find trait `Div` in this scope
4046
help: possible candidate is found in another module, you can import it into scope
4147
|
4248
11 | use std::ops::Div;
43-
| ^^^^^^^^^^^^^^^^^^
49+
|
4450

4551
error: cannot continue compilation due to previous error
4652

‎src/test/ui/resolve/issue-21221-2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `T` in this scope
77
help: possible candidate is found in another module, you can import it into scope
88
|
99
11 | use foo::bar::T;
10-
| ^^^^^^^^^^^^^^^^
10+
|
1111

1212
error[E0601]: main function not found
1313

‎src/test/ui/resolve/issue-21221-3.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `OuterTrait` in this scope
77
help: possible candidate is found in another module, you can import it into scope
88
|
99
16 | use issue_21221_3::outer::OuterTrait;
10-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
|
1111

1212
error: cannot continue compilation due to previous error
1313

‎src/test/ui/resolve/issue-21221-4.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0405]: cannot find trait `T` in this scope
77
help: possible candidate is found in another module, you can import it into scope
88
|
99
16 | use issue_21221_4::T;
10-
| ^^^^^^^^^^^^^^^^^^^^^
10+
|
1111

1212
error: cannot continue compilation due to previous error
1313

‎src/test/ui/resolve/issue-3907.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0404]: expected trait, found type alias `Foo`
77
help: possible better candidate is found in another module, you can import it into scope
88
|
99
12 | use issue_3907::Foo;
10-
| ^^^^^^^^^^^^^^^^^^^^
10+
|
1111

1212
error: cannot continue compilation due to previous error
1313

‎src/test/ui/resolve/privacy-struct-ctor.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error[E0423]: expected value, found struct `Z`
1111
help: possible better candidate is found in another module, you can import it into scope
1212
|
1313
15 | use m::n::Z;
14-
| ^^^^^^^^^^^^
14+
|
1515

1616
error[E0423]: expected value, found struct `S`
1717
--> $DIR/privacy-struct-ctor.rs:36:5
@@ -25,7 +25,7 @@ error[E0423]: expected value, found struct `S`
2525
help: possible better candidate is found in another module, you can import it into scope
2626
|
2727
13 | use m::S;
28-
| ^^^^^^^^^
28+
|
2929

3030
error[E0423]: expected value, found struct `xcrate::S`
3131
--> $DIR/privacy-struct-ctor.rs:42:5
@@ -39,7 +39,7 @@ error[E0423]: expected value, found struct `xcrate::S`
3939
help: possible better candidate is found in another module, you can import it into scope
4040
|
4141
13 | use m::S;
42-
| ^^^^^^^^^
42+
|
4343

4444
error[E0603]: tuple struct `Z` is private
4545
--> $DIR/privacy-struct-ctor.rs:25:9

‎src/test/ui/span/issue-35987.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error[E0404]: expected trait, found type parameter `Add`
77
help: possible better candidate is found in another module, you can import it into scope
88
|
99
11 | use std::ops::Add;
10-
| ^^^^^^^^^^^^^^^^^^
10+
|
1111

1212
error[E0601]: main function not found
1313

0 commit comments

Comments
 (0)