bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

De-emph minimized spans, add better debugging output

Browse source
This commit is contained in:
Jonathan Turner 2016-05-16 15:39:25 -04:00
parent ae1e73affe
commit 3e9747af49
4 changed files with 37 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/libsyntax/errors/snippet/mod.rs
View file

@ -58,6 +58,9 @@ struct Annotation {
/// Is this annotation derived from primary span
is_primary: bool,
/// Is this a large span minimized down to a smaller span
is_minimized: bool,
/// Optional label to display adjacent to the annotation.
label: Option<String>,
}
@ -90,6 +93,7 @@ pub enum Style {
UnderlineSecondary,
LabelPrimary,
LabelSecondary,
OldSkoolNoteText,
OldSkoolNote,
NoStyle,
}
@ -383,10 +387,10 @@ impl FileInfo {
// Basically, although this loses information, multi-line spans just
// never look good.
let (line, start_col, mut end_col) = if lines.len() == 1 {
(lines[0].line_index, lines[0].start_col, lines[0].end_col)
let (line, start_col, mut end_col, is_minimized) = if lines.len() == 1 {
(lines[0].line_index, lines[0].start_col, lines[0].end_col, false)
} else {
(lines[0].line_index, lines[0].start_col, CharPos(lines[0].start_col.0 + 1))
(lines[0].line_index, lines[0].start_col, CharPos(lines[0].start_col.0 + 1), true)
};
// Watch out for "empty spans". If we get a span like 6..6, we
@ -402,6 +406,7 @@ impl FileInfo {
self.lines[index].push_annotation(start_col,
end_col,
is_primary,
is_minimized,
label);
}
@ -498,6 +503,7 @@ impl FileInfo {
match self.primary_span {
Some(span) => {
let lo = codemap.lookup_char_pos(span.lo);
let hi = codemap.lookup_char_pos(span.hi);
//Before each secondary line in old skool-mode, print the label
//as an old-style note
if !line.annotations[0].is_primary {
@ -507,14 +513,15 @@ impl FileInfo {
text: lo.file.name.clone(),
style: Style::FileNameStyle,
}, StyledString {
text: format!(":{}:{}: ", lo.line, lo.col.0 + 1),
text: format!(":{}:{}: {}:{} ", lo.line, lo.col.0 + 1,
hi.line, hi.col.0+1),
style: Style::LineAndColumn,
}, StyledString {
text: format!("note: "),
style: Style::LabelSecondary,
style: Style::OldSkoolNote,
}, StyledString {
text: format!("{}", ann),
style: Style::OldSkoolNote,
style: Style::OldSkoolNoteText,
}],
kind: RenderedLineKind::Annotations,
});
@ -621,7 +628,7 @@ impl FileInfo {
if annotation.is_primary {
Style::UnderlinePrimary
} else {
Style::UnderlineSecondary
Style::OldSkoolNote
});
}
else {
@ -629,7 +636,7 @@ impl FileInfo {
if annotation.is_primary {
Style::UnderlinePrimary
} else {
Style::UnderlineSecondary
Style::OldSkoolNote
});
}
}
@ -638,10 +645,14 @@ impl FileInfo {
for p in annotation.start_col .. annotation.end_col {
if annotation.is_primary {
styled_buffer.putc(1, p, '^', Style::UnderlinePrimary);
styled_buffer.set_style(0, p, Style::UnderlinePrimary);
if !annotation.is_minimized {
styled_buffer.set_style(0, p, Style::UnderlinePrimary);
}
} else {
styled_buffer.putc(1, p, '-', Style::UnderlineSecondary);
styled_buffer.set_style(0, p, Style::UnderlineSecondary);
if !annotation.is_minimized {
styled_buffer.set_style(0, p, Style::UnderlineSecondary);
}
}
}
}
@ -842,11 +853,13 @@ impl Line {
start: CharPos,
end: CharPos,
is_primary: bool,
is_minimized: bool,
label: Option<String>) {
self.annotations.push(Annotation {
start_col: start.0,
end_col: end.0,
is_primary: is_primary,
is_minimized: is_minimized,
label: label,
});
}