mirror of
https://github.com/nushell/nushell
synced 2024-12-30 15:03:25 +00:00
e389e51b2b
# Description Fix some issues related to #7444 1. Empty lists and records are now displayed as a small notice in a box: ![image](https://user-images.githubusercontent.com/17511668/215832023-3f8d743a-2899-416f-9109-7876ad2bbedf.png) ![image](https://user-images.githubusercontent.com/17511668/215832273-c737b8a4-af33-4c16-8dd3-bd4f0fd19b5a.png) 2. Empty records are now correctly displayed if inside of another record list or table: ![image](https://user-images.githubusercontent.com/17511668/215832597-00f0cebc-a3b6-4ce8-8373-a9340d4c7020.png) ![image](https://user-images.githubusercontent.com/17511668/215832540-ab0e2a14-b8f6-4f47-976c-42003b622ef6.png) 3. Fixed inconsistent coloring of empty list placeholder inside of lists/tables: ![image](https://user-images.githubusercontent.com/17511668/215832924-813ffe17-e04e-4301-97c3-1bdbccf1825c.png) ![image](https://user-images.githubusercontent.com/17511668/215832963-4765c4cf-3036-4bcc-81e1-ced941fa47cb.png) # User-Facing Changes `table` command now displays empty records and lists like a table with text and correctly displays empty records inside tables and lists. New behavior of displaying empty lists and records can be disabled using `table.show_empty` config option. # 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.
123 lines
2.5 KiB
Rust
123 lines
2.5 KiB
Rust
use nu_test_support::fs::Stub::EmptyFile;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
#[test]
|
|
fn find_with_list_search_with_string() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
[moe larry curly] | find moe | get 0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "moe");
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_list_search_with_char() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
[moe larry curly] | find l | to json -r
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, r#"["larry","curly"]"#);
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_list_search_with_number() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
[1 2 3 4 5] | find 3 | get 0
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "3");
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_string_search_with_string() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
echo Cargo.toml | find toml
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "Cargo.toml");
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_string_search_with_string_not_found() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
[moe larry curly] | find shemp | is-empty
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "true");
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_filepath_search_with_string() {
|
|
Playground::setup("filepath_test_1", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("amigos.txt"),
|
|
EmptyFile("arepas.clu"),
|
|
EmptyFile("los.txt"),
|
|
EmptyFile("tres.txt"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
ls
|
|
| get name
|
|
| find arep
|
|
| to json -r
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, r#"["arepas.clu"]"#);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn find_with_filepath_search_with_multiple_patterns() {
|
|
Playground::setup("filepath_test_2", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("amigos.txt"),
|
|
EmptyFile("arepas.clu"),
|
|
EmptyFile("los.txt"),
|
|
EmptyFile("tres.txt"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
ls
|
|
| get name
|
|
| find arep ami
|
|
| to json -r
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, r#"["amigos.txt","arepas.clu"]"#);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn find_takes_into_account_linebreaks_in_string() {
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
"atest\nanothertest\nnohit\n" | find a | length
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "2");
|
|
}
|