Skip to content

Commit 2851f2c

Browse files
author
Zibi Braniecki
committed
Unify more of the code between color and non-color formatters
1 parent e1be915 commit 2851f2c

File tree

3 files changed

+166
-189
lines changed

3 files changed

+166
-189
lines changed

‎src/display_list_formatting.rs‎

Lines changed: 103 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,72 @@
11
use display_list::{DisplayAnnotationPart, DisplayAnnotationType, DisplayLine, DisplayMark,
2-
DisplayTextFragment};
2+
DisplayMarkType, DisplayTextFragment};
33
use std::fmt;
44

55
pub trait DisplayListFormatting {
6-
fn format_annotation_type(annotation_type: &DisplayAnnotationType) -> String;
6+
fn format_annotation_type(annotation_type: &DisplayAnnotationType) -> String {
7+
match annotation_type {
8+
DisplayAnnotationType::Error => "error".to_string(),
9+
DisplayAnnotationType::Warning => "warning".to_string(),
10+
DisplayAnnotationType::Info => "info".to_string(),
11+
DisplayAnnotationType::Note => "note".to_string(),
12+
DisplayAnnotationType::Help => "help".to_string(),
13+
}
14+
}
715

8-
fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String;
16+
fn get_inline_mark(inline_mark: &DisplayMark) -> String {
17+
let sigil = match inline_mark.mark_type {
18+
DisplayMarkType::AnnotationThrough => '|',
19+
DisplayMarkType::AnnotationStart => '/',
20+
};
21+
sigil.to_string()
22+
}
23+
24+
fn format_inline_mark(inline_mark: &DisplayMark) -> String {
25+
Self::get_inline_mark(inline_mark)
26+
}
27+
28+
fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
29+
format!(
30+
"{}{}",
31+
" ".repeat(inline_marks_width - inline_marks.len()),
32+
inline_marks
33+
.iter()
34+
.map(Self::format_inline_mark)
35+
.collect::<Vec<String>>()
36+
.join(""),
37+
)
38+
}
39+
40+
fn get_source_annotation_marks(
41+
annotation_type: &DisplayAnnotationType,
42+
annotation_part: &DisplayAnnotationPart,
43+
) -> (char, char) {
44+
let indent_char = match annotation_part {
45+
DisplayAnnotationPart::Singleline => ' ',
46+
DisplayAnnotationPart::MultilineStart => '_',
47+
DisplayAnnotationPart::MultilineEnd => '_',
48+
};
49+
let mark = match annotation_type {
50+
DisplayAnnotationType::Error => '^',
51+
DisplayAnnotationType::Warning => '-',
52+
DisplayAnnotationType::Info => '-',
53+
DisplayAnnotationType::Note => '-',
54+
DisplayAnnotationType::Help => '-',
55+
};
56+
return (indent_char, mark);
57+
}
58+
59+
fn format_source_annotation_parts(
60+
annotation_type: &DisplayAnnotationType,
61+
indent_char: char,
62+
mark: char,
63+
range: &(usize, usize),
64+
lineno_width: usize,
65+
) -> (String, String, String);
66+
67+
fn format_label_line(_annotation_type: &DisplayAnnotationType, line: &str) -> String {
68+
return line.to_string();
69+
}
970

1071
fn format_source_annotation_lines(
1172
f: &mut fmt::Formatter,
@@ -15,7 +76,45 @@ pub trait DisplayListFormatting {
1576
label: &[DisplayTextFragment],
1677
annotation_type: &DisplayAnnotationType,
1778
annotation_part: &DisplayAnnotationPart,
18-
) -> fmt::Result;
79+
) -> fmt::Result {
80+
let (indent_char, mark) =
81+
Self::get_source_annotation_marks(annotation_type, annotation_part);
82+
let (lineno, indent, pointer) = Self::format_source_annotation_parts(
83+
annotation_type,
84+
indent_char,
85+
mark,
86+
range,
87+
lineno_width,
88+
);
89+
if let Some((first, rest)) = Self::format_label(label)
90+
.lines()
91+
.collect::<Vec<&str>>()
92+
.split_first()
93+
{
94+
writeln!(
95+
f,
96+
"{}{}{}{} {}",
97+
lineno,
98+
inline_marks,
99+
indent,
100+
pointer,
101+
Self::format_label_line(annotation_type, *first),
102+
)?;
103+
for line in rest {
104+
writeln!(
105+
f,
106+
"{}{}{} {}",
107+
lineno,
108+
inline_marks,
109+
" ".repeat(range.1),
110+
Self::format_label_line(annotation_type, *line),
111+
)?;
112+
}
113+
} else {
114+
writeln!(f, "{}{}{}{}", lineno, inline_marks, indent, pointer,)?;
115+
}
116+
Ok(())
117+
}
19118

