Skip to content

Commit 1bde8ef

Browse files
committed
No need to check the context for arrow since we are already speculating it based on =>
Fixes #304
1 parent 072bd26 commit 1bde8ef

File tree

6 files changed

+248
-9
lines changed

6 files changed

+248
-9
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ repository:
14411441
'1': { name: storage.modifier.async.ts }
14421442
'2': { name: variable.parameter.ts }
14431443
- name: meta.arrow.ts
1444-
begin: (?x)(?<=return|throw|yield|await|async|default|[=(\[,:>*])\s*(?=(<([^<>]|\<[^<>]+\>)+>\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
1444+
begin: (?x)\s*(?=(<([^<>]|\<[^<>]+\>)+>\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=>)
14451445
end: (?==>)
14461446
patterns:
14471447
- include: '#comment'

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4069,7 +4069,7 @@
40694069
<key>name</key>
40704070
<string>meta.arrow.ts</string>
40714071
<key>begin</key>
4072-
<string>(?x)(?&lt;=return|throw|yield|await|async|default|[=(\[,:&gt;*])\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
4072+
<string>(?x)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
40734073
<key>end</key>
40744074
<string>(?==&gt;)</string>
40754075
<key>patterns</key>

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4051,7 +4051,7 @@
40514051
<key>name</key>
40524052
<string>meta.arrow.tsx</string>
40534053
<key>begin</key>
4054-
<string>(?x)(?&lt;=return|throw|yield|await|async|default|[=(\[,:&gt;*])\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
4054+
<string>(?x)\s*(?=(&lt;([^&lt;&gt;]|\&lt;[^&lt;&gt;]+\&gt;)+&gt;\s*)?\(([^()]|\([^()]*\))*\)(\s*:\s*(.)*)?\s*=&gt;)</string>
40554055
<key>end</key>
40564056
<string>(?==&gt;)</string>
40574057
<key>patterns</key>

tests/baselines/Issue177.baseline.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Grammar: TypeScript.tmLanguage
88
-----------------------------------
99
>() => (/s/);
1010
^
11-
source.ts meta.brace.round.ts
11+
source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
1212
^
13-
source.ts meta.brace.round.ts
13+
source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
1414
^
15-
source.ts
15+
source.ts meta.arrow.ts
1616
^^
1717
source.ts meta.arrow.ts storage.type.function.arrow.ts
1818
^
@@ -33,11 +33,11 @@ Grammar: TypeScript.tmLanguage
3333
source.ts
3434
>() => /s/;
3535
^
36-
source.ts meta.brace.round.ts
36+
source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
3737
^
38-
source.ts meta.brace.round.ts
38+
source.ts meta.arrow.ts meta.parameters.ts punctuation.definition.parameters.end.ts
3939
^
40-
source.ts
40+
source.ts meta.arrow.ts
4141
^^
4242
source.ts meta.arrow.ts storage.type.function.arrow.ts
4343
^

0 commit comments

Comments
 (0)