Merge pull request #372 from Microsoft/forAwaitOf

Adds for-await-of

Author: rbuckton

TypeScript.YAML-tmLanguage

@@ -1043,10 +1043,11 @@ repository:
       - include: '#expression'
 
   for-loop:
-    begin: (?<!\.|\$)\b(for)\s*(\()
+    begin: (?<!\.|\$)\b(for)(?:\s+(await))?\s*(\()
     beginCaptures:
       '1': { name: keyword.control.loop.ts }
-      '2': { name: meta.brace.round.ts }
+      '2': { name: keyword.control.loop.ts }
+      '3': { name: meta.brace.round.ts }
     end: \)
     endCaptures:
       '0': { name: meta.brace.round.ts }

TypeScript.tmLanguage

@@ -3179,7 +3179,7 @@
       <key>for-loop</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\.|\$)\b(for)\s*(\()</string>
+        <string>(?&lt;!\.|\$)\b(for)(?:\s+(await))?\s*(\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -3188,6 +3188,11 @@
             <string>keyword.control.loop.ts</string>
           </dict>
           <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.loop.ts</string>
+          </dict>
+          <key>3</key>
           <dict>
             <key>name</key>
             <string>meta.brace.round.ts</string>

TypeScriptReact.tmLanguage

@@ -3183,7 +3183,7 @@
       <key>for-loop</key>
       <dict>
         <key>begin</key>
-        <string>(?&lt;!\.|\$)\b(for)\s*(\()</string>
+        <string>(?&lt;!\.|\$)\b(for)(?:\s+(await))?\s*(\()</string>
         <key>beginCaptures</key>
         <dict>
           <key>1</key>
@@ -3192,6 +3192,11 @@
             <string>keyword.control.loop.tsx</string>
           </dict>
           <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.loop.tsx</string>
+          </dict>
+          <key>3</key>
           <dict>
             <key>name</key>
             <string>meta.brace.round.tsx</string>

tests/baselines/forof.baseline.txt

@@ -0,0 +1,72 @@
+original file
+-----------------------------------
+for (const x of y) {}
+for await (const x of y) {}
+-----------------------------------
+
+Grammar: TypeScript.tmLanguage
+-----------------------------------
+>for (const x of y) {}
+ ^^^
+ source.ts keyword.control.loop.ts
+    ^
+    source.ts
+     ^
+     source.ts meta.brace.round.ts
+      ^^^^^
+      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
+              ^^
+              source.ts keyword.operator.expression.of.ts
+                ^
+                source.ts
+                 ^
+                 source.ts variable.other.readwrite.ts
+                  ^
+                  source.ts meta.brace.round.ts
+                   ^
+                   source.ts
+                    ^
+                    source.ts meta.block.ts punctuation.definition.block.ts
+                     ^
+                     source.ts meta.block.ts punctuation.definition.block.ts
+                      ^^
+                      source.ts
+>for await (const x of y) {}
+ ^^^
+ source.ts keyword.control.loop.ts
+    ^
+    source.ts
+     ^^^^^
+     source.ts keyword.control.loop.ts
+          ^
+          source.ts
+           ^
+           source.ts meta.brace.round.ts
+            ^^^^^
+            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
+                    ^^
+                    source.ts keyword.operator.expression.of.ts
+                      ^
+                      source.ts
+                       ^
+                       source.ts variable.other.readwrite.ts
+                        ^
+                        source.ts meta.brace.round.ts
+                         ^
+                         source.ts
+                          ^
+                          source.ts meta.block.ts punctuation.definition.block.ts
+                           ^
+                           source.ts meta.block.ts punctuation.definition.block.ts

tests/cases/forof.ts

@@ -0,0 +1,2 @@
+for (const x of y) {}
+for await (const x of y) {}