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

Allow let/let-env to see custom command input (#854)

Browse Source
This commit is contained in:
JT
2022-01-26 14:00:25 -05:00
committed by GitHub
parent 83ec374995
commit 78b5da8255
5 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-command/src/core_commands/let_.rs
View File

@ -1,4 +1,4 @@
use nu_engine::eval_expression;
use nu_engine::eval_expression_with_input;
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, Example, PipelineData, Signature, SyntaxShape};
@ -31,7 +31,7 @@ impl Command for Let {
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
_input: PipelineData,
input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
let var_id = call.positional[0]
.as_var()
@ -41,11 +41,11 @@ impl Command for Let {
.as_keyword()
.expect("internal error: missing keyword");
let rhs = eval_expression(engine_state, stack, keyword_expr)?;
let rhs = eval_expression_with_input(engine_state, stack, keyword_expr, input, false)?;
//println!("Adding: {:?} to {}", rhs, var_id);
stack.add_var(var_id, rhs);
stack.add_var(var_id, rhs.into_value(call.head));
Ok(PipelineData::new(call.head))
}

7
crates/nu-command/src/env/let_env.rs vendored
View File

@ -1,4 +1,4 @@
use nu_engine::{current_dir, eval_expression};
use nu_engine::{current_dir, eval_expression_with_input};
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, PipelineData, Signature, SyntaxShape, Value};
@ -31,7 +31,7 @@ impl Command for LetEnv {
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
_input: PipelineData,
input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
let env_var = call.positional[0]
.as_string()
@ -41,7 +41,8 @@ impl Command for LetEnv {
.as_keyword()
.expect("internal error: missing keyword");
let rhs = eval_expression(engine_state, stack, keyword_expr)?;
let rhs = eval_expression_with_input(engine_state, stack, keyword_expr, input, false)?
.into_value(call.head);
if env_var == "PWD" {
let cwd = current_dir(engine_state, stack)?;