Skip to content

Commit 7f34cb5

Browse files
author
Benjamin Pasero
committed
sandbox - ensure IElectronService is declared from electron-sandbox layer
1 parent 231bee5 commit 7f34cb5

44 files changed

Lines changed: 58 additions & 50 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { IUserDataSyncService, IUserDataSyncStoreService, registerConfiguration,
5353
import { UserDataSyncService } from 'vs/platform/userDataSync/common/userDataSyncService';
5454
import { UserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSyncStoreService';
5555
import { UserDataSyncChannel, UserDataSyncUtilServiceClient, UserDataAutoSyncChannel, StorageKeysSyncRegistryChannelClient, UserDataSyncMachinesServiceChannel } from 'vs/platform/userDataSync/common/userDataSyncIpc';
56-
import { IElectronService } from 'vs/platform/electron/common/electron';
56+
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
5757
import { LoggerService } from 'vs/platform/log/node/loggerService';
5858
import { UserDataSyncLogService } from 'vs/platform/userDataSync/common/userDataSyncLog';
5959
import { ICredentialsService } from 'vs/platform/credentials/common/credentials';

‎src/vs/code/electron-main/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IProcessEnvironment, isWindows, isMacintosh } from 'vs/base/common/plat
88
import { WindowsMainService } from 'vs/platform/windows/electron-main/windowsMainService';
99
import { IWindowOpenable } from 'vs/platform/windows/common/windows';
1010
import { OpenContext } from 'vs/platform/windows/node/window';
11-
import { ActiveWindowManager } from 'vs/code/node/activeWindowTracker';
11+
import { ActiveWindowManager } from 'vs/code/electron-main/windows';
1212
import { ILifecycleMainService, LifecycleMainPhase } from 'vs/platform/lifecycle/electron-main/lifecycleMainService';
1313
import { getShellEnvironment } from 'vs/code/node/shellEnv';
1414
import { IUpdateService } from 'vs/platform/update/common/update';

src/vs/code/node/activeWindowTracker.ts renamed to src/vs/code/electron-main/windows.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Event } from 'vs/base/common/event';
77
import { DisposableStore, Disposable } from 'vs/base/common/lifecycle';
88
import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
9-
import { IElectronService } from 'vs/platform/electron/common/electron';
9+
import { IElectronMainService } from 'vs/platform/electron/electron-main/electronMainService';
1010

