From 149cede9e6bd54383ceb3959bef50bdb8585a689 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 1 Mar 2016 12:32:25 +0100 Subject: [PATCH] PluginsRegistry -> ExtensionsRegistry --- .../browser/standalone/standaloneCodeEditor.ts | 4 ++-- .../editor/common/services/modeServiceImpl.ts | 6 +++--- src/vs/editor/node/textMate/TMSnippets.ts | 6 +++--- src/vs/editor/node/textMate/TMSyntax.ts | 6 +++--- .../platform/actions/common/actionsService.ts | 8 ++++---- .../common/configurationRegistry.ts | 4 ++-- .../extensions/common/abstractPluginService.ts | 10 +++++----- ...luginsRegistry.ts => extensionsRegistry.ts} | 18 +++++++++--------- .../extensions/common/nativePluginService.ts | 8 ++++---- .../extensions/node/pluginVersionValidator.ts | 2 +- .../common/jsonValidationExtensionPoint.ts | 4 ++-- .../platform/markers/common/problemMatcher.ts | 2 +- src/vs/workbench/api/node/extHost.api.impl.ts | 6 +++--- src/vs/workbench/node/extensionPoints.ts | 4 ++-- src/vs/workbench/node/pluginHostMain.ts | 8 ++++---- .../debug/node/debugConfigurationManager.ts | 4 ++-- src/vs/workbench/parts/tasks/common/tasks.ts | 2 +- .../electron-browser/keybindingService.ts | 8 ++++---- .../services/themes/node/themeService.ts | 6 +++--- 19 files changed, 58 insertions(+), 58 deletions(-) rename src/vs/platform/extensions/common/{pluginsRegistry.ts => extensionsRegistry.ts} (96%) diff --git a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts index 32881d435cb..d3397d0627d 100644 --- a/src/vs/editor/browser/standalone/standaloneCodeEditor.ts +++ b/src/vs/editor/browser/standalone/standaloneCodeEditor.ts @@ -11,7 +11,7 @@ import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {IEditorService} from 'vs/platform/editor/common/editor'; -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {createInstantiationService} from 'vs/platform/instantiation/common/instantiationService'; import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; @@ -447,7 +447,7 @@ export function createCustomMode(language:ILanguage): TPromise { export function registerStandaloneLanguage(language:ILanguageExtensionPoint, defModule:string): void { ModesRegistry.registerLanguage(language); - PluginsRegistry.registerOneTimeActivationEventListener('onLanguage:' + language.id, () => { + ExtensionsRegistry.registerOneTimeActivationEventListener('onLanguage:' + language.id, () => { require([defModule], (value:{language:ILanguage}) => { if (!value.language) { console.error('Expected ' + defModule + ' to export a `language`'); diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index 291f37ecf4e..b322f18d5c5 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -13,7 +13,7 @@ import * as paths from 'vs/base/common/paths'; import {TPromise} from 'vs/base/common/winjs.base'; import {createAsyncDescriptor0, createAsyncDescriptor1} from 'vs/platform/instantiation/common/descriptors'; import {IExtensionService} from 'vs/platform/extensions/common/extensions'; -import {IExtensionPointUser, IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IExtensionPointUser, IExtensionMessageCollector, ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {IThreadService, Remotable, ThreadAffinity} from 'vs/platform/thread/common/thread'; import * as modes from 'vs/editor/common/modes'; import {FrankensteinMode} from 'vs/editor/common/modes/abstractMode'; @@ -35,7 +35,7 @@ import {IModelService} from 'vs/editor/common/services/modelService'; interface IModeConfigurationMap { [modeId: string]: any; } -let languagesExtPoint = PluginsRegistry.registerExtensionPoint('languages', { +let languagesExtPoint = ExtensionsRegistry.registerExtensionPoint('languages', { description: nls.localize('vscode.extension.contributes.languages', 'Contributes language declarations.'), type: 'array', defaultSnippets: [{ body: [{ id: '', aliases: [], extensions: [] }] }], @@ -106,7 +106,7 @@ function isUndefinedOrStringArray(value: string[]): boolean { return value.every(item => typeof item === 'string'); } -function isValidLanguageExtensionPoint(value:ILanguageExtensionPoint, collector:IMessageCollector): boolean { +function isValidLanguageExtensionPoint(value:ILanguageExtensionPoint, collector:IExtensionMessageCollector): boolean { if (!value) { collector.error(nls.localize('invalid.empty', "Empty value for `contributes.{0}`", languagesExtPoint.name)); return false; diff --git a/src/vs/editor/node/textMate/TMSnippets.ts b/src/vs/editor/node/textMate/TMSnippets.ts index 4414dd24f33..ea88d06e415 100644 --- a/src/vs/editor/node/textMate/TMSnippets.ts +++ b/src/vs/editor/node/textMate/TMSnippets.ts @@ -9,7 +9,7 @@ import {parse} from 'vs/base/common/json'; import * as paths from 'vs/base/common/paths'; import {TPromise} from 'vs/base/common/winjs.base'; import {readFile} from 'vs/base/node/pfs'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IExtensionMessageCollector, ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {ISuggestion} from 'vs/editor/common/modes'; import {SnippetsRegistry} from 'vs/editor/common/modes/supports'; import {IModeService} from 'vs/editor/common/services/modeService'; @@ -30,7 +30,7 @@ export function snippetUpdated(modeId: string, filePath: string): TPromise }); } -let snippetsExtensionPoint = PluginsRegistry.registerExtensionPoint('snippets', { +let snippetsExtensionPoint = ExtensionsRegistry.registerExtensionPoint('snippets', { description: nls.localize('vscode.extension.contributes.snippets', 'Contributes textmate snippets.'), type: 'array', defaultSnippets: [ { body: [{ language: '', path: '' }] }], @@ -71,7 +71,7 @@ export class MainProcessTextMateSnippet { }); } - private _withTMSnippetContribution(extensionFolderPath:string, snippet:ITMSnippetsExtensionPoint, collector:IMessageCollector): void { + private _withTMSnippetContribution(extensionFolderPath:string, snippet:ITMSnippetsExtensionPoint, collector:IExtensionMessageCollector): void { if (!snippet.language || (typeof snippet.language !== 'string') || !this._modeService.isRegisteredMode(snippet.language)) { collector.error(nls.localize('invalid.language', "Unknown language in `contributes.{0}.language`. Provided value: {1}", snippetsExtensionPoint.name, String(snippet.language))); return; diff --git a/src/vs/editor/node/textMate/TMSyntax.ts b/src/vs/editor/node/textMate/TMSyntax.ts index 27f58c15964..6ada2636258 100644 --- a/src/vs/editor/node/textMate/TMSyntax.ts +++ b/src/vs/editor/node/textMate/TMSyntax.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import {onUnexpectedError} from 'vs/base/common/errors'; import * as paths from 'vs/base/common/paths'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IExtensionMessageCollector, ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {Bracket, ILineTokens, IMode, IToken, ITokenizationSupport} from 'vs/editor/common/modes'; import {TMState} from 'vs/editor/common/modes/TMState'; import {Token} from 'vs/editor/common/modes/supports'; @@ -20,7 +20,7 @@ export interface ITMSyntaxExtensionPoint { path: string; } -let grammarsExtPoint = PluginsRegistry.registerExtensionPoint('grammars', { +let grammarsExtPoint = ExtensionsRegistry.registerExtensionPoint('grammars', { description: nls.localize('vscode.extension.contributes.grammars', 'Contributes textmate tokenizers.'), type: 'array', defaultSnippets: [ { body: [{ id: '', extensions: [] }] }], @@ -70,7 +70,7 @@ export class MainProcessTextMateSyntax { }); } - private _handleGrammarExtensionPointUser(extensionFolderPath:string, syntax:ITMSyntaxExtensionPoint, collector: IMessageCollector): void { + private _handleGrammarExtensionPointUser(extensionFolderPath:string, syntax:ITMSyntaxExtensionPoint, collector: IExtensionMessageCollector): void { if (syntax.language && ((typeof syntax.language !== 'string') || !this._modeService.isRegisteredMode(syntax.language))) { collector.error(nls.localize('invalid.language', "Unknown language in `contributes.{0}.language`. Provided value: {1}", grammarsExtPoint.name, String(syntax.language))); return; diff --git a/src/vs/platform/actions/common/actionsService.ts b/src/vs/platform/actions/common/actionsService.ts index a29c2d59992..7d8c08bfaa4 100644 --- a/src/vs/platform/actions/common/actionsService.ts +++ b/src/vs/platform/actions/common/actionsService.ts @@ -8,7 +8,7 @@ import {localize} from 'vs/nls'; import {Action, IAction} from 'vs/base/common/actions'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; import {IExtensionService} from 'vs/platform/extensions/common/extensions'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IExtensionMessageCollector, ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IActionsService} from './actions'; @@ -63,7 +63,7 @@ let commandType: IJSONSchema = { } } }; -let commandsExtPoint = PluginsRegistry.registerExtensionPoint('commands', { +let commandsExtPoint = ExtensionsRegistry.registerExtensionPoint('commands', { description: localize('vscode.extension.contributes.commands', "Contributes commands to the command palette."), oneOf: [ commandType, @@ -92,7 +92,7 @@ export default class ActionsService implements IActionsService { }); } - private _onDescription(commands: Command | Command[], collector: IMessageCollector): void { + private _onDescription(commands: Command | Command[], collector: IExtensionMessageCollector): void { if (isCommands(commands)) { for (let command of commands) { this._handleCommand(command, collector); @@ -102,7 +102,7 @@ export default class ActionsService implements IActionsService { } } - private _handleCommand(command: Command, collector: IMessageCollector): void { + private _handleCommand(command: Command, collector: IExtensionMessageCollector): void { let rejects: string[] = []; diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index dbfc54d9580..19e7cd4837c 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -9,7 +9,7 @@ import Event, {Emitter} from 'vs/base/common/event'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import platform = require('vs/platform/platform'); import objects = require('vs/base/common/objects'); -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); @@ -93,7 +93,7 @@ class ConfigurationRegistry implements IConfigurationRegistry { const configurationRegistry = new ConfigurationRegistry(); platform.Registry.add(Extensions.Configuration, configurationRegistry); -let configurationExtPoint = PluginsRegistry.registerExtensionPoint('configuration', { +let configurationExtPoint = ExtensionsRegistry.registerExtensionPoint('configuration', { description: nls.localize('vscode.extension.contributes.configuration', 'Contributes configuration settings.'), type: 'object', defaultSnippets: [{ body: { title: '', properties: {} } }], diff --git a/src/vs/platform/extensions/common/abstractPluginService.ts b/src/vs/platform/extensions/common/abstractPluginService.ts index d494f027ac1..9e402a1b945 100644 --- a/src/vs/platform/extensions/common/abstractPluginService.ts +++ b/src/vs/platform/extensions/common/abstractPluginService.ts @@ -9,7 +9,7 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; import {IMessage, IExtensionDescription, IExtensionService, IExtensionsStatus} from 'vs/platform/extensions/common/extensions'; -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; const hasOwnProperty = Object.hasOwnProperty; @@ -93,15 +93,15 @@ export abstract class AbstractPluginService implement public activateByEvent(activationEvent: string): TPromise { return this._onReady.then(() => { - PluginsRegistry.triggerActivationEventListeners(activationEvent); - let activatePlugins = PluginsRegistry.getPluginDescriptionsForActivationEvent(activationEvent); + ExtensionsRegistry.triggerActivationEventListeners(activationEvent); + let activatePlugins = ExtensionsRegistry.getPluginDescriptionsForActivationEvent(activationEvent); return this._activatePlugins(activatePlugins, 0); }); } public activateById(pluginId: string): TPromise { return this._onReady.then(() => { - let desc = PluginsRegistry.getPluginDescription(pluginId); + let desc = ExtensionsRegistry.getPluginDescription(pluginId); if (!desc) { throw new Error('Plugin `' + pluginId + '` is not known'); } @@ -120,7 +120,7 @@ export abstract class AbstractPluginService implement for (let j = 0, lenJ = depIds.length; j < lenJ; j++) { let depId = depIds[j]; - let depDesc = PluginsRegistry.getPluginDescription(depId); + let depDesc = ExtensionsRegistry.getPluginDescription(depId); if (!depDesc) { // Error condition 1: unknown dependency diff --git a/src/vs/platform/extensions/common/pluginsRegistry.ts b/src/vs/platform/extensions/common/extensionsRegistry.ts similarity index 96% rename from src/vs/platform/extensions/common/pluginsRegistry.ts rename to src/vs/platform/extensions/common/extensionsRegistry.ts index 61b052e48c9..0c1a3e16086 100644 --- a/src/vs/platform/extensions/common/pluginsRegistry.ts +++ b/src/vs/platform/extensions/common/extensionsRegistry.ts @@ -13,7 +13,7 @@ import {IActivationEventListener, IMessage, IExtensionDescription, IPointListene import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {Registry} from 'vs/platform/platform'; -export interface IMessageCollector { +export interface IExtensionMessageCollector { error(message: any): void; warn(message: any): void; info(message: any): void; @@ -23,10 +23,10 @@ export interface IPluginsMessageCollector { error(source: string, message: any): void; warn(source: string, message: any): void; info(source: string, message: any): void; - scopeTo(source: string): IMessageCollector; + scopeTo(source: string): IExtensionMessageCollector; } -class ScopedMessageCollector implements IMessageCollector { +class ScopedMessageCollector implements IExtensionMessageCollector { private _scope: string; private _actual: IPluginsMessageCollector; @@ -87,7 +87,7 @@ class PluginsMessageForwarder implements IPluginsMessageCollector { this._pushMessage(Severity.Info, source, message); } - public scopeTo(source: string): IMessageCollector { + public scopeTo(source: string): IExtensionMessageCollector { return new ScopedMessageCollector(source, this); } } @@ -131,7 +131,7 @@ export class PluginsMessageCollector implements IPluginsMessageCollector { this._pushMessage(Severity.Info, source, message); } - public scopeTo(source: string): IMessageCollector { + public scopeTo(source: string): IExtensionMessageCollector { return new ScopedMessageCollector(source, this); } } @@ -206,7 +206,7 @@ let schemaRegistry = Registry.as(Extensions.JSONContr export interface IExtensionPointUser { description: IExtensionDescription; value: T; - collector: IMessageCollector; + collector: IExtensionMessageCollector; } export interface IExtensionPointHandler { @@ -520,10 +520,10 @@ function _isStringArray(arr: string[]): boolean { } const PRExtensions = { - PluginsRegistry: 'PluginsRegistry' + ExtensionsRegistry: 'ExtensionsRegistry' }; -Registry.add(PRExtensions.PluginsRegistry, new PluginsRegistryImpl()); -export const PluginsRegistry: IPluginsRegistry = Registry.as(PRExtensions.PluginsRegistry); +Registry.add(PRExtensions.ExtensionsRegistry, new PluginsRegistryImpl()); +export const ExtensionsRegistry: IPluginsRegistry = Registry.as(PRExtensions.ExtensionsRegistry); schemaRegistry.registerSchema(schemaId, schema); schemaRegistry.addSchemaFileAssociation('/package.json', schemaId); \ No newline at end of file diff --git a/src/vs/platform/extensions/common/nativePluginService.ts b/src/vs/platform/extensions/common/nativePluginService.ts index 175ec23208e..6752bf29e4f 100644 --- a/src/vs/platform/extensions/common/nativePluginService.ts +++ b/src/vs/platform/extensions/common/nativePluginService.ts @@ -11,7 +11,7 @@ import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; import {AbstractPluginService, ActivatedPlugin, IPluginContext, IPluginMemento} from 'vs/platform/extensions/common/abstractPluginService'; import {IMessage, IExtensionDescription, IExtensionsStatus} from 'vs/platform/extensions/common/extensions'; -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {IMessageService} from 'vs/platform/message/common/message'; import {PluginHostStorage} from 'vs/platform/storage/common/remotable.storage'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; @@ -110,7 +110,7 @@ export class MainProcessPluginService extends AbstractPluginService { + ExtensionsRegistry.handleExtensionPoints((severity, source, message) => { this.showMessage(severity, source, message); }); } @@ -215,7 +215,7 @@ export class MainProcessPluginService extends AbstractPluginService { diff --git a/src/vs/platform/extensions/node/pluginVersionValidator.ts b/src/vs/platform/extensions/node/pluginVersionValidator.ts index 3488af6101e..8e963f46835 100644 --- a/src/vs/platform/extensions/node/pluginVersionValidator.ts +++ b/src/vs/platform/extensions/node/pluginVersionValidator.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import {IExtensionDescription} from 'vs/platform/extensions/common/extensions'; -import {isValidPluginDescription as baseIsValidPluginDescription} from 'vs/platform/extensions/common/pluginsRegistry'; +import {isValidPluginDescription as baseIsValidPluginDescription} from 'vs/platform/extensions/common/extensionsRegistry'; import {valid} from 'semver'; export interface IParsedVersion { diff --git a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts index bd98b4dc6fb..e4ad1118c14 100644 --- a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -5,7 +5,7 @@ 'use strict'; import nls = require('vs/nls'); -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {Registry} from 'vs/platform/platform'; import URI from 'vs/base/common/uri'; import JSONContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); @@ -19,7 +19,7 @@ interface IJSONValidationExtensionPoint { let schemaRegistry = Registry.as(JSONContributionRegistry.Extensions.JSONContribution); -let configurationExtPoint = PluginsRegistry.registerExtensionPoint('jsonValidation', { +let configurationExtPoint = ExtensionsRegistry.registerExtensionPoint('jsonValidation', { description: nls.localize('contributes.jsonValidation', 'Contributes json schema configuration.'), type: 'array', defaultSnippets: [{ body: [{ fileMatch: '{{file.json}}', url: '{{url}}' }] }], diff --git a/src/vs/platform/markers/common/problemMatcher.ts b/src/vs/platform/markers/common/problemMatcher.ts index 607d88ec9e8..04cb327174b 100644 --- a/src/vs/platform/markers/common/problemMatcher.ts +++ b/src/vs/platform/markers/common/problemMatcher.ts @@ -1000,7 +1000,7 @@ export class ProblemMatcherParser extends Parser { } } -// let problemMatchersExtPoint = PluginsRegistry.registerExtensionPoint('problemMatchers', { +// let problemMatchersExtPoint = ExtensionsRegistry.registerExtensionPoint('problemMatchers', { // TODO@Dirk: provide here JSON schema for extension point // }); diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index bb08a2b146b..95af5d8f0b1 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -31,7 +31,7 @@ import {IDisposable} from 'vs/base/common/lifecycle'; import EditorCommon = require('vs/editor/common/editorCommon'); import {IExtensionService, IExtensionDescription} from 'vs/platform/extensions/common/extensions'; import {PluginHostPluginService} from 'vs/platform/extensions/common/nativePluginService'; -import {PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {TPromise} from 'vs/base/common/winjs.base'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {CancellationTokenSource} from 'vs/base/common/cancellation'; @@ -372,13 +372,13 @@ export class ExtHostAPIImplementation { // this.extensions = { getExtension(extensionId: string):Extension { - let desc = PluginsRegistry.getPluginDescription(extensionId); + let desc = ExtensionsRegistry.getPluginDescription(extensionId); if (desc) { return new Extension( extensionService, desc); } }, get all():Extension[] { - return PluginsRegistry.getAllPluginDescriptions().map((desc) => new Extension( extensionService, desc)); + return ExtensionsRegistry.getAllPluginDescriptions().map((desc) => new Extension( extensionService, desc)); } }; diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts index 01de5d5d937..c64427d73bc 100644 --- a/src/vs/workbench/node/extensionPoints.ts +++ b/src/vs/workbench/node/extensionPoints.ts @@ -12,7 +12,7 @@ import {groupBy, values} from 'vs/base/common/collections'; import paths = require('vs/base/common/paths'); import json = require('vs/base/common/json'); import Types = require('vs/base/common/types'); -import {IPluginsMessageCollector, IMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IPluginsMessageCollector, IExtensionMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry'; import {isValidPluginDescription} from 'vs/platform/extensions/node/pluginVersionValidator'; import * as semver from 'semver'; @@ -69,7 +69,7 @@ export class PluginScanner { * Strings to replace are one values of a key. So for example string[] are ignored. * This is done to speed things up. */ - private static replaceStrings(literal: T, messages: { [key: string]: string; }, builder: IMessageCollector): void { + private static replaceStrings(literal: T, messages: { [key: string]: string; }, builder: IExtensionMessageCollector): void { Object.keys(literal).forEach(key => { if (literal.hasOwnProperty(key)) { let value = literal[key]; diff --git a/src/vs/workbench/node/pluginHostMain.ts b/src/vs/workbench/node/pluginHostMain.ts index 65a6e89e28b..5c7e7e258ff 100644 --- a/src/vs/workbench/node/pluginHostMain.ts +++ b/src/vs/workbench/node/pluginHostMain.ts @@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import paths = require('vs/base/common/paths'); import {IExtensionService, IExtensionDescription} from 'vs/platform/extensions/common/extensions'; -import {PluginsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry'; import {ExtHostAPIImplementation} from 'vs/workbench/api/node/extHost.api.impl'; import {IPluginsIPC} from 'vs/platform/extensions/common/ipcRemoteCom'; import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments'; @@ -117,7 +117,7 @@ export class PluginHostMain { this._isTerminating = true; try { - let allExtensions = PluginsRegistry.getAllPluginDescriptions(); + let allExtensions = ExtensionsRegistry.getAllPluginDescriptions(); let allExtensionsIds = allExtensions.map(ext => ext.id); let activatedExtensions = allExtensionsIds.filter(id => this._extensionService.isActivated(id)); @@ -145,7 +145,7 @@ export class PluginHostMain { }) .then(extensions => { // Register & Signal done - PluginsRegistry.registerPlugins(extensions); + ExtensionsRegistry.registerPlugins(extensions); this._extensionService.registrationDone(collector.getMessages()); }) .then(() => this.handleEagerPlugins()) @@ -204,7 +204,7 @@ export class PluginHostMain { [filename: string]: boolean; } = {}; - PluginsRegistry.getAllPluginDescriptions().forEach((desc) => { + ExtensionsRegistry.getAllPluginDescriptions().forEach((desc) => { let activationEvents = desc.activationEvents; if (!activationEvents) { return; diff --git a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts index 63aefc2573c..c3323ed0c3e 100644 --- a/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/node/debugConfigurationManager.ts @@ -12,7 +12,7 @@ import { Schemas } from 'vs/base/common/network'; import paths = require('vs/base/common/paths'); import { IJSONSchema } from 'vs/base/common/jsonSchema'; import editor = require('vs/editor/common/editorCommon'); -import pluginsRegistry = require('vs/platform/extensions/common/pluginsRegistry'); +import extensionsRegistry = require('vs/platform/extensions/common/extensionsRegistry'); import platform = require('vs/platform/platform'); import jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; @@ -27,7 +27,7 @@ import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickO // debuggers extension point -export var debuggersExtPoint = pluginsRegistry.PluginsRegistry.registerExtensionPoint('debuggers', { +export var debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint('debuggers', { description: nls.localize('vscode.extension.contributes.debuggers', 'Contributes debug adapters.'), type: 'array', defaultSnippets: [{ body: [{ type: '', extensions: [] }] }], diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index edec04c296c..1e18c19f5d7 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -244,7 +244,7 @@ export class TaskParser extends Parser { } } -// let tasksExtPoint = PluginsRegistry.registerExtensionPoint('tasks', { +// let tasksExtPoint = ExtensionsRegistry.registerExtensionPoint('tasks', { // TODO@Dirk: provide JSON schema here // }); diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts index b25bd64a60b..750e9f09c0b 100644 --- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts @@ -12,7 +12,7 @@ import * as platform from 'vs/base/common/platform'; import {TPromise} from 'vs/base/common/winjs.base'; import {IEventService} from 'vs/platform/event/common/event'; import {IExtensionService} from 'vs/platform/extensions/common/extensions'; -import {IMessageCollector, PluginsRegistry} from 'vs/platform/extensions/common/pluginsRegistry'; +import {IExtensionMessageCollector, ExtensionsRegistry} from 'vs/platform/extensions/common/extensionsRegistry'; import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {KeybindingService} from 'vs/platform/keybinding/browser/keybindingServiceImpl'; import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; @@ -100,7 +100,7 @@ let keybindingType:IJSONSchema = { } }; -let keybindingsExtPoint = PluginsRegistry.registerExtensionPoint('keybindings', { +let keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint('keybindings', { description: nls.localize('vscode.extension.contributes.keybindings', "Contributes keybindings."), oneOf: [ keybindingType, @@ -209,7 +209,7 @@ export class WorkbenchKeybindingService extends KeybindingService { return super.getElectronAcceleratorFor(keybinding); } - private _handleKeybindingsExtensionPointUser(isBuiltin: boolean, keybindings:ContributedKeyBinding | ContributedKeyBinding[], collector:IMessageCollector): boolean { + private _handleKeybindingsExtensionPointUser(isBuiltin: boolean, keybindings:ContributedKeyBinding | ContributedKeyBinding[], collector:IExtensionMessageCollector): boolean { if (isContributedKeyBindingsArray(keybindings)) { let commandAdded = false; for (let i = 0, len = keybindings.length; i < len; i++) { @@ -221,7 +221,7 @@ export class WorkbenchKeybindingService extends KeybindingService { } } - private _handleKeybinding(isBuiltin: boolean, idx:number, keybindings:ContributedKeyBinding, collector:IMessageCollector): boolean { + private _handleKeybinding(isBuiltin: boolean, idx:number, keybindings:ContributedKeyBinding, collector:IExtensionMessageCollector): boolean { let rejects: string[] = []; let commandAdded = false; diff --git a/src/vs/workbench/services/themes/node/themeService.ts b/src/vs/workbench/services/themes/node/themeService.ts index 428e8b9b0e1..8a8120968d6 100644 --- a/src/vs/workbench/services/themes/node/themeService.ts +++ b/src/vs/workbench/services/themes/node/themeService.ts @@ -10,7 +10,7 @@ import Paths = require('vs/base/common/paths'); import Themes = require('vs/platform/theme/common/themes'); import {IThemeExtensionPoint} from 'vs/platform/theme/common/themeExtensionPoint'; import {IExtensionService} from 'vs/platform/extensions/common/extensions'; -import {PluginsRegistry, IMessageCollector} from 'vs/platform/extensions/common/pluginsRegistry'; +import {ExtensionsRegistry, IExtensionMessageCollector} from 'vs/platform/extensions/common/extensionsRegistry'; import {IThemeService, IThemeData, DEFAULT_THEME_ID} from 'vs/workbench/services/themes/common/themeService'; import plist = require('vs/base/node/plist'); @@ -20,7 +20,7 @@ import pfs = require('vs/base/node/pfs'); let defaultBaseTheme = Themes.getBaseThemeId(DEFAULT_THEME_ID); -let themesExtPoint = PluginsRegistry.registerExtensionPoint('themes', { +let themesExtPoint = ExtensionsRegistry.registerExtensionPoint('themes', { description: nls.localize('vscode.extension.contributes.themes', 'Contributes textmate color themes.'), type: 'array', defaultSnippets: [{ body: [{ label: '{{label}}', uiTheme: 'vs-dark', path: './themes/{{id}}.tmTheme.' }] }], @@ -84,7 +84,7 @@ export class ThemeService implements IThemeService { }); } - private onThemes(extensionFolderPath: string, extensionId: string, themes: IThemeExtensionPoint[], collector: IMessageCollector): void { + private onThemes(extensionFolderPath: string, extensionId: string, themes: IThemeExtensionPoint[], collector: IExtensionMessageCollector): void { if (!Array.isArray(themes)) { collector.error(nls.localize( 'reqarray',