extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-10 05:28:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve external output in subexprs (#294)

Browse Source
This commit is contained in:
JT
2021-11-06 18:50:33 +13:00
committed by GitHub
parent c7d159a0f3
commit 02b8027749
50 changed files with 320 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.rs
View File

@ -19,7 +19,7 @@ use nu_parser::parse;
use nu_protocol::{
ast::Call,
engine::{EngineState, Stack, StateWorkingSet},
IntoPipelineData, PipelineData, ShellError, Value,
IntoPipelineData, PipelineData, ShellError, Span, Value,
};
use reedline::{Completer, CompletionActionHandler, DefaultPrompt, LineBuffer, Prompt};
@ -126,7 +126,12 @@ fn main() -> Result<()> {
stack.env_vars.insert(k, v);
}
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
match eval_block(
&engine_state,
&mut stack,
&block,
PipelineData::new(Span::unknown()),
) {
Ok(pipeline_data) => {
println!("{}", pipeline_data.collect_string());
}
@ -312,7 +317,12 @@ fn update_prompt<'prompt>(
let mut stack = stack.clone();
let evaluated_prompt = match eval_block(engine_state, &mut stack, &block, PipelineData::new()) {
let evaluated_prompt = match eval_block(
engine_state,
&mut stack,
&block,
PipelineData::new(Span::unknown()),
) {
Ok(pipeline_data) => pipeline_data.collect_string(),
Err(err) => {
let working_set = StateWorkingSet::new(engine_state);
@ -349,9 +359,14 @@ fn eval_source(
engine_state.merge_delta(delta);
match eval_block(engine_state, stack, &block, PipelineData::new()) {
match eval_block(
engine_state,
stack,
&block,
PipelineData::new(Span::unknown()),
) {
Ok(pipeline_data) => {
if let Err(err) = print_value(pipeline_data.into_value(), engine_state) {
if let Err(err) = print_value(pipeline_data.into_value(Span::unknown()), engine_state) {
let working_set = StateWorkingSet::new(engine_state);
report_error(&working_set, &err);