fix case where ) appears in a class in an extglob

isaacs · Jan 17, 2023 · 35b00ba · 35b00ba
1 parent 9ddf1df
commit 35b00ba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/index.ts b/src/index.ts
@@ -760,11 +760,12 @@ export class Minimatch {
         }
 
         case ')': {
-          const plEntry = patternListStack.pop()
+          const plEntry = patternListStack[patternListStack.length - 1]
           if (inClass || !plEntry) {
             re += '\\)'
             continue
           }
+          patternListStack.pop()
 
           // closing an extglob
           clearStateChar()

diff --git a/tap-snapshots/test/basic.js.test.cjs b/tap-snapshots/test/basic.js.test.cjs
@@ -193,6 +193,14 @@ exports[`test/basic.js TAP basic tests > makeRe @(.*|js) 1`] = `
 /^(?:(?=.)(?:\\.[^/]*?|(?!\\.)js))$/
 `
 
+exports[`test/basic.js TAP basic tests > makeRe @(a|a[(])b 1`] = `
+/^(?:(?=.)(?:(?!\\.)a|(?!\\.)a[(])b)$/
+`
+
+exports[`test/basic.js TAP basic tests > makeRe @(a|a[)])b 1`] = `
+/^(?:(?=.)(?:(?!\\.)a|(?!\\.)a[\\)])b)$/
+`
+
 exports[`test/basic.js TAP basic tests > makeRe @(js|.*) 1`] = `
 /^(?:(?=.)(?:(?!\\.)js|\\.[^/]*?))$/
 `

diff --git a/test/patterns.js b/test/patterns.js
@@ -336,6 +336,9 @@ module.exports = [
   // doesn't start at 0, no dice
   // neg extglobs don't trigger this behavior.
   ['!(.a|js)@(.*)', ['a.js'], { nonegate: true }],
+  () => files=['a(b', 'ab', 'a)b'],
+  ['@(a|a[(])b', ['a(b', 'ab']],
+  ['@(a|a[)])b', ['a)b', 'ab']],
 ]
 
 Object.defineProperty(module.exports, 'files', {