extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-12 17:28:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds error printing back in a couple places (#5400)

Browse Source
This commit is contained in:
JT 2022-05-02 08:40:46 +12:00 committed by GitHub
parent 92785ab92c
commit 14c9bd44ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/nu-protocol/src/pipeline_data.rs
View File

@ -5,8 +5,8 @@ use std::{
use crate::{ use crate::{
ast::{Call, PathMember}, ast::{Call, PathMember},
engine::{EngineState, Stack}, engine::{EngineState, Stack, StateWorkingSet},
Config, ListStream, RawStream, ShellError, Span, Value, format_error, Config, ListStream, RawStream, ShellError, Span, Value,
}; };
/// The foundational abstraction for input and output to commands /// The foundational abstraction for input and output to commands
@ -455,7 +455,15 @@ impl PipelineData {
for item in table { for item in table {
let stdout = std::io::stdout(); let stdout = std::io::stdout();
let mut out = item.into_string("\n", config);
let mut out = if let Value::Error { error } = item {
let working_set = StateWorkingSet::new(engine_state);
format_error(&working_set, &error)
} else {
item.into_string("\n", config)
};
out.push('\n'); out.push('\n');
match stdout.lock().write_all(out.as_bytes()) { match stdout.lock().write_all(out.as_bytes()) {
@ -467,7 +475,13 @@ impl PipelineData {
None => { None => {
for item in self { for item in self {
let stdout = std::io::stdout(); let stdout = std::io::stdout();
let mut out = item.into_string("\n", config); let mut out = if let Value::Error { error } = item {
let working_set = StateWorkingSet::new(engine_state);
format_error(&working_set, &error)
} else {
item.into_string("\n", config)
};
out.push('\n'); out.push('\n');
match stdout.lock().write_all(out.as_bytes()) { match stdout.lock().write_all(out.as_bytes()) {