Fix inefficient regexes (fixes microsoft#2684 and microsoft#2683)

anyscale · Feb 4, 2022 · 9c40bbe · 9c40bbe
1 parent d0500b3
commit 9c40bbe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
@@ -246,8 +246,8 @@ function parseRegExp(pattern: string): string {
 // regexes to check for trivial glob patterns that just check for String#endsWith
 const T1 = /^\*\*\/\*\.[\w\.-]+$/; // **/*.something
 const T2 = /^\*\*\/([\w\.-]+)\/?$/; // **/something
-const T3 = /^{\*\*\/[\*\.]?[\w\.-]+\/?(,\*\*\/[\*\.]?[\w\.-]+\/?)*}$/; // {**/*.something,**/*.else} or {**/package.json,**/project.json}
-const T3_2 = /^{\*\*\/[\*\.]?[\w\.-]+(\/(\*\*)?)?(,\*\*\/[\*\.]?[\w\.-]+(\/(\*\*)?)?)*}$/; // Like T3, with optional trailing /**
+const T3 = /^{\*\*\/\*?[\w\.-]+\/?(,\*\*\/\*?[\w\.-]+\/?)*}$/; // {**/*.something,**/*.else} or {**/package.json,**/project.json}
+const T3_2 = /^{\*\*\/\*?[\w\.-]+(\/(\*\*)?)?(,\*\*\/\*?[\w\.-]+(\/(\*\*)?)?)*}$/; // Like T3, with optional trailing /**
 const T4 = /^\*\*((\/[\w\.-]+)+)\/?$/; // **/something/else
 const T5 = /^([\w\.-]+(\/[\w\.-]+)*)\/?$/; // something/else