forked from extern/nushell
19beafa865
# Description Change behavior of block evaluation to not print result of intermediate commands. Previously result of every but last pipeline in a block was printed to stdout, and last one was returned ![image](https://user-images.githubusercontent.com/17511668/222550110-3f62fbed-432c-4b46-b9b1-4cb45a1f893e.png) With this change results of intermediate pipelines are discarded after they finish and the last one is returned as before: ![image](https://user-images.githubusercontent.com/17511668/222550346-f1e74f80-f6b6-4aa3-98d6-888ea4cb4915.png) Now one should use `print` explicitly to print something to stdout ![image](https://user-images.githubusercontent.com/17511668/222923955-fda0d77b-41b4-4f91-a80f-12b0a1880c05.png) **Note, that this behavior is not limited to functions!** The scope of this change are all blocks. All of the below are executed as blocks and thus exibited this behavior in the same way: ![image](https://user-images.githubusercontent.com/17511668/222924062-342c15de-4273-4bf5-8b39-fe6e3aa96076.png) With this change outputs for all types of blocks are cleaned: ![image](https://user-images.githubusercontent.com/17511668/222924118-7d51c27e-04bb-43e5-8efe-38b484683bfe.png) # User-Facing Changes All types of blocks (function bodies, closures, `if` branches, `for` and `loop` bodies e.t.c.) no longer print result of intermediate pipelines. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
113 lines
2.2 KiB
Rust
113 lines
2.2 KiB
Rust
use nu_test_support::nu;
|
|
|
|
#[test]
|
|
fn try_succeed() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try { 345 } catch { echo 'hello' }"
|
|
);
|
|
|
|
assert!(output.out.contains("345"));
|
|
}
|
|
|
|
#[test]
|
|
fn try_catch() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try { foobarbaz } catch { echo 'hello' }"
|
|
);
|
|
|
|
assert!(output.out.contains("hello"));
|
|
}
|
|
|
|
#[test]
|
|
fn catch_can_access_error() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try { foobarbaz } catch { |err| $err | get raw }"
|
|
);
|
|
|
|
assert!(output.err.contains("External command failed"));
|
|
}
|
|
|
|
#[test]
|
|
fn catch_can_access_error_as_dollar_in() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try { foobarbaz } catch { $in | get raw }"
|
|
);
|
|
|
|
assert!(output.err.contains("External command failed"));
|
|
}
|
|
|
|
#[test]
|
|
fn external_failed_should_be_caught() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try { nu --testbin fail; echo 'success' } catch { echo 'fail' }"
|
|
);
|
|
|
|
assert!(output.out.contains("fail"));
|
|
}
|
|
|
|
#[test]
|
|
fn loop_try_break_should_be_successful() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"loop { try { print 'successful'; break } catch { print 'failed'; continue } }"
|
|
);
|
|
|
|
assert_eq!(output.out, "successful");
|
|
}
|
|
|
|
#[test]
|
|
fn loop_catch_break_should_show_failed() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"loop {
|
|
try { invalid 1;
|
|
continue; } catch { print 'failed'; break }
|
|
}
|
|
"
|
|
);
|
|
|
|
assert_eq!(output.out, "failed");
|
|
}
|
|
|
|
#[test]
|
|
fn loop_try_ignores_continue() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"mut total = 0;
|
|
for i in 0..10 {
|
|
try { if ($i mod 2) == 0 {
|
|
continue;}
|
|
$total += 1
|
|
} catch { echo 'failed'; break }
|
|
}
|
|
echo $total
|
|
"
|
|
);
|
|
|
|
assert_eq!(output.out, "5");
|
|
}
|
|
|
|
#[test]
|
|
fn loop_try_break_on_command_should_show_successful() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"loop { try { ls; break } catch { echo 'failed';continue }}"
|
|
);
|
|
|
|
assert!(!output.out.contains("failed"));
|
|
}
|
|
|
|
#[test]
|
|
fn catch_block_can_use_error_object() {
|
|
let output = nu!(
|
|
cwd: ".",
|
|
"try {1 / 0} catch {|err| print ($err | get msg)}"
|
|
);
|
|
assert_eq!(output.out, "Division by zero.")
|
|
}
|