Skip to content

fix: reserved word substrings #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2025
Merged

fix: reserved word substrings #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f366712
fix: reserved word substrings
lucascolley Apr 8, 2025
ab4a656
edit test
lucascolley Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/deno_task_shell/src/grammar.pest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ Stdout = ${ "|" ~ !"|" ~ !"&"}
StdoutStderr = { "|&" }

RESERVED_WORD = _{
If | Then | Else | Elif | Fi | Do | Done |
(If | Then | Else | Elif | Fi | Done | Do |
Copy link
Contributor Author

@lucascolley lucascolley Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still a little fragile—"done" needs to be checked for match before "do"

Case | Esac | While | Until | For |
Lbrace | Rbrace | Bang | In |
StdoutStderr | Stdout
StdoutStderr | Stdout) ~ &(WHITESPACE | NEWLINE | EOI)
}

// Main grammar rules
Expand Down
16 changes: 16 additions & 0 deletions crates/tests/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,6 +1463,22 @@ async fn test_set() {
.await;
}

#[tokio::test]
async fn test_reserved_substring() {
// Test that there is no panic (prefix-dev/shell#256)
TestBuilder::new()
.command(r#"fiqwertymnbvc bla"#)
.assert_exit_code(127)
.run()
.await;

TestBuilder::new()
.command(r#"forplmoknib bla"#)
.assert_exit_code(127)
.run()
.await;
}

#[cfg(test)]
fn no_such_file_error_text() -> &'static str {
if cfg!(windows) {
Expand Down
Loading