remove placeholders in class member snippets (#46598)

microsoft · Oct 29, 2021 · 6b1e8f7 · 6b1e8f7
1 parent e3fab9f
commit 6b1e8f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 39 deletions.
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -857,15 +857,14 @@ namespace ts.Completions {
         const importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
 
         let body;
-        let tabstopStart = 1;
         if (preferences.includeCompletionsWithSnippetText) {
             isSnippet = true;
-            // We are adding a final tabstop (i.e. $0) in the body of the suggested member, if it has one.
+            // We are adding a tabstop (i.e. `$0`) in the body of the suggested member,
+            // if it has one, so that the cursor ends up in the body once the completion is inserted.
             // Note: this assumes we won't have more than one body in the completion nodes, which should be the case.
-            const emptyStatement1 = factory.createExpressionStatement(factory.createIdentifier(""));
-            setSnippetElement(emptyStatement1, { kind: SnippetKind.TabStop, order: 1 });
-            tabstopStart = 2;
-            body = factory.createBlock([emptyStatement1], /* multiline */ true);
+            const emptyStatement = factory.createExpressionStatement(factory.createIdentifier(""));
+            setSnippetElement(emptyStatement, { kind: SnippetKind.TabStop, order: 0 });
+            body = factory.createBlock([emptyStatement], /* multiline */ true);
         }
         else {
             body = factory.createBlock([], /* multiline */ true);
@@ -923,9 +922,6 @@ namespace ts.Completions {
             isAbstract);
 
         if (completionNodes.length) {
-            if (preferences.includeCompletionsWithSnippetText) {
-                addSnippets(completionNodes, tabstopStart);
-            }
             insertText = printer.printSnippetList(ListFormat.MultiLine, factory.createNodeArray(completionNodes), sourceFile);
         }
 
@@ -973,35 +969,6 @@ namespace ts.Completions {
         return undefined;
     }
 
-    function addSnippets(nodes: Node[], orderStart: number): void {
-        let order = orderStart;
-        for (const node of nodes) {
-            addSnippetsWorker(node, /*parent*/ undefined);
-        }
-
-        function addSnippetsWorker(node: Node, parent: Node | undefined) {
-            if (isVariableLike(node) && node.kind === SyntaxKind.Parameter) {
-                // Placeholder
-                setSnippetElement(node.name, { kind: SnippetKind.Placeholder, order });
-                order += 1;
-                if (node.type) {
-                    setSnippetElement(node.type, { kind: SnippetKind.Placeholder, order });
-                    order += 1;
-                }
-            }
-            else if (isTypeNode(node) && parent && isFunctionLikeDeclaration(parent)) {
-                setSnippetElement(node, { kind: SnippetKind.Placeholder, order });
-                order += 1;
-            }
-            else if (isTypeParameterDeclaration(node) && parent && isFunctionLikeDeclaration(parent)) {
-                setSnippetElement(node, { kind: SnippetKind.Placeholder, order });
-                order += 1;
-            }
-
-            forEachChild(node, child => addSnippetsWorker(child, node));
-        }
-    }
-
     function createSnippetPrinter(
         printerOptions: PrinterOptions,
     ) {

diff --git a/tests/cases/fourslash/completionsOverridingMethod2.ts b/tests/cases/fourslash/completionsOverridingMethod2.ts
@@ -30,7 +30,7 @@ verify.completions({
             },
             isSnippet: true,
             insertText:
-"\"\\$usd\"(${2:a}: ${3:number}): ${4:number} {\n    $1\n}\n",
+"\"\\$usd\"(a: number): number {\n    $0\n}\n",
         }
     ],
 });