From a10e4cb91118858296b477b771a73923a4040034 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Mon, 24 Feb 2020 15:53:08 -0800
Subject: [PATCH] Make sure we set the correct replacement range for dot member
 completions

Fixes #91105
---
 .../src/features/completions.ts               | 28 +++++++++++++------
 .../src/test/completions.test.ts              | 25 +++++++++++++++++
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/completions.ts b/extensions/typescript-language-features/src/features/completions.ts
index 52e82adf2a8..e2f8ba9fd37 100644
--- a/extensions/typescript-language-features/src/features/completions.ts
+++ b/extensions/typescript-language-features/src/features/completions.ts
@@ -83,7 +83,15 @@ class MyCompletionItem extends vscode.CompletionItem {
 		if (completionContext.isMemberCompletion && completionContext.dotAccessorContext) {
 			this.filterText = completionContext.dotAccessorContext.text + (this.insertText || this.label);
 			if (!this.range) {
-				this.range = completionContext.dotAccessorContext.range;
+				const replacementRange = this.getReplaceRange(line);
+				if (replacementRange) {
+					this.range = {
+						inserting: completionContext.dotAccessorContext.range,
+						replacing: completionContext.dotAccessorContext.range.union(replacementRange),
+					};
+				} else {
+					this.range = completionContext.dotAccessorContext.range;
+				}
 				this.insertText = this.filterText;
 			}
 		}
@@ -135,7 +143,6 @@ class MyCompletionItem extends vscode.CompletionItem {
 			} else {
 				return wordStart === '#' ? undefined : this.tsEntry.name.replace(/^#/, '');
 			}
-			return undefined;
 		}
 
 		// For `this.` completions, generally don't set the filter text since we don't want them to be overly prioritized. #74164
@@ -162,6 +169,16 @@ class MyCompletionItem extends vscode.CompletionItem {
 			return;
 		}
 
+		const replaceRange = this.getReplaceRange(line);
+		if (replaceRange) {
+			this.range = {
+				inserting: new vscode.Range(replaceRange.start, this.position),
+				replacing: replaceRange
+			};
+		}
+	}
+
+	private getReplaceRange(line: string) {
 		const wordRange = this.document.getWordRangeAtPosition(this.position);
 		let replaceRange = wordRange;
 
@@ -177,12 +194,7 @@ class MyCompletionItem extends vscode.CompletionItem {
 			}
 		}
 
-		if (replaceRange) {
-			this.range = {
-				inserting: new vscode.Range(replaceRange.start, this.position),
-				replacing: replaceRange
-			};
-		}
+		return replaceRange;
 	}
 
 	private static convertKind(kind: string): vscode.CompletionItemKind {
diff --git a/extensions/typescript-language-features/src/test/completions.test.ts b/extensions/typescript-language-features/src/test/completions.test.ts
index 20afd43678e..0c928fb4a39 100644
--- a/extensions/typescript-language-features/src/test/completions.test.ts
+++ b/extensions/typescript-language-features/src/test/completions.test.ts
@@ -622,4 +622,29 @@ suite('TypeScript Completions', () => {
 				`Config: ${config}`);
 		});
 	});
+
+	test('Replace should work after this. (#91105)', async () => {
+		await updateConfig(testDocumentUri, { [Config.insertMode]: 'replace' });
+
+		const editor = await createTestEditor(testDocumentUri,
+			`class A {`,
+			`  abc = 1`,
+			`  foo() {`,
+			`    this.$0abc`,
+			`  }`,
+			`}`,
+		);
+
+		await acceptFirstSuggestion(testDocumentUri, _disposables);
+
+		assertEditorContents(editor,
+			joinLines(
+				`class A {`,
+				`  abc = 1`,
+				`  foo() {`,
+				`    this.abc`,
+				`  }`,
+				`}`,
+			));
+	});
 });