holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error printing changes for watch (#5389)

Browse Source 
* Move CliError to nu-protocol

clean up comment

* Enable printing errors instead of just returning them

* Nicer Miette error printing in watch command
This commit is contained in:
Reilly Wood
2022-05-01 00:33:41 -07:00
committed by GitHub
parent 7a7aa310aa
commit 5077242892
7 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-command/src/filesystem/watch.rs
View File

@ -6,10 +6,10 @@ use std::time::Duration;
use notify::{DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
use nu_engine::{current_dir, eval_block, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack, StateWorkingSet};
use nu_protocol::{
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
Value,
format_error, Category, Example, IntoPipelineData, PipelineData, ShellError, Signature,
Spanned, SyntaxShape, Value,
};
// durations chosen mostly arbitrarily
@ -219,9 +219,8 @@ impl Command for Watch {
val.print(engine_state, stack)?;
}
Err(err) => {
// TODO: this isn't as nice as the Miette errors. Find a way to print those.
// Unfortunately can't just wrap err in PipelineData, PipelineData.print() doesn't work that way
eprintln!("{err:?}");
let working_set = StateWorkingSet::new(engine_state);
eprintln!("{}", format_error(&working_set, &err));
}
}
}

15
crates/nu-command/src/viewers/table.rs
View File

@ -3,10 +3,10 @@ use nu_color_config::{get_color_config, style_primitive};
use nu_engine::column::get_columns;
use nu_engine::{env_to_string, CallExt};
use nu_protocol::ast::{Call, PathMember};
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::engine::{Command, EngineState, Stack, StateWorkingSet};
use nu_protocol::{
Category, Config, DataSource, Example, IntoPipelineData, ListStream, PipelineData,
PipelineMetadata, RawStream, ShellError, Signature, Span, SyntaxShape, Value,
format_error, Category, Config, DataSource, Example, IntoPipelineData, ListStream,
PipelineData, PipelineMetadata, RawStream, ShellError, Signature, Span, SyntaxShape, Value,
};
use nu_table::{StyledString, TextStyle, Theme};
use std::sync::atomic::{AtomicBool, Ordering};
@ -141,7 +141,14 @@ impl Command for Table {
}
.into_pipeline_data())
}
PipelineData::Value(Value::Error { error }, ..) => Err(error),
PipelineData::Value(Value::Error { error }, ..) => {
let working_set = StateWorkingSet::new(engine_state);
Ok(Value::String {
val: format_error(&working_set, &error),
span: call.head,
}
.into_pipeline_data())
}
PipelineData::Value(Value::CustomValue { val, span }, ..) => {
let base_pipeline = val.to_base_value(span)?.into_pipeline_data();
self.run(engine_state, stack, call, base_pipeline)