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
8 changes: 8 additions & 0 deletions turbopack/crates/turbo-tasks-fs/src/glob.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ mod tests {
#[case::alternatives_empty1("react{,-dom}", "react")]
#[case::alternatives_empty2("react{,-dom}", "react-dom")]
#[case::alternatives_chars("[abc]", "b")]
#[case::character_range("[a-z].js", "b.js")]
fn glob_match(#[case] glob: &str, #[case] path: &str) {
let glob = Glob::parse(RcStr::from(glob), GlobOptions::default()).unwrap();

Expand All @@ -245,6 +246,13 @@ mod tests {
assert!(glob.matches(path));
}

#[test]
fn glob_rejects_invalid_character_range() {
let error = Glob::parse(rcstr!("[z-a]"), GlobOptions::default()).unwrap_err();

assert!(format!("{error:#}").contains("invalid character range"));
}

#[rstest]
#[case::early_end("*.raw", "hello.raw.js")]
#[case::early_end(
Expand Down
3 changes: 2 additions & 1 deletion turbopack/crates/turbo-tasks-fs/src/globset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ impl<'a> Parser<'a> {
if in_range {
// invariant: in_range is only set when there is
// already at least one character seen.
if let Some(kind) = add_to_last_range(ranges.last_mut().unwrap(), '-') {
if let Some(kind) = add_to_last_range(ranges.last_mut().unwrap(), c) {
return Err(self.error(kind));
}
} else {
Expand Down Expand Up @@ -653,6 +653,7 @@ mod tests {
"(?:a|b|c(?:/)?)(?:/h(?:/.*)?)?"
)]
#[case::classes("[abc]/d/**", "[abc]/d/.*", "[abc](?:/d(?:/.*)?)?")]
#[case::ranges("[a-z]/d/**", "[a-z]/d/.*", "[a-z](?:/d(?:/.*)?)?")]
fn glob_regex_mapping(
#[case] glob: &str,
#[case] glob_regex: &str,
Expand Down
Loading