From 2678fffd7f886823aeaededb0d81d8479214ec23 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 13 Mar 2018 15:21:26 -0700
Subject: [PATCH] Fix optional insert text completions

Fixes https://github.com/Microsoft/TypeScript/issues/22125
---
 .../typescript/src/features/completionItemProvider.ts    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index 6f9ae5cee272b..3bb7417510570 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -71,8 +71,13 @@ class MyCompletionItem extends vscode.CompletionItem {
 		}
 
 		if (tsEntry.kindModifiers && tsEntry.kindModifiers.match(/\boptional\b/)) {
-			this.insertText = this.label;
-			this.filterText = this.label;
+			if (!this.insertText) {
+				this.insertText = this.label;
+			}
+
+			if (!this.filterText) {
+				this.filterText = this.label;
+			}
 			this.label += '?';
 		}
 	}