Merge pull request #28818 from Cow258/master

Move await keyword to inside of function

Author: sheetalkamat

src/harness/fourslash.ts

@@ -4775,6 +4775,7 @@ namespace FourSlashInterface {
             "package",
             "yield",
             "async",
+            "await",
         ].map(keywordEntry);
 
         // TODO: many of these are inappropriate to always provide
@@ -4907,6 +4908,7 @@ namespace FourSlashInterface {
             "package",
             "yield",
             "async",
+            "await",
         ].map(keywordEntry);
 
         export const globalKeywordsPlusUndefined: ReadonlyArray<ExpectedCompletionEntryObject> = (() => {

src/services/completions.ts

@@ -1957,7 +1957,7 @@ namespace ts.Completions {
     }
 
     function isFunctionLikeBodyKeyword(kind: SyntaxKind) {
-        return kind === SyntaxKind.AsyncKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+        return kind === SyntaxKind.AsyncKeyword || kind === SyntaxKind.AwaitKeyword || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
     }
 
     function keywordForNode(node: Node): SyntaxKind {

tests/cases/fourslash/completionInFunctionLikeBody.ts

@@ -16,7 +16,7 @@
 verify.completions(
     {
         marker: ["1", "2"],
-        includes: "async",
+        includes: ["async", "await"],
         excludes: ["public", "private", "protected", "constructor", "readonly", "static", "abstract", "get", "set"],
     },
     { marker: ["3", "4"], exact: completion.classElementKeywords, isNewIdentifierLocation: true },