add completion filter for function like body (microsoft#21257)

Kingwl · mhegazy · commit d1ff12e0a69b · 2018-01-19T17:26:58.000-08:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -20,6 +20,7 @@ namespace ts.Completions {
         None,
         ClassElementKeywords,           // Keywords at class keyword
         ConstructorParameterKeywords,   // Keywords at constructor parameter
+        FunctionLikeBodyKeywords        // Keywords at function like body
     }
 
     export function getCompletionsAtPosition(
@@ -1060,6 +1061,10 @@ namespace ts.Completions {
                 return true;
             }
 
+            if (tryGetFunctionLikeBodyCompletionContainer(contextToken)) {
+                keywordFilters = KeywordCompletionFilters.FunctionLikeBodyKeywords;
+            }
+
             if (classLikeContainer = tryGetClassLikeCompletionContainer(contextToken)) {
                 // cursor inside class declaration
                 getGetClassLikeCompletionSymbols(classLikeContainer);
@@ -1688,6 +1693,22 @@ namespace ts.Completions {
             return undefined;
         }
 
+        function tryGetFunctionLikeBodyCompletionContainer(contextToken: Node): FunctionLikeDeclaration {
+            if (contextToken) {
+                let prev: Node;
+                const container = findAncestor(contextToken.parent, (node: Node) => {
+                    if (isClassLike(node)) {
+                        return "quit";
+                    }
+                    if (isFunctionLikeDeclaration(node) && prev === node.body) {
+                        return true;
+                    }
+                    prev = node;
+                });
+                return container && container as FunctionLikeDeclaration;
+            }
+        }
+
         function tryGetContainingJsxElement(contextToken: Node): JsxOpeningLikeElement {
             if (contextToken) {
                 const parent = contextToken.parent;
@@ -2126,6 +2147,8 @@ namespace ts.Completions {
                     return getFilteredKeywordCompletions(isClassMemberCompletionKeywordText);
                 case KeywordCompletionFilters.ConstructorParameterKeywords:
                     return getFilteredKeywordCompletions(isConstructorParameterCompletionKeywordText);
+                case KeywordCompletionFilters.FunctionLikeBodyKeywords:
+                    return getFilteredKeywordCompletions(isFunctionLikeBodyCompletionKeywordText);
                 default:
                     Debug.assertNever(keywordFilter);
             }
@@ -2188,6 +2211,26 @@ namespace ts.Completions {
         return isConstructorParameterCompletionKeyword(stringToToken(text));
     }
 
+    function isFunctionLikeBodyCompletionKeyword(kind: SyntaxKind) {
+        switch (kind) {
+            case SyntaxKind.PublicKeyword:
+            case SyntaxKind.PrivateKeyword:
+            case SyntaxKind.ProtectedKeyword:
+            case SyntaxKind.ReadonlyKeyword:
+            case SyntaxKind.ConstructorKeyword:
+            case SyntaxKind.StaticKeyword:
+            case SyntaxKind.AbstractKeyword:
+            case SyntaxKind.GetKeyword:
+            case SyntaxKind.SetKeyword:
+                return false;
+        }
+        return true;
+    }
+
+    function isFunctionLikeBodyCompletionKeywordText(text: string) {
+        return isFunctionLikeBodyCompletionKeyword(stringToToken(text));
+    }
+
     function isEqualityOperatorKind(kind: ts.SyntaxKind): kind is EqualityOperator {
         switch (kind) {
             case ts.SyntaxKind.EqualsEqualsEqualsToken:
diff --git a/tests/cases/fourslash/completionInFunctionLikeBody.ts b/tests/cases/fourslash/completionInFunctionLikeBody.ts
@@ -0,0 +1,43 @@
+/// <reference path='fourslash.ts'/>
+
+//// class Foo {
+////     bar () {
+////         /*1*/
+////         class Foo1 {
+////             bar1 () {
+////                 /*2*/
+////             }
+////             /*3*/
+////         }
+////     }
+////     /*4*/
+//// }
+    
+
+goTo.marker("1");
+verify.not.completionListContains("public", "public", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("private", "private", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("protected", "protected", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("constructor", "constructor", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("readonly", "readonly", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("static", "static", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("abstract", "abstract", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("get", "get", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("set", "set", /*documentation*/ undefined, "keyword");
+
+goTo.marker("2");
+verify.not.completionListContains("public", "public", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("private", "private", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("protected", "protected", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("constructor", "constructor", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("readonly", "readonly", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("static", "static", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("abstract", "abstract", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("get", "get", /*documentation*/ undefined, "keyword");
+verify.not.completionListContains("set", "set", /*documentation*/ undefined, "keyword");
+
+goTo.marker("3");
+verify.completionListContainsClassElementKeywords();
+
+goTo.marker("4");
+verify.completionListContainsClassElementKeywords();
diff --git a/tests/cases/fourslash/completionInJSDocFunctionNew.ts b/tests/cases/fourslash/completionInJSDocFunctionNew.ts
@@ -6,5 +6,5 @@
 ////var f = function () { return new/**/; }
 
 goTo.marker();
-verify.completionListCount(116);
+verify.completionListCount(107);
 verify.completionListContains('new');
diff --git a/tests/cases/fourslash/completionInJSDocFunctionThis.ts b/tests/cases/fourslash/completionInJSDocFunctionThis.ts
@@ -5,5 +5,5 @@
 ////var f = function (s) { return this/**/; }
 
 goTo.marker();
-verify.completionListCount(117);
+verify.completionListCount(108);
 verify.completionListContains('this')
