From d26e7a0a77a1ddf3cc0938ed5325e93fd4df78d9 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 4 Sep 2020 11:14:49 +0200 Subject: [PATCH] sandbox - move workspace editing service to electron-sandbox --- .../backup/{electron-browser => electron-sandbox}/backup.ts | 0 .../services/environment/electron-browser/environmentService.ts | 2 +- .../workspaceEditingService.ts | 2 +- src/vs/workbench/workbench.desktop.main.ts | 1 - src/vs/workbench/workbench.sandbox.main.ts | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) rename src/vs/workbench/services/backup/{electron-browser => electron-sandbox}/backup.ts (100%) rename src/vs/workbench/services/workspaces/{electron-browser => electron-sandbox}/workspaceEditingService.ts (99%) diff --git a/src/vs/workbench/services/backup/electron-browser/backup.ts b/src/vs/workbench/services/backup/electron-sandbox/backup.ts similarity index 100% rename from src/vs/workbench/services/backup/electron-browser/backup.ts rename to src/vs/workbench/services/backup/electron-sandbox/backup.ts diff --git a/src/vs/workbench/services/environment/electron-browser/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts index 1ec6fbb87e0..ba9e481664f 100644 --- a/src/vs/workbench/services/environment/electron-browser/environmentService.ts +++ b/src/vs/workbench/services/environment/electron-browser/environmentService.ts @@ -8,7 +8,7 @@ import { INativeWorkbenchConfiguration, INativeWorkbenchEnvironmentService } fro import { memoize } from 'vs/base/common/decorators'; import { URI } from 'vs/base/common/uri'; import { Schemas } from 'vs/base/common/network'; -import { toBackupWorkspaceResource } from 'vs/workbench/services/backup/electron-browser/backup'; +import { toBackupWorkspaceResource } from 'vs/workbench/services/backup/electron-sandbox/backup'; import { dirname, join } from 'vs/base/common/path'; import product from 'vs/platform/product/common/product'; import { isLinux, isWindows } from 'vs/base/common/platform'; diff --git a/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts similarity index 99% rename from src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts rename to src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts index 17356848c26..61b87ae61ef 100644 --- a/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts @@ -13,7 +13,7 @@ import { WorkspaceService } from 'vs/workbench/services/configuration/browser/co import { IStorageService } from 'vs/platform/storage/common/storage'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; -import { toBackupWorkspaceResource } from 'vs/workbench/services/backup/electron-browser/backup'; +import { toBackupWorkspaceResource } from 'vs/workbench/services/backup/electron-sandbox/backup'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { basename } from 'vs/base/common/resources'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index c4e846a2a4b..e62f6f88c17 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -50,7 +50,6 @@ import 'vs/workbench/services/configurationResolver/electron-browser/configurati import 'vs/workbench/services/extensionManagement/node/extensionManagementService'; import 'vs/workbench/services/accessibility/electron-browser/accessibilityService'; import 'vs/workbench/services/backup/node/backupFileService'; -import 'vs/workbench/services/workspaces/electron-browser/workspaceEditingService'; import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncMachinesService'; import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncService'; import 'vs/workbench/services/userDataSync/electron-browser/userDataSyncAccountService'; diff --git a/src/vs/workbench/workbench.sandbox.main.ts b/src/vs/workbench/workbench.sandbox.main.ts index 038fcb6f660..b4a9b96899b 100644 --- a/src/vs/workbench/workbench.sandbox.main.ts +++ b/src/vs/workbench/workbench.sandbox.main.ts @@ -33,6 +33,7 @@ import 'vs/workbench/services/request/electron-sandbox/requestService'; import 'vs/workbench/services/extensionResourceLoader/electron-sandbox/extensionResourceLoaderService'; import 'vs/workbench/services/clipboard/electron-sandbox/clipboardService'; import 'vs/workbench/services/contextmenu/electron-sandbox/contextmenuService'; +import 'vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService'; //#endregion -- GitLab