1111
export class ActiveWindowManager extends Disposable {
1212

@@ -15,15 +15,15 @@ export class ActiveWindowManager extends Disposable {
1515

1616
private activeWindowId: number | undefined;
1717

18-
constructor(@IElectronService electronService: IElectronService) {
18+
constructor(@IElectronMainService electronService: IElectronMainService) {
1919
super();
2020

2121
// remember last active window id upon events
2222
const onActiveWindowChange = Event.latch(Event.any(electronService.onWindowOpen, electronService.onWindowFocus));
2323
onActiveWindowChange(this.setActiveWindow, this, this.disposables);
2424

2525
// resolve current active window
26-
this.firstActiveWindowIdPromise = createCancelablePromise(() => electronService.getActiveWindowId());
26+
this.firstActiveWindowIdPromise = createCancelablePromise(() => electronService.getActiveWindowId(-1));
2727
(async () => {
2828
try {
2929
const windowId = await this.firstActiveWindowIdPromise;

‎src/vs/platform/driver/electron-browser/driver.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { IMainProcessService } from 'vs/platform/ipc/common/mainProcessService';
1010
import { remote } from 'electron';
1111
import { timeout } from 'vs/base/common/async';
1212
import { BaseWindowDriver } from 'vs/platform/driver/browser/baseDriver';
13-
import { IElectronService } from 'vs/platform/electron/common/electron';
13+
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
1414

1515
class WindowDriver extends BaseWindowDriver {
1616

‎src/vs/platform/electron/common/electron.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55

66
import { Event } from 'vs/base/common/event';
77
import { MessageBoxOptions, MessageBoxReturnValue, OpenDevToolsOptions, SaveDialogOptions, OpenDialogOptions, OpenDialogReturnValue, SaveDialogReturnValue, CrashReporterStartOptions } from 'vs/base/parts/sandbox/common/electronTypes';
8-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
98
import { IOpenedWindow, IWindowOpenable, IOpenEmptyWindowOptions, INativeOpenWindowOptions } from 'vs/platform/windows/common/windows';
109
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
1110
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1211

13-
export const IElectronService = createDecorator<IElectronService>('electronService');
14-
15-
export interface IElectronService {
12+
export interface ICommonElectronService {
1613

1714
_serviceBrand: undefined;
1815

‎src/vs/platform/electron/electron-main/electronMainService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ILifecycleMainService } from 'vs/platform/lifecycle/electron-main/lifec
1111
import { IOpenedWindow, INativeOpenWindowOptions, IWindowOpenable, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
1212
import { INativeOpenDialogOptions } from 'vs/platform/dialogs/common/dialogs';
1313
import { isMacintosh } from 'vs/base/common/platform';
14-
import { IElectronService } from 'vs/platform/electron/common/electron';
14+
import { ICommonElectronService } from 'vs/platform/electron/common/electron';
1515
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
1616
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1717
import { AddFirstParameterToFunctions } from 'vs/base/common/types';
@@ -23,9 +23,9 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
2323
import { ILogService } from 'vs/platform/log/common/log';
2424
import { INativeEnvironmentService } from 'vs/platform/environment/node/environmentService';
2525

26-
export interface IElectronMainService extends AddFirstParameterToFunctions<IElectronService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
26+
export interface IElectronMainService extends AddFirstParameterToFunctions<ICommonElectronService, Promise<unknown> /* only methods, not events */, number | undefined /* window ID */> { }
2727

28-
export const IElectronMainService = createDecorator<IElectronService>('electronMainService');
28+
export const IElectronMainService = createDecorator<IElectronMainService>('electronMainService');
2929

3030
export class ElectronMainService implements IElectronMainService {
3131

‎src/vs/platform/electron/electron-sandbox/electron.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
7+
import { ICommonElectronService } from 'vs/platform/electron/common/electron';
8+
9+
export const IElectronService = createDecorator<IElectronService>('electronService');
10+
11+
export interface IElectronService extends ICommonElectronService { }

‎src/vs/platform/files/electron-browser/diskFileSystemProvider.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { isWindows } from 'vs/base/common/platform';
99
import { localize } from 'vs/nls';
1010
import { basename } from 'vs/base/common/path';
1111
import { ILogService } from 'vs/platform/log/common/log';
12-
import { IElectronService } from 'vs/platform/electron/common/electron';
12+
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
1313

1414
export class DiskFileSystemProvider extends NodeDiskFileSystemProvider {
1515

‎src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { IUserDataSyncService, IUserDataSyncLogService, IUserDataSyncEnablementService } from 'vs/platform/userDataSync/common/userDataSync';
77
import { Event } from 'vs/base/common/event';
8-
import { IElectronService } from 'vs/platform/electron/common/electron';
8+
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
99
import { UserDataAutoSyncService as BaseUserDataAutoSyncService } from 'vs/platform/userDataSync/common/userDataAutoSyncService';
1010
import { IAuthenticationTokenService } from 'vs/platform/authentication/common/authentication';
1111
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

‎src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Severity from 'vs/base/common/severity';
1414
import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
1515
import { isMacintosh } from 'vs/base/common/platform';
1616
import { HotExitConfiguration } from 'vs/platform/files/common/files';
17-
import { IElectronService } from 'vs/platform/electron/common/electron';
17+
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
1818
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
1919
import { ILogService } from 'vs/platform/log/common/log';
2020
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';

0 commit comments

Comments
 (0)