diff --git a/src/vs/editor/browser/standalone/simpleServices.ts b/src/vs/editor/browser/standalone/simpleServices.ts index f8523d05c77..5af3b43e73e 100644 --- a/src/vs/editor/browser/standalone/simpleServices.ts +++ b/src/vs/editor/browser/standalone/simpleServices.ts @@ -252,7 +252,7 @@ export class StandaloneKeybindingService extends KeybindingService { } } -export class SimplePluginService extends AbstractExtensionService { +export class SimpleExtensionService extends AbstractExtensionService { constructor() { super(true); diff --git a/src/vs/editor/browser/standalone/standaloneServices.ts b/src/vs/editor/browser/standalone/standaloneServices.ts index f867f1123ee..825e6f1c09b 100644 --- a/src/vs/editor/browser/standalone/standaloneServices.ts +++ b/src/vs/editor/browser/standalone/standaloneServices.ts @@ -40,7 +40,7 @@ import {MainThreadModeServiceImpl} from 'vs/editor/common/services/modeServiceIm import {IModelService} from 'vs/editor/common/services/modelService'; import {ModelServiceImpl} from 'vs/editor/common/services/modelServiceImpl'; import {CodeEditorServiceImpl} from 'vs/editor/browser/services/codeEditorServiceImpl'; -import {SimpleConfigurationService, SimpleEditorRequestService, SimpleMessageService, SimplePluginService, StandaloneKeybindingService} from 'vs/editor/browser/standalone/simpleServices'; +import {SimpleConfigurationService, SimpleEditorRequestService, SimpleMessageService, SimpleExtensionService, StandaloneKeybindingService} from 'vs/editor/browser/standalone/simpleServices'; export interface IEditorContextViewService extends IContextViewService { dispose(): void; @@ -183,7 +183,7 @@ export function getOrCreateStaticServices(services?: IEditorOverrideServices): I let threadService = services.threadService || new MainThreadService(contextService, 'vs/editor/common/worker/editorWorkerServer', 2); let messageService = services.messageService || new SimpleMessageService(); - let extensionService = services.extensionService || new SimplePluginService(); + let extensionService = services.extensionService || new SimpleExtensionService(); let markerService = services.markerService || new MainProcessMarkerService(threadService); let requestService = services.requestService || new SimpleEditorRequestService(contextService, telemetryService); let modeService = services.modeService || new MainThreadModeServiceImpl(threadService, extensionService); diff --git a/src/vs/editor/common/worker/editorWorkerServer.ts b/src/vs/editor/common/worker/editorWorkerServer.ts index 74c9fb8e48e..86bda9ace86 100644 --- a/src/vs/editor/common/worker/editorWorkerServer.ts +++ b/src/vs/editor/common/worker/editorWorkerServer.ts @@ -45,7 +45,7 @@ export interface ICallback { (something:any):void; } -class WorkerPluginService extends AbstractExtensionService { +class WorkerExtensionService extends AbstractExtensionService { constructor() { super(true); @@ -86,7 +86,7 @@ export class EditorWorkerServer { public initialize(mainThread:WorkerServer, complete:ICallback, error:ICallback, progress:ICallback, initData:IInitData):void { - var extensionService = new WorkerPluginService(); + var extensionService = new WorkerExtensionService(); var contextService = new BaseWorkspaceContextService(initData.contextService.workspace, initData.contextService.configuration, initData.contextService.options); diff --git a/src/vs/editor/test/common/servicesTestUtils.ts b/src/vs/editor/test/common/servicesTestUtils.ts index a1399e37a9c..8d6df844371 100644 --- a/src/vs/editor/test/common/servicesTestUtils.ts +++ b/src/vs/editor/test/common/servicesTestUtils.ts @@ -99,7 +99,7 @@ export function createMockEditorWorkerServices(mockEditorWorkerServices: IMockEd } class MockModeService extends ModeServiceImpl {} -class MockPluginService extends AbstractExtensionService { +class MockExtensionService extends AbstractExtensionService { constructor() { super(true); } @@ -133,7 +133,7 @@ class MockModelService extends ModelServiceImpl { } export function createMockModeService(): IModeService { var threadService = NULL_THREAD_SERVICE; - var extensionService = new MockPluginService(); + var extensionService = new MockExtensionService(); var modeService = new MockModeService(threadService, extensionService); var inst = createInstantiationService({ threadService: threadService, @@ -155,7 +155,7 @@ export function createMockModelService(): IModelService { let eventService = new EventService(); let configurationService = new MockConfigurationService(contextService, eventService); var threadService = NULL_THREAD_SERVICE; - var extensionService = new MockPluginService(); + var extensionService = new MockExtensionService(); var modeService = new MockModeService(threadService, extensionService); var modelService = new MockModelService(threadService, null, modeService, configurationService); var inst = createInstantiationService({ diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 2a78ab55310..f3c88fda85a 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -132,14 +132,14 @@ export class ExtHostAPIImplementation { this.TextEditorRevealType = TextEditorRevealType; errors.setUnexpectedErrorHandler((err) => { - this._proxy.onUnexpectedPluginHostError(errors.transformErrorForSerialization(err)); + this._proxy.onUnexpectedExtHostError(errors.transformErrorForSerialization(err)); }); - const pluginHostCommands = this._threadService.getRemotable(ExtHostCommands); - const pluginHostEditors = this._threadService.getRemotable(ExtHostEditors); - const pluginHostMessageService = new ExtHostMessageService(this._threadService, this.commands); - const pluginHostQuickOpen = this._threadService.getRemotable(ExtHostQuickOpen); - const pluginHostStatusBar = new ExtHostStatusBar(this._threadService); + const extHostCommands = this._threadService.getRemotable(ExtHostCommands); + const extHostEditors = this._threadService.getRemotable(ExtHostEditors); + const extHostMessageService = new ExtHostMessageService(this._threadService, this.commands); + const extHostQuickOpen = this._threadService.getRemotable(ExtHostQuickOpen); + const extHostStatusBar = new ExtHostStatusBar(this._threadService); const extHostOutputService = new ExtHostOutputService(this._threadService); // env namespace @@ -154,12 +154,12 @@ export class ExtHostAPIImplementation { // commands namespace this.commands = { registerCommand(id: string, command: (...args: any[]) => T | Thenable, thisArgs?: any): vscode.Disposable { - return pluginHostCommands.registerCommand(id, command, thisArgs); + return extHostCommands.registerCommand(id, command, thisArgs); }, registerTextEditorCommand(id: string, callback: (textEditor: vscode.TextEditor, edit: vscode.TextEditorEdit) => void, thisArg?: any): vscode.Disposable { let actualCallback: typeof callback = thisArg ? callback.bind(thisArg) : callback; - return pluginHostCommands.registerCommand(id, () => { - let activeTextEditor = pluginHostEditors.getActiveTextEditor(); + return extHostCommands.registerCommand(id, () => { + let activeTextEditor = extHostEditors.getActiveTextEditor(); if (!activeTextEditor) { console.warn('Cannot execute ' + id + ' because there is no active text editor.'); return; @@ -177,55 +177,55 @@ export class ExtHostAPIImplementation { }); }, executeCommand(id: string, ...args: any[]): Thenable { - return pluginHostCommands.executeCommand(id, ...args); + return extHostCommands.executeCommand(id, ...args); }, getCommands(filterInternal: boolean = false): Thenable { - return pluginHostCommands.getCommands(filterInternal); + return extHostCommands.getCommands(filterInternal); } }; this.window = { get activeTextEditor() { - return pluginHostEditors.getActiveTextEditor(); + return extHostEditors.getActiveTextEditor(); }, get visibleTextEditors() { - return pluginHostEditors.getVisibleTextEditors(); + return extHostEditors.getVisibleTextEditors(); }, showTextDocument(document: vscode.TextDocument, column?: vscode.ViewColumn, preserveFocus?: boolean): TPromise { - return pluginHostEditors.showTextDocument(document, column, preserveFocus); + return extHostEditors.showTextDocument(document, column, preserveFocus); }, createTextEditorDecorationType(options:vscode.DecorationRenderOptions): vscode.TextEditorDecorationType { - return pluginHostEditors.createTextEditorDecorationType(options); + return extHostEditors.createTextEditorDecorationType(options); }, - onDidChangeActiveTextEditor: pluginHostEditors.onDidChangeActiveTextEditor.bind(pluginHostEditors), + onDidChangeActiveTextEditor: extHostEditors.onDidChangeActiveTextEditor.bind(extHostEditors), onDidChangeTextEditorSelection: (listener: (e: vscode.TextEditorSelectionChangeEvent) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => { - return pluginHostEditors.onDidChangeTextEditorSelection(listener, thisArgs, disposables); + return extHostEditors.onDidChangeTextEditorSelection(listener, thisArgs, disposables); }, onDidChangeTextEditorOptions: (listener: (e: vscode.TextEditorOptionsChangeEvent) => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => { - return pluginHostEditors.onDidChangeTextEditorOptions(listener, thisArgs, disposables); + return extHostEditors.onDidChangeTextEditorOptions(listener, thisArgs, disposables); }, onDidChangeTextEditorViewColumn(listener, thisArg?, disposables?) { - return pluginHostEditors.onDidChangeTextEditorViewColumn(listener, thisArg, disposables); + return extHostEditors.onDidChangeTextEditorViewColumn(listener, thisArg, disposables); }, showInformationMessage: (message, ...items) => { - return pluginHostMessageService.showMessage(Severity.Info, message, items); + return extHostMessageService.showMessage(Severity.Info, message, items); }, showWarningMessage: (message, ...items) => { - return pluginHostMessageService.showMessage(Severity.Warning, message, items); + return extHostMessageService.showMessage(Severity.Warning, message, items); }, showErrorMessage: (message, ...items) => { - return pluginHostMessageService.showMessage(Severity.Error, message, items); + return extHostMessageService.showMessage(Severity.Error, message, items); }, showQuickPick: (items: any, options: vscode.QuickPickOptions) => { - return pluginHostQuickOpen.show(items, options); + return extHostQuickOpen.show(items, options); }, - showInputBox: pluginHostQuickOpen.input.bind(pluginHostQuickOpen), + showInputBox: extHostQuickOpen.input.bind(extHostQuickOpen), createStatusBarItem(position?: vscode.StatusBarAlignment, priority?: number): vscode.StatusBarItem { - return pluginHostStatusBar.createStatusBarEntry(position, priority); + return extHostStatusBar.createStatusBarEntry(position, priority); }, setStatusBarMessage(text: string, timeoutOrThenable?: number | Thenable): vscode.Disposable { - return pluginHostStatusBar.setStatusBarMessage(text, timeoutOrThenable); + return extHostStatusBar.setStatusBarMessage(text, timeoutOrThenable); }, createOutputChannel(name: string): vscode.OutputChannel { return extHostOutputService.createOutputChannel(name); @@ -234,33 +234,33 @@ export class ExtHostAPIImplementation { // const workspacePath = contextService.getWorkspace() ? contextService.getWorkspace().resource.fsPath : undefined; - const pluginHostFileSystemEvent = threadService.getRemotable(ExtHostFileSystemEventService); - const pluginHostWorkspace = new ExtHostWorkspace(this._threadService, workspacePath); - const pluginHostDocuments = this._threadService.getRemotable(ExtHostModelService); + const extHostFileSystemEvent = threadService.getRemotable(ExtHostFileSystemEventService); + const extHostWorkspace = new ExtHostWorkspace(this._threadService, workspacePath); + const extHostDocuments = this._threadService.getRemotable(ExtHostModelService); this.workspace = Object.freeze({ get rootPath() { - return pluginHostWorkspace.getPath(); + return extHostWorkspace.getPath(); }, set rootPath(value) { throw errors.readonly(); }, asRelativePath: (pathOrUri) => { - return pluginHostWorkspace.getRelativePath(pathOrUri); + return extHostWorkspace.getRelativePath(pathOrUri); }, findFiles: (include, exclude, maxResults?, token?) => { - return pluginHostWorkspace.findFiles(include, exclude, maxResults, token); + return extHostWorkspace.findFiles(include, exclude, maxResults, token); }, saveAll: (includeUntitled?) => { - return pluginHostWorkspace.saveAll(includeUntitled); + return extHostWorkspace.saveAll(includeUntitled); }, applyEdit(edit: vscode.WorkspaceEdit): TPromise { - return pluginHostWorkspace.appyEdit(edit); + return extHostWorkspace.appyEdit(edit); }, createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): vscode.FileSystemWatcher => { - return pluginHostFileSystemEvent.createFileSystemWatcher(pattern, ignoreCreate, ignoreChange, ignoreDelete); + return extHostFileSystemEvent.createFileSystemWatcher(pattern, ignoreCreate, ignoreChange, ignoreDelete); }, get textDocuments() { - return pluginHostDocuments.getAllDocumentData().map(data => data.document); + return extHostDocuments.getAllDocumentData().map(data => data.document); }, set textDocuments(value) { throw errors.readonly(); @@ -274,31 +274,31 @@ export class ExtHostAPIImplementation { } else { throw new Error('illegal argument - uriOrFileName'); } - return pluginHostDocuments.ensureDocumentData(uri).then(() => { - const data = pluginHostDocuments.getDocumentData(uri); + return extHostDocuments.ensureDocumentData(uri).then(() => { + const data = extHostDocuments.getDocumentData(uri); return data && data.document; }); }, registerTextDocumentContentProvider(scheme: string, provider: vscode.TextDocumentContentProvider) { - return pluginHostDocuments.registerTextDocumentContentProvider(scheme, provider); + return extHostDocuments.registerTextDocumentContentProvider(scheme, provider); }, onDidOpenTextDocument: (listener, thisArgs?, disposables?) => { - return pluginHostDocuments.onDidAddDocument(listener, thisArgs, disposables); + return extHostDocuments.onDidAddDocument(listener, thisArgs, disposables); }, onDidCloseTextDocument: (listener, thisArgs?, disposables?) => { - return pluginHostDocuments.onDidRemoveDocument(listener, thisArgs, disposables); + return extHostDocuments.onDidRemoveDocument(listener, thisArgs, disposables); }, onDidChangeTextDocument: (listener, thisArgs?, disposables?) => { - return pluginHostDocuments.onDidChangeDocument(listener, thisArgs, disposables); + return extHostDocuments.onDidChangeDocument(listener, thisArgs, disposables); }, onDidSaveTextDocument: (listener, thisArgs?, disposables?) => { - return pluginHostDocuments.onDidSaveDocument(listener, thisArgs, disposables); + return extHostDocuments.onDidSaveDocument(listener, thisArgs, disposables); }, onDidChangeConfiguration: (listener: () => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => { - return pluginHostConfiguration.onDidChangeConfiguration(listener, thisArgs, disposables); + return extHostConfiguration.onDidChangeConfiguration(listener, thisArgs, disposables); }, getConfiguration: (section?: string):vscode.WorkspaceConfiguration => { - return pluginHostConfiguration.getConfiguration(section); + return extHostConfiguration.getConfiguration(section); } }); @@ -307,12 +307,12 @@ export class ExtHostAPIImplementation { // const languages = new ExtHostLanguages(this._threadService); - const pluginHostDiagnostics = new ExtHostDiagnostics(this._threadService); + const extHostDiagnostics = new ExtHostDiagnostics(this._threadService); const languageFeatures = threadService.getRemotable(ExtHostLanguageFeatures); this.languages = { createDiagnosticCollection(name?: string): vscode.DiagnosticCollection { - return pluginHostDiagnostics.createDiagnosticCollection(name); + return extHostDiagnostics.createDiagnosticCollection(name); }, getLanguages(): TPromise { return languages.getLanguages(); @@ -367,7 +367,7 @@ export class ExtHostAPIImplementation { } }; - var pluginHostConfiguration = threadService.getRemotable(ExtHostConfiguration); + var extHostConfiguration = threadService.getRemotable(ExtHostConfiguration); // this.extensions = { @@ -465,7 +465,7 @@ export class MainProcessVSCodeAPIHelper { this._token2Dispose = {}; } - public onUnexpectedPluginHostError(err: any): void { + public onUnexpectedExtHostError(err: any): void { errors.onUnexpectedError(err); } diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts index b1ce3079892..9ee1c8a552b 100644 --- a/src/vs/workbench/api/node/extHostCommands.ts +++ b/src/vs/workbench/api/node/extHostCommands.ts @@ -25,10 +25,10 @@ export class ExtHostCommands { private _commands: { [n: string]: CommandHandler } = Object.create(null); private _proxy: MainThreadCommands; - private _pluginHostEditors: ExtHostEditors; + private _extHostEditors: ExtHostEditors; constructor(@IThreadService threadService: IThreadService) { - this._pluginHostEditors = threadService.getRemotable(ExtHostEditors); + this._extHostEditors = threadService.getRemotable(ExtHostEditors); this._proxy = threadService.getRemotable(MainThreadCommands); } diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts index 175e1e08a99..ba54138a9b5 100644 --- a/src/vs/workbench/api/node/extHostDocuments.ts +++ b/src/vs/workbench/api/node/extHostDocuments.ts @@ -572,7 +572,7 @@ export class MainThreadDocuments { } } - // --- from plugin host process + // --- from extension host process _trySaveDocument(uri: URI): TPromise { return this._textFileService.save(uri); diff --git a/src/vs/workbench/api/node/extHostEditors.ts b/src/vs/workbench/api/node/extHostEditors.ts index f3aa718c9aa..d64c603ea6f 100644 --- a/src/vs/workbench/api/node/extHostEditors.ts +++ b/src/vs/workbench/api/node/extHostEditors.ts @@ -603,7 +603,7 @@ export class MainThreadEditors { return result; } - // --- from plugin host process + // --- from extension host process _tryShowTextDocument(resource: URI, position: EditorPosition, preserveFocus: boolean): TPromise { diff --git a/src/vs/workbench/api/node/mainThreadEditors.ts b/src/vs/workbench/api/node/mainThreadEditors.ts index 78babf27394..10ec8362557 100644 --- a/src/vs/workbench/api/node/mainThreadEditors.ts +++ b/src/vs/workbench/api/node/mainThreadEditors.ts @@ -334,7 +334,7 @@ export class MainThreadEditorsTracker { private _doUpdateMapping(): void { let allModels = this._modelService.getModels(); - // Same filter as in pluginHostDocuments + // Same filter as in extHostDocuments allModels.filter((model) => !model.isTooLargeForHavingARichMode()); let allModelsMap: { [modelUri:string]: EditorCommon.IModel; } = Object.create(null); allModels.forEach((model) => { diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 9d2d09cf2dc..eec2d349dd8 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -176,7 +176,7 @@ export class WorkbenchShell { this.workbench = new Workbench(workbenchContainer.getHTMLElement(), this.workspace, this.configuration, this.options, instantiationService); this.workbench.startup({ onServicesCreated: () => { - this.initPluginSystem(); + this.initExtensionSystem(); }, onWorkbenchStarted: () => { this.onWorkbenchStarted(); @@ -231,7 +231,7 @@ export class WorkbenchShell { this.windowService = new WindowService(); - let disableWorkspaceStorage = this.configuration.env.extensionTestsPath || (!this.workspace && !this.configuration.env.extensionDevelopmentPath); // without workspace or in any plugin test, we use inMemory storage unless we develop a plugin where we want to preserve state + let disableWorkspaceStorage = this.configuration.env.extensionTestsPath || (!this.workspace && !this.configuration.env.extensionDevelopmentPath); // without workspace or in any extension test, we use inMemory storage unless we develop an extension where we want to preserve state this.storageService = new Storage(this.contextService, window.localStorage, disableWorkspaceStorage ? inMemoryLocalStorageInstance : window.localStorage); let configService = new ConfigurationService( @@ -239,7 +239,7 @@ export class WorkbenchShell { eventService ); - // no telemetry in a window for plugin development! + // no telemetry in a window for extension development! let enableTelemetry = this.configuration.env.isBuilt && !this.configuration.env.extensionDevelopmentPath ? !!this.configuration.env.enableTelemetry : false; this.telemetryService = new ElectronTelemetryService(configService, this.storageService, { enableTelemetry: enableTelemetry, version: this.configuration.env.version, commitHash: this.configuration.env.commitHash }); @@ -272,7 +272,7 @@ export class WorkbenchShell { let markerService = new MainProcessMarkerService(this.threadService); let extensionService = new MainProcessExtensionService(this.contextService, this.threadService, this.messageService, this.telemetryService); - this.keybindingService.setPluginService(extensionService); + this.keybindingService.setExtensionService(extensionService); let modeService = new MainThreadModeServiceImpl(this.threadService, extensionService); let modelService = new ModelServiceImpl(this.threadService, markerService, modeService, configService); @@ -312,7 +312,7 @@ export class WorkbenchShell { } // TODO@Alex, TODO@Joh move this out of here? - private initPluginSystem(): void { + private initExtensionSystem(): void { this.threadService.getRemotable(MainProcessVSCodeAPIHelper); this.threadService.getRemotable(MainThreadDocuments); this.threadService.getRemotable(RemoteTelemetryServiceHelper); diff --git a/src/vs/workbench/electron-main/menus.ts b/src/vs/workbench/electron-main/menus.ts index c283457fa8c..6ac2cefcd54 100644 --- a/src/vs/workbench/electron-main/menus.ts +++ b/src/vs/workbench/electron-main/menus.ts @@ -374,7 +374,7 @@ export class VSCodeMenu { private quit(): void { - // If the user selected to exit from a plugin development host window, do not quit, but just + // If the user selected to exit from an extension development host window, do not quit, but just // close the window unless this is the last window that is opened. let vscodeWindow = windows.manager.getFocusedWindow(); if (vscodeWindow && vscodeWindow.isPluginDevelopmentHost && windows.manager.getWindowCount() > 1) { diff --git a/src/vs/workbench/electron-main/sharedProcess.ts b/src/vs/workbench/electron-main/sharedProcess.ts index 756eb04a008..503e8001546 100644 --- a/src/vs/workbench/electron-main/sharedProcess.ts +++ b/src/vs/workbench/electron-main/sharedProcess.ts @@ -34,7 +34,7 @@ function getEnvironment(): IEnvironment { } function _spawnSharedProcess(): cp.ChildProcess { - // Make sure the nls configuration travels to the plugin host. + // Make sure the nls configuration travels to the shared process. const opts = { env: assign(assign({}, process.env), { AMD_ENTRYPOINT: 'vs/workbench/electron-main/sharedProcessMain' diff --git a/src/vs/workbench/node/pluginHostProcess.ts b/src/vs/workbench/node/pluginHostProcess.ts index 22296dabafd..58cc65049e8 100644 --- a/src/vs/workbench/node/pluginHostProcess.ts +++ b/src/vs/workbench/node/pluginHostProcess.ts @@ -18,7 +18,7 @@ interface IRendererConnection { } // This calls exit directly in case the initialization is not finished and we need to exit -// Otherwise, if initialization completed we go to pluginHostMain.terminate() +// Otherwise, if initialization completed we go to extensionHostMain.terminate() let onTerminate = function() { exit(); }; diff --git a/src/vs/workbench/parts/extensions/node/extensionsService.ts b/src/vs/workbench/parts/extensions/node/extensionsService.ts index 1b77c0ff0cf..896cd8212f2 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsService.ts @@ -203,8 +203,8 @@ export class ExtensionsService implements IExtensionsService { return all; } - return all.then(plugins => { - const byId = values(groupBy(plugins, p => `${ p.publisher }.${ p.name }`)); + return all.then(extensions => { + const byId = values(groupBy(extensions, p => `${ p.publisher }.${ p.name }`)); return byId.map(p => p.sort((a, b) => semver.rcompare(a.version, b.version))[0]); }); } diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts index 5991d67e326..8524e5d151c 100644 --- a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts @@ -145,7 +145,7 @@ export class TextFileService extends AbstractTextFileService { public confirmSave(resources?: URI[]): ConfirmResult { if (!!this.contextService.getConfiguration().env.extensionDevelopmentPath) { - return ConfirmResult.DONT_SAVE; // no veto when we are in plugin dev mode because we cannot assum we run interactive (e.g. tests) + return ConfirmResult.DONT_SAVE; // no veto when we are in extension dev mode because we cannot assum we run interactive (e.g. tests) } let resourcesToConfirm = this.getDirty(resources); diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index 1e18c19f5d7..a576e4b24aa 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -270,7 +270,7 @@ export class TaskRegistry { */ } - // private onDescriptions(descriptions: IPluginDescription[]) { + // private onDescriptions(descriptions: IExtensionDescription[]) { // descriptions.forEach(description => { // let extensions = description.contributes[extensionPoint]; // if (Types.isArray(extensions)) { diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index 729935620c6..d05a5306d18 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -153,7 +153,7 @@ export abstract class BaseHistoryService { protected getWindowTitle(input?: IEditorInput): string { let title = this.doGetWindowTitle(input); - // Plugin Development Host gets a special title to identify itself + // Extension Development Host gets a special title to identify itself if (this.contextService.getConfiguration().env.extensionDevelopmentPath) { return nls.localize('devExtensionWindowTitle', "[Extension Development Host] - {0}", title); } diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts index 750e9f09c0b..7d02838383c 100644 --- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts @@ -142,7 +142,7 @@ export class WorkbenchKeybindingService extends KeybindingService { this._beginListening(domNode); } - setPluginService(extensionService: IExtensionService): void { + setExtensionService(extensionService: IExtensionService): void { this._extensionService = extensionService; } diff --git a/src/vs/workbench/test/node/api/extHostDocuments.test.ts b/src/vs/workbench/test/node/api/extHostDocuments.test.ts index 12f54da0720..3627c901b06 100644 --- a/src/vs/workbench/test/node/api/extHostDocuments.test.ts +++ b/src/vs/workbench/test/node/api/extHostDocuments.test.ts @@ -13,7 +13,7 @@ import {Range as CodeEditorRange} from 'vs/editor/common/core/range'; import * as EditorCommon from 'vs/editor/common/editorCommon'; -suite("PluginHostDocument", () => { +suite("ExtHostDocument", () => { let data: ExtHostDocumentData; @@ -192,7 +192,7 @@ enum AssertDocumentLineMappingDirection { PositionToOffset } -suite("PluginHostDocument updates line mapping", () => { +suite("ExtHostDocument updates line mapping", () => { function positionToStr(position: { line: number; character: number;}): string { return '(' + position.line + ',' + position.character + ')';