Skip to content

Commit b2813d6

Browse files
author
Zibi Braniecki
committed
Finish multiline
1 parent 895862a commit b2813d6

File tree

5 files changed

+107
-30
lines changed

5 files changed

+107
-30
lines changed

‎src/display_list.rs‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn format_header(snippet: &Snippet) -> Vec<DisplayLine> {
3030
.main_annotation_pos
3131
.and_then(|pos| snippet.annotations.get(pos));
3232

33-
if let Some(annotation) = main_annotation {
33+
if let Some(_annotation) = main_annotation {
3434
let path = snippet.slice.origin.clone().unwrap_or("".to_string());
3535
let row = 52;
3636
let col = 1;
@@ -60,7 +60,6 @@ fn format_body(mut snippet: Snippet) -> Vec<DisplayLine> {
6060
current_line += 1;
6161
current_index += line_length + 1;
6262
}
63-
// println!("{:?}", line_index_ranges);
6463

6564
let mut annotation_line_count = 0;
6665
for idx in 0..body.len() {
@@ -69,7 +68,7 @@ fn format_body(mut snippet: Snippet) -> Vec<DisplayLine> {
6968
let body_idx = idx + annotation_line_count;
7069
match annotation.range {
7170
(Some(start), ..) if start > line_end => false,
72-
(Some(start), Some(end)) if start > line_start && end < line_end => {
71+
(Some(start), Some(end)) if start >= line_start && end <= line_end => {
7372
let range = (start - line_start, end - line_start);
7473
body.insert(
7574
body_idx + 1,
@@ -85,6 +84,20 @@ fn format_body(mut snippet: Snippet) -> Vec<DisplayLine> {
8584
annotation_line_count += 1;
8685
true
8786
}
87+
(Some(start), Some(end))
88+
if start >= line_start && start <= line_end && end > line_end =>
89+
{
90+
match body[body_idx] {
91+
DisplayLine::SourceLine {
92+
ref mut inline_marks,
93+
..
94+
} => {
95+
inline_marks.push(DisplayMark::AnnotationStart);
96+
}
97+
_ => {}
98+
}
99+
false
100+
}
88101
(Some(start), Some(end)) if start < line_start && end > line_end => {
89102
match body[body_idx] {
90103
DisplayLine::SourceLine {
@@ -97,12 +110,38 @@ fn format_body(mut snippet: Snippet) -> Vec<DisplayLine> {
97110
}
98111
false
99112
}
113+
(Some(start), Some(end))
114+
if start < line_start && end >= line_start && end <= line_end =>
115+
{
116+
match body[body_idx] {
117+
DisplayLine::SourceLine {
118+
ref mut inline_marks,
119+
..
120+
} => {
121+
inline_marks.push(DisplayMark::AnnotationThrough);
122+
}
123+
_ => {}
124+
}
125+
let range = (end - line_start, end - line_start + 1);
126+
body.insert(
127+
body_idx + 1,
128+
DisplayLine::AnnotationLine {
129+
inline_marks: vec![DisplayMark::AnnotationThrough],
130+
range,
131+
label: annotation.label.clone().unwrap_or("".to_string()),
132+
annotation_type: DisplayAnnotationType::MultilineEnd,
133+
},
134+
);
135+
annotation_line_count += 1;
136+
true
137+
}
100138
_ => false,
101139
}
102140
});
103141
}
104142

105143
body.insert(0, DisplayLine::EmptySourceLine);
144+
body.push(DisplayLine::EmptySourceLine);
106145
return body;
107146
}
108147

@@ -139,6 +178,8 @@ pub enum DisplayLine {
139178
pub enum DisplayAnnotationType {
140179
Error,
141180
Warning,
181+
MultilineStart,
182+
MultilineEnd,
142183
}
143184

144185
impl From<AnnotationType> for DisplayAnnotationType {

‎src/formatted_display_list.rs‎

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub struct FormattedDisplayList {
77

88
impl From<DisplayList> for FormattedDisplayList {
99
fn from(dl: DisplayList) -> Self {
10-
let max_lineno = dl.body.iter().fold(0, |max, ref line| match line {
10+
let lineno_width = dl.body.iter().fold(0, |max, ref line| match line {
1111
DisplayLine::SourceLine { lineno, .. } => {
1212
let width = lineno.to_string().len();
1313
if width > max {
@@ -18,9 +18,20 @@ impl From<DisplayList> for FormattedDisplayList {
1818
}
1919
_ => max,
2020
});
21+
let inline_marks_width = dl.body.iter().fold(0, |max, ref line| match line {
22+
DisplayLine::SourceLine { inline_marks, .. } => {
23+
let width = inline_marks.len();
24+
if width > max {
25+
width + 1
26+
} else {
27+
max
28+
}
29+
}
30+
_ => max,
31+
});
2132
let body = dl.body
2233
.into_iter()
23-
.map(|line| FormattedDisplayLine::format(line, max_lineno))
34+
.map(|line| FormattedDisplayLine::format(line, lineno_width, inline_marks_width))
2435
.collect();
2536
FormattedDisplayList { body }
2637
}
@@ -39,6 +50,7 @@ impl fmt::Display for FormattedDisplayList {
3950
}
4051
}
4152

53+
#[derive(Debug)]
4254
enum FormattedDisplayLine {
4355
RawLine(String),
4456
EmptySourceLine {
@@ -58,19 +70,19 @@ enum FormattedDisplayLine {
5870
}
5971

6072
impl FormattedDisplayLine {
61-
fn format(dl: DisplayLine, max_lineno: usize) -> Self {
73+
fn format(dl: DisplayLine, lineno_width: usize, inline_marks_width: usize) -> Self {
6274
match dl {
6375
DisplayLine::RawLine(s) => FormattedDisplayLine::RawLine(s),
6476
DisplayLine::EmptySourceLine => FormattedDisplayLine::EmptySourceLine {
65-
lineno: " ".repeat(max_lineno),
77+
lineno: " ".repeat(lineno_width),
6678
},
6779
DisplayLine::SourceLine {
6880
lineno,
6981
inline_marks,
7082
content,
7183
} => FormattedDisplayLine::SourceLine {
72-
lineno: format!("{: >width$}", lineno, width = max_lineno),
73-
inline_marks: Self::format_inline_marks(&inline_marks),
84+
lineno: format!("{: >width$}", lineno, width = lineno_width),
85+
inline_marks: Self::format_inline_marks(&inline_marks, inline_marks_width),
7486
content,
7587
},
7688
DisplayLine::AnnotationLine {
@@ -79,22 +91,23 @@ impl FormattedDisplayLine {
7991
label,
8092
annotation_type,
8193
} => FormattedDisplayLine::AnnotationLine {
82-
lineno: " ".repeat(max_lineno),
83-
inline_marks: Self::format_inline_marks(&inline_marks),
94+
lineno: " ".repeat(lineno_width),
95+
inline_marks: Self::format_inline_marks(&inline_marks, inline_marks_width),
8496
content: Self::format_annotation_content(range, label, annotation_type),
8597
},
8698
DisplayLine::FoldLine => FormattedDisplayLine::FoldLine,
8799
}
88100
}
89101

90-
fn format_inline_marks(inline_marks: &[DisplayMark]) -> String {
102+
fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
91103
format!(
92-
"{}",
104+
"{: >width$}",
93105
inline_marks
94106
.iter()
95107
.map(|mark| format!("{}", mark))
96108
.collect::<Vec<String>>()
97-
.join("")
109+
.join(""),
110+
width = inline_marks_width
98111
)
99112
}
100113

@@ -103,17 +116,32 @@ impl FormattedDisplayLine {
103116
label: String,
104117
annotation_type: DisplayAnnotationType,
105118
) -> String {
106-
let underline_char = match annotation_type {
107-
DisplayAnnotationType::Error => "^",
108-
DisplayAnnotationType::Warning => "-",
109-
};
110-
111-
format!(
112-
"{}{} {}",
113-
" ".repeat(range.0),
114-
underline_char.repeat(range.1 - range.0),
115-
label
116-
)
119+
match annotation_type {
120+
DisplayAnnotationType::Error => format!(
121+
"{}{} {}",
122+
" ".repeat(range.0),
123+
"^".repeat(range.1 - range.0),
124+
label
125+
),
126+
DisplayAnnotationType::Warning => format!(
127+
"{}{} {}",
128+
" ".repeat(range.0),
129+
"-".repeat(range.1 - range.0),
130+
label
131+
),
132+
DisplayAnnotationType::MultilineStart => format!(
133+
"{}{} {}",
134+
"_".repeat(range.0),
135+
"^".repeat(range.1 - range.0),
136+
label
137+
),
138+
DisplayAnnotationType::MultilineEnd => format!(
139+
"{}{} {}",
140+
"_".repeat(range.0),
141+
"^".repeat(range.1 - range.0),
142+
label
143+
),
144+
}
117145
}
118146
}
119147

@@ -125,13 +153,13 @@ impl fmt::Display for FormattedDisplayLine {
125153
lineno,
126154
inline_marks,
127155
content,
128-
} => write!(f, "{} | {}{}", lineno, inline_marks, content),
156+
} => write!(f, "{} |{} {}", lineno, inline_marks, content),
129157
FormattedDisplayLine::RawLine(body) => write!(f, "{}", body),
130158
FormattedDisplayLine::AnnotationLine {
131159
lineno,
132160
inline_marks,
133161
content,
134-
} => write!(f, "{} | {}{}", lineno, inline_marks, content),
162+
} => write!(f, "{} |{}{}", lineno, inline_marks, content),
135163
FormattedDisplayLine::FoldLine => write!(f, " ... |"),
136164
}
137165
}

‎tests/fixtures/multiline_annotation.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,9 @@ annotations:
1616
id: E0308
1717
annotation_type: Error
1818
range: [null, null]
19+
- label: expected `std::option::Option<std::string::String>` because of return type
20+
annotation_type: Warning
21+
range: [6, 20]
22+
- label: expected enum `std::option::Option`, found ()
23+
annotation_type: Error
24+
range: [23, 245]

‎tests/fixtures/multiple_annotations.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
|
12
96 | fn add_title_line(result: &mut Vec<String>, main_annotation: Option<&Annotation>) {
23
97 | if let Some(annotation) = main_annotation {
34
| ^^^^^^^^^^ Variable defined here
@@ -10,3 +11,4 @@
1011
102 | ));
1112
103 | }
1213
104 | }
14+
|

‎tests/fixtures/multiple_annotations.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ annotations:
1818
range: [null, null]
1919
- label: Variable defined here
2020
annotation_type: Error
21-
range: [101, 111]
21+
range: [102, 112]
2222
- label: Referenced here
2323
annotation_type: Error
24-
range: [187, 197]
24+
range: [188, 198]
2525
- label: Referenced again here
2626
annotation_type: Error
27-
range: [248, 258]
27+
range: [249, 259]

0 commit comments

Comments
 (0)