Oct 28, 2021 · Sep 10, 2021 · Sep 17, 2021 · Sep 20, 2021 · Sep 21, 2021 · Sep 22, 2021
diff --git a/src/services/completions.ts b/src/services/completions.ts
        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.
            // Note: this assumes we won't have more than one body in the completion nodes, which should be the case.
            const emptyStatement = factory.createExpressionStatement(factory.createIdentifier(""));
            setSnippetElement(emptyStatement, { kind: SnippetKind.TabStop, order: 0 });
            body = factory.createBlock([emptyStatement], /* multiline */ true);
            const emptyStatement1 = factory.createExpressionStatement(factory.createIdentifier(""));
            setSnippetElement(emptyStatement1, { kind: SnippetKind.TabStop, order: 1 });
            tabstopStart = 2;
            body = factory.createBlock([emptyStatement1], /* multiline */ true);
        }
        else {
            body = factory.createBlock([], /* multiline */ true);

        if (completionNodes.length) {
            if (preferences.includeCompletionsWithSnippetText) {
                addSnippets(completionNodes);
                addSnippets(completionNodes, tabstopStart);
            }
            insertText = printer.printSnippetList(ListFormat.MultiLine, factory.createNodeArray(completionNodes), sourceFile);
        }
        return undefined;
    }

    function addSnippets(nodes: Node[]): void {
        let order =1;
    function addSnippets(nodes: Node[], orderStart: number): void {
        let order =orderStart;
        for (const node of nodes) {
            addSnippetsWorker(node, /*parent*/ undefined);
        }
diff --git a/tests/cases/fourslash/completionsOverridingMethod2.ts b/tests/cases/fourslash/completionsOverridingMethod2.ts
            },
            isSnippet: true,
            insertText:
 "\"\\$usd\"(${1:a}: ${2:number}): ${3:number} {\n    $0\n}\n",
 "\"\\$usd\"(${2:a}: ${3:number}): ${4:number} {\n    $1\n}\n",
        }
    ],
 });
diff --git a/tests/cases/fourslash/completionsOverridingProperties.ts b/tests/cases/fourslash/completionsOverridingProperties.ts
 /// <reference path="fourslash.ts" />

 // @newline: LF
 // @Filename: a.ts
 // Case: Properties
 ////class Base {
 ////    protected foo: string = "bar";
 ////
 ////}
 ////
 ////class Sub extends Base {
 ////    /*a*/
 ////}




 verify.completions({
    marker: "a",
    isNewIdentifierLocation: true,
    preferences: {
        includeCompletionsWithInsertText: true,
        includeCompletionsWithSnippetText: false,
        includeCompletionsWithClassMemberSnippets: true,
    },
    includes: [
        {
            name: "foo",
            sortText: completion.SortText.LocationPriority,
            replacementSpan: {
                fileName: "",
                pos: 0,
                end: 0,
            },
            insertText:
 "protected foo: string;\n",
        }
    ],
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -849,13 +849,15 @@ 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.
		// Note: this assumes we won't have more than one body in the completion nodes, which should be the case.
		const emptyStatement = factory.createExpressionStatement(factory.createIdentifier(""));
		setSnippetElement(emptyStatement, { kind: SnippetKind.TabStop, order: 0 });
		body = factory.createBlock([emptyStatement], /* multiline */ true);
		const emptyStatement1 = factory.createExpressionStatement(factory.createIdentifier(""));
		setSnippetElement(emptyStatement1, { kind: SnippetKind.TabStop, order: 1 });
		tabstopStart = 2;
		body = factory.createBlock([emptyStatement1], /* multiline */ true);
		}
		else {
		body = factory.createBlock([], /* multiline */ true);
Expand DownExpand Up		@@ -914,7 +916,7 @@ namespace ts.Completions {

		if (completionNodes.length) {
		if (preferences.includeCompletionsWithSnippetText) {
		addSnippets(completionNodes);
		addSnippets(completionNodes, tabstopStart);
		}
		insertText = printer.printSnippetList(ListFormat.MultiLine, factory.createNodeArray(completionNodes), sourceFile);
		}
Expand DownExpand Up		@@ -963,8 +965,8 @@ namespace ts.Completions {
		return undefined;
		}

		function addSnippets(nodes: Node[]): void {
		let order =1;
		function addSnippets(nodes: Node[], orderStart: number): void {
		let order =orderStart;
		for (const node of nodes) {
		addSnippetsWorker(node, /parent/ undefined);
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,7 +30,7 @@ verify.completions({
		},
		isSnippet: true,
		insertText:
		"\"\\$usd\"(${1:a}: ${2:number}): ${3:number} {\n $0\n}\n",
		"\"\\$usd\"(${2:a}: ${3:number}): ${4:number} {\n $1\n}\n",
		}
		],
		});
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,39 @@
		/// <reference path="fourslash.ts" />

		// @newline: LF
		// @Filename: a.ts
		// Case: Properties
		////class Base {
		//// protected foo: string = "bar";
		////
		////}
		////
		////class Sub extends Base {
		//// /a/
		////}




		verify.completions({
		marker: "a",
		isNewIdentifierLocation: true,
		preferences: {
		includeCompletionsWithInsertText: true,
		includeCompletionsWithSnippetText: false,
		includeCompletionsWithClassMemberSnippets: true,
		},
		includes: [
		{
		name: "foo",
		sortText: completion.SortText.LocationPriority,
		replacementSpan: {
		fileName: "",
		pos: 0,
		end: 0,
		},
		insertText:
		"protected foo: string;\n",
		}
		],
		});