From 1c2741c5988f5c336ce9f2ee408bd56b9237d023 Mon Sep 17 00:00:00 2001 From: Antonio Natilla Date: Mon, 1 Nov 2021 12:51:46 +0100 Subject: [PATCH] Fixing run implementation for Echo Values to echo need to be extracted from the call, and then converted into PipelineData. I also updated the first example so that its result is a List, as in the reference implementation. --- crates/nu-command/src/core_commands/echo.rs | 25 +++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/crates/nu-command/src/core_commands/echo.rs b/crates/nu-command/src/core_commands/echo.rs index be921b62d8..af0c994893 100644 --- a/crates/nu-command/src/core_commands/echo.rs +++ b/crates/nu-command/src/core_commands/echo.rs @@ -1,6 +1,9 @@ +use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; -use nu_protocol::{Example, PipelineData, ShellError, Signature, SyntaxShape, Value}; +use nu_protocol::{ + Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Value, ValueStream, +}; #[derive(Clone)] pub struct Echo; @@ -20,12 +23,17 @@ impl Command for Echo { fn run( &self, - _engine_state: &EngineState, - _stack: &mut Stack, - _call: &Call, - input: PipelineData, + engine_state: &EngineState, + stack: &mut Stack, + call: &Call, + _input: PipelineData, ) -> Result { - Ok(input) + call.rest(engine_state, stack, 0).map(|to_be_echoed| { + PipelineData::Stream(ValueStream::from_stream( + to_be_echoed.into_iter(), + engine_state.ctrlc.clone(), + )) + }) } fn examples(&self) -> Vec { @@ -33,7 +41,10 @@ impl Command for Echo { Example { description: "Put a hello message in the pipeline", example: "echo 'hello'", - result: Some(Value::test_string("hello")), + result: Some(Value::List { + vals: vec![Value::test_string("hello")], + span: Span::new(0, 0), + }), }, Example { description: "Print the value of the special '$nu' variable",