From 533844ab8de02eb72860fb4519912d9ff87b52de Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 1 Mar 2016 18:46:03 +0100 Subject: [PATCH] More plugin -> extension --- src/vs/platform/actions/common/actionsService.ts | 4 ++-- src/vs/platform/extensions/common/ipcRemoteCom.ts | 6 +++--- .../extensions/common/nativeExtensionService.ts | 2 +- .../extensions/test/node/extensionValidator.test.ts | 2 +- .../common/abstractRemoteTelemetryService.ts | 2 +- src/vs/platform/test/common/nullThreadService.ts | 4 ++-- .../platform/thread/common/abstractThreadService.ts | 12 ++++++------ ...nHostThreadService.ts => extHostThreadService.ts} | 8 ++++---- src/vs/platform/thread/common/mainThreadService.ts | 6 +++--- src/vs/platform/thread/common/thread.ts | 8 ++++---- src/vs/platform/thread/common/workerThreadService.ts | 6 +++--- src/vs/workbench/api/node/extHostCommands.ts | 2 +- src/vs/workbench/api/node/extHostConfiguration.ts | 2 +- src/vs/workbench/api/node/extHostDocuments.ts | 2 +- src/vs/workbench/api/node/extHostEditors.ts | 2 +- .../api/node/extHostFileSystemEventService.ts | 2 +- src/vs/workbench/api/node/extHostLanguageFeatures.ts | 2 +- src/vs/workbench/api/node/extHostQuickOpen.ts | 2 +- src/vs/workbench/node/extensionHostMain.ts | 8 ++++---- src/vs/workbench/node/pluginHostProcess.ts | 4 ++-- .../thread/electron-browser/threadService.ts | 4 ++-- src/vs/workbench/test/node/api/testThreadService.ts | 2 +- 22 files changed, 46 insertions(+), 46 deletions(-) rename src/vs/platform/thread/common/{pluginHostThreadService.ts => extHostThreadService.ts} (86%) diff --git a/src/vs/platform/actions/common/actionsService.ts b/src/vs/platform/actions/common/actionsService.ts index 7d8c08bfaa4..67e06d63337 100644 --- a/src/vs/platform/actions/common/actionsService.ts +++ b/src/vs/platform/actions/common/actionsService.ts @@ -107,10 +107,10 @@ export default class ActionsService implements IActionsService { let rejects: string[] = []; if (isValidCommand(command, rejects)) { - // make sure this plugin is activated by this command + // make sure this extension is activated by this command let activationEvent = `onCommand:${command.command}`; - // action that (1) activates the plugin and dispatches the command + // action that (1) activates the extension and dispatches the command let label = command.category ? localize('category.label', "{0}: {1}", command.category, command.title) : command.title; let action = new Action(command.command, label, undefined, true, () => { return this._extensionService.activateByEvent(activationEvent).then(() => { diff --git a/src/vs/platform/extensions/common/ipcRemoteCom.ts b/src/vs/platform/extensions/common/ipcRemoteCom.ts index f10a08f0793..f819052313a 100644 --- a/src/vs/platform/extensions/common/ipcRemoteCom.ts +++ b/src/vs/platform/extensions/common/ipcRemoteCom.ts @@ -53,11 +53,11 @@ function createRPC(serializeAndSend: (obj: any) => void): IRPCFunc { }; } -export interface IPluginsIPC extends remote.IRemoteCom { +export interface IMainProcessExtHostIPC extends remote.IRemoteCom { handle(msg: string[]): void; } -export function create(send: (obj: string[]) => void): IPluginsIPC { +export function create(send: (obj: string[]) => void): IMainProcessExtHostIPC { let rpc = createRPC(marshallAndSend); let bigHandler: remote.IManyHandler = null; let invokedHandlers: { [req: string]: winjs.TPromise; } = Object.create(null); @@ -134,7 +134,7 @@ export function create(send: (obj: string[]) => void): IPluginsIPC { }); }; - let r: IPluginsIPC = { + let r: IMainProcessExtHostIPC = { callOnRemote: rpc, setManyHandler: (_bigHandler: remote.IManyHandler): void => { bigHandler = _bigHandler; diff --git a/src/vs/platform/extensions/common/nativeExtensionService.ts b/src/vs/platform/extensions/common/nativeExtensionService.ts index 2efbb2ef533..6b063c7db24 100644 --- a/src/vs/platform/extensions/common/nativeExtensionService.ts +++ b/src/vs/platform/extensions/common/nativeExtensionService.ts @@ -241,7 +241,7 @@ export interface IExtensionContext { asAbsolutePath(relativePath: string): string; } -@Remotable.PluginHostContext('ExtHostExtensionService') +@Remotable.ExtHostContext('ExtHostExtensionService') export class ExtHostExtensionService extends AbstractExtensionService { private _threadService: IThreadService; diff --git a/src/vs/platform/extensions/test/node/extensionValidator.test.ts b/src/vs/platform/extensions/test/node/extensionValidator.test.ts index 59180d2ba66..9c032a0f777 100644 --- a/src/vs/platform/extensions/test/node/extensionValidator.test.ts +++ b/src/vs/platform/extensions/test/node/extensionValidator.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/extensions/node/extensionValidator'; -suite('Plugin Version Validator', () => { +suite('Extension Version Validator', () => { test('isValidVersionStr', () => { assert.equal(isValidVersionStr('0.10.0-dev'), true); diff --git a/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts b/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts index fe875b5e773..2e1d5cd49d5 100644 --- a/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts +++ b/src/vs/platform/telemetry/common/abstractRemoteTelemetryService.ts @@ -30,7 +30,7 @@ export class RemoteTelemetryServiceHelper { } /** - * Base class for remote telemetry services (instantiated in plugin host or in web workers) + * Base class for remote telemetry services (instantiated in extension host or in web workers) */ export class AbstractRemoteTelemetryService extends AbstractTelemetryService.AbstractTelemetryService implements ITelemetryService { diff --git a/src/vs/platform/test/common/nullThreadService.ts b/src/vs/platform/test/common/nullThreadService.ts index fbabaf5cc3f..fa6fc9415f5 100644 --- a/src/vs/platform/test/common/nullThreadService.ts +++ b/src/vs/platform/test/common/nullThreadService.ts @@ -48,11 +48,11 @@ export class NullThreadService extends abstractThreadService.AbstractThreadServi this._registerLocalInstance(id, actor); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T { + protected _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T { return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerPluginHostActor(id: string, actor: T): void { + protected _registerExtHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } diff --git a/src/vs/platform/thread/common/abstractThreadService.ts b/src/vs/platform/thread/common/abstractThreadService.ts index 42cc7dd8dff..28beb434122 100644 --- a/src/vs/platform/thread/common/abstractThreadService.ts +++ b/src/vs/platform/thread/common/abstractThreadService.ts @@ -134,8 +134,8 @@ export abstract class AbstractThreadService implements remote.IManyHandler { return this._registerAndInstantiateMainProcessActor(id, desc); } - if (Remotable.Registry.PluginHostContext[id]) { - return this._registerAndInstantiatePluginHostActor(id, desc); + if (Remotable.Registry.ExtHostContext[id]) { + return this._registerAndInstantiateExtHostActor(id, desc); } if (Remotable.Registry.WorkerContext[id]) { @@ -155,8 +155,8 @@ export abstract class AbstractThreadService implements remote.IManyHandler { return this._registerMainProcessActor(id, instance); } - if (Remotable.Registry.PluginHostContext[id]) { - return this._registerPluginHostActor(id, instance); + if (Remotable.Registry.ExtHostContext[id]) { + return this._registerExtHostActor(id, instance); } if (Remotable.Registry.WorkerContext[id]) { @@ -168,8 +168,8 @@ export abstract class AbstractThreadService implements remote.IManyHandler { protected abstract _registerAndInstantiateMainProcessActor(id: string, descriptor: SyncDescriptor0): T; protected abstract _registerMainProcessActor(id: string, actor: T): void; - protected abstract _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T; - protected abstract _registerPluginHostActor(id: string, actor: T): void; + protected abstract _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T; + protected abstract _registerExtHostActor(id: string, actor: T): void; protected abstract _registerAndInstantiateWorkerActor(id: string, descriptor: SyncDescriptor0, whichWorker: ThreadAffinity): T; protected abstract _registerWorkerActor(id: string, actor: T): void; } diff --git a/src/vs/platform/thread/common/pluginHostThreadService.ts b/src/vs/platform/thread/common/extHostThreadService.ts similarity index 86% rename from src/vs/platform/thread/common/pluginHostThreadService.ts rename to src/vs/platform/thread/common/extHostThreadService.ts index 1c499797e3b..2f8d2c1e3a6 100644 --- a/src/vs/platform/thread/common/pluginHostThreadService.ts +++ b/src/vs/platform/thread/common/extHostThreadService.ts @@ -11,7 +11,7 @@ import descriptors = require('vs/platform/instantiation/common/descriptors'); import abstractThreadService = require('./abstractThreadService'); import {IThreadService, IThreadSynchronizableObject, ThreadAffinity, IThreadServiceStatusListener} from 'vs/platform/thread/common/thread'; -export class PluginHostThreadService extends abstractThreadService.AbstractThreadService implements IThreadService { +export class ExtHostThreadService extends abstractThreadService.AbstractThreadService implements IThreadService { public serviceId = IThreadService; protected _remoteCom: remote.IRemoteCom; @@ -45,16 +45,16 @@ export class PluginHostThreadService extends abstractThreadService.AbstractThrea throw new Error('Not supported in this runtime context!'); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: descriptors.SyncDescriptor0): T { + protected _registerAndInstantiateExtHostActor(id: string, descriptor: descriptors.SyncDescriptor0): T { return this._getOrCreateLocalInstance(id, descriptor); } - protected _registerPluginHostActor(id: string, actor: T): void { + protected _registerExtHostActor(id: string, actor: T): void { this._registerLocalInstance(id, actor); } protected _registerAndInstantiateWorkerActor(id: string, descriptor: descriptors.SyncDescriptor0, whichWorker: ThreadAffinity): T { - throw new Error('Not supported in this runtime context! Cannot communicate directly from Plugin Host to Worker!'); + throw new Error('Not supported in this runtime context! Cannot communicate directly from Extension Host to Worker!'); } protected _registerWorkerActor(id: string, actor: T): void { diff --git a/src/vs/platform/thread/common/mainThreadService.ts b/src/vs/platform/thread/common/mainThreadService.ts index f3e6d8c6726..edbad2ce4a9 100644 --- a/src/vs/platform/thread/common/mainThreadService.ts +++ b/src/vs/platform/thread/common/mainThreadService.ts @@ -263,11 +263,11 @@ export class MainThreadService extends abstractThreadService.AbstractThreadServi this._registerLocalInstance(id, actor); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T { - throw new Error('Not supported in this runtime context: Cannot communicate to non-existant Plugin Host!'); + protected _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T { + throw new Error('Not supported in this runtime context: Cannot communicate to non-existant Extension Host!'); } - protected _registerPluginHostActor(id: string, actor: T): void { + protected _registerExtHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } diff --git a/src/vs/platform/thread/common/thread.ts b/src/vs/platform/thread/common/thread.ts index 68fd5b2b948..7485601ce42 100644 --- a/src/vs/platform/thread/common/thread.ts +++ b/src/vs/platform/thread/common/thread.ts @@ -51,7 +51,7 @@ export class Remotable { public static Registry = { MainContext: Object.create(null), - PluginHostContext: Object.create(null), + ExtHostContext: Object.create(null), WorkerContext: Object.create(null), }; @@ -67,10 +67,10 @@ export class Remotable { }; } - public static PluginHostContext(identifier: string) { + public static ExtHostContext(identifier: string) { return function(target: Function) { Remotable._ensureUnique(identifier); - Remotable.Registry.PluginHostContext[identifier] = target; + Remotable.Registry.ExtHostContext[identifier] = target; target[Remotable.PROP_NAME] = identifier; }; } @@ -87,7 +87,7 @@ export class Remotable { } private static _ensureUnique(identifier: string): void { - if (Remotable.Registry.MainContext[identifier] || Remotable.Registry.PluginHostContext[identifier] || Remotable.Registry.WorkerContext[identifier]) { + if (Remotable.Registry.MainContext[identifier] || Remotable.Registry.ExtHostContext[identifier] || Remotable.Registry.WorkerContext[identifier]) { throw new Error('Duplicate Remotable identifier found'); } } diff --git a/src/vs/platform/thread/common/workerThreadService.ts b/src/vs/platform/thread/common/workerThreadService.ts index 49f60c1ab0d..61643664345 100644 --- a/src/vs/platform/thread/common/workerThreadService.ts +++ b/src/vs/platform/thread/common/workerThreadService.ts @@ -72,11 +72,11 @@ export class WorkerThreadService extends abstractThreadService.AbstractThreadSer throw new Error('Not supported in this runtime context!'); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T { - throw new Error('Not supported in this runtime context: Cannot communicate from Worker directly to Plugin Host!'); + protected _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T { + throw new Error('Not supported in this runtime context: Cannot communicate from Worker directly to Extension Host!'); } - protected _registerPluginHostActor(id: string, actor: T): void { + protected _registerExtHostActor(id: string, actor: T): void { throw new Error('Not supported in this runtime context!'); } diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts index eb2d65a8f35..b1ce3079892 100644 --- a/src/vs/workbench/api/node/extHostCommands.ts +++ b/src/vs/workbench/api/node/extHostCommands.ts @@ -20,7 +20,7 @@ interface CommandHandler { description: ICommandHandlerDescription; } -@Remotable.PluginHostContext('ExtHostCommands') +@Remotable.ExtHostContext('ExtHostCommands') export class ExtHostCommands { private _commands: { [n: string]: CommandHandler } = Object.create(null); diff --git a/src/vs/workbench/api/node/extHostConfiguration.ts b/src/vs/workbench/api/node/extHostConfiguration.ts index a7b1d28b326..a42977bfa95 100644 --- a/src/vs/workbench/api/node/extHostConfiguration.ts +++ b/src/vs/workbench/api/node/extHostConfiguration.ts @@ -11,7 +11,7 @@ import {IConfigurationService, ConfigurationServiceEventTypes, IConfigurationSer import Event, {Emitter} from 'vs/base/common/event'; import {WorkspaceConfiguration} from 'vscode'; -@Remotable.PluginHostContext('ExtHostConfiguration') +@Remotable.ExtHostContext('ExtHostConfiguration') export class ExtHostConfiguration { private _config: any; diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts index 25257dfa78b..175e1e08a99 100644 --- a/src/vs/workbench/api/node/extHostDocuments.ts +++ b/src/vs/workbench/api/node/extHostDocuments.ts @@ -49,7 +49,7 @@ export function getWordDefinitionFor(modeId: string): RegExp { return _modeId2WordDefinition[modeId]; } -@Remotable.PluginHostContext('ExtHostModelService') +@Remotable.ExtHostContext('ExtHostModelService') export class ExtHostModelService { private static _handlePool: number = 0; diff --git a/src/vs/workbench/api/node/extHostEditors.ts b/src/vs/workbench/api/node/extHostEditors.ts index 14c89c8daf4..f3aa718c9aa 100644 --- a/src/vs/workbench/api/node/extHostEditors.ts +++ b/src/vs/workbench/api/node/extHostEditors.ts @@ -37,7 +37,7 @@ export interface ITextEditorPositionData { [id: string]: EditorPosition; } -@Remotable.PluginHostContext('ExtHostEditors') +@Remotable.ExtHostContext('ExtHostEditors') export class ExtHostEditors { public onDidChangeTextEditorSelection: Event; diff --git a/src/vs/workbench/api/node/extHostFileSystemEventService.ts b/src/vs/workbench/api/node/extHostFileSystemEventService.ts index 38cfd4f0417..aba21f14e52 100644 --- a/src/vs/workbench/api/node/extHostFileSystemEventService.ts +++ b/src/vs/workbench/api/node/extHostFileSystemEventService.ts @@ -97,7 +97,7 @@ export class FileSystemWatcher implements _FileSystemWatcher { } } -@Remotable.PluginHostContext('ExtHostFileSystemEventService') +@Remotable.ExtHostContext('ExtHostFileSystemEventService') export class ExtHostFileSystemEventService { private _emitter = new Emitter(); diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 6468f14e16f..501c71b8a6a 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -629,7 +629,7 @@ type Adapter = OutlineAdapter | CodeLensAdapter | DeclarationAdapter | ExtraInfo | RangeFormattingAdapter | OnTypeFormattingAdapter | NavigateTypeAdapter | RenameAdapter | SuggestAdapter | ParameterHintsAdapter; -@Remotable.PluginHostContext('ExtHostLanguageFeatures') +@Remotable.ExtHostContext('ExtHostLanguageFeatures') export class ExtHostLanguageFeatures { private static _handlePool: number = 0; diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts index f071b9250b9..24bb221a5de 100644 --- a/src/vs/workbench/api/node/extHostQuickOpen.ts +++ b/src/vs/workbench/api/node/extHostQuickOpen.ts @@ -15,7 +15,7 @@ export interface MyQuickPickItems extends IPickOpenEntry { export type Item = string | QuickPickItem; -@Remotable.PluginHostContext('ExtHostQuickOpen') +@Remotable.ExtHostContext('ExtHostQuickOpen') export class ExtHostQuickOpen { private _proxy: MainThreadQuickOpen; diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index 426b7e70267..49a7f21456c 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -16,12 +16,12 @@ import paths = require('vs/base/common/paths'); import {IExtensionService, IExtensionDescription} from 'vs/platform/extensions/common/extensions'; import {ExtensionsRegistry} 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 {IMainProcessExtHostIPC} from 'vs/platform/extensions/common/ipcRemoteCom'; import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments'; import {IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import InstantiationService = require('vs/platform/instantiation/common/instantiationService'); import {ExtHostExtensionService} from 'vs/platform/extensions/common/nativeExtensionService'; -import {PluginHostThreadService} from 'vs/platform/thread/common/pluginHostThreadService'; +import {ExtHostThreadService} from 'vs/platform/thread/common/extHostThreadService'; import {ExtHostTelemetryService} from 'vs/workbench/api/node/extHostTelemetry'; import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService'; @@ -54,10 +54,10 @@ export function exit(code?: number) { nativeExit(code); } -export function createServices(remoteCom: IPluginsIPC, initData: IInitData, sharedProcessClient: Client): IInstantiationService { +export function createServices(remoteCom: IMainProcessExtHostIPC, initData: IInitData, sharedProcessClient: Client): IInstantiationService { let contextService = new BaseWorkspaceContextService(initData.contextService.workspace, initData.contextService.configuration, initData.contextService.options); - let threadService = new PluginHostThreadService(remoteCom); + let threadService = new ExtHostThreadService(remoteCom); threadService.setInstantiationService(InstantiationService.createInstantiationService({ threadService: threadService })); let telemetryService = new ExtHostTelemetryService(threadService); let requestService = new BaseRequestService(contextService, telemetryService); diff --git a/src/vs/workbench/node/pluginHostProcess.ts b/src/vs/workbench/node/pluginHostProcess.ts index 74c669332fe..22296dabafd 100644 --- a/src/vs/workbench/node/pluginHostProcess.ts +++ b/src/vs/workbench/node/pluginHostProcess.ts @@ -9,11 +9,11 @@ import {onUnexpectedError} from 'vs/base/common/errors'; import { TPromise } from 'vs/base/common/winjs.base'; import { ExtensionHostMain, createServices, IInitData, exit } from 'vs/workbench/node/extensionHostMain'; import { Client, connect } from 'vs/base/node/service.net'; -import { create as createIPC, IPluginsIPC } from 'vs/platform/extensions/common/ipcRemoteCom'; +import { create as createIPC, IMainProcessExtHostIPC } from 'vs/platform/extensions/common/ipcRemoteCom'; import marshalling = require('vs/base/common/marshalling'); interface IRendererConnection { - remoteCom: IPluginsIPC; + remoteCom: IMainProcessExtHostIPC; initData: IInitData; } diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts index 20c0b0ef866..82b580b358e 100644 --- a/src/vs/workbench/services/thread/electron-browser/threadService.ts +++ b/src/vs/workbench/services/thread/electron-browser/threadService.ts @@ -38,7 +38,7 @@ export interface ILogEntry { export class MainThreadService extends CommonMainThreadService { private pluginHostProcessManager: PluginHostProcessManager; - private remoteCom: pluginsIPC.IPluginsIPC; + private remoteCom: pluginsIPC.IMainProcessExtHostIPC; constructor(contextService: IWorkspaceContextService, messageService: IMessageService, windowService: IWindowService) { super(contextService, 'vs/editor/common/worker/editorWorkerServer', 1); @@ -72,7 +72,7 @@ export class MainThreadService extends CommonMainThreadService { this.pluginHostProcessManager.terminate(); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T { + protected _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T { return this._getOrCreateProxyInstance(this.remoteCom, id, descriptor); } } diff --git a/src/vs/workbench/test/node/api/testThreadService.ts b/src/vs/workbench/test/node/api/testThreadService.ts index 215ec7869b6..47b84c0244d 100644 --- a/src/vs/workbench/test/node/api/testThreadService.ts +++ b/src/vs/workbench/test/node/api/testThreadService.ts @@ -92,7 +92,7 @@ export class TestThreadService extends NullThreadService { }, id, descriptor); } - protected _registerAndInstantiatePluginHostActor(id: string, descriptor: SyncDescriptor0): T { + protected _registerAndInstantiateExtHostActor(id: string, descriptor: SyncDescriptor0): T { return this._getOrCreateLocalInstance(id, descriptor); } }