From da7264c5b389b7f96f606c16c49de527bda0c1b4 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Wed, 27 Jul 2016 15:41:37 +0200
Subject: [PATCH] [json] set filter text for all property proposals

---
 extensions/javascript/src/features/bowerJSONContribution.ts    | 3 +++
 extensions/javascript/src/features/jsonContributions.ts        | 3 ---
 extensions/javascript/src/features/packageJSONContribution.ts  | 2 ++
 .../server/src/jsoncontributions/projectJSONContribution.ts    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/javascript/src/features/bowerJSONContribution.ts b/extensions/javascript/src/features/bowerJSONContribution.ts
index 5355c5b71de..ae8e664ccdd 100644
--- a/extensions/javascript/src/features/bowerJSONContribution.ts
+++ b/extensions/javascript/src/features/bowerJSONContribution.ts
@@ -71,6 +71,7 @@ export class BowerJSONContribution implements IJSONContribution {
 									let proposal = new CompletionItem(name);
 									proposal.kind = CompletionItemKind.Property;
 									proposal.insertText = insertText;
+									proposal.filterText = JSON.stringify(name);
 									proposal.documentation = description;
 									collector.add(proposal);
 								}
@@ -100,6 +101,7 @@ export class BowerJSONContribution implements IJSONContribution {
 					let proposal = new CompletionItem(name);
 					proposal.kind = CompletionItemKind.Property;
 					proposal.insertText = insertText;
+					proposal.filterText = JSON.stringify(name);
 					proposal.documentation = '';
 					collector.add(proposal);
 				});
@@ -115,6 +117,7 @@ export class BowerJSONContribution implements IJSONContribution {
 			// not implemented. Could be do done calling the bower command. Waiting for web API: https://github.com/bower/registry/issues/26
 			let proposal = new CompletionItem(localize('json.bower.latest.version', 'latest'));
 			proposal.insertText = '"{{latest}}"';
+			proposal.filterText = '""';
 			proposal.kind = CompletionItemKind.Value;
 			proposal.documentation = 'The latest version of the package';
 			collector.add(proposal);
diff --git a/extensions/javascript/src/features/jsonContributions.ts b/extensions/javascript/src/features/jsonContributions.ts
index d643212c42f..ffa70cbdc17 100644
--- a/extensions/javascript/src/features/jsonContributions.ts
+++ b/extensions/javascript/src/features/jsonContributions.ts
@@ -101,7 +101,6 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
 		} else {
 			overwriteRange = new Range(document.positionAt(offset - currentWord.length), position);
 		}
-		let filterText = document.getText(new Range(overwriteRange.start, position));
 
 		let proposed: { [key: string]: boolean } = {};
 		let collector: ISuggestionsCollector = {
@@ -109,8 +108,6 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
 				if (!proposed[suggestion.label]) {
 					proposed[suggestion.label] = true;
 					suggestion.textEdit = TextEdit.replace(overwriteRange, suggestion.insertText);
-					suggestion.filterText = filterText;
-
 					items.push(suggestion);
 				}
 			},
diff --git a/extensions/javascript/src/features/packageJSONContribution.ts b/extensions/javascript/src/features/packageJSONContribution.ts
index 1bda2b29f7e..cd1bc8e4d15 100644
--- a/extensions/javascript/src/features/packageJSONContribution.ts
+++ b/extensions/javascript/src/features/packageJSONContribution.ts
@@ -74,6 +74,7 @@ export class PackageJSONContribution implements IJSONContribution {
 										let proposal = new CompletionItem(name);
 										proposal.kind = CompletionItemKind.Property;
 										proposal.insertText = insertText;
+										proposal.filterText = JSON.stringify(name);
 										proposal.documentation = '';
 										collector.add(proposal);
 									}
@@ -105,6 +106,7 @@ export class PackageJSONContribution implements IJSONContribution {
 					let proposal = new CompletionItem(name);
 					proposal.kind = CompletionItemKind.Property;
 					proposal.insertText = insertText;
+					proposal.filterText = JSON.stringify(name);
 					proposal.documentation = '';
 					collector.add(proposal);
 				});
diff --git a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts
index 7c7ccb2eebd..813bd925a2b 100644
--- a/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts
+++ b/extensions/json/server/src/jsoncontributions/projectJSONContribution.ts
@@ -155,7 +155,7 @@ export class ProjectJSONContribution implements JSONWorkerContribution {
 									insertText += ',';
 								}
 							}
-							let item : CompletionItem = { kind: CompletionItemKind.Property, label: name, insertText: insertText };
+							let item : CompletionItem = { kind: CompletionItemKind.Property, label: name, insertText: insertText, filterText: JSON.stringify(name)};
 							if (!this.completeWithCache(name, item)) {
 								item.data = RESOLVE_ID + name;
 							}
-- 
GitLab