Skip to content

Commit dc10229

Browse files
committed
Adds for-await-of
1 parent 55e9f73 commit dc10229

File tree

5 files changed

+89
-4
lines changed

5 files changed

+89
-4
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,10 +1038,11 @@ repository:
10381038
- include: '#expression'
10391039

10401040
for-loop:
1041-
begin: (?<!\.|\$)\b(for)\s*(\()
1041+
begin: (?<!\.|\$)\b(for)(?:\s+(await))?\s*(\()
10421042
beginCaptures:
10431043
'1': { name: keyword.control.loop.ts }
1044-
'2': { name: meta.brace.round.ts }
1044+
'2': { name: keyword.control.loop.ts }
1045+
'3': { name: meta.brace.round.ts }
10451046
end: \)
10461047
endCaptures:
10471048
'0': { name: meta.brace.round.ts }

TypeScript.tmLanguage

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3161,7 +3161,7 @@
31613161
<key>for-loop</key>
31623162
<dict>
31633163
<key>begin</key>
3164-
<string>(?&lt;!\.|\$)\b(for)\s*(\()</string>
3164+
<string>(?&lt;!\.|\$)\b(for)(?:\s+(await))?\s*(\()</string>
31653165
<key>beginCaptures</key>
31663166
<dict>
31673167
<key>1</key>
@@ -3170,6 +3170,11 @@
31703170
<string>keyword.control.loop.ts</string>
31713171
</dict>
31723172
<key>2</key>
3173+
<dict>
3174+
<key>name</key>
3175+
<string>keyword.control.loop.ts</string>
3176+
</dict>
3177+
<key>3</key>
31733178
<dict>
31743179
<key>name</key>
31753180
<string>meta.brace.round.ts</string>

TypeScriptReact.tmLanguage

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3165,7 +3165,7 @@
31653165
<key>for-loop</key>
31663166
<dict>
31673167
<key>begin</key>
3168-
<string>(?&lt;!\.|\$)\b(for)\s*(\()</string>
3168+
<string>(?&lt;!\.|\$)\b(for)(?:\s+(await))?\s*(\()</string>
31693169
<key>beginCaptures</key>
31703170
<dict>
31713171
<key>1</key>
@@ -3174,6 +3174,11 @@
31743174
<string>keyword.control.loop.tsx</string>
31753175
</dict>
31763176
<key>2</key>
3177+
<dict>
3178+
<key>name</key>
3179+
<string>keyword.control.loop.tsx</string>
3180+
</dict>
3181+
<key>3</key>
31773182
<dict>
31783183
<key>name</key>
31793184
<string>meta.brace.round.tsx</string>

tests/baselines/forof.baseline.txt

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
original file
2+
-----------------------------------
3+
for (const x of y) {}
4+
for await (const x of y) {}
5+
-----------------------------------
6+
7+
Grammar: TypeScript.tmLanguage
8+
-----------------------------------
9+
>for (const x of y) {}
10+
^^^
11+
source.ts keyword.control.loop.ts
12+
^
13+
source.ts
14+
^
15+
source.ts meta.brace.round.ts
16+
^^^^^
17+
source.ts meta.var.expr.ts storage.type.ts
18+
^
19+
source.ts meta.var.expr.ts
20+
^
21+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
22+
^
23+
source.ts
24+
^^
25+
source.ts keyword.operator.expression.of.ts
26+
^
27+
source.ts
28+
^
29+
source.ts variable.other.readwrite.ts
30+
^
31+
source.ts meta.brace.round.ts
32+
^
33+
source.ts
34+
^
35+
source.ts meta.block.ts punctuation.definition.block.ts
36+
^
37+
source.ts meta.block.ts punctuation.definition.block.ts
38+
^^
39+
source.ts
40+
>for await (const x of y) {}
41+
^^^
42+
source.ts keyword.control.loop.ts
43+
^
44+
source.ts
45+
^^^^^
46+
source.ts keyword.control.loop.ts
47+
^
48+
source.ts
49+
^
50+
source.ts meta.brace.round.ts
51+
^^^^^
52+
source.ts meta.var.expr.ts storage.type.ts
53+
^
54+
source.ts meta.var.expr.ts
55+
^
56+
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.readwrite.ts
57+
^
58+
source.ts
59+
^^
60+
source.ts keyword.operator.expression.of.ts
61+
^
62+
source.ts
63+
^
64+
source.ts variable.other.readwrite.ts
65+
^
66+
source.ts meta.brace.round.ts
67+
^
68+
source.ts
69+
^
70+
source.ts meta.block.ts punctuation.definition.block.ts
71+
^
72+
source.ts meta.block.ts punctuation.definition.block.ts

tests/cases/forof.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
for (const x of y) {}
2+
for await (const x of y) {}

0 commit comments

Comments
 (0)