extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 07:46:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use writer from host instead of always std::err (#3112)

Browse Source
This commit is contained in:
Leonhard Kipp
2021-03-01 03:00:40 +01:00
committed by GitHub
parent 079e575cac
commit f83ff0e47d
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-command/src/maybe_print_errors.rs
View File

@ -9,7 +9,7 @@ pub fn maybe_print_errors(context: &EvaluationContext, source: Text) -> bool {
let error = errors[0].clone();
*errors = vec![];
crate::script::print_err(error, &source);
crate::script::print_err(error, &source, context);
true
} else {
false

8
crates/nu-command/src/script.rs
View File

@ -33,15 +33,13 @@ fn chomp_newline(s: &str) -> &str {
}
}
pub fn print_err(err: ShellError, source: &Text) {
pub fn print_err(err: ShellError, source: &Text, ctx: &EvaluationContext) {
if let Some(diag) = err.into_diagnostic() {
let source = source.to_string();
let mut files = codespan_reporting::files::SimpleFiles::new();
files.add("shell", source);
let writer = codespan_reporting::term::termcolor::StandardStream::stderr(
codespan_reporting::term::termcolor::ColorChoice::Always,
);
let writer = ctx.host.lock().err_termcolor();
let config = codespan_reporting::term::Config::default();
let _ = std::panic::catch_unwind(move || {
@ -260,7 +258,7 @@ pub async fn run_script_standalone(
LineResult::Error(line, err) => {
context.with_host(|_host| {
print_err(err, &Text::from(line.clone()));
print_err(err, &Text::from(line.clone()), &context);
});
maybe_print_errors(&context, Text::from(line));