nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-09 21:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7230 from Blei/green-squiggle

Browse Source 
syntax::diagnostics: Color the ^~~~ in green for better visibility
This commit is contained in:
Daniel Micay 2013-06-22 12:50:47 -07:00
commit 69e0704520
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/libsyntax/diagnostic.rs
View File

@ -189,28 +189,34 @@ fn diagnosticcolor(lvl: level) -> u8 {
} }
} }
fn print_diagnostic(topic: &str, lvl: level, msg: &str) { fn print_maybe_colored(msg: &str, color: u8) {
let t = term::Terminal::new(io::stderr()); let stderr = io::stderr();
let t = term::Terminal::new(stderr);
match t {
Ok(term) => {
if stderr.get_type() == io::Screen {
term.fg(color);
stderr.write_str(msg);
term.reset();
} else {
stderr.write_str(msg);
}
},
_ => stderr.write_str(msg)
}
}
fn print_diagnostic(topic: &str, lvl: level, msg: &str) {
let stderr = io::stderr(); let stderr = io::stderr();
if !topic.is_empty() { if !topic.is_empty() {
stderr.write_str(fmt!("%s ", topic)); stderr.write_str(fmt!("%s ", topic));
} }
match t { print_maybe_colored(fmt!("%s: ", diagnosticstr(lvl)), diagnosticcolor(lvl));
Ok(term) => { stderr.write_str(fmt!("%s\n", msg));
if stderr.get_type() == io::Screen {
term.fg(diagnosticcolor(lvl));
stderr.write_str(fmt!("%s: ", diagnosticstr(lvl)));
term.reset();
stderr.write_str(fmt!("%s\n", msg));
} else {
stderr.write_str(fmt!("%s: %s\n", diagnosticstr(lvl), msg));
}
},
_ => stderr.write_str(fmt!("%s: %s\n", diagnosticstr(lvl), msg))
}
} }
pub fn collect(messages: @mut ~[~str]) pub fn collect(messages: @mut ~[~str])
@ -292,14 +298,15 @@ fn highlight_lines(cm: @codemap::CodeMap,
_ => " " // -squigly-line as well (instead of a _ => " " // -squigly-line as well (instead of a
}; // space). This way the squigly-line will }; // space). This way the squigly-line will
} // usually appear in the correct position. } // usually appear in the correct position.
s += "^"; io::stderr().write_str(s);
let mut s = ~"^";
let hi = cm.lookup_char_pos(sp.hi); let hi = cm.lookup_char_pos(sp.hi);
if hi.col != lo.col { if hi.col != lo.col {
// the ^ already takes up one space // the ^ already takes up one space
let num_squiglies = hi.col.to_uint()-lo.col.to_uint()-1u; let num_squiglies = hi.col.to_uint()-lo.col.to_uint()-1u;
for num_squiglies.times() { s += "~"; } for num_squiglies.times() { s += "~"; }
} }
io::stderr().write_str(s + "\n"); print_maybe_colored(s + "\n", term::color_bright_green);
} }
} }