github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-19 18:32:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression causing crash on unconsumed }

Browse Source 
Fixes #11052
This commit is contained in:
Johannes Altmanninger 2025-01-16 04:32:28 +01:00
parent dd2b9943a7
commit 0cc7ee5511
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ast.rs
View File

@ -3466,6 +3466,7 @@ impl<'s> Populator<'s> {
} }
ParseTokenType::pipe ParseTokenType::pipe
| ParseTokenType::redirection | ParseTokenType::redirection
| ParseTokenType::right_brace
| ParseTokenType::background | ParseTokenType::background
| ParseTokenType::andand | ParseTokenType::andand
| ParseTokenType::oror => { | ParseTokenType::oror => {

13
src/tests/tokenizer.rs
View File

@ -68,6 +68,19 @@ fn test_tokenizer() {
assert_eq!(token.type_, TokenType::left_brace); assert_eq!(token.type_, TokenType::left_brace);
} }
{
let s = L!("{ | { name } '");
let mut t = Tokenizer::new(s, TokFlags(0));
let mut next_type = || t.next().unwrap().type_;
assert_eq!(next_type(), TokenType::left_brace);
assert_eq!(next_type(), TokenType::pipe);
assert_eq!(next_type(), TokenType::left_brace);
assert_eq!(next_type(), TokenType::string);
assert_eq!(next_type(), TokenType::right_brace);
assert_eq!(next_type(), TokenType::error);
assert!(t.next().is_none());
}
let s = L!(concat!( let s = L!(concat!(
"string <redirection 2>&1 'nested \"quoted\" '(string containing subshells ", "string <redirection 2>&1 'nested \"quoted\" '(string containing subshells ",
"){and,brackets}$as[$well (as variable arrays)] not_a_redirect^ ^ ^^is_a_redirect ", "){and,brackets}$as[$well (as variable arrays)] not_a_redirect^ ^ ^^is_a_redirect ",