From e3bf6fdfc0ef3ea9a69fb65cee43b52fd463cb6b Mon Sep 17 00:00:00 2001 From: Reilly Wood <26268125+rgwood@users.noreply.github.com> Date: Fri, 21 Oct 2022 10:08:57 -0700 Subject: [PATCH] Print command help in base from+to commands (#6856) --- crates/nu-command/src/formats/from/command.rs | 13 +++++++++---- crates/nu-command/src/formats/to/command.rs | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/crates/nu-command/src/formats/from/command.rs b/crates/nu-command/src/formats/from/command.rs index 719face4c..125b9bef0 100644 --- a/crates/nu-command/src/formats/from/command.rs +++ b/crates/nu-command/src/formats/from/command.rs @@ -1,6 +1,7 @@ +use nu_engine::get_full_help; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; -use nu_protocol::{Category, PipelineData, ShellError, Signature}; +use nu_protocol::{Category, IntoPipelineData, PipelineData, ShellError, Signature, Value}; #[derive(Clone)] pub struct From; @@ -20,11 +21,15 @@ impl Command for From { fn run( &self, - _engine_state: &EngineState, - _stack: &mut Stack, + engine_state: &EngineState, + stack: &mut Stack, call: &Call, _input: PipelineData, ) -> Result { - Ok(PipelineData::new(call.head)) + Ok(Value::String { + val: get_full_help(&From.signature(), &From.examples(), engine_state, stack), + span: call.head, + } + .into_pipeline_data()) } } diff --git a/crates/nu-command/src/formats/to/command.rs b/crates/nu-command/src/formats/to/command.rs index 068d875a5..82092dfb5 100644 --- a/crates/nu-command/src/formats/to/command.rs +++ b/crates/nu-command/src/formats/to/command.rs @@ -1,6 +1,7 @@ +use nu_engine::get_full_help; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; -use nu_protocol::{Category, PipelineData, ShellError, Signature}; +use nu_protocol::{Category, IntoPipelineData, PipelineData, ShellError, Signature, Value}; #[derive(Clone)] pub struct To; @@ -20,11 +21,15 @@ impl Command for To { fn run( &self, - _engine_state: &EngineState, - _stack: &mut Stack, + engine_state: &EngineState, + stack: &mut Stack, call: &Call, _input: PipelineData, ) -> Result { - Ok(PipelineData::new(call.head)) + Ok(Value::String { + val: get_full_help(&To.signature(), &To.examples(), engine_state, stack), + span: call.head, + } + .into_pipeline_data()) } }