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

Apply continue to each (#8889)

Browse Source 
# Description
Fixes #8878
Add continue command on each and added new tests too .
This commit is contained in:
Amirhossein Akhlaghpour 2023-04-15 08:41:02 +03:30 committed by GitHub
parent 45d33e70db
commit fff4de5c44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/nu-command/src/filters/each.rs
View File

@ -164,6 +164,7 @@ with 'transpose' first."#
redirect_stderr, redirect_stderr,
) { ) {
Ok(v) => Some(v.into_value(span)), Ok(v) => Some(v.into_value(span)),
Err(ShellError::Continue(v)) => Some(Value::nothing(v)),
Err(ShellError::Break(_)) => None, Err(ShellError::Break(_)) => None,
Err(error) => { Err(error) => {
let error = chain_error_with_input(error, input_span); let error = chain_error_with_input(error, input_span);
@ -188,6 +189,7 @@ with 'transpose' first."#
let x = match x { let x = match x {
Ok(x) => x, Ok(x) => x,
Err(ShellError::Continue(v)) => return Some(Value::nothing(v)),
Err(ShellError::Break(_)) => return None, Err(ShellError::Break(_)) => return None,
Err(err) => { Err(err) => {
return Some(Value::Error { return Some(Value::Error {
@ -212,6 +214,7 @@ with 'transpose' first."#
redirect_stderr, redirect_stderr,
) { ) {
Ok(v) => Some(v.into_value(span)), Ok(v) => Some(v.into_value(span)),
Err(ShellError::Continue(v)) => Some(Value::nothing(v)),
Err(ShellError::Break(_)) => None, Err(ShellError::Break(_)) => None,
Err(error) => { Err(error) => {
let error = Box::new(chain_error_with_input(error, input_span)); let error = Box::new(chain_error_with_input(error, input_span));

16
crates/nu-command/tests/commands/each.rs
View File

@ -73,3 +73,19 @@ fn each_while_uses_enumerate_index() {
assert_eq!(actual.out, "[0, 1, 2, 3]"); assert_eq!(actual.out, "[0, 1, 2, 3]");
} }
#[test]
fn each_element_continue_command() {
let actual =
nu!("[1,2,3,4,6,7] | each { |x| if ($x mod 2 == 0) {continue} else { $x }} | to nuon");
assert_eq!(actual.out, "[1, 3, 7]");
}
#[test]
fn each_element_break_command() {
let actual =
nu!("[1,2,5,4,6,7] | each { |x| if ($x mod 3 == 0) {break} else { $x }} | to nuon");
assert_eq!(actual.out, "[1, 2, 5, 4]");
}