Skip to content

Commit

Permalink
De-emph minimized spans, add better debugging output
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Turner committed May 17, 2016
1 parent ae1e73a commit 3e9747a
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 17 deletions.
4 changes: 4 additions & 0 deletions src/libsyntax/errors/emitter.rs
View file
Expand Up @@ -526,6 +526,10 @@ impl Destination {
}
Style::OldSkoolNote => {
self.start_attr(term::Attr::Bold)?;
self.start_attr(term::Attr::ForegroundColor(term::color::BRIGHT_GREEN))?;
}
Style::OldSkoolNoteText => {
self.start_attr(term::Attr::Bold)?;
}
Style::UnderlinePrimary | Style::LabelPrimary => {
self.start_attr(term::Attr::Bold)?;
Expand Down
33 changes: 23 additions & 10 deletions src/libsyntax/errors/snippet/mod.rs
View file
Expand Up @@ -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>,
}
Expand Down Expand Up @@ -90,6 +93,7 @@ pub enum Style {
UnderlineSecondary,
LabelPrimary,
LabelSecondary,
OldSkoolNoteText,
OldSkoolNote,
NoStyle,
}
Expand Down Expand Up @@ -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
Expand All @@ -402,6 +406,7 @@ impl FileInfo {
self.lines[index].push_annotation(start_col,
end_col,
is_primary,
is_minimized,
label);
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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,
});
Expand Down Expand Up @@ -621,15 +628,15 @@ impl FileInfo {
if annotation.is_primary {
Style::UnderlinePrimary
} else {
Style::UnderlineSecondary
Style::OldSkoolNote
});
}
else {
styled_buffer.putc(1, p, '~',
if annotation.is_primary {
Style::UnderlinePrimary
} else {
Style::UnderlineSecondary
Style::OldSkoolNote
});
}
}
Expand All @@ -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);
}
}
}
}
Expand Down Expand Up @@ -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,
});
}
Expand Down
11 changes: 7 additions & 4 deletions src/tools/compiletest/src/json.rs
View file
Expand Up @@ -12,6 +12,7 @@ use errors::{Error, ErrorKind};
use rustc_serialize::json;
use std::str::FromStr;
use std::path::Path;
use runtest::{fatal_proc_rec, ProcRes};

// These structs are a subset of the ones found in
// `syntax::errors::json`.
Expand Down Expand Up @@ -55,13 +56,13 @@ struct DiagnosticCode {
explanation: Option<String>,
}

pub fn parse_output(file_name: &str, output: &str) -> Vec<Error> {
pub fn parse_output(file_name: &str, output: &str, proc_res: &ProcRes) -> Vec<Error> {
output.lines()
.flat_map(|line| parse_line(file_name, line))
.flat_map(|line| parse_line(file_name, line, output, proc_res))
.collect()
}

fn parse_line(file_name: &str, line: &str) -> Vec<Error> {
fn parse_line(file_name: &str, line: &str, output: &str, proc_res: &ProcRes) -> Vec<Error> {
// The compiler sometimes intermingles non-JSON stuff into the
// output. This hack just skips over such lines. Yuck.
if line.chars().next() == Some('{') {
Expand All @@ -72,7 +73,9 @@ fn parse_line(file_name: &str, line: &str) -> Vec<Error> {
expected_errors
}
Err(error) => {
panic!("failed to decode compiler output as json: `{}`", error);
fatal_proc_rec(None, &format!(
"failed to decode compiler output as json: `{}`\noutput: {}\nline: {}",
error, line, output), proc_res);
}
}
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/tools/compiletest/src/runtest.rs
View file
Expand Up @@ -1001,7 +1001,7 @@ actual:\n\
let expect_note = expected_errors.iter().any(|ee| ee.kind == Some(ErrorKind::Note));

// Parse the JSON output from the compiler and extract out the messages.
let actual_errors = json::parse_output(&file_name, &proc_res.stderr);
let actual_errors = json::parse_output(&file_name, &proc_res.stderr, &proc_res);
let mut unexpected = 0;
let mut not_found = 0;
let mut found = vec![false; expected_errors.len()];
Expand Down Expand Up @@ -1528,7 +1528,7 @@ actual:\n\
self.error(err); panic!();
}

fn fatal_proc_rec(&self, err: &str, proc_res: &ProcRes) -> ! {
pub fn fatal_proc_rec(&self, err: &str, proc_res: &ProcRes) -> ! {
self.error(err);
print!("\
status: {}\n\
Expand Down Expand Up @@ -2197,7 +2197,7 @@ struct ProcArgs {
args: Vec<String>,
}

struct ProcRes {
pub struct ProcRes {
status: Status,
stdout: String,
stderr: String,
Expand Down

0 comments on commit 3e9747a

Please sign in to comment.