Merge pull request #1338 from DustinCampbell/project-json-triggers

DustinCampbell · web-flow · commit 4e9e98a65d2e · 2017-03-21T10:30:28.000-07:00
Add '"' and ':' as trigger characters for project.json completion
diff --git a/src/features/json/jsonContributions.ts b/src/features/json/jsonContributions.ts
@@ -45,7 +45,8 @@ export function addJSONProviders(): Disposable {
     let contributions = [new ProjectJSONContribution(xhr)];
     contributions.forEach(contribution => {
         let selector = contribution.getDocumentSelector();
-        subscriptions.push(languages.registerCompletionItemProvider(selector, new JSONCompletionItemProvider(contribution)));
+        let triggerCharacters = ['"', ':', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+        subscriptions.push(languages.registerCompletionItemProvider(selector, new JSONCompletionItemProvider(contribution), ...triggerCharacters));
         subscriptions.push(languages.registerHoverProvider(selector, new JSONHoverProvider(contribution)));
     });
 
diff --git a/src/features/json/projectJSONContribution.ts b/src/features/json/projectJSONContribution.ts
@@ -105,6 +105,7 @@ export class ProjectJSONContribution implements IJSONContribution {
                             let proposal = new CompletionItem(name);
                             proposal.kind = CompletionItemKind.Property;
                             proposal.insertText = insertText;
+                            proposal.filterText = JSON.stringify(name);
                             result.add(proposal);
                         }
                         if (results.length === LIMIT) {

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ export class ProjectJSONContribution implements IJSONContribution {`
`105`	`105`	`let proposal = new CompletionItem(name);`
`106`	`106`	`proposal.kind = CompletionItemKind.Property;`
`107`	`107`	`proposal.insertText = insertText;`
	`108`	`+ proposal.filterText = JSON.stringify(name);`
`108`	`109`	`result.add(proposal);`
`109`	`110`	`}`
`110`	`111`	`if (results.length === LIMIT) {`