From d86436cb1baf3a18136797d3310be09add3668d1 Mon Sep 17 00:00:00 2001
From: Tobias Koppers <tobias.koppers@googlemail.com>
Date: Mon, 6 Feb 2023 11:16:09 +0100
Subject: [PATCH] fix glob parsing and improve error reporting
 (vercel/turbo#3644)

Our glob parser was not able to parse alternatives that contain a slash:
`{a/b}`
---
 crates/turbo-tasks-fs/src/glob.rs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/crates/turbo-tasks-fs/src/glob.rs b/crates/turbo-tasks-fs/src/glob.rs
index 4803447b3b9ac..0400029250e9b 100644
--- a/crates/turbo-tasks-fs/src/glob.rs
+++ b/crates/turbo-tasks-fs/src/glob.rs
@@ -1,6 +1,6 @@
 use std::mem::take;
 
-use anyhow::{bail, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use serde::{Deserialize, Serialize};
 use turbo_tasks::trace::TraceRawVcs;
 
@@ -75,7 +75,8 @@ impl Glob {
         let mut expression = Vec::new();
 
         while !current.is_empty() {
-            let (part, remainder) = GlobPart::parse(current, false)?;
+            let (part, remainder) = GlobPart::parse(current, false)
+                .with_context(|| anyhow!("Failed to parse glob {input}"))?;
             expression.push(part);
             current = remainder;
         }
@@ -198,7 +199,10 @@ impl GlobPart {
                             current = &current[1..];
                             break;
                         }
-                        _ => bail!("Unterminated glob braces"),
+                        None => bail!("Unterminated glob braces"),
+                        _ => {
+                            // next part of the glob
+                        }
                     }
                 }
 
@@ -391,6 +395,20 @@ mod tests {
         "**/*/next/dist/server/next.js",
         "node_modules/next/dist/server/next.js"
     )]
+    #[case::node_modules_root("**/node_modules/**", "node_modules/next/dist/server/next.js")]
+    #[case::node_modules_nested(
+        "**/node_modules/**",
+        "apps/some-app/node_modules/regenerate-unicode-properties/Script_Extensions/Osage.js"
+    )]
+    #[case::node_modules_pnpm(
+        "**/node_modules/**",
+        "node_modules/.pnpm/regenerate-unicode-properties@9.0.0/node_modules/\
+         regenerate-unicode-properties/Script_Extensions/Osage.js"
+    )]
+    #[case::alternatives_nested1("{a,b/c,d/e/{f,g/h}}", "a")]
+    #[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")]
     fn glob_match(#[case] glob: &str, #[case] path: &str) {
         let glob = Glob::parse(glob).unwrap();