forked from extern/nushell
break for
, loop
, while
execution when external command runs to failed (#7475)
Fixes: #7467 # User-Facing Changes ## for ``` ❯ for i in 1..2 { echo 1; ^false } 1 ``` ## loop ``` ❯ loop { echo bb; ^false } bb ``` ## while ``` ❯ mut x = 1; while $x < 3 { $x = $x + 1; echo bb; ^false } bb ```
This commit is contained in:
parent
98b9839e3d
commit
db3177a5aa
@ -118,7 +118,10 @@ impl Command for For {
|
|||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
Ok(pipeline) => {
|
Ok(pipeline) => {
|
||||||
let _ = pipeline.print(&engine_state, stack, false, false)?;
|
let exit_code = pipeline.print(&engine_state, stack, false, false)?;
|
||||||
|
if exit_code != 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -157,7 +160,10 @@ impl Command for For {
|
|||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
Ok(pipeline) => {
|
Ok(pipeline) => {
|
||||||
let _ = pipeline.print(&engine_state, stack, false, false)?;
|
let exit_code = pipeline.print(&engine_state, stack, false, false)?;
|
||||||
|
if exit_code != 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -69,7 +69,10 @@ impl Command for Loop {
|
|||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
Ok(pipeline) => {
|
Ok(pipeline) => {
|
||||||
let _ = pipeline.print(engine_state, stack, false, false)?;
|
let exit_code = pipeline.print(engine_state, stack, false, false)?;
|
||||||
|
if exit_code != 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -77,7 +77,11 @@ impl Command for While {
|
|||||||
return Err(err);
|
return Err(err);
|
||||||
}
|
}
|
||||||
Ok(pipeline) => {
|
Ok(pipeline) => {
|
||||||
let _ = pipeline.print(engine_state, stack, false, false)?;
|
let exit_code =
|
||||||
|
pipeline.print(engine_state, stack, false, false)?;
|
||||||
|
if exit_code != 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -14,3 +14,18 @@ fn for_auto_print_in_each_iteration() {
|
|||||||
// that's ok, our main concern is it auto print value in each iteration.
|
// that's ok, our main concern is it auto print value in each iteration.
|
||||||
assert_eq!(actual.out, "11");
|
assert_eq!(actual.out, "11");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn for_break_on_external_failed() {
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: ".",
|
||||||
|
r#"
|
||||||
|
for i in 1..2 {
|
||||||
|
echo 1;
|
||||||
|
nu --testbin fail
|
||||||
|
}"#
|
||||||
|
);
|
||||||
|
// Note: nu! macro auto repalce "\n" and "\r\n" with ""
|
||||||
|
// so our output will be `1`
|
||||||
|
assert_eq!(actual.out, "1");
|
||||||
|
}
|
||||||
|
@ -20,3 +20,24 @@ fn loop_auto_print_in_each_iteration() {
|
|||||||
// that's ok, our main concern is it auto print value in each iteration.
|
// that's ok, our main concern is it auto print value in each iteration.
|
||||||
assert_eq!(actual.out, "111");
|
assert_eq!(actual.out, "111");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn loop_break_on_external_failed() {
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: ".",
|
||||||
|
r#"
|
||||||
|
mut total = 0;
|
||||||
|
loop {
|
||||||
|
if $total == 3 {
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
$total += 1;
|
||||||
|
}
|
||||||
|
echo 1;
|
||||||
|
nu --testbin fail;
|
||||||
|
}"#
|
||||||
|
);
|
||||||
|
// Note: nu! macro auto repalce "\n" and "\r\n" with ""
|
||||||
|
// so our output will be `1`.
|
||||||
|
assert_eq!(actual.out, "1");
|
||||||
|
}
|
||||||
|
@ -21,3 +21,14 @@ fn while_auto_print_in_each_iteration() {
|
|||||||
// that's ok, our main concern is it auto print value in each iteration.
|
// that's ok, our main concern is it auto print value in each iteration.
|
||||||
assert_eq!(actual.out, "11");
|
assert_eq!(actual.out, "11");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn while_break_on_external_failed() {
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: ".",
|
||||||
|
"mut total = 0; while $total < 2 { $total = $total + 1; echo 1; nu --testbin fail }"
|
||||||
|
);
|
||||||
|
// Note: nu! macro auto repalce "\n" and "\r\n" with ""
|
||||||
|
// so our output will be `1`
|
||||||
|
assert_eq!(actual.out, "1");
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user