user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ^~~~~ colour dependent on error/warning/note level. Also correct spelling of squigglies.

Browse source
This commit is contained in:
Ben Blum 2013-06-25 18:36:48 -04:00 • committed by Corey Richardson
parent 41f953af2e
commit 00b4138857
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libsyntax/diagnostic.rs
View file

@ -231,7 +231,7 @@ pub fn emit(cmsp: Option<(@codemap::CodeMap, span)>, msg: &str, lvl: level) {
let ss = cm.span_to_str(sp);
let lines = cm.span_to_lines(sp);
print_diagnostic(ss, lvl, msg);
highlight_lines(cm, sp, lines);
highlight_lines(cm, sp, lvl, lines);
print_macro_backtrace(cm, sp);
}
None => {
@ -241,7 +241,7 @@ pub fn emit(cmsp: Option<(@codemap::CodeMap, span)>, msg: &str, lvl: level) {
}
fn highlight_lines(cm: @codemap::CodeMap,
sp: span,
sp: span, lvl: level,
lines: @codemap::FileLines) {
let fm = lines.file;
@ -293,18 +293,18 @@ fn highlight_lines(cm: @codemap::CodeMap,
let curChar = (orig[pos] as char);
s += match curChar { // Whenever a tab occurs on the previous
'\t' => "\t", // line, we insert one on the error-point-
_ => " " // -squigly-line as well (instead of a
}; // space). This way the squigly-line will
_ => " " // -squiggly-line as well (instead of a
}; // space). This way the squiggly-line will
} // usually appear in the correct position.
io::stderr().write_str(s);
let mut s = ~"^";
let hi = cm.lookup_char_pos(sp.hi);
if hi.col != lo.col {
// the ^ already takes up one space
let num_squiglies = hi.col.to_uint()-lo.col.to_uint()-1u;
for num_squiglies.times() { s += "~"; }
let num_squigglies = hi.col.to_uint()-lo.col.to_uint()-1u;
for num_squigglies.times() { s += "~"; }
}
print_maybe_colored(s + "\n", term::color_bright_green);
print_maybe_colored(s + "\n", diagnosticcolor(lvl));
}
}