Skip to content

Commit 0d79b63

Browse files
suimongBen Yangfdncred
authored
Fix find command output bug in the case of taking ByteStream input. (#13246)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> fixes #13245 # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> In addition to addressing #13245, this PR also updated one of the doc example to the `find` command to document that non-regex mode is case insensitive, which may surprise some users. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # 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. --> --------- Co-authored-by: Ben Yang <[email protected]> Co-authored-by: Darren Schroeder <[email protected]>
1 parent 46ed69a commit 0d79b63

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

crates/nu-command/src/filters/find.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ impl Command for Find {
6969
result: None,
7070
},
7171
Example {
72-
description: "Search and highlight text for a term in a string",
73-
example: r#"'Cargo.toml' | find toml"#,
74-
result: Some(Value::test_string("\u{1b}[37mCargo.\u{1b}[0m\u{1b}[41;37mtoml\u{1b}[0m\u{1b}[37m\u{1b}[0m".to_owned())),
72+
description: "Search and highlight text for a term in a string. Note that regular search is case insensitive",
73+
example: r#"'Cargo.toml' | find cargo"#,
74+
result: Some(Value::test_string("\u{1b}[37m\u{1b}[0m\u{1b}[41;37mCargo\u{1b}[0m\u{1b}[37m.toml\u{1b}[0m".to_owned())),
7575
},
7676
Example {
7777
description: "Search a number or a file size in a list of numbers",
@@ -457,9 +457,10 @@ fn find_with_rest_and_highlight(
457457

458458
let mut output: Vec<Value> = vec![];
459459
for line in lines {
460-
let line = line?.to_lowercase();
460+
let line = line?;
461+
let lower_val = line.to_lowercase();
461462
for term in &terms {
462-
if line.contains(term) {
463+
if lower_val.contains(term) {
463464
output.push(Value::string(
464465
highlight_search_string(
465466
&line,

crates/nu-command/tests/commands/find.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ fn find_with_list_search_with_char() {
1717
assert_eq!(actual.out, "[\"\\u001b[37m\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37marry\\u001b[0m\",\"\\u001b[37mcur\\u001b[0m\\u001b[41;37ml\\u001b[0m\\u001b[37my\\u001b[0m\"]");
1818
}
1919

20+
#[test]
21+
fn find_with_bytestream_search_with_char() {
22+
let actual =
23+
nu!("\"ABC\" | save foo.txt; let res = open foo.txt | find abc; rm foo.txt; $res | get 0");
24+
assert_eq!(
25+
actual.out,
26+
"\u{1b}[37m\u{1b}[0m\u{1b}[41;37mABC\u{1b}[0m\u{1b}[37m\u{1b}[0m"
27+
)
28+
}
29+
2030
#[test]
2131
fn find_with_list_search_with_number() {
2232
let actual = nu!("[1 2 3 4 5] | find 3 | get 0");

0 commit comments

Comments
 (0)