20119
fn format_label(label: &[DisplayTextFragment]) -> String;
21120

‎src/format.rs‎

Lines changed: 18 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,28 @@
1-
use display_list::{DisplayAnnotationPart, DisplayAnnotationType, DisplayHeaderType, DisplayLine,
2-
DisplayList, DisplayMark, DisplayMarkType, DisplayTextFragment};
1+
use display_list::{DisplayAnnotationType, DisplayHeaderType, DisplayLine, DisplayList,
2+
DisplayTextFragment};
33
use display_list_formatting::DisplayListFormatting;
44
use std::fmt;
55

66
struct Formatter {}
77

8-
impl DisplayListFormatting for Formatter {
9-
fn format_annotation_type(annotation_type: &DisplayAnnotationType) -> String {
10-
match annotation_type {
11-
DisplayAnnotationType::Error => "error".to_string(),
12-
DisplayAnnotationType::Warning => "warning".to_string(),
13-
DisplayAnnotationType::Info => "info".to_string(),
14-
DisplayAnnotationType::Note => "note".to_string(),
15-
DisplayAnnotationType::Help => "help".to_string(),
16-
}
17-
}
18-
19-
fn format_inline_marks(inline_marks: &[DisplayMark], inline_marks_width: usize) -> String {
20-
format!(
21-
"{:>width$}",
22-
inline_marks
23-
.iter()
24-
.map(|mark| {
25-
let sigil = match mark.mark_type {
26-
DisplayMarkType::AnnotationThrough => "|",
27-
DisplayMarkType::AnnotationStart => "/",
28-
};
29-
sigil
30-
})
31-
.collect::<Vec<&str>>()
32-
.join(""),
33-
width = inline_marks_width
34-
)
35-
}
8+
fn repeat_char(c: char, n: usize) -> String {
9+
let mut s = String::with_capacity(c.len_utf8());
10+
s.push(c);
11+
return s.repeat(n);
12+
}
3613

37-
fn format_source_annotation_lines(
38-
f: &mut fmt::Formatter,
39-
lineno_width: usize,
40-
inline_marks: String,
14+
impl DisplayListFormatting for Formatter {
15+
fn format_source_annotation_parts(
16+
_annotation_type: &DisplayAnnotationType,
17+
indent_char: char,
18+
mark: char,
4119
range: &(usize, usize),
42-
label: &[DisplayTextFragment],
43-
annotation_type: &DisplayAnnotationType,
44-
annotation_part: &DisplayAnnotationPart,
45-
) -> fmt::Result {
46-
let indent_char = match annotation_part {
47-
DisplayAnnotationPart::Singleline => " ",
48-
DisplayAnnotationPart::MultilineStart => "_",
49-
DisplayAnnotationPart::MultilineEnd => "_",
50-
};
51-
let mark = match annotation_type {
52-
DisplayAnnotationType::Error => "^",
53-
DisplayAnnotationType::Warning => "-",
54-
DisplayAnnotationType::Info => "-",
55-
DisplayAnnotationType::Note => "-",
56-
DisplayAnnotationType::Help => "-",
57-
};
58-
if let Some((first, rest)) = Self::format_label(label)
59-
.lines()
60-
.collect::<Vec<&str>>()
61-
.split_first()
62-
{
63-
let indent = range.1;
64-
writeln!(
65-
f,
66-
"{}{}{}{} {}",
67-
format!("{} |", " ".repeat(lineno_width)),
68-
inline_marks,
69-
indent_char.repeat(range.0),
70-
mark.repeat(range.1 - range.0),
71-
first,
72-
)?;
73-
for line in rest {
74-
writeln!(
75-
f,
76-
"{}{}{} {}",
77-
format!("{} |", " ".repeat(lineno_width)),
78-
inline_marks,
79-
" ".repeat(indent),
80-
line,
81-
)?;
82-
}
83-
} else {
84-
writeln!(
85-
f,
86-
"{}{}{}{}",
87-
format!("{} |", " ".repeat(lineno_width)),
88-
inline_marks,
89-
indent_char.repeat(range.0),
90-
mark.repeat(range.1 - range.0),
91-
)?;
92-
}
93-
Ok(())
20+
lineno_width: usize,
21+
) -> (String, String, String) {
22+
let lineno = format!("{} |", " ".repeat(lineno_width));
23+
let indent = repeat_char(indent_char, range.0);
24+
let pointer = repeat_char(mark, range.1 - range.0);
25+
return (lineno, indent, pointer);
9426
}
9527

9628
fn format_label(label: &[DisplayTextFragment]) -> String {

0 commit comments

Comments
 (0)