From a8ad40f131c0459d6316ff872cd7e4909d36d71b Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 11 May 2017 11:42:36 -0700
Subject: [PATCH] Add async to the list of class element completion keyword and
 refactoring according to feedback

---
 src/harness/fourslash.ts                                | 3 ++-
 src/services/completions.ts                             | 8 ++++----
 tests/cases/fourslash/completionEntryForClassMembers.ts | 4 ++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 74790400b98..57d0eb59ee2 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -3426,7 +3426,8 @@ namespace FourSlashInterface {
             "readonly",
             "get",
             "set",
-            "constructor"
+            "constructor",
+            "async"
         ];
 
         constructor(protected state: FourSlash.TestState, private negative = false) {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index cb4abb89b58..986ad0fe5ad 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -618,7 +618,8 @@ namespace ts.Completions {
 
             if (classLikeContainer = tryGetClassLikeCompletionContainer(contextToken)) {
                 // cursor inside class declaration
-                return tryGetClassLikeCompletionSymbols(classLikeContainer);
+                getGetClassLikeCompletionSymbols(classLikeContainer);
+                return true;
             }
 
             if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
@@ -929,7 +930,7 @@ namespace ts.Completions {
          *
          * @returns true if 'symbols' was successfully populated; false otherwise.
          */
-        function tryGetClassLikeCompletionSymbols(classLikeDeclaration: ClassLikeDeclaration): boolean {
+        function getGetClassLikeCompletionSymbols(classLikeDeclaration: ClassLikeDeclaration) {
             // We're looking up possible property names from parent type.
             isMemberCompletion = true;
             // Declaring new property/method/accessor
@@ -965,8 +966,6 @@ namespace ts.Completions {
                         baseProperty =>  baseProperty.getDeclarations() && !(getDeclarationModifierFlagsFromSymbol(baseProperty) & ModifierFlags.Private));
                 }
             }
-
-            return true;
         }
 
         /**
@@ -1431,6 +1430,7 @@ namespace ts.Completions {
             case SyntaxKind.ReadonlyKeyword:
             case SyntaxKind.GetKeyword:
             case SyntaxKind.SetKeyword:
+            case SyntaxKind.AsyncKeyword:
                 return true;
         }
     }
diff --git a/tests/cases/fourslash/completionEntryForClassMembers.ts b/tests/cases/fourslash/completionEntryForClassMembers.ts
index 672046f62a7..8cea37d3b1e 100644
--- a/tests/cases/fourslash/completionEntryForClassMembers.ts
+++ b/tests/cases/fourslash/completionEntryForClassMembers.ts
@@ -84,6 +84,9 @@
 ////class M extends B {
 ////    private static identi/*classThatStartedWritingIdentifierAfterPrivateStaticModifier*/
 ////}
+////class N extends B {
+////    async /*classThatHasWrittenAsyncKeyword*/
+////}
 
 const allowedKeywordCount = verify.allowedClassElementKeywords.length;
 type CompletionInfo = [string, string];
@@ -171,6 +174,7 @@ const classInstanceElementLocations = [
     "classThatStartedWritingIdentifierOfGetAccessor",
     "classThatStartedWritingIdentifierOfSetAccessor",
     "classThatStartedWritingIdentifierAfterModifier",
+    "classThatHasWrittenAsyncKeyword"
 ];
 verifyClassElementLocations(instanceMemberInfo, classInstanceElementLocations);