Fix where -b flag (#7313)

# Description

The `where -b` flag was broken. The following now works:
```
let cond = {|x| $x.name !~ 'foo'}; ls | where -b $cond
```

This is just a quick fix. Ultimately, the `where` command shouldn't need
the flag and `where $cond` should work. The first step, however, is to
move `where` away from shape-directed parsing and make it a parser
keyword.

# User-Facing Changes

`where -b` is not broken

# 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.
This commit is contained in:
Jakub Žádník 2022-12-02 01:11:03 +02:00 committed by GitHub
parent 0621ab6652
commit cf0a18be51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions

View File

@ -9,8 +9,8 @@ pub fn test_examples(cmd: impl Command + 'static) {
#[cfg(test)] #[cfg(test)]
mod test_examples { mod test_examples {
use super::super::{ use super::super::{
Ansi, Date, Echo, From, If, Into, LetEnv, Math, MathEuler, MathPi, MathRound, Path, Random, Ansi, Date, Echo, From, If, Into, Let, LetEnv, Math, MathEuler, MathPi, MathRound, Path,
Split, SplitColumn, SplitRow, Str, StrJoin, StrLength, StrReplace, Url, Wrap, Random, Split, SplitColumn, SplitRow, Str, StrJoin, StrLength, StrReplace, Url, Wrap,
}; };
use crate::{Break, Mut, To}; use crate::{Break, Mut, To};
use itertools::Itertools; use itertools::Itertools;
@ -60,6 +60,7 @@ mod test_examples {
// Base functions that are needed for testing // Base functions that are needed for testing
// Try to keep this working set small to keep tests running as fast as possible // Try to keep this working set small to keep tests running as fast as possible
let mut working_set = StateWorkingSet::new(&*engine_state); let mut working_set = StateWorkingSet::new(&*engine_state);
working_set.add_decl(Box::new(Let));
working_set.add_decl(Box::new(Str)); working_set.add_decl(Box::new(Str));
working_set.add_decl(Box::new(StrJoin)); working_set.add_decl(Box::new(StrJoin));
working_set.add_decl(Box::new(StrLength)); working_set.add_decl(Box::new(StrLength));

View File

@ -49,7 +49,7 @@ impl Command for Where {
call: &Call, call: &Call,
input: PipelineData, input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> { ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
if let Ok(Some(capture_block)) = call.get_flag::<Closure>(engine_state, stack, "block") { if let Ok(Some(capture_block)) = call.get_flag::<Closure>(engine_state, stack, "closure") {
let metadata = input.metadata(); let metadata = input.metadata();
let ctrlc = engine_state.ctrlc.clone(); let ctrlc = engine_state.ctrlc.clone();
let engine_state = engine_state.clone(); let engine_state = engine_state.clone();
@ -303,6 +303,14 @@ impl Command for Where {
span: Span::test_data(), span: Span::test_data(),
}), }),
}, },
Example {
description: "Filter items of a list according to a stored condition",
example: "let cond = {|x| $x > 1}; [1 2] | where -b $cond",
result: Some(Value::List {
vals: vec![Value::test_int(2)],
span: Span::test_data(),
}),
},
Example { Example {
description: "List all files in the current directory with sizes greater than 2kb", description: "List all files in the current directory with sizes greater than 2kb",
example: "ls | where size > 2kb", example: "ls | where size > 2kb",