Ensure that 'await' is highlighted properly in situations where it might look like a local declaration

Author: DustinCampbell

grammars/csharp.tmLanguage

@@ -309,6 +309,10 @@
             <key>include</key>
             <string>#yield-statement</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#await-statement</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#try-statement</string>
@@ -2529,6 +2533,28 @@
           </dict>
         </dict>
       </dict>
+      <key>await-statement</key>
+      <dict>
+        <key>begin</key>
+        <string>(?&lt;!\.)\b(await)\b</string>
+        <key>beginCaptures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.other.await.cs</string>
+          </dict>
+        </dict>
+        <key>end</key>
+        <string>(?=;)</string>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>include</key>
+            <string>#expression</string>
+          </dict>
+        </array>
+      </dict>
       <key>if-statement</key>
       <dict>
         <key>begin</key>

grammars/csharp.tmLanguage.cson

@@ -216,6 +216,9 @@ repository:
       {
         include: "#yield-statement"
       }
+      {
+        include: "#await-statement"
+      }
       {
         include: "#try-statement"
       }
@@ -1587,6 +1590,17 @@ repository:
         name: "keyword.control.flow.yield.cs"
       "2":
         name: "keyword.control.flow.break.cs"
+  "await-statement":
+    begin: "(?<!\\.)\\b(await)\\b"
+    beginCaptures:
+      "1":
+        name: "keyword.other.await.cs"
+    end: "(?=;)"
+    patterns: [
+      {
+        include: "#expression"
+      }
+    ]
   "if-statement":
     begin: "(?<!\\.)\\b(if)\\b\\s*(?=\\()"
     beginCaptures:

package.json

@@ -34,12 +34,12 @@
     "gulp": "^3.9.1",
     "gulp-json2cson": "^1.0.1",
     "gulp-mocha": "^3.0.1",
-    "gulp-typescript": "^3.1.3",
+    "gulp-typescript": "^3.2.2",
     "gulp-yaml": "^1.0.1",
     "js-yaml": "^3.7.0",
     "mocha": "^3.2.0",
     "plist": "^2.0.1",
-    "typescript": "^2.3.3",
+    "typescript": "^2.5.2",
     "vscode-textmate": "^2.3.2"
   }
 }

src/csharp.tmLanguage.yml

@@ -91,6 +91,7 @@ repository:
     - include: '#break-or-continue-statement'
     - include: '#throw-statement'
     - include: '#yield-statement'
+    - include: '#await-statement'
     - include: '#try-statement'
     - include: '#checked-unchecked-statement'
     - include: '#lock-statement'
@@ -934,6 +935,16 @@ repository:
       '1': { name: keyword.control.flow.yield.cs }
       '2': { name: keyword.control.flow.break.cs }
 
+  # Technically, there isn't an "await statement" in the C# grammar. However, including one here makes it easier to handle
+  # the scenario where an await-expression will be match by local-declaration first. (e.g. await x;)
+  await-statement:
+    begin: (?<!\.)\b(await)\b
+    beginCaptures:
+      '1': { name: keyword.other.await.cs }
+    end: (?=;)
+    patterns:
+    - include: '#expression'
+
   if-statement:
     begin: (?<!\.)\b(if)\b\s*(?=\()
     beginCaptures:

test/expressions.tests.ts

@@ -968,6 +968,17 @@ var x = new
                     Token.Punctuation.Semicolon
                 ]);
             });
+
+            it("statement level (issue #83)", () => {
+                const input = Input.InMethod(`await x;`);
+                const tokens = tokenize(input);
+
+                tokens.should.deep.equal([
+                    Token.Keywords.Await,
+                    Token.Variables.ReadWrite("x"),
+                    Token.Punctuation.Semicolon
+                ]);
+            });
         });
 
         describe("Casts", () => {

tsconfig.json

@@ -7,6 +7,7 @@
     "rootDir": ".",
     "noImplicitReturns": true
   },
+  "compileOnSave": true,
   "exclude": [
     "node_modules"
   ]