Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions turbopack/crates/turbo-tasks-fs/src/glob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ mod tests {
#[case::alternatives_nested2("{a,b/c,d/e/{f,g/h}}", "b/c")]
#[case::alternatives_nested3("{a,b/c,d/e/{f,g/h}}", "d/e/f")]
#[case::alternatives_nested4("{a,b/c,d/e/{f,g/h}}", "d/e/g/h")]
#[case::alternatives_empty1("react{,-dom}", "react")]
#[case::alternatives_empty2("react{,-dom}", "react-dom")]
#[case::alternatives_chars("[abc]", "b")]
fn glob_match(#[case] glob: &str, #[case] path: &str) {
let glob = Glob::parse(glob).unwrap();
Expand Down
8 changes: 7 additions & 1 deletion turbopack/crates/turbo-tasks-fs/src/globset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,13 @@ impl Tokens {

fn build_alternates(re: &mut String, patterns: &Vec<Tokens>, branch_fn: fn(&[Token], &mut String)) {
let mut parts = Vec::with_capacity(patterns.len());
let mut has_empty_part = false;
for pat in patterns {
let mut altre = String::new();
branch_fn(pat, &mut altre);
if !altre.is_empty() {
if altre.is_empty() {
has_empty_part = true;
} else {
parts.push(altre);
}
}
Expand All @@ -265,6 +268,9 @@ fn build_alternates(re: &mut String, patterns: &Vec<Tokens>, branch_fn: fn(&[Tok
// resulting alternation '()' would be an error.
if !parts.is_empty() {
re.push_str("(?:");
if has_empty_part {
re.push('|');
}
re.push_str(&parts.join("|"));
re.push(')');
}
Expand Down
Loading