extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 06:35:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix return in filter closure eval (#12292)

Browse Source 
# Description
Closes https://github.com/nushell/nushell/issues/12257

This was down to the use of `eval_block` instead of
`eval_block_with_early_return`. We may want to reconsider how we
differentiate between this behavior. We currently need to check all the
remaining commands that can invoke a closure block, if they properly
handle `ShellError::Return` as a passing of a `Value`

- **Add test for `return` in `filter` closure**
- **Fix use of `return` in `filter` closure**

# User-Facing Changes
You can now return a value from a `filter` closure


# Tests + Formatting
Regression test
This commit is contained in:
Stefan Holderbach
2024-03-26 17:50:36 +01:00
committed by GitHub
parent b70766e6f5
commit 592dc4bbfa
3 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-command/src/filters/filter.rs
View File

@ -1,5 +1,5 @@
use super::utils::chain_error_with_input;
use nu_engine::{get_eval_block, CallExt};
use nu_engine::{get_eval_block_with_early_return, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{Closure, Command, EngineState, Stack};
@ -62,7 +62,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
let orig_env_vars = stack.env_vars.clone();
let orig_env_hidden = stack.env_hidden.clone();
let span = call.head;
let eval_block = get_eval_block(&engine_state);
let eval_block_with_early_return = get_eval_block_with_early_return(&engine_state);
match input {
PipelineData::Empty => Ok(PipelineData::Empty),
@ -84,7 +84,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
}
}
match eval_block(
match eval_block_with_early_return(
&engine_state,
&mut stack,
&block,
@ -126,7 +126,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
}
}
match eval_block(
match eval_block_with_early_return(
&engine_state,
&mut stack,
&block,
@ -159,7 +159,7 @@ a variable. On the other hand, the "row condition" syntax is not supported."#
}
}
Ok(match eval_block(
Ok(match eval_block_with_early_return(
&engine_state,
&mut stack,
&block,