Merge remote-tracking branch 'origin/master' into treeExplorerAPI

This commit is contained in:
Pine Wu
2016-10-24 11:08:03 -07:00
213 changed files with 5311 additions and 4300 deletions

View File

@@ -88,10 +88,10 @@ export class ExtHostContribution implements IWorkbenchContribution {
col.finish(true, this.threadService);
// Other interested parties
create(MainProcessTextMateSyntax);
let tmSyntax = create(MainProcessTextMateSyntax);
create(MainProcessTextMateSnippet);
create(JSONValidationExtensionPoint);
create(LanguageConfigurationFileHandler);
this.instantiationService.createInstance(LanguageConfigurationFileHandler, tmSyntax);
create(MainThreadFileSystemEventService);
create(SaveParticipant);
}