Skip to content

Commit f3a1dfe

Browse files
authored
Fix panic if tokens are placed after a redirection (#14035)
<!-- 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 you can also mention related issues, PRs or discussions! --> # 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. --> fixes #13835 The `concat` function from `span.rs` assumes that two consecutive span intervals must overlap. But when parsing `let` and `mut` expressions, we call `parts_including_redirection` which chains two slices of span and leads to the above condition not holding. So my solution here is to sort them after chaining. # 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 > ``` --> # 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. -->
1 parent f738932 commit f3a1dfe

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

crates/nu-parser/src/lite_parser.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,15 @@ impl LiteCommand {
136136
}
137137

138138
pub fn parts_including_redirection(&self) -> impl Iterator<Item = Span> + '_ {
139-
self.parts.iter().copied().chain(
140-
self.redirection
141-
.iter()
142-
.flat_map(|redirection| redirection.spans()),
143-
)
139+
self.parts
140+
.iter()
141+
.copied()
142+
.chain(
143+
self.redirection
144+
.iter()
145+
.flat_map(|redirection| redirection.spans()),
146+
)
147+
.sorted_unstable_by_key(|a| (a.start, a.end))
144148
}
145149
}
146150

crates/nu-parser/tests/test_parser.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,18 @@ fn test_nothing_comparison_eq() {
12431243
assert!(matches!(&element.expr.expr, Expr::BinaryOp(..)));
12441244
}
12451245

1246+
#[rstest]
1247+
#[case(b"let a o> file = 1")]
1248+
#[case(b"mut a o> file = 1")]
1249+
fn test_redirection_inside_letmut_no_panic(#[case] phase: &[u8]) {
1250+
let engine_state = EngineState::new();
1251+
let mut working_set = StateWorkingSet::new(&engine_state);
1252+
working_set.add_decl(Box::new(Let));
1253+
working_set.add_decl(Box::new(Mut));
1254+
1255+
parse(&mut working_set, None, phase, true);
1256+
}
1257+
12461258
#[rstest]
12471259
#[case(b"let a = 1 err> /dev/null")]
12481260
#[case(b"let a = 1 out> /dev/null")]

0 commit comments

Comments
 (0)