fix: duplicated patterns in second phase preprocess loop

PR-URL: #235 Credit: @ziqiq Close: #235 Reviewed-by: @isaacs
isaacs · Jun 25, 2024 · f09ab67 · f09ab67
1 parent d5ef89f
commit f09ab67
Show file tree

Hide file tree

Showing 3 changed files with 152 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -675,9 +675,11 @@ export class Minimatch {
           globParts[j],
           !this.preserveMultipleSlashes
         )
-        if (!matched) continue
-        globParts[i] = matched
-        globParts[j] = []
+        if (matched) {
+          globParts[i] = []
+          globParts[j] = matched
+          break
+        }
       }
     }
     return globParts.filter(gs => gs.length)

diff --git a/tap-snapshots/test/optimization-level-2.ts.test.cjs b/tap-snapshots/test/optimization-level-2.ts.test.cjs
@@ -4510,6 +4510,78 @@ Array [
 ]
 `
 
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {*,a,b} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {*,a,b} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {*,a,b} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,*,b} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,*,b} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,*,b} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,b,*} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,b,*} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a,b,*} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
 exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > linux > {a/**/b,a/b} > defaults 1`] = `
 Array [
   Array [
@@ -5838,6 +5910,78 @@ Array [
 ]
 `
 
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {*,a,b} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {*,a,b} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {*,a,b} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,*,b} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,*,b} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,*,b} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,b,*} > defaults 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,b,*} > multislash 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
+exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a,b,*} > no globstar 1`] = `
+Array [
+  Array [
+    "*",
+  ],
+]
+`
+
 exports[`test/optimization-level-2.ts > TAP > explicit pattern coalescing and optimization > win32 > {a/**/b,a/b} > defaults 1`] = `
 Array [
   Array [

diff --git a/test/optimization-level-2.ts b/test/optimization-level-2.ts
@@ -60,6 +60,9 @@ t.test('explicit pattern coalescing and optimization', t => {
         './x/.././///.//./',
         '*/../**',
         '*/../**/?/*/[a-z]',
+        '{*,a,b}',
+        '{a,*,b}',
+        '{a,b,*}',
       ]
 
       const exp = (p: string) => braceExpand(p).map(s => s.split('/'))