Simplify arrow parameter regex so make sure it doesnt take forever

Author: sheetalkamat

TypeScript.YAML-tmLanguage

@@ -1005,7 +1005,7 @@ repository:
       captures:
         '1': { name: variable.parameter.ts }
     - name: meta.arrow.ts
-      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
+      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=>)
       end: (?==>)
       patterns:
       - include: '#function-parameters'

TypeScript.tmLanguage

@@ -182,7 +182,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
 					<key>end</key>
 					<string>(?==&gt;)</string>
 					<key>name</key>

TypeScriptReact.YAML-tmLanguage

@@ -995,7 +995,7 @@ repository:
       captures:
         '1': { name: variable.parameter.tsx }
     - name: meta.arrow.tsx
-      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
+      begin: (?x)(?<=return|throw|yield|await|async|[=(\[,:>*])\s*(?=\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=>)
       end: (?==>)
       patterns:
       - include: '#function-parameters'

TypeScriptReact.tmLanguage

@@ -182,7 +182,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\(([^()]+|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
+					<string>(?x)(?&lt;=return|throw|yield|await|async|[=(\[,:&gt;*])\s*(?=\([^()]*(\([^()]*\))*[^()]*(\([^()]*\))*[^()]*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
 					<key>end</key>
 					<string>(?==&gt;)</string>
 					<key>name</key>

tests/baselines/arrowInsideCall.baseline.txt

@@ -0,0 +1,56 @@
+original file
+-----------------------------------
+optsList.sort((a, b) => compareValues<string>(a.name.toLowerCase(), b.name.toLowerCase()));
+-----------------------------------
+
+>optsList.sort((a, b) => compareValues<string>(a.name.toLowerCase(), b.name.toLowerCase()));
+ ^^^^^^^^^^^^^
+ source.ts
+              ^
+              source.ts meta.brace.round.ts
+               ^
+               source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+                ^
+                source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+                 ^
+                 source.ts meta.arrow.ts meta.parameters.ts
+                  ^
+                  source.ts meta.arrow.ts meta.parameters.ts
+                   ^
+                   source.ts meta.arrow.ts meta.parameters.ts variable.parameter.ts
+                    ^
+                    source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+                     ^
+                     source.ts meta.arrow.ts
+                      ^^
+                      source.ts meta.arrow.ts storage.type.function.arrow.ts
+                        ^
+                        source.ts meta.arrow.ts
+                         ^^^^^^^^^^^^^
+                         source.ts meta.type.parameters.ts entity.name.function.ts
+                                      ^
+                                      source.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
+                                       ^^^^^^
+                                       source.ts meta.type.parameters.ts support.type.primitive.ts
+                                             ^
+                                             source.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
+                                              ^
+                                              source.ts meta.brace.round.ts
+                                               ^^^^^^^^^^^^^^^^^^
+                                               source.ts
+                                                                 ^
+                                                                 source.ts meta.brace.round.ts
+                                                                  ^
+                                                                  source.ts meta.brace.round.ts
+                                                                   ^^^^^^^^^^^^^^^^^^^^
+                                                                   source.ts
+                                                                                       ^
+                                                                                       source.ts meta.brace.round.ts
+                                                                                        ^
+                                                                                        source.ts meta.brace.round.ts
+                                                                                         ^
+                                                                                         source.ts meta.brace.round.ts
+                                                                                          ^
+                                                                                          source.ts meta.brace.round.ts
+                                                                                           ^^
+                                                                                           source.ts

tests/cases/arrowInsideCall.ts

@@ -0,0 +1 @@
+optsList.sort((a, b) => compareValues<string>(a.name.toLowerCase(), b.name.toLowerCase()));