improve completions keyword for function like body (microsoft#25824)

Kingwl · Andy · commit fedcd3a1b414 · 2018-07-20T08:25:16.000-07:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -2125,7 +2125,7 @@ namespace ts.Completions {
                 case KeywordCompletionFilters.ConstructorParameterKeywords:
                     return isParameterPropertyModifier(kind);
                 case KeywordCompletionFilters.FunctionLikeBodyKeywords:
-                    return !isClassMemberCompletionKeyword(kind);
+                    return isFunctionLikeBodyKeyword(kind);
                 case KeywordCompletionFilters.TypeKeywords:
                     return isTypeKeyword(kind);
                 default:
@@ -2151,6 +2151,10 @@ namespace ts.Completions {
         }
     }
 
+    function isFunctionLikeBodyKeyword(kind: SyntaxKind) {
+        return kind === SyntaxKind.AsyncKeyword || !isClassMemberCompletionKeyword(kind);
+    }
+
     function keywordForNode(node: Node): SyntaxKind {
         return isIdentifier(node) ? node.originalKeywordKind || SyntaxKind.Unknown : node.kind;
     }
diff --git a/tests/cases/fourslash/completionInFunctionLikeBody.ts b/tests/cases/fourslash/completionInFunctionLikeBody.ts
@@ -15,6 +15,7 @@
     
 
 goTo.marker("1");
+verify.completionListContains("async", "async", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("public", "public", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("private", "private", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("protected", "protected", /*documentation*/ undefined, "keyword");
@@ -26,6 +27,7 @@ verify.not.completionListContains("get", "get", /*documentation*/ undefined, "ke
 verify.not.completionListContains("set", "set", /*documentation*/ undefined, "keyword");
 
 goTo.marker("2");
+verify.completionListContains("async", "async", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("public", "public", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("private", "private", /*documentation*/ undefined, "keyword");
 verify.not.completionListContains("protected", "protected", /*documentation*/ undefined, "keyword");
@@ -41,3 +43,4 @@ verify.completionListContainsClassElementKeywords();
 
 goTo.marker("4");
 verify.completionListContainsClassElementKeywords();
+

Original file line number	Diff line number	Diff line change
`@@ -2125,7 +2125,7 @@ namespace ts.Completions {`
`2125`	`2125`	`case KeywordCompletionFilters.ConstructorParameterKeywords:`
`2126`	`2126`	`return isParameterPropertyModifier(kind);`
`2127`	`2127`	`case KeywordCompletionFilters.FunctionLikeBodyKeywords:`
`2128`		`- return !isClassMemberCompletionKeyword(kind);`
	`2128`	`+ return isFunctionLikeBodyKeyword(kind);`
`2129`	`2129`	`case KeywordCompletionFilters.TypeKeywords:`
`2130`	`2130`	`return isTypeKeyword(kind);`
`2131`	`2131`	`default:`
`@@ -2151,6 +2151,10 @@ namespace ts.Completions {`
`2151`	`2151`	`}`
`2152`	`2152`	`}`
`2153`	`2153`
	`2154`	`+ function isFunctionLikeBodyKeyword(kind: SyntaxKind) {`
	`2155`	`+ return kind === SyntaxKind.AsyncKeyword \|\| !isClassMemberCompletionKeyword(kind);`
	`2156`	`+ }`
	`2157`	`+`
`2154`	`2158`	`function keywordForNode(node: Node): SyntaxKind {`
`2155`	`2159`	`return isIdentifier(node) ? node.originalKeywordKind \|\| SyntaxKind.Unknown : node.kind;`
`2156`	`2160`	`}`