fixup! Fix globrex's globstar on Windows

denoland · Sep 20, 2019 · 7b83407 · 7b83407
1 parent 9770ef2
commit 7b83407
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fs/globrex.ts b/fs/globrex.ts
@@ -268,9 +268,9 @@ export function globrex(
         let isGlobstar =
           starCount > 1 && // multiple "*"'s
           // from the start of the segment
-          (prevChar === SEP_RAW || prevChar === undefined) &&
+          [SEP_RAW, "/", undefined].includes(prevChar) &&
           // to the end of the segment
-          (nextChar === SEP_RAW || nextChar === undefined);
+          [SEP_RAW, "/", undefined].includes(nextChar);
         if (isGlobstar) {
           // it's a globstar, so match zero or more path segments
           add(GLOBSTAR, { only: "regex" });

diff --git a/testing/runner.ts b/testing/runner.ts
@@ -54,6 +54,8 @@ function partition(
 }
 
 function expandDirectory(dir: string, options: ExpandGlobOptions): WalkInfo[] {
+  console.log('expand glob', join(dir, DIR_GLOBS[0]));
+  console.log(glob(join(dir, DIR_GLOBS[0]), options));
   return DIR_GLOBS.flatMap((s: string): WalkInfo[] => [
     ...expandGlobSync(s, { ...options, root: dir })
   ]);