From d3b77c03be260f6be4b63efb6ccc7aac54ce7f60 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 6 Jan 2016 12:34:58 +0100 Subject: [PATCH] fix ipc: now has event as first arg on renderer side --- src/vs/workbench/electron-browser/integration.ts | 12 ++++++------ src/vs/workbench/electron-browser/update.ts | 2 +- .../electron-browser/extensionsWorkbenchExtension.ts | 2 +- .../files/electron-browser/electronFileTracker.ts | 2 +- .../parts/files/electron-browser/textFileServices.ts | 1 - .../snippets/electron-browser/snippetsTracker.ts | 1 - .../lifecycle/electron-browser/lifecycleService.ts | 2 +- .../window/electron-browser/windowService.ts | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/electron-browser/integration.ts b/src/vs/workbench/electron-browser/integration.ts index 5cff5dc4570..ce6c4ad8393 100644 --- a/src/vs/workbench/electron-browser/integration.ts +++ b/src/vs/workbench/electron-browser/integration.ts @@ -49,12 +49,12 @@ export class ElectronIntegration { this.windowService.registerWindow(activeWindow); // Support runAction event - ipc.on('vscode:runAction', (actionId: string) => { + ipc.on('vscode:runAction', (event, actionId: string) => { this.keybindingService.executeCommand(actionId, { from: 'menu' }).done(undefined, err => this.messageService.show(Severity.Error, err)); }); // Support options change - ipc.on('vscode:optionsChange', (options: string) => { + ipc.on('vscode:optionsChange', (event, options: string) => { let optionsData = JSON.parse(options); for (let key in optionsData) { if (optionsData.hasOwnProperty(key)) { @@ -65,7 +65,7 @@ export class ElectronIntegration { }); // Support resolve keybindings event - ipc.on('vscode:resolveKeybindings', (rawActionIds: string) => { + ipc.on('vscode:resolveKeybindings', (event, rawActionIds: string) => { let actionIds: string[] = []; try { actionIds = JSON.parse(rawActionIds); @@ -81,11 +81,11 @@ export class ElectronIntegration { }, () => errors.onUnexpectedError); }); - ipc.on('vscode:telemetry', ({ eventName, data }) => { + ipc.on('vscode:telemetry', (event, { eventName, data }) => { this.telemetryService.publicLog(eventName, data); }); - ipc.on('vscode:reportError', (error) => { + ipc.on('vscode:reportError', (event, error) => { if (error) { let errorParsed = JSON.parse(error); errorParsed.mainProcess = true; @@ -99,7 +99,7 @@ export class ElectronIntegration { }); // Theme changes - ipc.on('vscode:changeTheme', (theme: string) => { + ipc.on('vscode:changeTheme', (event, theme: string) => { this.storageService.store('workbench.theme', theme, StorageScope.GLOBAL); }); diff --git a/src/vs/workbench/electron-browser/update.ts b/src/vs/workbench/electron-browser/update.ts index 6959e4cbabc..d66d694d4c1 100644 --- a/src/vs/workbench/electron-browser/update.ts +++ b/src/vs/workbench/electron-browser/update.ts @@ -57,7 +57,7 @@ export class Update { ) { const env = this.contextService.getConfiguration().env; - ipc.on('vscode:update-downloaded', (update: IUpdate) => { + ipc.on('vscode:update-downloaded', (event, update: IUpdate) => { this.messageService.show(severity.Info, { message: nls.localize('updateAvailable', "{0} will be updated after it restarts.", env.appName), actions: [Update.ShowReleaseNotesAction(env.releaseNotesUrl), Update.NotNowAction, Update.ApplyUpdateAction] diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts index 26da649bd13..d3613eb8918 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts @@ -83,7 +83,7 @@ export class ExtensionsWorkbenchExtension implements IWorkbenchContribution { } private registerListeners(): void { - ipc.on('vscode:installExtensions', (request: IInstallExtensionsRequest) => { + ipc.on('vscode:installExtensions', (event, request: IInstallExtensionsRequest) => { if (request.extensionsToInstall) { this.install(request.extensionsToInstall).done(null, errors.onUnexpectedError); } diff --git a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts index d5c4d8e1801..8783cec96f8 100644 --- a/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts +++ b/src/vs/workbench/parts/files/electron-browser/electronFileTracker.ts @@ -82,7 +82,7 @@ export class FileTracker implements IWorkbenchContribution { this.toUnbind.push(() => disposable.dispose()); // Support openFiles event for existing and new files - ipc.on('vscode:openFiles', (request: IOpenFileRequest) => { + ipc.on('vscode:openFiles', (event, request: IOpenFileRequest) => { let inputs: IResourceInput[] = []; if (request.filesToOpen) { inputs.push(...this.toInputs(request.filesToOpen, false)); diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts index 1843f100062..a4ef2c48387 100644 --- a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts @@ -30,7 +30,6 @@ import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration'; import remote = require('remote'); -import {ipcRenderer as ipc} from 'electron'; const Dialog = remote.require('dialog'); diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts index 887a678f481..cf436f05ec1 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsTracker.ts @@ -20,7 +20,6 @@ import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import remote = require('remote'); -import {ipcRenderer as ipc} from 'electron'; import fs = require('fs'); export class SnippetsTracker implements workbenchExt.IWorkbenchContribution { diff --git a/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts index 06618c6ad43..bc1de9b6110 100644 --- a/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts @@ -28,7 +28,7 @@ export class LifecycleService extends BaseLifecycleService { let windowId = this.windowService.getWindowId(); // Main side indicates that window is about to unload, check for vetos - ipc.on('vscode:beforeUnload', (reply: { okChannel: string, cancelChannel: string }) => { + ipc.on('vscode:beforeUnload', (event, reply: { okChannel: string, cancelChannel: string }) => { let veto = this.beforeUnload(); if (typeof veto === 'boolean') { diff --git a/src/vs/workbench/services/window/electron-browser/windowService.ts b/src/vs/workbench/services/window/electron-browser/windowService.ts index 015647b741a..1c48f770dcb 100644 --- a/src/vs/workbench/services/window/electron-browser/windowService.ts +++ b/src/vs/workbench/services/window/electron-browser/windowService.ts @@ -50,7 +50,7 @@ export class WindowService implements IWindowService { } private registerListeners(): void { - ipc.on('vscode:broadcast', (b: IBroadcast) => { + ipc.on('vscode:broadcast', (event, b: IBroadcast) => { this._onBroadcast.fire(b); }); } -- GitLab