Fix the arrow parameter detection

sheetalkamat · sheetalkamat · commit c4036f9df0dd · 2017-11-03T12:35:08.000-07:00
Fixes #536
diff --git a/TypeScript.YAML-tmLanguage b/TypeScript.YAML-tmLanguage
@@ -29,7 +29,7 @@ variables:
     # arrow function possible to detect only with => on same line
     (
       {{typeParameters}}?                                                           # typeparameters
-      \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+      \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
       (\s*:\s*([^<>\(\)]|\<[^<>]+\>|\([^\(\)]+\))+)?                                # return type
       \s*=>                                                                         # arrow operator
     )
diff --git a/TypeScript.tmLanguage b/TypeScript.tmLanguage
@@ -408,7 +408,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -796,7 +796,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -1182,7 +1182,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -1623,7 +1623,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -3098,7 +3098,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -4335,7 +4335,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
diff --git a/TypeScriptReact.tmLanguage b/TypeScriptReact.tmLanguage
@@ -412,7 +412,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -800,7 +800,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -1186,7 +1186,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -1627,7 +1627,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -3102,7 +3102,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
@@ -4281,7 +4281,7 @@
 # arrow function possible to detect only with =&gt; on same line
 (
   (&lt;\s*[_$[:alpha:]\{\(\[]([^&lt;&gt;=]|=[^&lt;]|\&lt;\s*[_$[:alpha:]\{\(\[]([^=&lt;&gt;]|=[^&lt;])+\&gt;)+&gt;\s*)?                                                           # typeparameters
-  \((\s*[_$[:alpha:]\{\(]([^()]|\((\s*[_$[:alpha:]\{\(]\{\(][^()]*)?\))*)?\)    # parameteres
+  \(\s*([_$[:alpha:]\{\[]([^()]|\((\s*[_$[:alpha:]\{\[][^()]*)?\))*)?\)         # parameteres
   (\s*:\s*([^&lt;&gt;\(\)]|\&lt;[^&lt;&gt;]+\&gt;|\([^\(\)]+\))+)?                                # return type
   \s*=&gt;                                                                         # arrow operator
 )
diff --git a/tests/baselines/Issue536.baseline.txt b/tests/baselines/Issue536.baseline.txt
@@ -0,0 +1,42 @@
+original file
+-----------------------------------
+const z = (() => {})()
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>const z = (() => {})()
+ ^^^^^
+ source.ts meta.var.expr.ts storage.type.ts
+      ^
+      source.ts meta.var.expr.ts
+       ^
+       source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
+        ^
+        source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
+         ^
+         source.ts meta.var.expr.ts keyword.operator.assignment.ts
+          ^
+          source.ts meta.var.expr.ts
+           ^
+           source.ts meta.var.expr.ts meta.brace.round.ts
+            ^
+            source.ts meta.var.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
+             ^
+             source.ts meta.var.expr.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
+              ^
+              source.ts meta.var.expr.ts meta.arrow.ts
+               ^^
+               source.ts meta.var.expr.ts meta.arrow.ts storage.type.function.arrow.ts
+                 ^
+                 source.ts meta.var.expr.ts meta.arrow.ts
+                  ^
+                  source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts
+                   ^
+                   source.ts meta.var.expr.ts meta.arrow.ts meta.block.ts punctuation.definition.block.ts
+                    ^
+                    source.ts meta.var.expr.ts meta.brace.round.ts
+                     ^
+                     source.ts meta.var.expr.ts meta.brace.round.ts
+                      ^
+                      source.ts meta.var.expr.ts meta.brace.round.ts
diff --git a/tests/cases/Issue536.ts b/tests/cases/Issue536.ts
@@ -0,0 +1 @@
+const z = (() => {})()

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ variables:`
`29`	`29`	`# arrow function possible to detect only with => on same line`
`30`	`30`	`(`
`31`	`31`	`{{typeParameters}}? # typeparameters`
`32`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`32`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`33`	`33`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`34`	`34`	`\s*=> # arrow operator`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@`
`408`	`408`	`# arrow function possible to detect only with => on same line`
`409`	`409`	`(`
`410`	`410`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`411`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`411`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`412`	`412`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`413`	`413`	`\s*=> # arrow operator`
`414`	`414`	`)`
`@@ -796,7 +796,7 @@`
`796`	`796`	`# arrow function possible to detect only with => on same line`
`797`	`797`	`(`
`798`	`798`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`799`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`799`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`800`	`800`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`801`	`801`	`\s*=> # arrow operator`
`802`	`802`	`)`
`@@ -1182,7 +1182,7 @@`
`1182`	`1182`	`# arrow function possible to detect only with => on same line`
`1183`	`1183`	`(`
`1184`	`1184`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`1185`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`1185`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`1186`	`1186`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`1187`	`1187`	`\s*=> # arrow operator`
`1188`	`1188`	`)`
`@@ -1623,7 +1623,7 @@`
`1623`	`1623`	`# arrow function possible to detect only with => on same line`
`1624`	`1624`	`(`
`1625`	`1625`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`1626`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`1626`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`1627`	`1627`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`1628`	`1628`	`\s*=> # arrow operator`
`1629`	`1629`	`)`
`@@ -3098,7 +3098,7 @@`
`3098`	`3098`	`# arrow function possible to detect only with => on same line`
`3099`	`3099`	`(`
`3100`	`3100`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`3101`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`3101`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`3102`	`3102`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`3103`	`3103`	`\s*=> # arrow operator`
`3104`	`3104`	`)`
`@@ -4335,7 +4335,7 @@`
`4335`	`4335`	`# arrow function possible to detect only with => on same line`
`4336`	`4336`	`(`
`4337`	`4337`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`4338`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`4338`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`4339`	`4339`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`4340`	`4340`	`\s*=> # arrow operator`
`4341`	`4341`	`)`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@`
`412`	`412`	`# arrow function possible to detect only with => on same line`
`413`	`413`	`(`
`414`	`414`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`415`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`415`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`416`	`416`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`417`	`417`	`\s*=> # arrow operator`
`418`	`418`	`)`
`@@ -800,7 +800,7 @@`
`800`	`800`	`# arrow function possible to detect only with => on same line`
`801`	`801`	`(`
`802`	`802`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`803`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`803`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`804`	`804`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`805`	`805`	`\s*=> # arrow operator`
`806`	`806`	`)`
`@@ -1186,7 +1186,7 @@`
`1186`	`1186`	`# arrow function possible to detect only with => on same line`
`1187`	`1187`	`(`
`1188`	`1188`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`1189`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`1189`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`1190`	`1190`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`1191`	`1191`	`\s*=> # arrow operator`
`1192`	`1192`	`)`
`@@ -1627,7 +1627,7 @@`
`1627`	`1627`	`# arrow function possible to detect only with => on same line`
`1628`	`1628`	`(`
`1629`	`1629`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`1630`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`1630`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`1631`	`1631`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`1632`	`1632`	`\s*=> # arrow operator`
`1633`	`1633`	`)`
`@@ -3102,7 +3102,7 @@`
`3102`	`3102`	`# arrow function possible to detect only with => on same line`
`3103`	`3103`	`(`
`3104`	`3104`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`3105`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`3105`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`3106`	`3106`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`3107`	`3107`	`\s*=> # arrow operator`
`3108`	`3108`	`)`
`@@ -4281,7 +4281,7 @@`
`4281`	`4281`	`# arrow function possible to detect only with => on same line`
`4282`	`4282`	`(`
`4283`	`4283`	`(<\s[_$[:alpha:]\{\(\[]([^<>=]\|=[^<]\|\<\s[_$[:alpha:]\{\(\[]([^=<>]\|=[^<])+\>)+>\s*)? # typeparameters`
`4284`		`- \((\s[_$[:alpha:]\{\(]([^()]\|\((\s[_$[:alpha:]\{\(]\{\(][^()])?\)))?\) # parameteres`
	`4284`	`+ \(\s([_$[:alpha:]\{\[]([^()]\|\((\s[_$[:alpha:]\{\[][^()])?\)))?\) # parameteres`
`4285`	`4285`	`(\s:\s([^<>\(\)]\|\<[^<>]+\>\|\([^\(\)]+\))+)? # return type`
`4286`	`4286`	`\s*=> # arrow operator`
`4287`	`4287`	`)`