From cdf404ff47a2eb58f0a9b01cdfab3a5adbf8e936 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 9 Jun 2025 09:08:43 +0200 Subject: [PATCH] debt - restore old layer name (#250928) --- .eslint-plugin-local/code-import-patterns.ts | 6 +- build/buildfile.js | 4 +- build/checker/layersChecker.js | 9 +- build/checker/layersChecker.ts | 10 +- build/checker/tsconfig.browser.json | 1 + ...ox.json => tsconfig.electron-browser.json} | 6 +- build/checker/tsconfig.electron-main.json | 6 +- build/checker/tsconfig.electron-utility.json | 17 ++ build/checker/tsconfig.node.json | 1 + build/checker/tsconfig.worker.json | 28 +++ build/gulpfile.reh.js | 2 +- build/gulpfile.vscode.js | 14 +- build/gulpfile.vscode.web.js | 2 +- eslint.config.js | 16 +- package.json | 2 +- src/bootstrap-import.ts | 2 +- src/tsec.exemptions.json | 6 +- .../contextmenu.ts | 2 +- .../ipc.electron.ts | 2 +- .../ipc.mp.ts | 2 +- src/vs/base/parts/ipc/electron-main/ipc.mp.ts | 2 +- .../ipc.mp.test.ts | 0 .../electronTypes.ts | 2 +- .../globals.ts | 0 .../preload-aux.ts | 0 .../preload.ts | 0 .../globals.test.ts | 2 +- src/vs/base/test/common/labels.test.ts | 2 +- .../workbench/workbench-dev.html | 0 .../workbench/workbench.html | 0 .../workbench/workbench.ts | 8 +- .../auxiliaryWindowsMainService.ts | 2 +- .../diagnosticsService.ts | 2 +- .../extensionsProfileScannerService.ts | 0 .../externalTerminalService.ts | 2 +- .../mainProcessService.ts | 2 +- .../services.ts | 0 .../menubar.ts | 0 .../profileAnalysisWorker.ts | 0 .../profileAnalysisWorkerMain.ts | 0 .../profileAnalysisWorkerService.ts | 2 +- .../profilingService.ts | 2 +- .../electronRemoteResourceLoader.ts | 0 .../remoteAuthorityResolverService.ts | 0 .../sharedProcessTunnelService.ts | 2 +- .../remoteAuthorityResolverService.test.ts | 2 +- .../remoteTunnelService.ts | 2 +- .../customEndpointTelemetryService.ts | 2 +- .../userDataProfileStorageService.ts | 0 .../webContentExtractorService.ts | 2 +- .../window.ts | 2 +- .../windows/electron-main/windowImpl.ts | 4 +- .../actions/chatDeveloperActions.ts | 0 .../actions/media/voiceChatActions.css | 0 .../actions/voiceChatActions.ts | 0 .../chat.contribution.ts | 0 .../tools/fetchPageTool.ts | 0 .../voiceChatActions.test.ts | 2 +- .../codeEditor.contribution.ts | 0 .../displayChangeRemeasureFonts.ts | 0 .../inputClipboardActions.ts | 0 .../selectionClipboard.ts | 0 .../sleepResumeRepaintMinimap.ts | 0 .../startDebugTextMate.ts | 2 +- .../extensionHostDebugService.ts | 2 +- .../emergencyAlert.contribution.ts | 0 .../encryption.contribution.ts | 0 .../debugExtensionHostAction.ts | 0 .../extensionProfileService.ts | 2 +- .../extensions.contribution.ts | 2 +- .../extensionsActions.ts | 2 +- .../extensionsAutoProfiler.ts | 6 +- .../extensionsSlowActions.ts | 2 +- .../remoteExtensionsInit.ts | 0 .../runtimeExtensionsEditor.ts | 0 .../extension.test.ts | 0 .../extensionRecommendationsService.test.ts | 4 +- .../extensionsActions.test.ts | 8 +- .../extensionsViews.test.ts | 6 +- .../extensionsWorkbenchService.test.ts | 6 +- .../externalTerminal.contribution.ts | 2 +- .../fileActions.contribution.ts | 0 .../fileCommands.ts | 0 .../inlineChat.contribution.ts | 0 .../inlineChatActions.ts | 2 +- .../issue.contribution.ts | 0 .../issueReporterService.ts | 2 +- .../issueService.ts | 0 .../nativeIssueFormService.ts | 0 .../localHistory.contribution.ts | 0 .../localHistoryCommands.ts | 0 .../localization.contribution.ts | 2 +- .../minimalTranslations.ts | 0 .../logs.contribution.ts | 0 .../logsActions.ts | 2 +- .../mcp.contribution.ts | 0 .../mcpDevModeDebuggingNode.ts | 0 .../nativeMpcDiscovery.ts | 0 .../devCommands.ts | 0 .../mergeEditor.contribution.ts | 0 .../performance.contribution.ts | 0 .../rendererAutoProfiler.ts | 4 +- .../startupProfiler.ts | 2 +- .../startupTimings.ts | 2 +- .../processExplorer.contribution.ts | 0 .../processExplorerControl.ts | 0 .../processExplorerEditor.ts | 0 .../remote.contribution.ts | 4 +- .../remoteTunnel.contribution.ts | 0 .../splash.contribution.ts | 0 .../tags.contribution.ts | 0 .../workspaceTags.ts | 0 .../workspaceTagsService.ts | 0 .../taskService.ts | 0 .../localPty.ts | 0 .../localTerminalBackend.ts | 4 +- .../terminal.contribution.ts | 2 +- .../terminalNativeContribution.ts | 2 +- .../terminalProfileResolverService.ts | 0 .../terminalRemote.ts | 0 .../userDataSync.contribution.ts | 2 +- .../webview.contribution.ts | 0 .../webviewCommands.ts | 0 .../webviewElement.ts | 0 .../webviewService.ts | 0 .../windowIgnoreMenuShortcutsManager.ts | 0 .../actions/developerActions.ts | 2 +- .../actions/installActions.ts | 0 .../actions/media/actions.css | 0 .../actions/windowActions.ts | 2 +- .../desktop.contribution.ts | 2 +- .../desktop.main.ts | 26 +-- .../media/window.css | 0 .../parts/dialogs/dialog.contribution.ts | 0 .../parts/dialogs/dialogHandler.ts | 2 +- .../parts/titlebar/menubarControl.ts | 4 +- .../parts/titlebar/titlebarPart.ts | 2 +- .../window.ts | 12 +- .../accessibilityService.ts | 2 +- .../auxiliaryWindowService.ts | 4 +- .../browserElementsService.ts | 4 +- .../checksumService.ts | 2 +- .../clipboardService.ts | 0 .../configurationResolverService.ts | 4 +- .../configurationResolverService.test.ts | 0 .../contextmenuService.ts | 2 +- .../fileDialogService.ts | 0 .../fileDialogService.test.ts | 2 +- .../encryptionService.ts | 2 +- .../environmentService.ts | 0 .../shellEnvironmentService.ts | 2 +- .../extensionGalleryManifestService.ts | 2 +- .../extensionManagementServerService.ts | 2 +- .../extensionManagementService.ts | 2 +- .../extensionTipsService.ts | 2 +- .../nativeExtensionManagementService.ts | 2 +- .../remoteExtensionManagementService.ts | 0 .../cachedExtensionScanner.ts | 0 .../extensionHostProfiler.ts | 0 .../extensionHostStarter.ts | 2 +- .../extensionsScannerService.ts | 0 .../localProcessExtensionHost.ts | 6 +- .../nativeExtensionService.ts | 0 .../diskFileSystemProvider.ts | 2 +- .../elevatedFileService.ts | 2 +- .../watcherClient.ts | 2 +- .../nativeHostService.ts | 2 +- .../integrityService.ts | 0 .../nativeKeyboardLayout.ts | 0 .../nativeKeyboardLayoutService.ts | 0 .../lifecycleService.ts | 2 +- .../lifecycleService.test.ts | 4 +- .../languagePackService.ts | 2 +- .../localeService.ts | 0 .../logService.ts | 2 +- .../menubarService.ts | 4 +- .../pathService.ts | 2 +- .../processService.ts | 2 +- .../remoteAgentService.ts | 0 .../requestService.ts | 0 .../searchService.ts | 0 .../secretStorageService.ts | 0 .../sharedProcessService.ts | 4 +- .../storageService.ts | 0 .../telemetryService.ts | 6 +- .../nativeTextFileService.ts | 2 +- .../nativeTextFileService.io.test.ts | 2 +- .../nativeTextFileService.test.ts | 2 +- .../nativeHostColorSchemeService.ts | 2 +- .../themes.contribution.ts | 0 .../timerService.ts | 4 +- .../titleService.ts | 2 +- .../tunnelService.ts | 2 +- .../updateService.ts | 2 +- .../urlService.ts | 0 .../userDataAutoSyncService.ts | 2 +- .../userDataSyncService.ts | 2 +- .../utilityProcessWorkerWorkbenchService.ts | 2 +- .../workingCopyBackupService.ts | 2 +- .../workingCopyBackupTracker.ts | 0 .../workingCopyHistoryService.ts | 0 .../workingCopyBackupService.test.ts | 4 +- .../workingCopyBackupTracker.test.ts | 4 +- .../workingCopyHistoryService.test.ts | 0 .../workingCopyHistoryTracker.test.ts | 0 .../workspaceEditingService.ts | 2 +- .../workspacesService.ts | 0 .../resolveExternal.test.ts | 2 +- .../workbenchTestServices.ts | 6 +- src/vs/workbench/workbench.desktop.main.ts | 166 +++++++++--------- test/unit/browser/index.js | 2 +- test/unit/node/index.js | 2 +- 212 files changed, 332 insertions(+), 270 deletions(-) rename build/checker/{tsconfig.electron-sandbox.json => tsconfig.electron-browser.json} (78%) create mode 100644 build/checker/tsconfig.electron-utility.json create mode 100644 build/checker/tsconfig.worker.json rename src/vs/base/parts/contextmenu/{electron-sandbox => electron-browser}/contextmenu.ts (97%) rename src/vs/base/parts/ipc/{electron-sandbox => electron-browser}/ipc.electron.ts (95%) rename src/vs/base/parts/ipc/{electron-sandbox => electron-browser}/ipc.mp.ts (98%) rename src/vs/base/parts/ipc/test/{electron-sandbox => electron-browser}/ipc.mp.test.ts (100%) rename src/vs/base/parts/sandbox/{electron-sandbox => electron-browser}/electronTypes.ts (99%) rename src/vs/base/parts/sandbox/{electron-sandbox => electron-browser}/globals.ts (100%) rename src/vs/base/parts/sandbox/{electron-sandbox => electron-browser}/preload-aux.ts (100%) rename src/vs/base/parts/sandbox/{electron-sandbox => electron-browser}/preload.ts (100%) rename src/vs/base/parts/sandbox/test/{electron-sandbox => electron-browser}/globals.test.ts (96%) rename src/vs/code/{electron-sandbox => electron-browser}/workbench/workbench-dev.html (100%) rename src/vs/code/{electron-sandbox => electron-browser}/workbench/workbench.html (100%) rename src/vs/code/{electron-sandbox => electron-browser}/workbench/workbench.ts (98%) rename src/vs/platform/diagnostics/{electron-sandbox => electron-browser}/diagnosticsService.ts (95%) rename src/vs/platform/extensionManagement/{electron-sandbox => electron-browser}/extensionsProfileScannerService.ts (100%) rename src/vs/platform/externalTerminal/{electron-sandbox => electron-browser}/externalTerminalService.ts (97%) rename src/vs/platform/ipc/{electron-sandbox => electron-browser}/mainProcessService.ts (97%) rename src/vs/platform/ipc/{electron-sandbox => electron-browser}/services.ts (100%) rename src/vs/platform/menubar/{electron-sandbox => electron-browser}/menubar.ts (100%) rename src/vs/platform/profiling/{electron-sandbox => electron-browser}/profileAnalysisWorker.ts (100%) rename src/vs/platform/profiling/{electron-sandbox => electron-browser}/profileAnalysisWorkerMain.ts (100%) rename src/vs/platform/profiling/{electron-sandbox => electron-browser}/profileAnalysisWorkerService.ts (97%) rename src/vs/platform/profiling/{electron-sandbox => electron-browser}/profilingService.ts (95%) rename src/vs/platform/remote/{electron-sandbox => electron-browser}/electronRemoteResourceLoader.ts (100%) rename src/vs/platform/remote/{electron-sandbox => electron-browser}/remoteAuthorityResolverService.ts (100%) rename src/vs/platform/remote/{electron-sandbox => electron-browser}/sharedProcessTunnelService.ts (95%) rename src/vs/platform/remote/test/{electron-sandbox => electron-browser}/remoteAuthorityResolverService.test.ts (93%) rename src/vs/platform/remoteTunnel/{electron-sandbox => electron-browser}/remoteTunnelService.ts (95%) rename src/vs/platform/telemetry/{electron-sandbox => electron-browser}/customEndpointTelemetryService.ts (95%) rename src/vs/platform/userDataProfile/{electron-sandbox => electron-browser}/userDataProfileStorageService.ts (100%) rename src/vs/platform/webContentExtractor/{electron-sandbox => electron-browser}/webContentExtractorService.ts (91%) rename src/vs/platform/window/{electron-sandbox => electron-browser}/window.ts (98%) rename src/vs/workbench/contrib/chat/{electron-sandbox => electron-browser}/actions/chatDeveloperActions.ts (100%) rename src/vs/workbench/contrib/chat/{electron-sandbox => electron-browser}/actions/media/voiceChatActions.css (100%) rename src/vs/workbench/contrib/chat/{electron-sandbox => electron-browser}/actions/voiceChatActions.ts (100%) rename src/vs/workbench/contrib/chat/{electron-sandbox => electron-browser}/chat.contribution.ts (100%) rename src/vs/workbench/contrib/chat/{electron-sandbox => electron-browser}/tools/fetchPageTool.ts (100%) rename src/vs/workbench/contrib/chat/test/{electron-sandbox => electron-browser}/voiceChatActions.test.ts (95%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/codeEditor.contribution.ts (100%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/displayChangeRemeasureFonts.ts (100%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/inputClipboardActions.ts (100%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/selectionClipboard.ts (100%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/sleepResumeRepaintMinimap.ts (100%) rename src/vs/workbench/contrib/codeEditor/{electron-sandbox => electron-browser}/startDebugTextMate.ts (98%) rename src/vs/workbench/contrib/debug/{electron-sandbox => electron-browser}/extensionHostDebugService.ts (95%) rename src/vs/workbench/contrib/emergencyAlert/{electron-sandbox => electron-browser}/emergencyAlert.contribution.ts (100%) rename src/vs/workbench/contrib/encryption/{electron-sandbox => electron-browser}/encryption.contribution.ts (100%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/debugExtensionHostAction.ts (100%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/extensionProfileService.ts (99%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/extensions.contribution.ts (99%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/extensionsActions.ts (97%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/extensionsAutoProfiler.ts (98%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/extensionsSlowActions.ts (99%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/remoteExtensionsInit.ts (100%) rename src/vs/workbench/contrib/extensions/{electron-sandbox => electron-browser}/runtimeExtensionsEditor.ts (100%) rename src/vs/workbench/contrib/extensions/test/{electron-sandbox => electron-browser}/extension.test.ts (100%) rename src/vs/workbench/contrib/extensions/test/{electron-sandbox => electron-browser}/extensionRecommendationsService.test.ts (99%) rename src/vs/workbench/contrib/extensions/test/{electron-sandbox => electron-browser}/extensionsActions.test.ts (99%) rename src/vs/workbench/contrib/extensions/test/{electron-sandbox => electron-browser}/extensionsViews.test.ts (99%) rename src/vs/workbench/contrib/extensions/test/{electron-sandbox => electron-browser}/extensionsWorkbenchService.test.ts (99%) rename src/vs/workbench/contrib/externalTerminal/{electron-sandbox => electron-browser}/externalTerminal.contribution.ts (99%) rename src/vs/workbench/contrib/files/{electron-sandbox => electron-browser}/fileActions.contribution.ts (100%) rename src/vs/workbench/contrib/files/{electron-sandbox => electron-browser}/fileCommands.ts (100%) rename src/vs/workbench/contrib/inlineChat/{electron-sandbox => electron-browser}/inlineChat.contribution.ts (100%) rename src/vs/workbench/contrib/inlineChat/{electron-sandbox => electron-browser}/inlineChatActions.ts (98%) rename src/vs/workbench/contrib/issue/{electron-sandbox => electron-browser}/issue.contribution.ts (100%) rename src/vs/workbench/contrib/issue/{electron-sandbox => electron-browser}/issueReporterService.ts (99%) rename src/vs/workbench/contrib/issue/{electron-sandbox => electron-browser}/issueService.ts (100%) rename src/vs/workbench/contrib/issue/{electron-sandbox => electron-browser}/nativeIssueFormService.ts (100%) rename src/vs/workbench/contrib/localHistory/{electron-sandbox => electron-browser}/localHistory.contribution.ts (100%) rename src/vs/workbench/contrib/localHistory/{electron-sandbox => electron-browser}/localHistoryCommands.ts (100%) rename src/vs/workbench/contrib/localization/{electron-sandbox => electron-browser}/localization.contribution.ts (98%) rename src/vs/workbench/contrib/localization/{electron-sandbox => electron-browser}/minimalTranslations.ts (100%) rename src/vs/workbench/contrib/logs/{electron-sandbox => electron-browser}/logs.contribution.ts (100%) rename src/vs/workbench/contrib/logs/{electron-sandbox => electron-browser}/logsActions.ts (97%) rename src/vs/workbench/contrib/mcp/{electron-sandbox => electron-browser}/mcp.contribution.ts (100%) rename src/vs/workbench/contrib/mcp/{electron-sandbox => electron-browser}/mcpDevModeDebuggingNode.ts (100%) rename src/vs/workbench/contrib/mcp/{electron-sandbox => electron-browser}/nativeMpcDiscovery.ts (100%) rename src/vs/workbench/contrib/mergeEditor/{electron-sandbox => electron-browser}/devCommands.ts (100%) rename src/vs/workbench/contrib/mergeEditor/{electron-sandbox => electron-browser}/mergeEditor.contribution.ts (100%) rename src/vs/workbench/contrib/performance/{electron-sandbox => electron-browser}/performance.contribution.ts (100%) rename src/vs/workbench/contrib/performance/{electron-sandbox => electron-browser}/rendererAutoProfiler.ts (97%) rename src/vs/workbench/contrib/performance/{electron-sandbox => electron-browser}/startupProfiler.ts (99%) rename src/vs/workbench/contrib/performance/{electron-sandbox => electron-browser}/startupTimings.ts (99%) rename src/vs/workbench/contrib/processExplorer/{electron-sandbox => electron-browser}/processExplorer.contribution.ts (100%) rename src/vs/workbench/contrib/processExplorer/{electron-sandbox => electron-browser}/processExplorerControl.ts (100%) rename src/vs/workbench/contrib/processExplorer/{electron-sandbox => electron-browser}/processExplorerEditor.ts (100%) rename src/vs/workbench/contrib/remote/{electron-sandbox => electron-browser}/remote.contribution.ts (99%) rename src/vs/workbench/contrib/remoteTunnel/{electron-sandbox => electron-browser}/remoteTunnel.contribution.ts (100%) rename src/vs/workbench/contrib/splash/{electron-sandbox => electron-browser}/splash.contribution.ts (100%) rename src/vs/workbench/contrib/tags/{electron-sandbox => electron-browser}/tags.contribution.ts (100%) rename src/vs/workbench/contrib/tags/{electron-sandbox => electron-browser}/workspaceTags.ts (100%) rename src/vs/workbench/contrib/tags/{electron-sandbox => electron-browser}/workspaceTagsService.ts (100%) rename src/vs/workbench/contrib/tasks/{electron-sandbox => electron-browser}/taskService.ts (100%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/localPty.ts (100%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/localTerminalBackend.ts (99%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/terminal.contribution.ts (97%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/terminalNativeContribution.ts (99%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/terminalProfileResolverService.ts (100%) rename src/vs/workbench/contrib/terminal/{electron-sandbox => electron-browser}/terminalRemote.ts (100%) rename src/vs/workbench/contrib/userDataSync/{electron-sandbox => electron-browser}/userDataSync.contribution.ts (99%) rename src/vs/workbench/contrib/webview/{electron-sandbox => electron-browser}/webview.contribution.ts (100%) rename src/vs/workbench/contrib/webview/{electron-sandbox => electron-browser}/webviewCommands.ts (100%) rename src/vs/workbench/contrib/webview/{electron-sandbox => electron-browser}/webviewElement.ts (100%) rename src/vs/workbench/contrib/webview/{electron-sandbox => electron-browser}/webviewService.ts (100%) rename src/vs/workbench/contrib/webview/{electron-sandbox => electron-browser}/windowIgnoreMenuShortcutsManager.ts (100%) rename src/vs/workbench/{electron-sandbox => electron-browser}/actions/developerActions.ts (99%) rename src/vs/workbench/{electron-sandbox => electron-browser}/actions/installActions.ts (100%) rename src/vs/workbench/{electron-sandbox => electron-browser}/actions/media/actions.css (100%) rename src/vs/workbench/{electron-sandbox => electron-browser}/actions/windowActions.ts (99%) rename src/vs/workbench/{electron-sandbox => electron-browser}/desktop.contribution.ts (99%) rename src/vs/workbench/{electron-sandbox => electron-browser}/desktop.main.ts (96%) rename src/vs/workbench/{electron-sandbox => electron-browser}/media/window.css (100%) rename src/vs/workbench/{electron-sandbox => electron-browser}/parts/dialogs/dialog.contribution.ts (100%) rename src/vs/workbench/{electron-sandbox => electron-browser}/parts/dialogs/dialogHandler.ts (99%) rename src/vs/workbench/{electron-sandbox => electron-browser}/parts/titlebar/menubarControl.ts (98%) rename src/vs/workbench/{electron-sandbox => electron-browser}/parts/titlebar/titlebarPart.ts (99%) rename src/vs/workbench/{electron-sandbox => electron-browser}/window.ts (99%) rename src/vs/workbench/services/accessibility/{electron-sandbox => electron-browser}/accessibilityService.ts (99%) rename src/vs/workbench/services/auxiliaryWindow/{electron-sandbox => electron-browser}/auxiliaryWindowService.ts (99%) rename src/vs/workbench/services/browserElements/{electron-sandbox => electron-browser}/browserElementsService.ts (97%) rename src/vs/workbench/services/checksum/{electron-sandbox => electron-browser}/checksumService.ts (92%) rename src/vs/workbench/services/clipboard/{electron-sandbox => electron-browser}/clipboardService.ts (100%) rename src/vs/workbench/services/configurationResolver/{electron-sandbox => electron-browser}/configurationResolverService.ts (96%) rename src/vs/workbench/services/configurationResolver/test/{electron-sandbox => electron-browser}/configurationResolverService.test.ts (100%) rename src/vs/workbench/services/contextmenu/{electron-sandbox => electron-browser}/contextmenuService.ts (99%) rename src/vs/workbench/services/dialogs/{electron-sandbox => electron-browser}/fileDialogService.ts (100%) rename src/vs/workbench/services/dialogs/test/{electron-sandbox => electron-browser}/fileDialogService.test.ts (99%) rename src/vs/workbench/services/encryption/{electron-sandbox => electron-browser}/encryptionService.ts (93%) rename src/vs/workbench/services/environment/{electron-sandbox => electron-browser}/environmentService.ts (100%) rename src/vs/workbench/services/environment/{electron-sandbox => electron-browser}/shellEnvironmentService.ts (98%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/extensionGalleryManifestService.ts (99%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/extensionManagementServerService.ts (99%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/extensionManagementService.ts (99%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/extensionTipsService.ts (98%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/nativeExtensionManagementService.ts (98%) rename src/vs/workbench/services/extensionManagement/{electron-sandbox => electron-browser}/remoteExtensionManagementService.ts (100%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/cachedExtensionScanner.ts (100%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/extensionHostProfiler.ts (100%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/extensionHostStarter.ts (93%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/extensionsScannerService.ts (100%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/localProcessExtensionHost.ts (99%) rename src/vs/workbench/services/extensions/{electron-sandbox => electron-browser}/nativeExtensionService.ts (100%) rename src/vs/workbench/services/files/{electron-sandbox => electron-browser}/diskFileSystemProvider.ts (99%) rename src/vs/workbench/services/files/{electron-sandbox => electron-browser}/elevatedFileService.ts (98%) rename src/vs/workbench/services/files/{electron-sandbox => electron-browser}/watcherClient.ts (97%) rename src/vs/workbench/services/host/{electron-sandbox => electron-browser}/nativeHostService.ts (99%) rename src/vs/workbench/services/integrity/{electron-sandbox => electron-browser}/integrityService.ts (100%) rename src/vs/workbench/services/keybinding/{electron-sandbox => electron-browser}/nativeKeyboardLayout.ts (100%) rename src/vs/workbench/services/keybinding/{electron-sandbox => electron-browser}/nativeKeyboardLayoutService.ts (100%) rename src/vs/workbench/services/lifecycle/{electron-sandbox => electron-browser}/lifecycleService.ts (99%) rename src/vs/workbench/services/lifecycle/test/{electron-sandbox => electron-browser}/lifecycleService.test.ts (98%) rename src/vs/workbench/services/localization/{electron-sandbox => electron-browser}/languagePackService.ts (93%) rename src/vs/workbench/services/localization/{electron-sandbox => electron-browser}/localeService.ts (100%) rename src/vs/workbench/services/log/{electron-sandbox => electron-browser}/logService.ts (97%) rename src/vs/workbench/services/menubar/{electron-sandbox => electron-browser}/menubarService.ts (88%) rename src/vs/workbench/services/path/{electron-sandbox => electron-browser}/pathService.ts (96%) rename src/vs/workbench/services/process/{electron-sandbox => electron-browser}/processService.ts (93%) rename src/vs/workbench/services/remote/{electron-sandbox => electron-browser}/remoteAgentService.ts (100%) rename src/vs/workbench/services/request/{electron-sandbox => electron-browser}/requestService.ts (100%) rename src/vs/workbench/services/search/{electron-sandbox => electron-browser}/searchService.ts (100%) rename src/vs/workbench/services/secrets/{electron-sandbox => electron-browser}/secretStorageService.ts (100%) rename src/vs/workbench/services/sharedProcess/{electron-sandbox => electron-browser}/sharedProcessService.ts (98%) rename src/vs/workbench/services/storage/{electron-sandbox => electron-browser}/storageService.ts (100%) rename src/vs/workbench/services/telemetry/{electron-sandbox => electron-browser}/telemetryService.ts (97%) rename src/vs/workbench/services/textfile/{electron-sandbox => electron-browser}/nativeTextFileService.ts (99%) rename src/vs/workbench/services/textfile/test/{electron-sandbox => electron-browser}/nativeTextFileService.io.test.ts (98%) rename src/vs/workbench/services/textfile/test/{electron-sandbox => electron-browser}/nativeTextFileService.test.ts (98%) rename src/vs/workbench/services/themes/{electron-sandbox => electron-browser}/nativeHostColorSchemeService.ts (98%) rename src/vs/workbench/services/themes/{electron-sandbox => electron-browser}/themes.contribution.ts (100%) rename src/vs/workbench/services/timer/{electron-sandbox => electron-browser}/timerService.ts (98%) rename src/vs/workbench/services/title/{electron-sandbox => electron-browser}/titleService.ts (90%) rename src/vs/workbench/services/tunnel/{electron-sandbox => electron-browser}/tunnelService.ts (99%) rename src/vs/workbench/services/update/{electron-sandbox => electron-browser}/updateService.ts (94%) rename src/vs/workbench/services/url/{electron-sandbox => electron-browser}/urlService.ts (100%) rename src/vs/workbench/services/userDataSync/{electron-sandbox => electron-browser}/userDataAutoSyncService.ts (98%) rename src/vs/workbench/services/userDataSync/{electron-sandbox => electron-browser}/userDataSyncService.ts (97%) rename src/vs/workbench/services/utilityProcess/{electron-sandbox => electron-browser}/utilityProcessWorkerWorkbenchService.ts (99%) rename src/vs/workbench/services/workingCopy/{electron-sandbox => electron-browser}/workingCopyBackupService.ts (98%) rename src/vs/workbench/services/workingCopy/{electron-sandbox => electron-browser}/workingCopyBackupTracker.ts (100%) rename src/vs/workbench/services/workingCopy/{electron-sandbox => electron-browser}/workingCopyHistoryService.ts (100%) rename src/vs/workbench/services/workingCopy/test/{electron-sandbox => electron-browser}/workingCopyBackupService.test.ts (99%) rename src/vs/workbench/services/workingCopy/test/{electron-sandbox => electron-browser}/workingCopyBackupTracker.test.ts (99%) rename src/vs/workbench/services/workingCopy/test/{electron-sandbox => electron-browser}/workingCopyHistoryService.test.ts (100%) rename src/vs/workbench/services/workingCopy/test/{electron-sandbox => electron-browser}/workingCopyHistoryTracker.test.ts (100%) rename src/vs/workbench/services/workspaces/{electron-sandbox => electron-browser}/workspaceEditingService.ts (99%) rename src/vs/workbench/services/workspaces/{electron-sandbox => electron-browser}/workspacesService.ts (100%) rename src/vs/workbench/test/{electron-sandbox => electron-browser}/resolveExternal.test.ts (98%) rename src/vs/workbench/test/{electron-sandbox => electron-browser}/workbenchTestServices.ts (99%) diff --git a/.eslint-plugin-local/code-import-patterns.ts b/.eslint-plugin-local/code-import-patterns.ts index ed14fa35d5a..e4beb9a4738 100644 --- a/.eslint-plugin-local/code-import-patterns.ts +++ b/.eslint-plugin-local/code-import-patterns.ts @@ -18,7 +18,7 @@ interface ConditionalPattern { interface RawImportPatternsConfig { target: string; - layer?: 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main'; + layer?: 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main'; test?: boolean; restrictions: string | (string | ConditionalPattern)[]; } @@ -80,7 +80,7 @@ export = new class implements eslint.Rule.RuleModule { return this._optionsCache.get(options)!; } - type Layer = 'common' | 'worker' | 'browser' | 'electron-sandbox' | 'node' | 'electron-utility' | 'electron-main'; + type Layer = 'common' | 'worker' | 'browser' | 'electron-browser' | 'node' | 'electron-utility' | 'electron-main'; interface ILayerRule { layer: Layer; @@ -98,7 +98,7 @@ export = new class implements eslint.Rule.RuleModule { { layer: 'common', deps: orSegment(['common']) }, { layer: 'worker', deps: orSegment(['common', 'worker']) }, { layer: 'browser', deps: orSegment(['common', 'browser']), isBrowser: true }, - { layer: 'electron-sandbox', deps: orSegment(['common', 'browser', 'electron-sandbox']), isBrowser: true }, + { layer: 'electron-browser', deps: orSegment(['common', 'browser', 'electron-browser']), isBrowser: true }, { layer: 'node', deps: orSegment(['common', 'node']), isNode: true }, { layer: 'electron-utility', deps: orSegment(['common', 'node', 'electron-utility']), isNode: true, isElectron: true }, { layer: 'electron-main', deps: orSegment(['common', 'node', 'electron-utility', 'electron-main']), isNode: true, isElectron: true }, diff --git a/build/buildfile.js b/build/buildfile.js index b1ce1186d4e..b5e8f6e7e6c 100644 --- a/build/buildfile.js +++ b/build/buildfile.js @@ -18,7 +18,7 @@ exports.workerExtensionHost = createModuleDescription('vs/workbench/api/worker/e exports.workerNotebook = createModuleDescription('vs/workbench/contrib/notebook/common/services/notebookWebWorkerMain'); exports.workerLanguageDetection = createModuleDescription('vs/workbench/services/languageDetection/browser/languageDetectionWebWorkerMain'); exports.workerLocalFileSearch = createModuleDescription('vs/workbench/services/search/worker/localFileSearchMain'); -exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain'); +exports.workerProfileAnalysis = createModuleDescription('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain'); exports.workerOutputLinks = createModuleDescription('vs/workbench/contrib/output/common/outputLinkComputerMain'); exports.workerBackgroundTokenization = createModuleDescription('vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateTokenizationWorker.workerMain'); @@ -43,7 +43,7 @@ exports.code = [ // 'vs/code/node/cli' is not included here because it comes in via ./src/cli.js createModuleDescription('vs/code/node/cliProcessMain'), createModuleDescription('vs/code/electron-utility/sharedProcess/sharedProcessMain'), - createModuleDescription('vs/code/electron-sandbox/workbench/workbench'), + createModuleDescription('vs/code/electron-browser/workbench/workbench'), createModuleDescription('vs/workbench/contrib/webview/browser/pre/service-worker') ]; diff --git a/build/checker/layersChecker.js b/build/checker/layersChecker.js index 0c30e64baa0..b2e319b5ecb 100644 --- a/build/checker/layersChecker.js +++ b/build/checker/layersChecker.js @@ -53,9 +53,9 @@ const RULES = [ ].join(',')}}`, disallowedTypes: [ /* Ignore native types that are defined from here */], }, - // Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts + // Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts { - target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts', + target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts', disallowedTypes: NATIVE_TYPES, }, // Common @@ -63,6 +63,11 @@ const RULES = [ target: '**/vs/**/common/**', disallowedTypes: NATIVE_TYPES, }, + // Common + { + target: '**/vs/**/worker/**', + disallowedTypes: NATIVE_TYPES, + }, // Browser { target: '**/vs/**/browser/**', diff --git a/build/checker/layersChecker.ts b/build/checker/layersChecker.ts index 6337967b248..68e12e61c40 100644 --- a/build/checker/layersChecker.ts +++ b/build/checker/layersChecker.ts @@ -55,9 +55,9 @@ const RULES: IRule[] = [ disallowedTypes: [/* Ignore native types that are defined from here */], }, - // Common: vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts + // Common: vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts { - target: '**/vs/base/parts/sandbox/electron-sandbox/preload{,-aux}.ts', + target: '**/vs/base/parts/sandbox/electron-browser/preload{,-aux}.ts', disallowedTypes: NATIVE_TYPES, }, @@ -67,6 +67,12 @@ const RULES: IRule[] = [ disallowedTypes: NATIVE_TYPES, }, + // Common + { + target: '**/vs/**/worker/**', + disallowedTypes: NATIVE_TYPES, + }, + // Browser { target: '**/vs/**/browser/**', diff --git a/build/checker/tsconfig.browser.json b/build/checker/tsconfig.browser.json index 098a4ffbb1e..67868ef7575 100644 --- a/build/checker/tsconfig.browser.json +++ b/build/checker/tsconfig.browser.json @@ -11,6 +11,7 @@ "skipLibCheck": true }, "include": [ + "../../src/*.ts", "../../src/**/common/**/*.ts", "../../src/**/browser/**/*.ts", "../../src/typings/*.d.ts", diff --git a/build/checker/tsconfig.electron-sandbox.json b/build/checker/tsconfig.electron-browser.json similarity index 78% rename from build/checker/tsconfig.electron-sandbox.json rename to build/checker/tsconfig.electron-browser.json index 88c04da1c2d..2cbe3d3bd33 100644 --- a/build/checker/tsconfig.electron-sandbox.json +++ b/build/checker/tsconfig.electron-browser.json @@ -3,7 +3,7 @@ "include": [ "../../src/**/common/**/*.ts", "../../src/**/browser/**/*.ts", - "../../src/**/electron-sandbox/**/*.ts", + "../../src/**/electron-browser/**/*.ts", "../../src/typings/*.d.ts", "../../src/vs/monaco.d.ts", "../../src/vscode-dts/vscode.proposed.*.d.ts", @@ -15,7 +15,7 @@ "exclude": [ "../../src/**/test/**", "../../src/**/fixtures/**", - "../../src/vs/base/parts/sandbox/electron-sandbox/preload.ts", // Preload scripts for Electron sandbox - "../../src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts" // have limited access to node.js APIs + "../../src/vs/base/parts/sandbox/electron-browser/preload.ts", // Preload scripts for Electron sandbox + "../../src/vs/base/parts/sandbox/electron-browser/preload-aux.ts" // have limited access to node.js APIs ] } diff --git a/build/checker/tsconfig.electron-main.json b/build/checker/tsconfig.electron-main.json index 3cb4450c701..a275f65d9e5 100644 --- a/build/checker/tsconfig.electron-main.json +++ b/build/checker/tsconfig.electron-main.json @@ -1,9 +1,13 @@ { "extends": "./tsconfig.node.json", "include": [ + "../../src/**/common/**/*.ts", + "../../src/**/node/**/*.ts", "../../src/**/electron-main/**/*.ts", - "../../src/**/electron-utility/**/*.ts", "../../src/typings/*.d.ts", + "../../src/vs/monaco.d.ts", + "../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../src/vscode-dts/vscode.d.ts", "../../node_modules/@types/trusted-types/index.d.ts", ], "exclude": [ diff --git a/build/checker/tsconfig.electron-utility.json b/build/checker/tsconfig.electron-utility.json new file mode 100644 index 00000000000..25b33be427d --- /dev/null +++ b/build/checker/tsconfig.electron-utility.json @@ -0,0 +1,17 @@ +{ + "extends": "./tsconfig.node.json", + "include": [ + "../../src/**/common/**/*.ts", + "../../src/**/node/**/*.ts", + "../../src/**/electron-utility/**/*.ts", + "../../src/typings/*.d.ts", + "../../src/vs/monaco.d.ts", + "../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../src/vscode-dts/vscode.d.ts", + "../../node_modules/@types/trusted-types/index.d.ts", + ], + "exclude": [ + "../../src/**/test/**", + "../../src/**/fixtures/**", + ] +} diff --git a/build/checker/tsconfig.node.json b/build/checker/tsconfig.node.json index 0b2a09b83f6..2e483136e08 100644 --- a/build/checker/tsconfig.node.json +++ b/build/checker/tsconfig.node.json @@ -11,6 +11,7 @@ "skipLibCheck": true }, "include": [ + "../../src/*.ts", "../../src/**/common/**/*.ts", "../../src/**/node/**/*.ts", "../../src/typings/*.d.ts", diff --git a/build/checker/tsconfig.worker.json b/build/checker/tsconfig.worker.json new file mode 100644 index 00000000000..ebb919bf0f2 --- /dev/null +++ b/build/checker/tsconfig.worker.json @@ -0,0 +1,28 @@ +{ + "extends": "../../src/tsconfig.base.json", + "compilerOptions": { + "lib": [ + "ES2022", + "WebWorker", + "Webworker.Iterable", + "WebWorker.AsyncIterable" + ], + "types": [], + "noEmit": true, + "skipLibCheck": true + }, + "include": [ + "../../src/**/common/**/*.ts", + "../../src/**/worker/**/*.ts", + "../../src/typings/*.d.ts", + "../../src/vs/monaco.d.ts", + "../../src/vscode-dts/vscode.proposed.*.d.ts", + "../../src/vscode-dts/vscode.d.ts", + "../../node_modules/@types/trusted-types/index.d.ts", + "../../node_modules/@types/wicg-file-system-access/index.d.ts" + ], + "exclude": [ + "../../src/**/test/**", + "../../src/**/fixtures/**" + ] +} diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index c3db770d0a0..ba9f0e46ff0 100644 --- a/build/gulpfile.reh.js +++ b/build/gulpfile.reh.js @@ -80,7 +80,7 @@ const serverResourceIncludes = [ ]; const serverResourceExcludes = [ - '!out-build/vs/**/{electron-sandbox,electron-main,electron-utility}/**', + '!out-build/vs/**/{electron-browser,electron-main,electron-utility}/**', '!out-build/vs/editor/standalone/**', '!out-build/vs/workbench/**/*-tb.png', '!**/test/**' diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 610cbc389fc..f819cd6a1c2 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -57,11 +57,11 @@ const vscodeResourceIncludes = [ 'out-build/nls.keys.json', // Workbench - 'out-build/vs/code/electron-sandbox/workbench/workbench.html', + 'out-build/vs/code/electron-browser/workbench/workbench.html', // Electron Preload - 'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js', - 'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js', + 'out-build/vs/base/parts/sandbox/electron-browser/preload.js', + 'out-build/vs/base/parts/sandbox/electron-browser/preload-aux.js', // Node Scripts 'out-build/vs/base/node/{terminateProcess.sh,cpuUsage.sh,ps.sh}', @@ -138,7 +138,7 @@ const bundleVSCodeTask = task.define('bundle-vscode', task.series( ...bootstrapEntryPoints ], resources: vscodeResources, - skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-sandbox/workbench/workbench' + skipTSBoilerplateRemoval: entryPoint => entryPoint === 'vs/code/electron-browser/workbench/workbench' } } ) @@ -220,12 +220,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const out = sourceFolderName; const checksums = computeChecksums(out, [ - 'vs/base/parts/sandbox/electron-sandbox/preload.js', + 'vs/base/parts/sandbox/electron-browser/preload.js', 'vs/workbench/workbench.desktop.main.js', 'vs/workbench/workbench.desktop.main.css', 'vs/workbench/api/node/extensionHostProcess.js', - 'vs/code/electron-sandbox/workbench/workbench.html', - 'vs/code/electron-sandbox/workbench/workbench.js' + 'vs/code/electron-browser/workbench/workbench.html', + 'vs/code/electron-browser/workbench/workbench.js' ]); const src = gulp.src(out + '/**', { base: '.' }) diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index 72423c765ea..08dfcfd0cd9 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -66,7 +66,7 @@ const vscodeWebResources = [ ...vscodeWebResourceIncludes, // Excludes - '!out-build/vs/**/{node,electron-sandbox,electron-main,electron-utility}/**', + '!out-build/vs/**/{node,electron-browser,electron-main,electron-utility}/**', '!out-build/vs/editor/standalone/**', '!out-build/vs/workbench/**/*-tb.png', '!out-build/vs/code/**/*-dev.html', diff --git a/eslint.config.js b/eslint.config.js index 7067b7ea730..dde24771a66 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -99,7 +99,7 @@ export default tseslint.config( 'browser': [ 'common' ], - 'electron-sandbox': [ + 'electron-browser': [ 'common', 'browser' ], @@ -406,10 +406,10 @@ export default tseslint.config( ] } }, - // browser/electron-sandbox layer + // browser/electron-browser layer { files: [ - 'src/**/{browser,electron-sandbox}/**/*.ts' + 'src/**/{browser,electron-browser}/**/*.ts' ], languageOptions: { parser: tseslint.parser, @@ -770,7 +770,7 @@ export default tseslint.config( { // imports that are allowed in all files of layers: // - browser - // - electron-sandbox + // - electron-browser 'when': 'hasBrowser', 'allow': [] }, @@ -866,18 +866,18 @@ export default tseslint.config( // - src/vs/base/common // - src/vs/base/worker // - src/vs/base/browser - // - src/vs/base/electron-sandbox + // - src/vs/base/electron-browser // - src/vs/base/node // - src/vs/base/electron-main // - src/vs/base/test/common // - src/vs/base/test/worker // - src/vs/base/test/browser - // - src/vs/base/test/electron-sandbox + // - src/vs/base/test/electron-browser // - src/vs/base/test/node // - src/vs/base/test/electron-main // // When /~ is used in the restrictions, it will be replaced with the correct - // layers that can be used e.g. 'src/vs/base/electron-sandbox' will be able + // layers that can be used e.g. 'src/vs/base/electron-browser' will be able // to import '{common,browser,electron-sanbox}', etc. // // It is possible to use /~ in the restrictions property even without using it in @@ -1203,7 +1203,7 @@ export default tseslint.config( }, { 'target': 'src/vs/workbench/workbench.desktop.main.ts', - 'layer': 'electron-sandbox', + 'layer': 'electron-browser', 'restrictions': [ 'vs/base/*/~', 'vs/base/parts/*/~', diff --git a/package.json b/package.json index 0a4e6295ad1..49da9b08d69 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "monaco-compile-check": "tsc -p src/tsconfig.monaco.json --noEmit", "tsec-compile-check": "node node_modules/tsec/bin/tsec -p src/tsconfig.tsec.json", "vscode-dts-compile-check": "tsc -p src/tsconfig.vscode-dts.json && tsc -p src/tsconfig.vscode-proposed-dts.json", - "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-sandbox.json && tsc -p build/checker/tsconfig.electron-main.json", + "valid-layers-check": "node build/checker/layersChecker.js && tsc -p build/checker/tsconfig.browser.json && tsc -p build/checker/tsconfig.worker.json && tsc -p build/checker/tsconfig.node.json && tsc -p build/checker/tsconfig.electron-browser.json && tsc -p build/checker/tsconfig.electron-main.json && tsc -p build/checker/tsconfig.electron-utility.json", "define-class-fields-check": "node build/lib/propertyInitOrderChecker.js && tsc -p src/tsconfig.defineClassFields.json", "update-distro": "node build/npm/update-distro.mjs", "web": "echo 'npm run web' is replaced by './scripts/code-server' or './scripts/code-web'", diff --git a/src/bootstrap-import.ts b/src/bootstrap-import.ts index 8869058159d..9d222a003eb 100644 --- a/src/bootstrap-import.ts +++ b/src/bootstrap-import.ts @@ -6,7 +6,7 @@ // ********************************************************************* // * * // * We need this to redirect to node_modules from the remote-folder. * -// * This ONLY applies when running out of source. * +// * This ONLY applies when running out of source. * // * * // ********************************************************************* diff --git a/src/tsec.exemptions.json b/src/tsec.exemptions.json index 5bb86c7a91f..f913df5e7da 100644 --- a/src/tsec.exemptions.json +++ b/src/tsec.exemptions.json @@ -1,6 +1,6 @@ { "ban-document-execcommand": [ - "vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts", + "vs/workbench/contrib/codeEditor/electron-browser/inputClipboardActions.ts", "vs/editor/contrib/clipboard/browser/clipboard.ts" ], "ban-eval-calls": [ @@ -12,7 +12,7 @@ "vs/workbench/services/keybinding/test/node/keyboardMapperTestUtils.ts" ], "ban-trustedtypes-createpolicy": [ - "vs/code/electron-sandbox/workbench/workbench.ts", + "vs/code/electron-browser/workbench/workbench.ts", "vs/amdX.ts", "vs/base/browser/trustedTypes.ts", "vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts" @@ -37,6 +37,6 @@ "**/*.ts" ], "ban-script-content-assignments": [ - "vs/code/electron-sandbox/workbench/workbench.ts" + "vs/code/electron-browser/workbench/workbench.ts" ] } diff --git a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts similarity index 97% rename from src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts rename to src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts index 845cf33c343..3eab2e24b9d 100644 --- a/src/vs/base/parts/contextmenu/electron-sandbox/contextmenu.ts +++ b/src/vs/base/parts/contextmenu/electron-browser/contextmenu.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { CONTEXT_MENU_CHANNEL, CONTEXT_MENU_CLOSE_CHANNEL, IContextMenuEvent, IContextMenuItem, IPopupOptions, ISerializableContextMenuItem } from '../common/contextmenu.js'; -import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../sandbox/electron-browser/globals.js'; let contextMenuIdPool = 0; diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts b/src/vs/base/parts/ipc/electron-browser/ipc.electron.ts similarity index 95% rename from src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts rename to src/vs/base/parts/ipc/electron-browser/ipc.electron.ts index 553a310e978..4a0ae19a37d 100644 --- a/src/vs/base/parts/ipc/electron-sandbox/ipc.electron.ts +++ b/src/vs/base/parts/ipc/electron-browser/ipc.electron.ts @@ -8,7 +8,7 @@ import { Event } from '../../../common/event.js'; import { IDisposable } from '../../../common/lifecycle.js'; import { IPCClient } from '../common/ipc.js'; import { Protocol as ElectronProtocol } from '../common/ipc.electron.js'; -import { ipcRenderer } from '../../sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../sandbox/electron-browser/globals.js'; /** * An implementation of `IPCClient` on top of Electron `ipcRenderer` IPC communication diff --git a/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts b/src/vs/base/parts/ipc/electron-browser/ipc.mp.ts similarity index 98% rename from src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts rename to src/vs/base/parts/ipc/electron-browser/ipc.mp.ts index 4a36b238817..407ff931794 100644 --- a/src/vs/base/parts/ipc/electron-sandbox/ipc.mp.ts +++ b/src/vs/base/parts/ipc/electron-browser/ipc.mp.ts @@ -6,7 +6,7 @@ import { mainWindow } from '../../../browser/window.js'; import { Event } from '../../../common/event.js'; import { generateUuid } from '../../../common/uuid.js'; -import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-sandbox/globals.js'; +import { ipcMessagePort, ipcRenderer } from '../../sandbox/electron-browser/globals.js'; interface IMessageChannelResult { nonce: string; diff --git a/src/vs/base/parts/ipc/electron-main/ipc.mp.ts b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts index dacaac11a56..4f2dc1987b3 100644 --- a/src/vs/base/parts/ipc/electron-main/ipc.mp.ts +++ b/src/vs/base/parts/ipc/electron-main/ipc.mp.ts @@ -34,7 +34,7 @@ export class Client extends MessagePortClient implements IDisposable { /** * This method opens a message channel connection * in the target window. The target window needs - * to use the `Server` from `electron-sandbox/ipc.mp`. + * to use the `Server` from `electron-browser/ipc.mp`. */ export async function connect(window: BrowserWindow): Promise { diff --git a/src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts b/src/vs/base/parts/ipc/test/electron-browser/ipc.mp.test.ts similarity index 100% rename from src/vs/base/parts/ipc/test/electron-sandbox/ipc.mp.test.ts rename to src/vs/base/parts/ipc/test/electron-browser/ipc.mp.test.ts diff --git a/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts b/src/vs/base/parts/sandbox/electron-browser/electronTypes.ts similarity index 99% rename from src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts rename to src/vs/base/parts/sandbox/electron-browser/electronTypes.ts index a132d7d6eb4..cbf98ff13c5 100644 --- a/src/vs/base/parts/sandbox/electron-sandbox/electronTypes.ts +++ b/src/vs/base/parts/sandbox/electron-browser/electronTypes.ts @@ -6,7 +6,7 @@ // ####################################################################### // ### ### -// ### electron.d.ts types we expose from electron-sandbox ### +// ### electron.d.ts types we expose from electron-browser ### // ### (copied from Electron 29.x) ### // ### ### // ####################################################################### diff --git a/src/vs/base/parts/sandbox/electron-sandbox/globals.ts b/src/vs/base/parts/sandbox/electron-browser/globals.ts similarity index 100% rename from src/vs/base/parts/sandbox/electron-sandbox/globals.ts rename to src/vs/base/parts/sandbox/electron-browser/globals.ts diff --git a/src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts b/src/vs/base/parts/sandbox/electron-browser/preload-aux.ts similarity index 100% rename from src/vs/base/parts/sandbox/electron-sandbox/preload-aux.ts rename to src/vs/base/parts/sandbox/electron-browser/preload-aux.ts diff --git a/src/vs/base/parts/sandbox/electron-sandbox/preload.ts b/src/vs/base/parts/sandbox/electron-browser/preload.ts similarity index 100% rename from src/vs/base/parts/sandbox/electron-sandbox/preload.ts rename to src/vs/base/parts/sandbox/electron-browser/preload.ts diff --git a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts b/src/vs/base/parts/sandbox/test/electron-browser/globals.test.ts similarity index 96% rename from src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts rename to src/vs/base/parts/sandbox/test/electron-browser/globals.test.ts index d979b221111..dcc6b0abc18 100644 --- a/src/vs/base/parts/sandbox/test/electron-sandbox/globals.test.ts +++ b/src/vs/base/parts/sandbox/test/electron-browser/globals.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import assert from 'assert'; -import { ipcRenderer, process, webFrame, webUtils } from '../../electron-sandbox/globals.js'; +import { ipcRenderer, process, webFrame, webUtils } from '../../electron-browser/globals.js'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../test/common/utils.js'; suite('Sandbox', () => { diff --git a/src/vs/base/test/common/labels.test.ts b/src/vs/base/test/common/labels.test.ts index 9e3feeb4d34..dd91ac24b97 100644 --- a/src/vs/base/test/common/labels.test.ts +++ b/src/vs/base/test/common/labels.test.ts @@ -60,7 +60,7 @@ suite('Labels', () => { assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']), ['a', 'a\\b', 'a\\b\\c', 'd\\b\\c', 'd\\b']); assert.deepStrictEqual(labels.shorten(['a', 'a\\b', 'b']), ['a', 'a\\b', 'b']); assert.deepStrictEqual(labels.shorten(['', 'a', 'b', 'b\\c', 'a\\c']), ['.\\', 'a', 'b', 'b\\c', 'a\\c']); - assert.deepStrictEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-sandbox', 'src\\vs\\workbench\\parts\\execution\\electron-sandbox\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-sandbox']), ['…\\execution\\electron-sandbox', '…\\something', '…\\terminal\\…']); + assert.deepStrictEqual(labels.shorten(['src\\vs\\workbench\\parts\\execution\\electron-browser', 'src\\vs\\workbench\\parts\\execution\\electron-browser\\something', 'src\\vs\\workbench\\parts\\terminal\\electron-browser']), ['…\\execution\\electron-browser', '…\\something', '…\\terminal\\…']); }); (isWindows ? test.skip : test)('shorten - not windows', () => { diff --git a/src/vs/code/electron-sandbox/workbench/workbench-dev.html b/src/vs/code/electron-browser/workbench/workbench-dev.html similarity index 100% rename from src/vs/code/electron-sandbox/workbench/workbench-dev.html rename to src/vs/code/electron-browser/workbench/workbench-dev.html diff --git a/src/vs/code/electron-sandbox/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html similarity index 100% rename from src/vs/code/electron-sandbox/workbench/workbench.html rename to src/vs/code/electron-browser/workbench/workbench.html diff --git a/src/vs/code/electron-sandbox/workbench/workbench.ts b/src/vs/code/electron-browser/workbench/workbench.ts similarity index 98% rename from src/vs/code/electron-sandbox/workbench/workbench.ts rename to src/vs/code/electron-browser/workbench/workbench.ts index 8c9ff16ec64..a49f0b2f278 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.ts +++ b/src/vs/code/electron-browser/workbench/workbench.ts @@ -11,11 +11,11 @@ performance.mark('code/didStartRenderer'); type ISandboxConfiguration = import('../../../base/parts/sandbox/common/sandboxTypes.js').ISandboxConfiguration; - type ILoadResult = import('../../../platform/window/electron-sandbox/window.js').ILoadResult; - type ILoadOptions = import('../../../platform/window/electron-sandbox/window.js').ILoadOptions; + type ILoadResult = import('../../../platform/window/electron-browser/window.js').ILoadResult; + type ILoadOptions = import('../../../platform/window/electron-browser/window.js').ILoadOptions; type INativeWindowConfiguration = import('../../../platform/window/common/window.ts').INativeWindowConfiguration; - type IMainWindowSandboxGlobals = import('../../../base/parts/sandbox/electron-sandbox/globals.js').IMainWindowSandboxGlobals; - type IDesktopMain = import('../../../workbench/electron-sandbox/desktop.main.js').IDesktopMain; + type IMainWindowSandboxGlobals = import('../../../base/parts/sandbox/electron-browser/globals.js').IMainWindowSandboxGlobals; + type IDesktopMain = import('../../../workbench/electron-browser/desktop.main.js').IDesktopMain; const preloadGlobals: IMainWindowSandboxGlobals = (window as any).vscode; // defined by preload.ts const safeProcess = preloadGlobals.process; diff --git a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts index 12754b8b00a..882dfac434c 100644 --- a/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts +++ b/src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindowsMainService.ts @@ -93,7 +93,7 @@ export class AuxiliaryWindowsMainService extends Disposable implements IAuxiliar createWindow(details: HandlerDetails): BrowserWindowConstructorOptions { const { state, overrides } = this.computeWindowStateAndOverrides(details); return this.instantiationService.invokeFunction(defaultBrowserWindowOptions, state, overrides, { - preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload-aux.js').fsPath + preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload-aux.js').fsPath }); } diff --git a/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts b/src/vs/platform/diagnostics/electron-browser/diagnosticsService.ts similarity index 95% rename from src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts rename to src/vs/platform/diagnostics/electron-browser/diagnosticsService.ts index f984d59c5bc..340daeb42af 100644 --- a/src/vs/platform/diagnostics/electron-sandbox/diagnosticsService.ts +++ b/src/vs/platform/diagnostics/electron-browser/diagnosticsService.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { IDiagnosticsService } from '../common/diagnostics.js'; -import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; registerSharedProcessRemoteService(IDiagnosticsService, 'diagnostics'); diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts b/src/vs/platform/extensionManagement/electron-browser/extensionsProfileScannerService.ts similarity index 100% rename from src/vs/platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.ts rename to src/vs/platform/extensionManagement/electron-browser/extensionsProfileScannerService.ts diff --git a/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts b/src/vs/platform/externalTerminal/electron-browser/externalTerminalService.ts similarity index 97% rename from src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts rename to src/vs/platform/externalTerminal/electron-browser/externalTerminalService.ts index ef1fe8b73df..cdea035f7c8 100644 --- a/src/vs/platform/externalTerminal/electron-sandbox/externalTerminalService.ts +++ b/src/vs/platform/externalTerminal/electron-browser/externalTerminalService.ts @@ -5,7 +5,7 @@ import { IExternalTerminalService as ICommonExternalTerminalService } from '../common/externalTerminal.js'; import { createDecorator } from '../../instantiation/common/instantiation.js'; -import { registerMainProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../ipc/electron-browser/services.js'; export const IExternalTerminalService = createDecorator('externalTerminal'); diff --git a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts b/src/vs/platform/ipc/electron-browser/mainProcessService.ts similarity index 97% rename from src/vs/platform/ipc/electron-sandbox/mainProcessService.ts rename to src/vs/platform/ipc/electron-browser/mainProcessService.ts index 8707d26a237..618d8f70ef4 100644 --- a/src/vs/platform/ipc/electron-sandbox/mainProcessService.ts +++ b/src/vs/platform/ipc/electron-browser/mainProcessService.ts @@ -5,7 +5,7 @@ import { Disposable } from '../../../base/common/lifecycle.js'; import { IChannel, IServerChannel } from '../../../base/parts/ipc/common/ipc.js'; -import { Client as IPCElectronClient } from '../../../base/parts/ipc/electron-sandbox/ipc.electron.js'; +import { Client as IPCElectronClient } from '../../../base/parts/ipc/electron-browser/ipc.electron.js'; import { IMainProcessService } from '../common/mainProcessService.js'; /** diff --git a/src/vs/platform/ipc/electron-sandbox/services.ts b/src/vs/platform/ipc/electron-browser/services.ts similarity index 100% rename from src/vs/platform/ipc/electron-sandbox/services.ts rename to src/vs/platform/ipc/electron-browser/services.ts diff --git a/src/vs/platform/menubar/electron-sandbox/menubar.ts b/src/vs/platform/menubar/electron-browser/menubar.ts similarity index 100% rename from src/vs/platform/menubar/electron-sandbox/menubar.ts rename to src/vs/platform/menubar/electron-browser/menubar.ts diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts b/src/vs/platform/profiling/electron-browser/profileAnalysisWorker.ts similarity index 100% rename from src/vs/platform/profiling/electron-sandbox/profileAnalysisWorker.ts rename to src/vs/platform/profiling/electron-browser/profileAnalysisWorker.ts diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.ts b/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.ts similarity index 100% rename from src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.ts rename to src/vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.ts diff --git a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts b/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts similarity index 97% rename from src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts rename to src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts index b53efdadc1a..1edace6dcaf 100644 --- a/src/vs/platform/profiling/electron-sandbox/profileAnalysisWorkerService.ts +++ b/src/vs/platform/profiling/electron-browser/profileAnalysisWorkerService.ts @@ -49,7 +49,7 @@ class ProfileAnalysisWorkerService implements IProfileAnalysisWorkerService { private async _withWorker(callback: (worker: Proxied) => Promise): Promise { const worker = createWebWorker( - FileAccess.asBrowserUri('vs/platform/profiling/electron-sandbox/profileAnalysisWorkerMain.js'), + FileAccess.asBrowserUri('vs/platform/profiling/electron-browser/profileAnalysisWorkerMain.js'), 'CpuProfileAnalysisWorker' ); diff --git a/src/vs/platform/profiling/electron-sandbox/profilingService.ts b/src/vs/platform/profiling/electron-browser/profilingService.ts similarity index 95% rename from src/vs/platform/profiling/electron-sandbox/profilingService.ts rename to src/vs/platform/profiling/electron-browser/profilingService.ts index ffb1e47edf1..54936f2c001 100644 --- a/src/vs/platform/profiling/electron-sandbox/profilingService.ts +++ b/src/vs/platform/profiling/electron-browser/profilingService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; import { IV8InspectProfilingService } from '../common/profiling.js'; registerSharedProcessRemoteService(IV8InspectProfilingService, 'v8InspectProfiling'); diff --git a/src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts b/src/vs/platform/remote/electron-browser/electronRemoteResourceLoader.ts similarity index 100% rename from src/vs/platform/remote/electron-sandbox/electronRemoteResourceLoader.ts rename to src/vs/platform/remote/electron-browser/electronRemoteResourceLoader.ts diff --git a/src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts b/src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts similarity index 100% rename from src/vs/platform/remote/electron-sandbox/remoteAuthorityResolverService.ts rename to src/vs/platform/remote/electron-browser/remoteAuthorityResolverService.ts diff --git a/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts b/src/vs/platform/remote/electron-browser/sharedProcessTunnelService.ts similarity index 95% rename from src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts rename to src/vs/platform/remote/electron-browser/sharedProcessTunnelService.ts index 81c04b34fcb..89e2e4034b0 100644 --- a/src/vs/platform/remote/electron-sandbox/sharedProcessTunnelService.ts +++ b/src/vs/platform/remote/electron-browser/sharedProcessTunnelService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; import { ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName } from '../common/sharedProcessTunnelService.js'; registerSharedProcessRemoteService(ISharedProcessTunnelService, ipcSharedProcessTunnelChannelName); diff --git a/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts b/src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts similarity index 93% rename from src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts rename to src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts index ebf023ac49c..c085559fa6a 100644 --- a/src/vs/platform/remote/test/electron-sandbox/remoteAuthorityResolverService.test.ts +++ b/src/vs/platform/remote/test/electron-browser/remoteAuthorityResolverService.test.ts @@ -8,7 +8,7 @@ import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../base/test/c import product from '../../../product/common/product.js'; import { IProductService } from '../../../product/common/productService.js'; import { RemoteAuthorityResolverError, RemoteAuthorityResolverErrorCode } from '../../common/remoteAuthorityResolver.js'; -import { RemoteAuthorityResolverService } from '../../electron-sandbox/remoteAuthorityResolverService.js'; +import { RemoteAuthorityResolverService } from '../../electron-browser/remoteAuthorityResolverService.js'; suite('RemoteAuthorityResolverService', () => { diff --git a/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts b/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts similarity index 95% rename from src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts rename to src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts index 7aa3657e2a5..fc033ed547e 100644 --- a/src/vs/platform/remoteTunnel/electron-sandbox/remoteTunnelService.ts +++ b/src/vs/platform/remoteTunnel/electron-browser/remoteTunnelService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; import { IRemoteTunnelService } from '../common/remoteTunnel.js'; registerSharedProcessRemoteService(IRemoteTunnelService, 'remoteTunnel'); diff --git a/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts b/src/vs/platform/telemetry/electron-browser/customEndpointTelemetryService.ts similarity index 95% rename from src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts rename to src/vs/platform/telemetry/electron-browser/customEndpointTelemetryService.ts index 97a41b21d5b..7b557705a69 100644 --- a/src/vs/platform/telemetry/electron-sandbox/customEndpointTelemetryService.ts +++ b/src/vs/platform/telemetry/electron-browser/customEndpointTelemetryService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; import { ICustomEndpointTelemetryService } from '../common/telemetry.js'; registerSharedProcessRemoteService(ICustomEndpointTelemetryService, 'customEndpointTelemetry'); diff --git a/src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts b/src/vs/platform/userDataProfile/electron-browser/userDataProfileStorageService.ts similarity index 100% rename from src/vs/platform/userDataProfile/electron-sandbox/userDataProfileStorageService.ts rename to src/vs/platform/userDataProfile/electron-browser/userDataProfileStorageService.ts diff --git a/src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts b/src/vs/platform/webContentExtractor/electron-browser/webContentExtractorService.ts similarity index 91% rename from src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts rename to src/vs/platform/webContentExtractor/electron-browser/webContentExtractorService.ts index 2d6ebf12b5f..9fab2c6e7e1 100644 --- a/src/vs/platform/webContentExtractor/electron-sandbox/webContentExtractorService.ts +++ b/src/vs/platform/webContentExtractor/electron-browser/webContentExtractorService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerMainProcessRemoteService, registerSharedProcessRemoteService } from '../../ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService, registerSharedProcessRemoteService } from '../../ipc/electron-browser/services.js'; import { ISharedWebContentExtractorService, IWebContentExtractorService } from '../common/webContentExtractor.js'; registerMainProcessRemoteService(IWebContentExtractorService, 'webContentExtractor'); diff --git a/src/vs/platform/window/electron-sandbox/window.ts b/src/vs/platform/window/electron-browser/window.ts similarity index 98% rename from src/vs/platform/window/electron-sandbox/window.ts rename to src/vs/platform/window/electron-browser/window.ts index c9914e2117e..cdd43a4e00c 100644 --- a/src/vs/platform/window/electron-sandbox/window.ts +++ b/src/vs/platform/window/electron-browser/window.ts @@ -7,7 +7,7 @@ import { getZoomLevel, setZoomFactor, setZoomLevel } from '../../../base/browser import { getActiveWindow, getWindows } from '../../../base/browser/dom.js'; import { mainWindow } from '../../../base/browser/window.js'; import { ISandboxConfiguration } from '../../../base/parts/sandbox/common/sandboxTypes.js'; -import { ISandboxGlobals, ipcRenderer, webFrame } from '../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ISandboxGlobals, ipcRenderer, webFrame } from '../../../base/parts/sandbox/electron-browser/globals.js'; import { zoomLevelToZoomFactor } from '../common/window.js'; export enum ApplyZoomTarget { diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts index 4eae571a75c..78587bf0b8c 100644 --- a/src/vs/platform/windows/electron-main/windowImpl.ts +++ b/src/vs/platform/windows/electron-main/windowImpl.ts @@ -619,7 +619,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow { this.logService.trace('window#ctor: using window state', state); const options = instantiationService.invokeFunction(defaultBrowserWindowOptions, this.windowState, undefined, { - preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-sandbox/preload.js').fsPath, + preload: FileAccess.asFileUri('vs/base/parts/sandbox/electron-browser/preload.js').fsPath, additionalArguments: [`--vscode-window-config=${this.configObjectUrl.resource.toString()}`], v8CacheOptions: this.environmentMainService.useCodeCache ? 'bypassHeatCheck' : 'none', }); @@ -1091,7 +1091,7 @@ export class CodeWindow extends BaseWindow implements ICodeWindow { this.readyState = ReadyState.NAVIGATING; // Load URL - this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-sandbox/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)); + this._win.loadURL(FileAccess.asBrowserUri(`vs/code/electron-browser/workbench/workbench${this.environmentMainService.isBuilt ? '' : '-dev'}.html`).toString(true)); // Remember that we did load const wasLoaded = this.wasLoaded; diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/chatDeveloperActions.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts similarity index 100% rename from src/vs/workbench/contrib/chat/electron-sandbox/actions/chatDeveloperActions.ts rename to src/vs/workbench/contrib/chat/electron-browser/actions/chatDeveloperActions.ts diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/media/voiceChatActions.css b/src/vs/workbench/contrib/chat/electron-browser/actions/media/voiceChatActions.css similarity index 100% rename from src/vs/workbench/contrib/chat/electron-sandbox/actions/media/voiceChatActions.css rename to src/vs/workbench/contrib/chat/electron-browser/actions/media/voiceChatActions.css diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts b/src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts similarity index 100% rename from src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts rename to src/vs/workbench/contrib/chat/electron-browser/actions/voiceChatActions.ts diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts b/src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts rename to src/vs/workbench/contrib/chat/electron-browser/chat.contribution.ts diff --git a/src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts b/src/vs/workbench/contrib/chat/electron-browser/tools/fetchPageTool.ts similarity index 100% rename from src/vs/workbench/contrib/chat/electron-sandbox/tools/fetchPageTool.ts rename to src/vs/workbench/contrib/chat/electron-browser/tools/fetchPageTool.ts diff --git a/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts b/src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts similarity index 95% rename from src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts rename to src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts index 478a0c14214..bcf00d4b79f 100644 --- a/src/vs/workbench/contrib/chat/test/electron-sandbox/voiceChatActions.test.ts +++ b/src/vs/workbench/contrib/chat/test/electron-browser/voiceChatActions.test.ts @@ -5,7 +5,7 @@ import assert from 'assert'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js'; -import { parseNextChatResponseChunk } from '../../electron-sandbox/actions/voiceChatActions.js'; +import { parseNextChatResponseChunk } from '../../electron-browser/actions/voiceChatActions.js'; suite('VoiceChatActions', function () { diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/codeEditor.contribution.ts diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts similarity index 100% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/displayChangeRemeasureFonts.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/displayChangeRemeasureFonts.ts diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/inputClipboardActions.ts similarity index 100% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/inputClipboardActions.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/inputClipboardActions.ts diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts similarity index 100% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/selectionClipboard.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/selectionClipboard.ts diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/sleepResumeRepaintMinimap.ts similarity index 100% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/sleepResumeRepaintMinimap.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/sleepResumeRepaintMinimap.ts diff --git a/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts b/src/vs/workbench/contrib/codeEditor/electron-browser/startDebugTextMate.ts similarity index 98% rename from src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts rename to src/vs/workbench/contrib/codeEditor/electron-browser/startDebugTextMate.ts index 645eabd6384..5a746dc17fc 100644 --- a/src/vs/workbench/contrib/codeEditor/electron-sandbox/startDebugTextMate.ts +++ b/src/vs/workbench/contrib/codeEditor/electron-browser/startDebugTextMate.ts @@ -16,7 +16,7 @@ import { ICodeEditorService } from '../../../../editor/browser/services/codeEdit import { ITextModel } from '../../../../editor/common/model.js'; import { Constants } from '../../../../base/common/uint.js'; import { IHostService } from '../../../services/host/browser/host.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { ILoggerService } from '../../../../platform/log/common/log.js'; import { joinPath } from '../../../../base/common/resources.js'; import { IFileService } from '../../../../platform/files/common/files.js'; diff --git a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts b/src/vs/workbench/contrib/debug/electron-browser/extensionHostDebugService.ts similarity index 95% rename from src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts rename to src/vs/workbench/contrib/debug/electron-browser/extensionHostDebugService.ts index cf036366f08..d229afb5feb 100644 --- a/src/vs/workbench/contrib/debug/electron-sandbox/extensionHostDebugService.ts +++ b/src/vs/workbench/contrib/debug/electron-browser/extensionHostDebugService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js'; -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js'; registerMainProcessRemoteService(IExtensionHostDebugService, ExtensionHostDebugBroadcastChannel.ChannelName, { channelClientCtor: ExtensionHostDebugChannelClient }); diff --git a/src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts b/src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.ts rename to src/vs/workbench/contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.ts diff --git a/src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts b/src/vs/workbench/contrib/encryption/electron-browser/encryption.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/encryption/electron-sandbox/encryption.contribution.ts rename to src/vs/workbench/contrib/encryption/electron-browser/encryption.contribution.ts diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts b/src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction.ts rename to src/vs/workbench/contrib/extensions/electron-browser/debugExtensionHostAction.ts diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts rename to src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts index 99057a3464c..353643784cc 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionProfileService.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionProfileService.ts @@ -21,7 +21,7 @@ import { IExtensionHostProfileService, ProfileSessionState } from './runtimeExte import { IEditorService } from '../../../services/editor/common/editorService.js'; import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js'; import { IExtensionHostProfile, IExtensionService, ProfileSession } from '../../../services/extensions/common/extensions.js'; -import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js'; +import { ExtensionHostProfiler } from '../../../services/extensions/electron-browser/extensionHostProfiler.js'; import { IStatusbarEntry, IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js'; import { URI } from '../../../../base/common/uri.js'; diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts rename to src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts index e78c2df7839..0ba0fad1d18 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts @@ -11,7 +11,7 @@ import { ExtensionRecommendationNotificationServiceChannel } from '../../../../p import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { Registry } from '../../../../platform/registry/common/platform.js'; import { EditorPaneDescriptor, IEditorPaneRegistry } from '../../../browser/editor.js'; import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js'; diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts similarity index 97% rename from src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts rename to src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts index d189fce4a3b..41978486698 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts @@ -6,7 +6,7 @@ import { localize2 } from '../../../../nls.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { URI } from '../../../../base/common/uri.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { Schemas } from '../../../../base/common/network.js'; import { Action2 } from '../../../../platform/actions/common/actions.js'; diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts similarity index 98% rename from src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts rename to src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts index bcab2c6a34d..b1223ae226c 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsAutoProfiler.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler.ts @@ -20,17 +20,17 @@ import { IFileService } from '../../../../platform/files/common/files.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { INotificationService, NotificationPriority, Severity } from '../../../../platform/notification/common/notification.js'; -import { IProfileAnalysisWorkerService } from '../../../../platform/profiling/electron-sandbox/profileAnalysisWorkerService.js'; +import { IProfileAnalysisWorkerService } from '../../../../platform/profiling/electron-browser/profileAnalysisWorkerService.js'; import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; import { IWorkbenchContribution } from '../../../common/contributions.js'; import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js'; import { createSlowExtensionAction } from './extensionsSlowActions.js'; import { IExtensionHostProfileService } from './runtimeExtensionsEditor.js'; import { IEditorService } from '../../../services/editor/common/editorService.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { ExtensionHostKind } from '../../../services/extensions/common/extensionHostKind.js'; import { IExtensionHostProfile, IExtensionService, IResponsiveStateChangeEvent, ProfileSession } from '../../../services/extensions/common/extensions.js'; -import { ExtensionHostProfiler } from '../../../services/extensions/electron-sandbox/extensionHostProfiler.js'; +import { ExtensionHostProfiler } from '../../../services/extensions/electron-browser/extensionHostProfiler.js'; import { ITimerService } from '../../../services/timer/browser/timerService.js'; export class ExtensionsAutoProfiler implements IWorkbenchContribution { diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts rename to src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts index 447f4c9ff1f..46120a9e645 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts @@ -16,7 +16,7 @@ import { joinPath } from '../../../../base/common/resources.js'; import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js'; import { IOpenerService } from '../../../../platform/opener/common/opener.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { Utils } from '../../../../platform/profiling/common/profiling.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { VSBuffer } from '../../../../base/common/buffer.js'; diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts b/src/vs/workbench/contrib/extensions/electron-browser/remoteExtensionsInit.ts similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-sandbox/remoteExtensionsInit.ts rename to src/vs/workbench/contrib/extensions/electron-browser/remoteExtensionsInit.ts diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts similarity index 100% rename from src/vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor.ts rename to src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsEditor.ts diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extension.test.ts similarity index 100% rename from src/vs/workbench/contrib/extensions/test/electron-sandbox/extension.test.ts rename to src/vs/workbench/contrib/extensions/test/electron-browser/extension.test.ts diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts rename to src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts index a380a714200..39d0a701927 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionRecommendationsService.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionRecommendationsService.test.ts @@ -18,7 +18,7 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; import { TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js'; import { TestContextService, TestProductService, TestStorageService } from '../../../../test/common/workbenchTestServices.js'; -import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { TestNotificationService } from '../../../../../platform/notification/test/common/testNotificationService.js'; import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js'; import { URI } from '../../../../../base/common/uri.js'; @@ -37,7 +37,7 @@ import { INotificationService, Severity, IPromptChoice, IPromptOptions } from '. import { NativeURLService } from '../../../../../platform/url/common/urlService.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js'; import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js'; -import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js'; import { FileService } from '../../../../../platform/files/common/fileService.js'; import { NullLogService, ILogService } from '../../../../../platform/log/common/log.js'; import { IFileService } from '../../../../../platform/files/common/files.js'; diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts rename to src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts index bce84045b3e..b194b88322d 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsActions.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsActions.test.ts @@ -26,16 +26,16 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js'; import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; import { TestContextService, TestWorkspaceTrustManagementService } from '../../../../test/common/workbenchTestServices.js'; -import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js'; import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js'; import { NativeURLService } from '../../../../../platform/url/common/urlService.js'; import { URI } from '../../../../../base/common/uri.js'; import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js'; import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js'; -import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js'; +import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js'; import { IExtensionContributions, ExtensionType, IExtensionDescription, IExtension } from '../../../../../platform/extensions/common/extensions.js'; -import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js'; import { CancellationToken } from '../../../../../base/common/cancellation.js'; import { ILabelService, IFormatterChangeEvent } from '../../../../../platform/label/common/label.js'; import { IProductService } from '../../../../../platform/product/common/productService.js'; @@ -45,7 +45,7 @@ import { ProgressService } from '../../../../services/progress/browser/progressS import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js'; import { TestEnvironmentService, TestLifecycleService } from '../../../../test/browser/workbenchTestServices.js'; import { DisposableStore } from '../../../../../base/common/lifecycle.js'; -import { INativeWorkbenchEnvironmentService } from '../../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../../services/environment/electron-browser/environmentService.js'; import { IWorkbenchEnvironmentService } from '../../../../services/environment/common/environmentService.js'; import { IUserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSync.js'; import { UserDataSyncEnablementService } from '../../../../../platform/userDataSync/common/userDataSyncEnablementService.js'; diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts rename to src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts index 3752be94aaa..4b5ebfc1d22 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsViews.test.ts @@ -26,7 +26,7 @@ import { NullTelemetryService } from '../../../../../platform/telemetry/common/t import { IExtensionService, toExtensionDescription } from '../../../../services/extensions/common/extensions.js'; import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; import { TestMenuService } from '../../../../test/browser/workbenchTestServices.js'; -import { TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js'; import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js'; import { NativeURLService } from '../../../../../platform/url/common/urlService.js'; @@ -34,9 +34,9 @@ import { URI } from '../../../../../base/common/uri.js'; import { TestConfigurationService } from '../../../../../platform/configuration/test/common/testConfigurationService.js'; import { SinonStub } from 'sinon'; import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js'; -import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js'; +import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js'; import { ExtensionType, IExtension } from '../../../../../platform/extensions/common/extensions.js'; -import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js'; import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js'; import { MockContextKeyService } from '../../../../../platform/keybinding/test/common/mockKeybindingService.js'; import { IMenuService } from '../../../../../platform/actions/common/actions.js'; diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts similarity index 99% rename from src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts rename to src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts index 6f9c1ee9667..c68caf3fbbb 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsWorkbenchService.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsWorkbenchService.test.ts @@ -24,7 +24,7 @@ import { IPager } from '../../../../../base/common/paging.js'; import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.js'; import { NullTelemetryService } from '../../../../../platform/telemetry/common/telemetryUtils.js'; import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; -import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestExtensionTipsService, TestSharedProcessService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { ConfigurationTarget, IConfigurationChangeEvent, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js'; import { ILogService, NullLogService } from '../../../../../platform/log/common/log.js'; import { IProgressService } from '../../../../../platform/progress/common/progress.js'; @@ -36,8 +36,8 @@ import { CancellationToken } from '../../../../../base/common/cancellation.js'; import { ExtensionType } from '../../../../../platform/extensions/common/extensions.js'; import { ExtensionKind } from '../../../../../platform/environment/common/environment.js'; import { IRemoteAgentService } from '../../../../services/remote/common/remoteAgentService.js'; -import { RemoteAgentService } from '../../../../services/remote/electron-sandbox/remoteAgentService.js'; -import { ISharedProcessService } from '../../../../../platform/ipc/electron-sandbox/services.js'; +import { RemoteAgentService } from '../../../../services/remote/electron-browser/remoteAgentService.js'; +import { ISharedProcessService } from '../../../../../platform/ipc/electron-browser/services.js'; import { TestContextService } from '../../../../test/common/workbenchTestServices.js'; import { IProductService } from '../../../../../platform/product/common/productService.js'; import { ILifecycleService } from '../../../../services/lifecycle/common/lifecycle.js'; diff --git a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts b/src/vs/workbench/contrib/externalTerminal/electron-browser/externalTerminal.contribution.ts similarity index 99% rename from src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts rename to src/vs/workbench/contrib/externalTerminal/electron-browser/externalTerminal.contribution.ts index 572445bbec5..1edaaa8ada1 100644 --- a/src/vs/workbench/contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.ts +++ b/src/vs/workbench/contrib/externalTerminal/electron-browser/externalTerminal.contribution.ts @@ -14,7 +14,7 @@ import { Schemas } from '../../../../base/common/network.js'; import { IConfigurationRegistry, Extensions, ConfigurationScope, type IConfigurationPropertySchema } from '../../../../platform/configuration/common/configurationRegistry.js'; import { Registry } from '../../../../platform/registry/common/platform.js'; import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from '../../../common/contributions.js'; -import { IExternalTerminalService } from '../../../../platform/externalTerminal/electron-sandbox/externalTerminalService.js'; +import { IExternalTerminalService } from '../../../../platform/externalTerminal/electron-browser/externalTerminalService.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { TerminalContextKeys } from '../../terminal/common/terminalContextKey.js'; import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js'; diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts b/src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/files/electron-sandbox/fileActions.contribution.ts rename to src/vs/workbench/contrib/files/electron-browser/fileActions.contribution.ts diff --git a/src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts b/src/vs/workbench/contrib/files/electron-browser/fileCommands.ts similarity index 100% rename from src/vs/workbench/contrib/files/electron-sandbox/fileCommands.ts rename to src/vs/workbench/contrib/files/electron-browser/fileCommands.ts diff --git a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts b/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChat.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChat.contribution.ts rename to src/vs/workbench/contrib/inlineChat/electron-browser/inlineChat.contribution.ts diff --git a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts b/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts similarity index 98% rename from src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts rename to src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts index 54754b0b91d..1f0e9638235 100644 --- a/src/vs/workbench/contrib/inlineChat/electron-sandbox/inlineChatActions.ts +++ b/src/vs/workbench/contrib/inlineChat/electron-browser/inlineChatActions.ts @@ -13,7 +13,7 @@ import { disposableTimeout } from '../../../../base/common/async.js'; import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js'; import { ICommandService } from '../../../../platform/commands/common/commands.js'; import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js'; -import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from '../../chat/electron-sandbox/actions/voiceChatActions.js'; +import { StartVoiceChatAction, StopListeningAction, VOICE_KEY_HOLD_THRESHOLD } from '../../chat/electron-browser/actions/voiceChatActions.js'; import { IChatExecuteActionContext } from '../../chat/browser/actions/chatExecuteActions.js'; import { CTX_INLINE_CHAT_VISIBLE, InlineChatConfigKeys } from '../common/inlineChat.js'; import { HasSpeechProvider, ISpeechService } from '../../speech/common/speechService.js'; diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts b/src/vs/workbench/contrib/issue/electron-browser/issue.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/issue/electron-sandbox/issue.contribution.ts rename to src/vs/workbench/contrib/issue/electron-browser/issue.contribution.ts diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-browser/issueReporterService.ts similarity index 99% rename from src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts rename to src/vs/workbench/contrib/issue/electron-browser/issueReporterService.ts index cbdf9723c31..4ad8cca1d8a 100644 --- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts +++ b/src/vs/workbench/contrib/issue/electron-browser/issueReporterService.ts @@ -17,7 +17,7 @@ import { INativeHostService } from '../../../../platform/native/common/native.js import { IProcessService } from '../../../../platform/process/common/process.js'; import { IThemeService } from '../../../../platform/theme/common/themeService.js'; import { IUpdateService, StateType } from '../../../../platform/update/common/update.js'; -import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js'; +import { applyZoom } from '../../../../platform/window/electron-browser/window.js'; import { BaseIssueReporterService } from '../browser/baseIssueReporterService.js'; import { IssueReporterData as IssueReporterModelData } from '../browser/issueReporterModel.js'; import { IIssueFormService, IssueReporterData, IssueType } from '../common/issue.js'; diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts b/src/vs/workbench/contrib/issue/electron-browser/issueService.ts similarity index 100% rename from src/vs/workbench/contrib/issue/electron-sandbox/issueService.ts rename to src/vs/workbench/contrib/issue/electron-browser/issueService.ts diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts b/src/vs/workbench/contrib/issue/electron-browser/nativeIssueFormService.ts similarity index 100% rename from src/vs/workbench/contrib/issue/electron-sandbox/nativeIssueFormService.ts rename to src/vs/workbench/contrib/issue/electron-browser/nativeIssueFormService.ts diff --git a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts b/src/vs/workbench/contrib/localHistory/electron-browser/localHistory.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/localHistory/electron-sandbox/localHistory.contribution.ts rename to src/vs/workbench/contrib/localHistory/electron-browser/localHistory.contribution.ts diff --git a/src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts b/src/vs/workbench/contrib/localHistory/electron-browser/localHistoryCommands.ts similarity index 100% rename from src/vs/workbench/contrib/localHistory/electron-sandbox/localHistoryCommands.ts rename to src/vs/workbench/contrib/localHistory/electron-browser/localHistoryCommands.ts diff --git a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts b/src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts similarity index 98% rename from src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts rename to src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts index 4201a6563f1..0455b7556b4 100644 --- a/src/vs/workbench/contrib/localization/electron-sandbox/localization.contribution.ts +++ b/src/vs/workbench/contrib/localization/electron-browser/localization.contribution.ts @@ -139,7 +139,7 @@ class NativeLocalizationWorkbenchContribution extends BaseLocalizationWorkbenchC const loc = manifest?.contributes?.localizations?.find(x => locale.startsWith(x.languageId.toLowerCase())); const languageName = loc ? (loc.languageName || locale) : locale; const languageDisplayName = loc ? (loc.localizedLanguageName || loc.languageName || locale) : locale; - const translationsFromPack: { [key: string]: string } = translation?.contents?.['vs/workbench/contrib/localization/electron-sandbox/minimalTranslations'] ?? {}; + const translationsFromPack: { [key: string]: string } = translation?.contents?.['vs/workbench/contrib/localization/electron-browser/minimalTranslations'] ?? {}; const promptMessageKey = extensionToInstall ? 'installAndRestartMessage' : 'showLanguagePackExtensions'; const useEnglish = !translationsFromPack[promptMessageKey]; diff --git a/src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts b/src/vs/workbench/contrib/localization/electron-browser/minimalTranslations.ts similarity index 100% rename from src/vs/workbench/contrib/localization/electron-sandbox/minimalTranslations.ts rename to src/vs/workbench/contrib/localization/electron-browser/minimalTranslations.ts diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts b/src/vs/workbench/contrib/logs/electron-browser/logs.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/logs/electron-sandbox/logs.contribution.ts rename to src/vs/workbench/contrib/logs/electron-browser/logs.contribution.ts diff --git a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts b/src/vs/workbench/contrib/logs/electron-browser/logsActions.ts similarity index 97% rename from src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts rename to src/vs/workbench/contrib/logs/electron-browser/logsActions.ts index bc7e00198c2..2e0f77cc3d7 100644 --- a/src/vs/workbench/contrib/logs/electron-sandbox/logsActions.ts +++ b/src/vs/workbench/contrib/logs/electron-browser/logsActions.ts @@ -6,7 +6,7 @@ import { Action } from '../../../../base/common/actions.js'; import * as nls from '../../../../nls.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { joinPath } from '../../../../base/common/resources.js'; import { Schemas } from '../../../../base/common/network.js'; diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.ts b/src/vs/workbench/contrib/mcp/electron-browser/mcp.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/mcp/electron-sandbox/mcp.contribution.ts rename to src/vs/workbench/contrib/mcp/electron-browser/mcp.contribution.ts diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/mcpDevModeDebuggingNode.ts b/src/vs/workbench/contrib/mcp/electron-browser/mcpDevModeDebuggingNode.ts similarity index 100% rename from src/vs/workbench/contrib/mcp/electron-sandbox/mcpDevModeDebuggingNode.ts rename to src/vs/workbench/contrib/mcp/electron-browser/mcpDevModeDebuggingNode.ts diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts b/src/vs/workbench/contrib/mcp/electron-browser/nativeMpcDiscovery.ts similarity index 100% rename from src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts rename to src/vs/workbench/contrib/mcp/electron-browser/nativeMpcDiscovery.ts diff --git a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts b/src/vs/workbench/contrib/mergeEditor/electron-browser/devCommands.ts similarity index 100% rename from src/vs/workbench/contrib/mergeEditor/electron-sandbox/devCommands.ts rename to src/vs/workbench/contrib/mergeEditor/electron-browser/devCommands.ts diff --git a/src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts b/src/vs/workbench/contrib/mergeEditor/electron-browser/mergeEditor.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.ts rename to src/vs/workbench/contrib/mergeEditor/electron-browser/mergeEditor.contribution.ts diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts b/src/vs/workbench/contrib/performance/electron-browser/performance.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/performance/electron-sandbox/performance.contribution.ts rename to src/vs/workbench/contrib/performance/electron-browser/performance.contribution.ts diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts b/src/vs/workbench/contrib/performance/electron-browser/rendererAutoProfiler.ts similarity index 97% rename from src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts rename to src/vs/workbench/contrib/performance/electron-browser/rendererAutoProfiler.ts index 5286ecc047b..52edafd6cff 100644 --- a/src/vs/workbench/contrib/performance/electron-sandbox/rendererAutoProfiler.ts +++ b/src/vs/workbench/contrib/performance/electron-browser/rendererAutoProfiler.ts @@ -12,8 +12,8 @@ import { IFileService } from '../../../../platform/files/common/files.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { IV8Profile } from '../../../../platform/profiling/common/profiling.js'; -import { IProfileAnalysisWorkerService, ProfilingOutput } from '../../../../platform/profiling/electron-sandbox/profileAnalysisWorkerService.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { IProfileAnalysisWorkerService, ProfilingOutput } from '../../../../platform/profiling/electron-browser/profileAnalysisWorkerService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { parseExtensionDevOptions } from '../../../services/extensions/common/extensionDevOptions.js'; import { ITimerService } from '../../../services/timer/browser/timerService.js'; diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts b/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts similarity index 99% rename from src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts rename to src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts index 448ebcba59f..f5b6f208aa1 100644 --- a/src/vs/workbench/contrib/performance/electron-sandbox/startupProfiler.ts +++ b/src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts @@ -8,7 +8,7 @@ import { localize } from '../../../../nls.js'; import { dirname, basename } from '../../../../base/common/resources.js'; import { ITextModelService } from '../../../../editor/common/services/resolverService.js'; import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js'; import { PerfviewContrib } from '../browser/perfviewEditor.js'; import { IExtensionService } from '../../../services/extensions/common/extensions.js'; diff --git a/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts b/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts similarity index 99% rename from src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts rename to src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts index 7753789e588..fe0d86ad970 100644 --- a/src/vs/workbench/contrib/performance/electron-sandbox/startupTimings.ts +++ b/src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts @@ -6,7 +6,7 @@ import { IWorkbenchContribution } from '../../../common/contributions.js'; import { timeout } from '../../../../base/common/async.js'; import { onUnexpectedError } from '../../../../base/common/errors.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; diff --git a/src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorer.contribution.ts b/src/vs/workbench/contrib/processExplorer/electron-browser/processExplorer.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorer.contribution.ts rename to src/vs/workbench/contrib/processExplorer/electron-browser/processExplorer.contribution.ts diff --git a/src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorerControl.ts b/src/vs/workbench/contrib/processExplorer/electron-browser/processExplorerControl.ts similarity index 100% rename from src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorerControl.ts rename to src/vs/workbench/contrib/processExplorer/electron-browser/processExplorerControl.ts diff --git a/src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorerEditor.ts b/src/vs/workbench/contrib/processExplorer/electron-browser/processExplorerEditor.ts similarity index 100% rename from src/vs/workbench/contrib/processExplorer/electron-sandbox/processExplorerEditor.ts rename to src/vs/workbench/contrib/processExplorer/electron-browser/processExplorerEditor.ts diff --git a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts b/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts similarity index 99% rename from src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts rename to src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts index 7443bf9cac1..95ecd96f3fd 100644 --- a/src/vs/workbench/contrib/remote/electron-sandbox/remote.contribution.ts +++ b/src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts @@ -16,9 +16,9 @@ import { ILabelService } from '../../../../platform/label/common/label.js'; import { ICommandService } from '../../../../platform/commands/common/commands.js'; import { Schemas } from '../../../../base/common/network.js'; import { IExtensionService } from '../../../services/extensions/common/extensions.js'; -import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { IDiagnosticInfoOptions, IRemoteDiagnosticInfo } from '../../../../platform/diagnostics/common/diagnostics.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { PersistentConnectionEventType } from '../../../../platform/remote/common/remoteAgentConnection.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from '../../../../platform/configuration/common/configurationRegistry.js'; diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts rename to src/vs/workbench/contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.ts diff --git a/src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts b/src/vs/workbench/contrib/splash/electron-browser/splash.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/splash/electron-sandbox/splash.contribution.ts rename to src/vs/workbench/contrib/splash/electron-browser/splash.contribution.ts diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts b/src/vs/workbench/contrib/tags/electron-browser/tags.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/tags/electron-sandbox/tags.contribution.ts rename to src/vs/workbench/contrib/tags/electron-browser/tags.contribution.ts diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts similarity index 100% rename from src/vs/workbench/contrib/tags/electron-sandbox/workspaceTags.ts rename to src/vs/workbench/contrib/tags/electron-browser/workspaceTags.ts diff --git a/src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts similarity index 100% rename from src/vs/workbench/contrib/tags/electron-sandbox/workspaceTagsService.ts rename to src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts diff --git a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts b/src/vs/workbench/contrib/tasks/electron-browser/taskService.ts similarity index 100% rename from src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts rename to src/vs/workbench/contrib/tasks/electron-browser/taskService.ts diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts b/src/vs/workbench/contrib/terminal/electron-browser/localPty.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts rename to src/vs/workbench/contrib/terminal/electron-browser/localPty.ts diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts b/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts similarity index 99% rename from src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts rename to src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts index 2c93a4c5c8b..0be06471a89 100644 --- a/src/vs/workbench/contrib/terminal/electron-sandbox/localTerminalBackend.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/localTerminalBackend.ts @@ -20,7 +20,7 @@ import { ITerminalProfileResolverService } from '../common/terminal.js'; import { TerminalStorageKeys } from '../common/terminalStorageKeys.js'; import { LocalPty } from './localPty.js'; import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js'; -import { IShellEnvironmentService } from '../../../services/environment/electron-sandbox/shellEnvironmentService.js'; +import { IShellEnvironmentService } from '../../../services/environment/electron-browser/shellEnvironmentService.js'; import { IHistoryService } from '../../../services/history/common/history.js'; import * as terminalEnvironment from '../common/terminalEnvironment.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; @@ -28,7 +28,7 @@ import { IEnvironmentVariableService } from '../common/environmentVariable.js'; import { BaseTerminalBackend } from '../browser/baseTerminalBackend.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/ipc.mp.js'; -import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js'; +import { acquirePort } from '../../../../base/parts/ipc/electron-browser/ipc.mp.js'; import { getDelayedChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { mark, PerformanceMark } from '../../../../base/common/performance.js'; import { ILifecycleService, LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js'; diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts similarity index 97% rename from src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts rename to src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts index 381db45fa4a..b439e425bd3 100644 --- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminal.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { Registry } from '../../../../platform/registry/common/platform.js'; import { ILocalPtyService, TerminalIpcChannels } from '../../../../platform/terminal/common/terminal.js'; import { IWorkbenchContributionsRegistry, WorkbenchPhase, Extensions as WorkbenchExtensions, registerWorkbenchContribution2 } from '../../../common/contributions.js'; diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution.ts similarity index 99% rename from src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts rename to src/vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution.ts index c3132312b08..a076cf8cfd9 100644 --- a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalNativeContribution.ts +++ b/src/vs/workbench/contrib/terminal/electron-browser/terminalNativeContribution.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { INativeOpenFileRequest } from '../../../../platform/window/common/window.js'; import { URI } from '../../../../base/common/uri.js'; import { IFileService } from '../../../../platform/files/common/files.js'; diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalProfileResolverService.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/electron-sandbox/terminalProfileResolverService.ts rename to src/vs/workbench/contrib/terminal/electron-browser/terminalProfileResolverService.ts diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts b/src/vs/workbench/contrib/terminal/electron-browser/terminalRemote.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/electron-sandbox/terminalRemote.ts rename to src/vs/workbench/contrib/terminal/electron-browser/terminalRemote.ts diff --git a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts b/src/vs/workbench/contrib/userDataSync/electron-browser/userDataSync.contribution.ts similarity index 99% rename from src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts rename to src/vs/workbench/contrib/userDataSync/electron-browser/userDataSync.contribution.ts index 6f3cd48be11..2b9a039ff3b 100644 --- a/src/vs/workbench/contrib/userDataSync/electron-sandbox/userDataSync.contribution.ts +++ b/src/vs/workbench/contrib/userDataSync/electron-browser/userDataSync.contribution.ts @@ -5,7 +5,7 @@ import { IWorkbenchContribution, WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js'; import { IUserDataSyncUtilService, SyncStatus } from '../../../../platform/userDataSync/common/userDataSync.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js'; import { localize, localize2 } from '../../../../nls.js'; import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js'; diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts b/src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts similarity index 100% rename from src/vs/workbench/contrib/webview/electron-sandbox/webview.contribution.ts rename to src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts similarity index 100% rename from src/vs/workbench/contrib/webview/electron-sandbox/webviewCommands.ts rename to src/vs/workbench/contrib/webview/electron-browser/webviewCommands.ts diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts similarity index 100% rename from src/vs/workbench/contrib/webview/electron-sandbox/webviewElement.ts rename to src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewService.ts similarity index 100% rename from src/vs/workbench/contrib/webview/electron-sandbox/webviewService.ts rename to src/vs/workbench/contrib/webview/electron-browser/webviewService.ts diff --git a/src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts b/src/vs/workbench/contrib/webview/electron-browser/windowIgnoreMenuShortcutsManager.ts similarity index 100% rename from src/vs/workbench/contrib/webview/electron-sandbox/windowIgnoreMenuShortcutsManager.ts rename to src/vs/workbench/contrib/webview/electron-browser/windowIgnoreMenuShortcutsManager.ts diff --git a/src/vs/workbench/electron-sandbox/actions/developerActions.ts b/src/vs/workbench/electron-browser/actions/developerActions.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/actions/developerActions.ts rename to src/vs/workbench/electron-browser/actions/developerActions.ts index 1bc0f68c98a..0b64a58ee06 100644 --- a/src/vs/workbench/electron-sandbox/actions/developerActions.ts +++ b/src/vs/workbench/electron-browser/actions/developerActions.ts @@ -13,7 +13,7 @@ import { IWorkbenchEnvironmentService } from '../../services/environment/common/ import { KeybindingWeight } from '../../../platform/keybinding/common/keybindingsRegistry.js'; import { IsDevelopmentContext } from '../../../platform/contextkey/common/contextkeys.js'; import { KeyCode, KeyMod } from '../../../base/common/keyCodes.js'; -import { INativeWorkbenchEnvironmentService } from '../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../services/environment/electron-browser/environmentService.js'; import { URI } from '../../../base/common/uri.js'; import { getActiveWindow } from '../../../base/browser/dom.js'; import { IDialogService } from '../../../platform/dialogs/common/dialogs.js'; diff --git a/src/vs/workbench/electron-sandbox/actions/installActions.ts b/src/vs/workbench/electron-browser/actions/installActions.ts similarity index 100% rename from src/vs/workbench/electron-sandbox/actions/installActions.ts rename to src/vs/workbench/electron-browser/actions/installActions.ts diff --git a/src/vs/workbench/electron-sandbox/actions/media/actions.css b/src/vs/workbench/electron-browser/actions/media/actions.css similarity index 100% rename from src/vs/workbench/electron-sandbox/actions/media/actions.css rename to src/vs/workbench/electron-browser/actions/media/actions.css diff --git a/src/vs/workbench/electron-sandbox/actions/windowActions.ts b/src/vs/workbench/electron-browser/actions/windowActions.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/actions/windowActions.ts rename to src/vs/workbench/electron-browser/actions/windowActions.ts index 4e31e25b81f..b542b8d7344 100644 --- a/src/vs/workbench/electron-sandbox/actions/windowActions.ts +++ b/src/vs/workbench/electron-browser/actions/windowActions.ts @@ -6,7 +6,7 @@ import './media/actions.css'; import { URI } from '../../../base/common/uri.js'; import { localize, localize2 } from '../../../nls.js'; -import { ApplyZoomTarget, MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, applyZoom } from '../../../platform/window/electron-sandbox/window.js'; +import { ApplyZoomTarget, MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL, applyZoom } from '../../../platform/window/electron-browser/window.js'; import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js'; import { getZoomLevel } from '../../../base/browser/browser.js'; import { FileKind } from '../../../platform/files/common/files.js'; diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-browser/desktop.contribution.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/desktop.contribution.ts rename to src/vs/workbench/electron-browser/desktop.contribution.ts index 008bc5ef3e1..f9d0fb87eed 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-browser/desktop.contribution.ts @@ -27,7 +27,7 @@ import { ShutdownReason } from '../services/lifecycle/common/lifecycle.js'; import { NativeWindow } from './window.js'; import { ModifierKeyEmitter } from '../../base/browser/dom.js'; import { applicationConfigurationNodeBase, securityConfigurationNodeBase } from '../common/configuration.js'; -import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-sandbox/window.js'; +import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-browser/window.js'; import { DefaultAccountManagementContribution } from '../services/accounts/common/defaultAccount.js'; import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contributions.js'; diff --git a/src/vs/workbench/electron-sandbox/desktop.main.ts b/src/vs/workbench/electron-browser/desktop.main.ts similarity index 96% rename from src/vs/workbench/electron-sandbox/desktop.main.ts rename to src/vs/workbench/electron-browser/desktop.main.ts index 306d1c7c685..0487ad5e2b8 100644 --- a/src/vs/workbench/electron-sandbox/desktop.main.ts +++ b/src/vs/workbench/electron-browser/desktop.main.ts @@ -13,20 +13,20 @@ import { domContentLoaded } from '../../base/browser/dom.js'; import { onUnexpectedError } from '../../base/common/errors.js'; import { URI } from '../../base/common/uri.js'; import { WorkspaceService } from '../services/configuration/browser/configurationService.js'; -import { INativeWorkbenchEnvironmentService, NativeWorkbenchEnvironmentService } from '../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService, NativeWorkbenchEnvironmentService } from '../services/environment/electron-browser/environmentService.js'; import { ServiceCollection } from '../../platform/instantiation/common/serviceCollection.js'; import { ILoggerService, ILogService, LogLevel } from '../../platform/log/common/log.js'; -import { NativeWorkbenchStorageService } from '../services/storage/electron-sandbox/storageService.js'; +import { NativeWorkbenchStorageService } from '../services/storage/electron-browser/storageService.js'; import { IWorkspaceContextService, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, IAnyWorkspaceIdentifier, reviveIdentifier, toWorkspaceIdentifier } from '../../platform/workspace/common/workspace.js'; import { IWorkbenchConfigurationService } from '../services/configuration/common/configuration.js'; import { IStorageService } from '../../platform/storage/common/storage.js'; import { Disposable } from '../../base/common/lifecycle.js'; -import { ISharedProcessService } from '../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../platform/ipc/electron-browser/services.js'; import { IMainProcessService } from '../../platform/ipc/common/mainProcessService.js'; -import { SharedProcessService } from '../services/sharedProcess/electron-sandbox/sharedProcessService.js'; -import { RemoteAuthorityResolverService } from '../../platform/remote/electron-sandbox/remoteAuthorityResolverService.js'; +import { SharedProcessService } from '../services/sharedProcess/electron-browser/sharedProcessService.js'; +import { RemoteAuthorityResolverService } from '../../platform/remote/electron-browser/remoteAuthorityResolverService.js'; import { IRemoteAuthorityResolverService, RemoteConnectionType } from '../../platform/remote/common/remoteAuthorityResolver.js'; -import { RemoteAgentService } from '../services/remote/electron-sandbox/remoteAgentService.js'; +import { RemoteAgentService } from '../services/remote/electron-browser/remoteAgentService.js'; import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.js'; import { FileService } from '../../platform/files/common/fileService.js'; import { IFileService } from '../../platform/files/common/files.js'; @@ -36,18 +36,18 @@ import { ISignService } from '../../platform/sign/common/sign.js'; import { IProductService } from '../../platform/product/common/productService.js'; import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js'; import { UriIdentityService } from '../../platform/uriIdentity/common/uriIdentityService.js'; -import { INativeKeyboardLayoutService, NativeKeyboardLayoutService } from '../services/keybinding/electron-sandbox/nativeKeyboardLayoutService.js'; -import { ElectronIPCMainProcessService } from '../../platform/ipc/electron-sandbox/mainProcessService.js'; +import { INativeKeyboardLayoutService, NativeKeyboardLayoutService } from '../services/keybinding/electron-browser/nativeKeyboardLayoutService.js'; +import { ElectronIPCMainProcessService } from '../../platform/ipc/electron-browser/mainProcessService.js'; import { LoggerChannelClient } from '../../platform/log/common/logIpc.js'; import { ProxyChannel } from '../../base/parts/ipc/common/ipc.js'; -import { NativeLogService } from '../services/log/electron-sandbox/logService.js'; +import { NativeLogService } from '../services/log/electron-browser/logService.js'; import { WorkspaceTrustEnablementService, WorkspaceTrustManagementService } from '../services/workspaces/common/workspaceTrust.js'; import { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService } from '../../platform/workspace/common/workspaceTrust.js'; import { safeStringify } from '../../base/common/objects.js'; -import { IUtilityProcessWorkerWorkbenchService, UtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js'; +import { IUtilityProcessWorkerWorkbenchService, UtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.js'; import { isBigSurOrNewer, isCI, isMacintosh } from '../../base/common/platform.js'; import { Schemas } from '../../base/common/network.js'; -import { DiskFileSystemProvider } from '../services/files/electron-sandbox/diskFileSystemProvider.js'; +import { DiskFileSystemProvider } from '../services/files/electron-browser/diskFileSystemProvider.js'; import { FileUserDataProvider } from '../../platform/userData/common/fileUserDataProvider.js'; import { IUserDataProfilesService, reviveProfile } from '../../platform/userDataProfile/common/userDataProfile.js'; import { UserDataProfilesService } from '../../platform/userDataProfile/common/userDataProfileIpc.js'; @@ -57,9 +57,9 @@ import { UserDataProfileService } from '../services/userDataProfile/common/userD import { IUserDataProfileService } from '../services/userDataProfile/common/userDataProfile.js'; import { BrowserSocketFactory } from '../../platform/remote/browser/browserSocketFactory.js'; import { RemoteSocketFactoryService, IRemoteSocketFactoryService } from '../../platform/remote/common/remoteSocketFactoryService.js'; -import { ElectronRemoteResourceLoader } from '../../platform/remote/electron-sandbox/electronRemoteResourceLoader.js'; +import { ElectronRemoteResourceLoader } from '../../platform/remote/electron-browser/electronRemoteResourceLoader.js'; import { IConfigurationService } from '../../platform/configuration/common/configuration.js'; -import { applyZoom } from '../../platform/window/electron-sandbox/window.js'; +import { applyZoom } from '../../platform/window/electron-browser/window.js'; import { mainWindow } from '../../base/browser/window.js'; import { DefaultAccountService, IDefaultAccountService } from '../services/accounts/common/defaultAccount.js'; import { AccountPolicyService } from '../services/policies/common/accountPolicyService.js'; diff --git a/src/vs/workbench/electron-sandbox/media/window.css b/src/vs/workbench/electron-browser/media/window.css similarity index 100% rename from src/vs/workbench/electron-sandbox/media/window.css rename to src/vs/workbench/electron-browser/media/window.css diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts b/src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts similarity index 100% rename from src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts rename to src/vs/workbench/electron-browser/parts/dialogs/dialog.contribution.ts diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-browser/parts/dialogs/dialogHandler.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts rename to src/vs/workbench/electron-browser/parts/dialogs/dialogHandler.ts index 6c61a590324..0806103b36a 100644 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts +++ b/src/vs/workbench/electron-browser/parts/dialogs/dialogHandler.ts @@ -11,7 +11,7 @@ import { AbstractDialogHandler, IConfirmation, IConfirmationResult, IPrompt, IAs import { ILogService } from '../../../../platform/log/common/log.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; -import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { process } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { getActiveWindow } from '../../../../base/browser/dom.js'; export class NativeDialogHandler extends AbstractDialogHandler { diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts b/src/vs/workbench/electron-browser/parts/titlebar/menubarControl.ts similarity index 98% rename from src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts rename to src/vs/workbench/electron-browser/parts/titlebar/menubarControl.ts index 6bbdb1b7a31..716f2280413 100644 --- a/src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts +++ b/src/vs/workbench/electron-browser/parts/titlebar/menubarControl.ts @@ -10,7 +10,7 @@ import { IWorkspacesService } from '../../../../platform/workspaces/common/works import { isMacintosh } from '../../../../base/common/platform.js'; import { INotificationService } from '../../../../platform/notification/common/notification.js'; import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { ILabelService } from '../../../../platform/label/common/label.js'; @@ -18,7 +18,7 @@ import { IUpdateService } from '../../../../platform/update/common/update.js'; import { IOpenRecentAction, MenubarControl } from '../../../browser/parts/titlebar/menubarControl.js'; import { IStorageService } from '../../../../platform/storage/common/storage.js'; import { IMenubarData, IMenubarMenu, IMenubarKeybinding, IMenubarMenuItemSubmenu, IMenubarMenuItemAction, MenubarMenuItem } from '../../../../platform/menubar/common/menubar.js'; -import { IMenubarService } from '../../../../platform/menubar/electron-sandbox/menubar.js'; +import { IMenubarService } from '../../../../platform/menubar/electron-browser/menubar.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { IHostService } from '../../../services/host/browser/host.js'; import { IPreferencesService } from '../../../services/preferences/common/preferences.js'; diff --git a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts rename to src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts index b437af42424..cfc3572068f 100644 --- a/src/vs/workbench/electron-sandbox/parts/titlebar/titlebarPart.ts +++ b/src/vs/workbench/electron-browser/parts/titlebar/titlebarPart.ts @@ -9,7 +9,7 @@ import { $, addDisposableListener, append, EventType, getWindow, getWindowId, hi import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js'; import { IConfigurationService, IConfigurationChangeEvent } from '../../../../platform/configuration/common/configuration.js'; import { IStorageService } from '../../../../platform/storage/common/storage.js'; -import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../../services/environment/electron-browser/environmentService.js'; import { IHostService } from '../../../services/host/browser/host.js'; import { isMacintosh, isWindows, isLinux, isBigSurOrNewer } from '../../../../base/common/platform.js'; import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js'; diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-browser/window.ts similarity index 99% rename from src/vs/workbench/electron-sandbox/window.ts rename to src/vs/workbench/electron-browser/window.ts index 30805019b89..d4072f5d95c 100644 --- a/src/vs/workbench/electron-sandbox/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -16,11 +16,11 @@ import { ITelemetryService } from '../../platform/telemetry/common/telemetry.js' import { WindowMinimumSize, IOpenFileRequest, IAddRemoveFoldersRequest, INativeRunActionInWindowRequest, INativeRunKeybindingInWindowRequest, INativeOpenFileRequest, hasNativeTitlebar } from '../../platform/window/common/window.js'; import { ITitleService } from '../services/title/browser/titleService.js'; import { IWorkbenchThemeService } from '../services/themes/common/workbenchThemeService.js'; -import { ApplyZoomTarget, applyZoom } from '../../platform/window/electron-sandbox/window.js'; +import { ApplyZoomTarget, applyZoom } from '../../platform/window/electron-browser/window.js'; import { setFullscreen, getZoomLevel, onDidChangeZoomLevel, getZoomFactor } from '../../base/browser/browser.js'; import { ICommandService, CommandsRegistry } from '../../platform/commands/common/commands.js'; import { IResourceEditorInput } from '../../platform/editor/common/editor.js'; -import { ipcRenderer, process } from '../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ipcRenderer, process } from '../../base/parts/sandbox/electron-browser/globals.js'; import { IWorkspaceEditingService } from '../services/workspaces/common/workspaceEditing.js'; import { IMenuService, MenuId, IMenu, MenuItemAction, MenuRegistry } from '../../platform/actions/common/actions.js'; import { ICommandAction } from '../../platform/action/common/action.js'; @@ -34,7 +34,7 @@ import { isWindows, isMacintosh } from '../../base/common/platform.js'; import { IProductService } from '../../platform/product/common/productService.js'; import { INotificationService, NotificationPriority, Severity } from '../../platform/notification/common/notification.js'; import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js'; -import { INativeWorkbenchEnvironmentService } from '../services/environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../services/environment/electron-browser/environmentService.js'; import { IAccessibilityService, AccessibilitySupport } from '../../platform/accessibility/common/accessibility.js'; import { WorkbenchState, IWorkspaceContextService } from '../../platform/workspace/common/workspace.js'; import { coalesce } from '../../base/common/arrays.js'; @@ -54,11 +54,11 @@ import { IRemoteAuthorityResolverService } from '../../platform/remote/common/re import { IAddressProvider, IAddress } from '../../platform/remote/common/remoteAgentConnection.js'; import { IEditorGroupsService, IEditorPart } from '../services/editor/common/editorGroupsService.js'; import { IDialogService } from '../../platform/dialogs/common/dialogs.js'; -import { AuthInfo } from '../../base/parts/sandbox/electron-sandbox/electronTypes.js'; +import { AuthInfo } from '../../base/parts/sandbox/electron-browser/electronTypes.js'; import { ILogService } from '../../platform/log/common/log.js'; import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js'; import { whenEditorClosed } from '../browser/editor.js'; -import { ISharedProcessService } from '../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../platform/ipc/electron-browser/services.js'; import { IProgressService, ProgressLocation } from '../../platform/progress/common/progress.js'; import { toErrorMessage } from '../../base/common/errorMessage.js'; import { ILabelService } from '../../platform/label/common/label.js'; @@ -67,7 +67,7 @@ import { IBannerService } from '../services/banner/browser/bannerService.js'; import { Codicon } from '../../base/common/codicons.js'; import { IUriIdentityService } from '../../platform/uriIdentity/common/uriIdentity.js'; import { IPreferencesService } from '../services/preferences/common/preferences.js'; -import { IUtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js'; +import { IUtilityProcessWorkerWorkbenchService } from '../services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.js'; import { registerWindowDriver } from '../services/driver/browser/driver.js'; import { mainWindow } from '../../base/browser/window.js'; import { BaseWindow } from '../browser/window.js'; diff --git a/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts b/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts similarity index 99% rename from src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts rename to src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts index 89f1c861cff..f3aab796cc1 100644 --- a/src/vs/workbench/services/accessibility/electron-sandbox/accessibilityService.ts +++ b/src/vs/workbench/services/accessibility/electron-browser/accessibilityService.ts @@ -5,7 +5,7 @@ import { IAccessibilityService, AccessibilitySupport } from '../../../../platform/accessibility/common/accessibility.js'; import { isWindows, isLinux } from '../../../../base/common/platform.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { AccessibilityService } from '../../../../platform/accessibility/browser/accessibilityService.js'; diff --git a/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts b/src/vs/workbench/services/auxiliaryWindow/electron-browser/auxiliaryWindowService.ts similarity index 99% rename from src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts rename to src/vs/workbench/services/auxiliaryWindow/electron-browser/auxiliaryWindowService.ts index 2c6f4addc8e..2c01f6fd5cf 100644 --- a/src/vs/workbench/services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.ts +++ b/src/vs/workbench/services/auxiliaryWindow/electron-browser/auxiliaryWindowService.ts @@ -7,7 +7,7 @@ import { localize } from '../../../../nls.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js'; import { AuxiliaryWindow, AuxiliaryWindowMode, BrowserAuxiliaryWindowService, IAuxiliaryWindowOpenOptions, IAuxiliaryWindowService } from '../browser/auxiliaryWindowService.js'; -import { ISandboxGlobals } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ISandboxGlobals } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { DisposableStore } from '../../../../base/common/lifecycle.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; @@ -19,7 +19,7 @@ import { ShutdownReason } from '../../lifecycle/common/lifecycle.js'; import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; import { Barrier } from '../../../../base/common/async.js'; import { IHostService } from '../../host/browser/host.js'; -import { applyZoom } from '../../../../platform/window/electron-sandbox/window.js'; +import { applyZoom } from '../../../../platform/window/electron-browser/window.js'; import { getZoomLevel, isFullscreen, setFullscreen } from '../../../../base/browser/browser.js'; import { getActiveWindow } from '../../../../base/browser/dom.js'; import { IWorkbenchEnvironmentService } from '../../environment/common/environmentService.js'; diff --git a/src/vs/workbench/services/browserElements/electron-sandbox/browserElementsService.ts b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts similarity index 97% rename from src/vs/workbench/services/browserElements/electron-sandbox/browserElementsService.ts rename to src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts index 0f28cde37f5..b2aae31f500 100644 --- a/src/vs/workbench/services/browserElements/electron-sandbox/browserElementsService.ts +++ b/src/vs/workbench/services/browserElements/electron-browser/browserElementsService.ts @@ -5,12 +5,12 @@ import { BrowserType, IElementData, INativeBrowserElementsService } from '../../../../platform/browserElements/common/browserElements.js'; import { IRectangle } from '../../../../platform/window/common/window.js'; -import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { CancellationToken } from '../../../../base/common/cancellation.js'; import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js'; import { IBrowserElementsService } from '../browser/browserElementsService.js'; import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { NativeBrowserElementsService } from '../../../../platform/browserElements/common/nativeBrowserElementsService.js'; class WorkbenchNativeBrowserElementsService extends NativeBrowserElementsService { diff --git a/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts b/src/vs/workbench/services/checksum/electron-browser/checksumService.ts similarity index 92% rename from src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts rename to src/vs/workbench/services/checksum/electron-browser/checksumService.ts index 57824e93880..93b88334fba 100644 --- a/src/vs/workbench/services/checksum/electron-sandbox/checksumService.ts +++ b/src/vs/workbench/services/checksum/electron-browser/checksumService.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { IChecksumService } from '../../../../platform/checksum/common/checksumService.js'; -import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; registerSharedProcessRemoteService(IChecksumService, 'checksum'); diff --git a/src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts b/src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts similarity index 100% rename from src/vs/workbench/services/clipboard/electron-sandbox/clipboardService.ts rename to src/vs/workbench/services/clipboard/electron-browser/clipboardService.ts diff --git a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts similarity index 96% rename from src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts rename to src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index 0e228ecb9f6..f169e776482 100644 --- a/src/vs/workbench/services/configurationResolver/electron-sandbox/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { ICommandService } from '../../../../platform/commands/common/commands.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; @@ -13,7 +13,7 @@ import { IConfigurationResolverService } from '../common/configurationResolver.j import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { BaseConfigurationResolverService } from '../browser/baseConfigurationResolverService.js'; import { ILabelService } from '../../../../platform/label/common/label.js'; -import { IShellEnvironmentService } from '../../environment/electron-sandbox/shellEnvironmentService.js'; +import { IShellEnvironmentService } from '../../environment/electron-browser/shellEnvironmentService.js'; import { IPathService } from '../../path/common/pathService.js'; import { IExtensionService } from '../../extensions/common/extensions.js'; import { IStorageService } from '../../../../platform/storage/common/storage.js'; diff --git a/src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts similarity index 100% rename from src/vs/workbench/services/configurationResolver/test/electron-sandbox/configurationResolverService.test.ts rename to src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts diff --git a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts similarity index 99% rename from src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts rename to src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts index a7999fb3b67..fb971f742d5 100644 --- a/src/vs/workbench/services/contextmenu/electron-sandbox/contextmenuService.ts +++ b/src/vs/workbench/services/contextmenu/electron-browser/contextmenuService.ts @@ -14,7 +14,7 @@ import { INotificationService } from '../../../../platform/notification/common/n import { IContextMenuDelegate, IContextMenuEvent } from '../../../../base/browser/contextmenu.js'; import { createSingleCallFunction } from '../../../../base/common/functional.js'; import { IContextMenuItem } from '../../../../base/parts/contextmenu/common/contextmenu.js'; -import { popup } from '../../../../base/parts/contextmenu/electron-sandbox/contextmenu.js'; +import { popup } from '../../../../base/parts/contextmenu/electron-browser/contextmenu.js'; import { hasNativeContextMenu, MenuSettings } from '../../../../platform/window/common/window.js'; import { isMacintosh, isWindows } from '../../../../base/common/platform.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; diff --git a/src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts b/src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts similarity index 100% rename from src/vs/workbench/services/dialogs/electron-sandbox/fileDialogService.ts rename to src/vs/workbench/services/dialogs/electron-browser/fileDialogService.ts diff --git a/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts b/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts similarity index 99% rename from src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts rename to src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts index f75cd47844e..f97f6a1d418 100644 --- a/src/vs/workbench/services/dialogs/test/electron-sandbox/fileDialogService.test.ts +++ b/src/vs/workbench/services/dialogs/test/electron-browser/fileDialogService.test.ts @@ -25,7 +25,7 @@ import { IOpenerService } from '../../../../../platform/opener/common/opener.js' import { IWorkspaceContextService } from '../../../../../platform/workspace/common/workspace.js'; import { IWorkspacesService } from '../../../../../platform/workspaces/common/workspaces.js'; import { ISimpleFileDialog } from '../../browser/simpleFileDialog.js'; -import { FileDialogService } from '../../electron-sandbox/fileDialogService.js'; +import { FileDialogService } from '../../electron-browser/fileDialogService.js'; import { IEditorService } from '../../../editor/common/editorService.js'; import { BrowserWorkbenchEnvironmentService } from '../../../environment/browser/environmentService.js'; import { IWorkbenchEnvironmentService } from '../../../environment/common/environmentService.js'; diff --git a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts b/src/vs/workbench/services/encryption/electron-browser/encryptionService.ts similarity index 93% rename from src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts rename to src/vs/workbench/services/encryption/electron-browser/encryptionService.ts index 8847433ce45..38d746bcd1f 100644 --- a/src/vs/workbench/services/encryption/electron-sandbox/encryptionService.ts +++ b/src/vs/workbench/services/encryption/electron-browser/encryptionService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { IEncryptionService } from '../../../../platform/encryption/common/encryptionService.js'; registerMainProcessRemoteService(IEncryptionService, 'encryption'); diff --git a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts b/src/vs/workbench/services/environment/electron-browser/environmentService.ts similarity index 100% rename from src/vs/workbench/services/environment/electron-sandbox/environmentService.ts rename to src/vs/workbench/services/environment/electron-browser/environmentService.ts diff --git a/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts b/src/vs/workbench/services/environment/electron-browser/shellEnvironmentService.ts similarity index 98% rename from src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts rename to src/vs/workbench/services/environment/electron-browser/shellEnvironmentService.ts index a05b8eacd24..b8108603fff 100644 --- a/src/vs/workbench/services/environment/electron-sandbox/shellEnvironmentService.ts +++ b/src/vs/workbench/services/environment/electron-browser/shellEnvironmentService.ts @@ -5,7 +5,7 @@ import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js'; import { IProcessEnvironment } from '../../../../base/common/platform.js'; -import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { process } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; export const IShellEnvironmentService = createDecorator('shellEnvironmentService'); diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts similarity index 99% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts index 4e494937b12..92d78c4f30f 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionGalleryManifestService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionGalleryManifestService.ts @@ -15,7 +15,7 @@ import { ExtensionGalleryManifestService as ExtensionGalleryManifestService } fr import { resolveMarketplaceHeaders } from '../../../../platform/externalServices/common/marketplace.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; import { asJson, IRequestService } from '../../../../platform/request/common/request.js'; diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts similarity index 99% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts index eaf010aafef..c76644b7c28 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementServerService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementServerService.ts @@ -8,7 +8,7 @@ import { Schemas } from '../../../../base/common/network.js'; import { ExtensionInstallLocation, IExtensionManagementServer, IExtensionManagementServerService } from '../common/extensionManagement.js'; import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js'; import { IChannel } from '../../../../base/parts/ipc/common/ipc.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { NativeRemoteExtensionManagementService } from './remoteExtensionManagementService.js'; import { ILabelService } from '../../../../platform/label/common/label.js'; diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts similarity index 99% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts index eeae819a083..68eddb835ba 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionManagementService.ts @@ -13,7 +13,7 @@ import { Schemas } from '../../../../base/common/network.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { IDownloadService } from '../../../../platform/download/common/download.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { joinPath } from '../../../../base/common/resources.js'; import { IUserDataSyncEnablementService } from '../../../../platform/userDataSync/common/userDataSync.js'; import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js'; diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/extensionTipsService.ts similarity index 98% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/extensionTipsService.ts index f27ddc63799..b20e96c6a97 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/extensionTipsService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/extensionTipsService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { IChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { IExtensionTipsService, IExecutableBasedExtensionTip, IConfigBasedExtensionTip } from '../../../../platform/extensionManagement/common/extensionManagement.js'; import { URI } from '../../../../base/common/uri.js'; diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts similarity index 98% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts index b45ca0bcce6..cb1e06e97c8 100644 --- a/src/vs/workbench/services/extensionManagement/electron-sandbox/nativeExtensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/electron-browser/nativeExtensionManagementService.ts @@ -17,7 +17,7 @@ import { IFileService } from '../../../../platform/files/common/files.js'; import { generateUuid } from '../../../../base/common/uuid.js'; import { ProfileAwareExtensionManagementChannelClient } from '../common/extensionManagementChannelClient.js'; import { ExtensionIdentifier, ExtensionType, isResolverExtension } from '../../../../platform/extensions/common/extensions.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; export class NativeExtensionManagementService extends ProfileAwareExtensionManagementChannelClient implements IProfileAwareExtensionManagementService { diff --git a/src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts b/src/vs/workbench/services/extensionManagement/electron-browser/remoteExtensionManagementService.ts similarity index 100% rename from src/vs/workbench/services/extensionManagement/electron-sandbox/remoteExtensionManagementService.ts rename to src/vs/workbench/services/extensionManagement/electron-browser/remoteExtensionManagementService.ts diff --git a/src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts similarity index 100% rename from src/vs/workbench/services/extensions/electron-sandbox/cachedExtensionScanner.ts rename to src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts similarity index 100% rename from src/vs/workbench/services/extensions/electron-sandbox/extensionHostProfiler.ts rename to src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHostStarter.ts similarity index 93% rename from src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts rename to src/vs/workbench/services/extensions/electron-browser/extensionHostStarter.ts index e8bcaabe8eb..cc0b19746e7 100644 --- a/src/vs/workbench/services/extensions/electron-sandbox/extensionHostStarter.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHostStarter.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { IExtensionHostStarter, ipcExtensionHostStarterChannelName } from '../../../../platform/extensions/common/extensionHostStarter.js'; registerMainProcessRemoteService(IExtensionHostStarter, ipcExtensionHostStarterChannelName); diff --git a/src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionsScannerService.ts similarity index 100% rename from src/vs/workbench/services/extensions/electron-sandbox/extensionsScannerService.ts rename to src/vs/workbench/services/extensions/electron-browser/extensionsScannerService.ts diff --git a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts similarity index 99% rename from src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts rename to src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts index 41b8bc38af9..803a4fd75db 100644 --- a/src/vs/workbench/services/extensions/electron-sandbox/localProcessExtensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/localProcessExtensionHost.ts @@ -16,7 +16,7 @@ import { URI } from '../../../../base/common/uri.js'; import { generateUuid } from '../../../../base/common/uuid.js'; import { IMessagePassingProtocol } from '../../../../base/parts/ipc/common/ipc.js'; import { BufferedEmitter } from '../../../../base/parts/ipc/common/ipc.net.js'; -import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js'; +import { acquirePort } from '../../../../base/parts/ipc/electron-browser/ipc.mp.js'; import * as nls from '../../../../nls.js'; import { IExtensionHostDebugService } from '../../../../platform/debug/common/extensionHostDebug.js'; import { IExtensionHostProcessOptions, IExtensionHostStarter } from '../../../../platform/extensions/common/extensionHostStarter.js'; @@ -29,8 +29,8 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet import { isLoggingOnly } from '../../../../platform/telemetry/common/telemetryUtils.js'; import { IUserDataProfilesService } from '../../../../platform/userDataProfile/common/userDataProfile.js'; import { IWorkspaceContextService, WorkbenchState, isUntitledWorkspace } from '../../../../platform/workspace/common/workspace.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; -import { IShellEnvironmentService } from '../../environment/electron-sandbox/shellEnvironmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; +import { IShellEnvironmentService } from '../../environment/electron-browser/shellEnvironmentService.js'; import { MessagePortExtHostConnection, writeExtHostConnection } from '../common/extensionHostEnv.js'; import { IExtensionHostInitData, MessageType, NativeLogMarkers, UIKind, isMessageOfType } from '../common/extensionHostProtocol.js'; import { LocalProcessRunningLocation } from '../common/extensionRunningLocation.js'; diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts similarity index 100% rename from src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts rename to src/vs/workbench/services/extensions/electron-browser/nativeExtensionService.ts diff --git a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts b/src/vs/workbench/services/files/electron-browser/diskFileSystemProvider.ts similarity index 99% rename from src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts rename to src/vs/workbench/services/files/electron-browser/diskFileSystemProvider.ts index 85b2f1eb68a..5c0af31e6b3 100644 --- a/src/vs/workbench/services/files/electron-sandbox/diskFileSystemProvider.ts +++ b/src/vs/workbench/services/files/electron-browser/diskFileSystemProvider.ts @@ -16,7 +16,7 @@ import { DiskFileSystemProviderClient, LOCAL_FILE_SYSTEM_CHANNEL_NAME } from '.. import { ILogMessage, AbstractUniversalWatcherClient } from '../../../../platform/files/common/watcher.js'; import { UniversalWatcherClient } from './watcherClient.js'; import { ILoggerService, ILogService } from '../../../../platform/log/common/log.js'; -import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js'; +import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.js'; import { LogService } from '../../../../platform/log/common/logService.js'; /** diff --git a/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts b/src/vs/workbench/services/files/electron-browser/elevatedFileService.ts similarity index 98% rename from src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts rename to src/vs/workbench/services/files/electron-browser/elevatedFileService.ts index 158a5ac0f4c..19c2a1c0640 100644 --- a/src/vs/workbench/services/files/electron-sandbox/elevatedFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/elevatedFileService.ts @@ -12,7 +12,7 @@ import { IFileService, IFileStatWithMetadata, IWriteFileOptions } from '../../.. import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { INativeHostService } from '../../../../platform/native/common/native.js'; import { IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IElevatedFileService } from '../common/elevatedFileService.js'; import { isWindows } from '../../../../base/common/platform.js'; import { ILabelService } from '../../../../platform/label/common/label.js'; diff --git a/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts b/src/vs/workbench/services/files/electron-browser/watcherClient.ts similarity index 97% rename from src/vs/workbench/services/files/electron-sandbox/watcherClient.ts rename to src/vs/workbench/services/files/electron-browser/watcherClient.ts index 2c8554796b3..39bcfbd0bbe 100644 --- a/src/vs/workbench/services/files/electron-sandbox/watcherClient.ts +++ b/src/vs/workbench/services/files/electron-browser/watcherClient.ts @@ -7,7 +7,7 @@ import { DisposableStore } from '../../../../base/common/lifecycle.js'; import { getDelayedChannel, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { IFileChange } from '../../../../platform/files/common/files.js'; import { AbstractUniversalWatcherClient, ILogMessage, IRecursiveWatcher } from '../../../../platform/files/common/watcher.js'; -import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.js'; +import { IUtilityProcessWorkerWorkbenchService } from '../../utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.js'; export class UniversalWatcherClient extends AbstractUniversalWatcherClient { diff --git a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts b/src/vs/workbench/services/host/electron-browser/nativeHostService.ts similarity index 99% rename from src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts rename to src/vs/workbench/services/host/electron-browser/nativeHostService.ts index f3d99829c08..cb7dcc810e2 100644 --- a/src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts +++ b/src/vs/workbench/services/host/electron-browser/nativeHostService.ts @@ -12,7 +12,7 @@ import { IWorkbenchEnvironmentService } from '../../environment/common/environme import { IWindowOpenable, IOpenWindowOptions, isFolderToOpen, isWorkspaceToOpen, IOpenEmptyWindowOptions, IPoint, IRectangle } from '../../../../platform/window/common/window.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; import { NativeHostService } from '../../../../platform/native/common/nativeHostService.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IMainProcessService } from '../../../../platform/ipc/common/mainProcessService.js'; import { disposableWindowInterval, getActiveDocument, getWindowId, getWindowsCount, hasWindow, onDidRegisterWindow } from '../../../../base/browser/dom.js'; import { memoize } from '../../../../base/common/decorators.js'; diff --git a/src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts b/src/vs/workbench/services/integrity/electron-browser/integrityService.ts similarity index 100% rename from src/vs/workbench/services/integrity/electron-sandbox/integrityService.ts rename to src/vs/workbench/services/integrity/electron-browser/integrityService.ts diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts b/src/vs/workbench/services/keybinding/electron-browser/nativeKeyboardLayout.ts similarity index 100% rename from src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayout.ts rename to src/vs/workbench/services/keybinding/electron-browser/nativeKeyboardLayout.ts diff --git a/src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts b/src/vs/workbench/services/keybinding/electron-browser/nativeKeyboardLayoutService.ts similarity index 100% rename from src/vs/workbench/services/keybinding/electron-sandbox/nativeKeyboardLayoutService.ts rename to src/vs/workbench/services/keybinding/electron-browser/nativeKeyboardLayoutService.ts diff --git a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts similarity index 99% rename from src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts rename to src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts index b7fe1aadac3..762840ba2f2 100644 --- a/src/vs/workbench/services/lifecycle/electron-sandbox/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts @@ -6,7 +6,7 @@ import { handleVetos } from '../../../../platform/lifecycle/common/lifecycle.js'; import { ShutdownReason, ILifecycleService, IWillShutdownEventJoiner, WillShutdownJoinerOrder } from '../common/lifecycle.js'; import { IStorageService } from '../../../../platform/storage/common/storage.js'; -import { ipcRenderer } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { ipcRenderer } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { AbstractLifecycleService } from '../common/lifecycleService.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; diff --git a/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts b/src/vs/workbench/services/lifecycle/test/electron-browser/lifecycleService.test.ts similarity index 98% rename from src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts rename to src/vs/workbench/services/lifecycle/test/electron-browser/lifecycleService.test.ts index 7afb9dd0ab0..fe043e7004d 100644 --- a/src/vs/workbench/services/lifecycle/test/electron-sandbox/lifecycleService.test.ts +++ b/src/vs/workbench/services/lifecycle/test/electron-browser/lifecycleService.test.ts @@ -9,8 +9,8 @@ import { DisposableStore } from '../../../../../base/common/lifecycle.js'; import { runWithFakedTimers } from '../../../../../base/test/common/timeTravelScheduler.js'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js'; import { ShutdownReason, WillShutdownJoinerOrder } from '../../common/lifecycle.js'; -import { NativeLifecycleService } from '../../electron-sandbox/lifecycleService.js'; -import { workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { NativeLifecycleService } from '../../electron-browser/lifecycleService.js'; +import { workbenchInstantiationService } from '../../../../test/electron-browser/workbenchTestServices.js'; suite('Lifecycleservice', function () { diff --git a/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts b/src/vs/workbench/services/localization/electron-browser/languagePackService.ts similarity index 93% rename from src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts rename to src/vs/workbench/services/localization/electron-browser/languagePackService.ts index 5c07673518d..a66deb42f13 100644 --- a/src/vs/workbench/services/localization/electron-sandbox/languagePackService.ts +++ b/src/vs/workbench/services/localization/electron-browser/languagePackService.ts @@ -4,6 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { ILanguagePackService } from '../../../../platform/languagePacks/common/languagePacks.js'; -import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; registerSharedProcessRemoteService(ILanguagePackService, 'languagePacks'); diff --git a/src/vs/workbench/services/localization/electron-sandbox/localeService.ts b/src/vs/workbench/services/localization/electron-browser/localeService.ts similarity index 100% rename from src/vs/workbench/services/localization/electron-sandbox/localeService.ts rename to src/vs/workbench/services/localization/electron-browser/localeService.ts diff --git a/src/vs/workbench/services/log/electron-sandbox/logService.ts b/src/vs/workbench/services/log/electron-browser/logService.ts similarity index 97% rename from src/vs/workbench/services/log/electron-sandbox/logService.ts rename to src/vs/workbench/services/log/electron-browser/logService.ts index 34245d85ff0..97ae7dbbf90 100644 --- a/src/vs/workbench/services/log/electron-sandbox/logService.ts +++ b/src/vs/workbench/services/log/electron-browser/logService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ConsoleLogger, ILogger } from '../../../../platform/log/common/log.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { LoggerChannelClient } from '../../../../platform/log/common/logIpc.js'; import { DisposableStore } from '../../../../base/common/lifecycle.js'; import { windowLogGroup, windowLogId } from '../common/logConstants.js'; diff --git a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts b/src/vs/workbench/services/menubar/electron-browser/menubarService.ts similarity index 88% rename from src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts rename to src/vs/workbench/services/menubar/electron-browser/menubarService.ts index 7b00164b381..bd5d8836993 100644 --- a/src/vs/workbench/services/menubar/electron-sandbox/menubarService.ts +++ b/src/vs/workbench/services/menubar/electron-browser/menubarService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IMenubarService } from '../../../../platform/menubar/electron-sandbox/menubar.js'; -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { IMenubarService } from '../../../../platform/menubar/electron-browser/menubar.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; registerMainProcessRemoteService(IMenubarService, 'menubar'); diff --git a/src/vs/workbench/services/path/electron-sandbox/pathService.ts b/src/vs/workbench/services/path/electron-browser/pathService.ts similarity index 96% rename from src/vs/workbench/services/path/electron-sandbox/pathService.ts rename to src/vs/workbench/services/path/electron-browser/pathService.ts index b2fbd6d92dd..5adc3bb3c6b 100644 --- a/src/vs/workbench/services/path/electron-sandbox/pathService.ts +++ b/src/vs/workbench/services/path/electron-browser/pathService.ts @@ -5,7 +5,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IRemoteAgentService } from '../../remote/common/remoteAgentService.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IPathService, AbstractPathService } from '../common/pathService.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; diff --git a/src/vs/workbench/services/process/electron-sandbox/processService.ts b/src/vs/workbench/services/process/electron-browser/processService.ts similarity index 93% rename from src/vs/workbench/services/process/electron-sandbox/processService.ts rename to src/vs/workbench/services/process/electron-browser/processService.ts index e47499664b7..1d9b8f2b17f 100644 --- a/src/vs/workbench/services/process/electron-sandbox/processService.ts +++ b/src/vs/workbench/services/process/electron-browser/processService.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { IProcessService } from '../../../../platform/process/common/process.js'; registerMainProcessRemoteService(IProcessService, 'process'); diff --git a/src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts b/src/vs/workbench/services/remote/electron-browser/remoteAgentService.ts similarity index 100% rename from src/vs/workbench/services/remote/electron-sandbox/remoteAgentService.ts rename to src/vs/workbench/services/remote/electron-browser/remoteAgentService.ts diff --git a/src/vs/workbench/services/request/electron-sandbox/requestService.ts b/src/vs/workbench/services/request/electron-browser/requestService.ts similarity index 100% rename from src/vs/workbench/services/request/electron-sandbox/requestService.ts rename to src/vs/workbench/services/request/electron-browser/requestService.ts diff --git a/src/vs/workbench/services/search/electron-sandbox/searchService.ts b/src/vs/workbench/services/search/electron-browser/searchService.ts similarity index 100% rename from src/vs/workbench/services/search/electron-sandbox/searchService.ts rename to src/vs/workbench/services/search/electron-browser/searchService.ts diff --git a/src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts b/src/vs/workbench/services/secrets/electron-browser/secretStorageService.ts similarity index 100% rename from src/vs/workbench/services/secrets/electron-sandbox/secretStorageService.ts rename to src/vs/workbench/services/secrets/electron-browser/secretStorageService.ts diff --git a/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts b/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts similarity index 98% rename from src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts rename to src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts index 8110886c226..ed735cbe689 100644 --- a/src/vs/workbench/services/sharedProcess/electron-sandbox/sharedProcessService.ts +++ b/src/vs/workbench/services/sharedProcess/electron-browser/sharedProcessService.ts @@ -7,11 +7,11 @@ import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/i import { IChannel, IServerChannel, getDelayedChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { ILogService } from '../../../../platform/log/common/log.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { SharedProcessChannelConnection, SharedProcessRawConnection } from '../../../../platform/sharedProcess/common/sharedProcess.js'; import { mark } from '../../../../base/common/performance.js'; import { Barrier, timeout } from '../../../../base/common/async.js'; -import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js'; +import { acquirePort } from '../../../../base/parts/ipc/electron-browser/ipc.mp.js'; export class SharedProcessService extends Disposable implements ISharedProcessService { diff --git a/src/vs/workbench/services/storage/electron-sandbox/storageService.ts b/src/vs/workbench/services/storage/electron-browser/storageService.ts similarity index 100% rename from src/vs/workbench/services/storage/electron-sandbox/storageService.ts rename to src/vs/workbench/services/storage/electron-browser/storageService.ts diff --git a/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts similarity index 97% rename from src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts rename to src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts index e49eaefbbab..75d61ed72d7 100644 --- a/src/vs/workbench/services/telemetry/electron-sandbox/telemetryService.ts +++ b/src/vs/workbench/services/telemetry/electron-browser/telemetryService.ts @@ -7,16 +7,16 @@ import { ITelemetryService, ITelemetryData, TelemetryLevel } from '../../../../p import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry } from '../../../../platform/telemetry/common/telemetryUtils.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { TelemetryAppenderClient } from '../../../../platform/telemetry/common/telemetryIpc.js'; import { IStorageService } from '../../../../platform/storage/common/storage.js'; import { resolveWorkbenchCommonProperties } from '../common/workbenchCommonProperties.js'; import { TelemetryService as BaseTelemetryService, ITelemetryServiceConfig } from '../../../../platform/telemetry/common/telemetryService.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { ClassifiedEvent, StrictPropertyCheck, OmitMetadata, IGDPRProperty } from '../../../../platform/telemetry/common/gdprTypings.js'; -import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { process } from '../../../../base/parts/sandbox/electron-browser/globals.js'; export class TelemetryService extends Disposable implements ITelemetryService { diff --git a/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts similarity index 99% rename from src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts rename to src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts index 913208b2221..79ef5c9ace6 100644 --- a/src/vs/workbench/services/textfile/electron-sandbox/nativeTextFileService.ts +++ b/src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts @@ -14,7 +14,7 @@ import { IUntitledTextEditorModelManager, IUntitledTextEditorService } from '../ import { ILifecycleService } from '../../lifecycle/common/lifecycle.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; import { IModelService } from '../../../../editor/common/services/model.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js'; import { IFilesConfigurationService } from '../../filesConfiguration/common/filesConfigurationService.js'; import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js'; diff --git a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts similarity index 98% rename from src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts rename to src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts index 9be96d96683..0fbc74192de 100644 --- a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.io.test.ts +++ b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.io.test.ts @@ -21,7 +21,7 @@ import { IWorkingCopyFileService, WorkingCopyFileService } from '../../../workin import { WorkingCopyService } from '../../../workingCopy/common/workingCopyService.js'; import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js'; import { TestInMemoryFileSystemProvider } from '../../../../test/browser/workbenchTestServices.js'; -import { TestNativeTextFileServiceWithEncodingOverrides, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestNativeTextFileServiceWithEncodingOverrides, workbenchInstantiationService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js'; suite('Files - NativeTextFileService i/o', function () { diff --git a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.test.ts similarity index 98% rename from src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts rename to src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.test.ts index 91250289f3a..6128845b778 100644 --- a/src/vs/workbench/services/textfile/test/electron-sandbox/nativeTextFileService.test.ts +++ b/src/vs/workbench/services/textfile/test/electron-browser/nativeTextFileService.test.ts @@ -12,7 +12,7 @@ import { ServiceCollection } from '../../../../../platform/instantiation/common/ import { DisposableStore } from '../../../../../base/common/lifecycle.js'; import { FileService } from '../../../../../platform/files/common/fileService.js'; import { NullLogService } from '../../../../../platform/log/common/log.js'; -import { TestNativeTextFileServiceWithEncodingOverrides, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestNativeTextFileServiceWithEncodingOverrides, TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { IWorkingCopyFileService, WorkingCopyFileService } from '../../../workingCopy/common/workingCopyFileService.js'; import { WorkingCopyService } from '../../../workingCopy/common/workingCopyService.js'; import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js'; diff --git a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts b/src/vs/workbench/services/themes/electron-browser/nativeHostColorSchemeService.ts similarity index 98% rename from src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts rename to src/vs/workbench/services/themes/electron-browser/nativeHostColorSchemeService.ts index b22de86f799..22cd3472570 100644 --- a/src/vs/workbench/services/themes/electron-sandbox/nativeHostColorSchemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/nativeHostColorSchemeService.ts @@ -8,7 +8,7 @@ import { INativeHostService } from '../../../../platform/native/common/native.js import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { Disposable } from '../../../../base/common/lifecycle.js'; import { IHostColorSchemeService } from '../common/hostColorSchemeService.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IStorageService, StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js'; import { isBoolean, isObject } from '../../../../base/common/types.js'; import { IColorScheme } from '../../../../platform/window/common/window.js'; diff --git a/src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts b/src/vs/workbench/services/themes/electron-browser/themes.contribution.ts similarity index 100% rename from src/vs/workbench/services/themes/electron-sandbox/themes.contribution.ts rename to src/vs/workbench/services/themes/electron-browser/themes.contribution.ts diff --git a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts similarity index 98% rename from src/vs/workbench/services/timer/electron-sandbox/timerService.ts rename to src/vs/workbench/services/timer/electron-browser/timerService.ts index e992d1fb55c..a12cfdc7d42 100644 --- a/src/vs/workbench/services/timer/electron-sandbox/timerService.ts +++ b/src/vs/workbench/services/timer/electron-browser/timerService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { INativeHostService } from '../../../../platform/native/common/native.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js'; import { IExtensionService } from '../../extensions/common/extensions.js'; import { IUpdateService } from '../../../../platform/update/common/update.js'; @@ -13,7 +13,7 @@ import { IEditorService } from '../../editor/common/editorService.js'; import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js'; import { IStartupMetrics, AbstractTimerService, Writeable, ITimerService } from '../browser/timerService.js'; import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js'; -import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals.js'; +import { process } from '../../../../base/parts/sandbox/electron-browser/globals.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; import { IWorkbenchLayoutService } from '../../layout/browser/layoutService.js'; import { IProductService } from '../../../../platform/product/common/productService.js'; diff --git a/src/vs/workbench/services/title/electron-sandbox/titleService.ts b/src/vs/workbench/services/title/electron-browser/titleService.ts similarity index 90% rename from src/vs/workbench/services/title/electron-sandbox/titleService.ts rename to src/vs/workbench/services/title/electron-browser/titleService.ts index 00244e14a85..a7d742993ce 100644 --- a/src/vs/workbench/services/title/electron-sandbox/titleService.ts +++ b/src/vs/workbench/services/title/electron-browser/titleService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; -import { NativeTitleService } from '../../../electron-sandbox/parts/titlebar/titlebarPart.js'; +import { NativeTitleService } from '../../../electron-browser/parts/titlebar/titlebarPart.js'; import { ITitleService } from '../browser/titleService.js'; registerSingleton(ITitleService, NativeTitleService, InstantiationType.Eager); diff --git a/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts b/src/vs/workbench/services/tunnel/electron-browser/tunnelService.ts similarity index 99% rename from src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts rename to src/vs/workbench/services/tunnel/electron-browser/tunnelService.ts index 0706995795a..f16f1c30360 100644 --- a/src/vs/workbench/services/tunnel/electron-sandbox/tunnelService.ts +++ b/src/vs/workbench/services/tunnel/electron-browser/tunnelService.ts @@ -14,7 +14,7 @@ import { ISharedProcessTunnelService } from '../../../../platform/remote/common/ import { ILifecycleService } from '../../lifecycle/common/lifecycle.js'; import { IRemoteAuthorityResolverService } from '../../../../platform/remote/common/remoteAuthorityResolver.js'; import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { OS } from '../../../../base/common/platform.js'; import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js'; diff --git a/src/vs/workbench/services/update/electron-sandbox/updateService.ts b/src/vs/workbench/services/update/electron-browser/updateService.ts similarity index 94% rename from src/vs/workbench/services/update/electron-sandbox/updateService.ts rename to src/vs/workbench/services/update/electron-browser/updateService.ts index 5ddd452efe4..c6bb0ae6063 100644 --- a/src/vs/workbench/services/update/electron-sandbox/updateService.ts +++ b/src/vs/workbench/services/update/electron-browser/updateService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IUpdateService } from '../../../../platform/update/common/update.js'; -import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerMainProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { UpdateChannelClient } from '../../../../platform/update/common/updateIpc.js'; registerMainProcessRemoteService(IUpdateService, 'update', { channelClientCtor: UpdateChannelClient }); diff --git a/src/vs/workbench/services/url/electron-sandbox/urlService.ts b/src/vs/workbench/services/url/electron-browser/urlService.ts similarity index 100% rename from src/vs/workbench/services/url/electron-sandbox/urlService.ts rename to src/vs/workbench/services/url/electron-browser/urlService.ts diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts b/src/vs/workbench/services/userDataSync/electron-browser/userDataAutoSyncService.ts similarity index 98% rename from src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts rename to src/vs/workbench/services/userDataSync/electron-browser/userDataAutoSyncService.ts index 5c265c0ee65..69503a49c1e 100644 --- a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataAutoSyncService.ts +++ b/src/vs/workbench/services/userDataSync/electron-browser/userDataAutoSyncService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IUserDataAutoSyncService, SyncOptions, UserDataSyncError } from '../../../../platform/userDataSync/common/userDataSync.js'; -import { ISharedProcessService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../../platform/ipc/electron-browser/services.js'; import { IChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { Event } from '../../../../base/common/event.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; diff --git a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts similarity index 97% rename from src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts rename to src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts index dc701548db8..a5b5857741f 100644 --- a/src/vs/workbench/services/userDataSync/electron-sandbox/userDataSyncService.ts +++ b/src/vs/workbench/services/userDataSync/electron-browser/userDataSyncService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService } from '../../../../platform/userDataSync/common/userDataSync.js'; -import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-sandbox/services.js'; +import { registerSharedProcessRemoteService } from '../../../../platform/ipc/electron-browser/services.js'; import { UserDataSyncServiceChannelClient } from '../../../../platform/userDataSync/common/userDataSyncServiceIpc.js'; import { IUserDataSyncMachinesService } from '../../../../platform/userDataSync/common/userDataSyncMachines.js'; import { UserDataSyncAccountServiceChannelClient, UserDataSyncStoreManagementServiceChannelClient } from '../../../../platform/userDataSync/common/userDataSyncIpc.js'; diff --git a/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts b/src/vs/workbench/services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.ts similarity index 99% rename from src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts rename to src/vs/workbench/services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.ts index 4f6672fda74..d074d17baeb 100644 --- a/src/vs/workbench/services/utilityProcess/electron-sandbox/utilityProcessWorkerWorkbenchService.ts +++ b/src/vs/workbench/services/utilityProcess/electron-browser/utilityProcessWorkerWorkbenchService.ts @@ -10,7 +10,7 @@ import { Client as MessagePortClient } from '../../../../base/parts/ipc/common/i import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js'; import { IPCClient, ProxyChannel } from '../../../../base/parts/ipc/common/ipc.js'; import { generateUuid } from '../../../../base/common/uuid.js'; -import { acquirePort } from '../../../../base/parts/ipc/electron-sandbox/ipc.mp.js'; +import { acquirePort } from '../../../../base/parts/ipc/electron-browser/ipc.mp.js'; import { IOnDidTerminateUtilityrocessWorkerProcess, ipcUtilityProcessWorkerChannelName, IUtilityProcessWorkerProcess, IUtilityProcessWorkerService } from '../../../../platform/utilityProcess/common/utilityProcessWorkerService.js'; import { Barrier, timeout } from '../../../../base/common/async.js'; diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts b/src/vs/workbench/services/workingCopy/electron-browser/workingCopyBackupService.ts similarity index 98% rename from src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts rename to src/vs/workbench/services/workingCopy/electron-browser/workingCopyBackupService.ts index fa5167d131e..ac4b7ec16ce 100644 --- a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupService.ts +++ b/src/vs/workbench/services/workingCopy/electron-browser/workingCopyBackupService.ts @@ -10,7 +10,7 @@ import { InstantiationType, registerSingleton } from '../../../../platform/insta import { IWorkingCopyBackupService } from '../common/workingCopyBackup.js'; import { IFileService } from '../../../../platform/files/common/files.js'; import { ILogService } from '../../../../platform/log/common/log.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { WorkbenchPhase, registerWorkbenchContribution2 } from '../../../common/contributions.js'; import { ILifecycleService } from '../../lifecycle/common/lifecycle.js'; import { NativeWorkingCopyBackupTracker } from './workingCopyBackupTracker.js'; diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts b/src/vs/workbench/services/workingCopy/electron-browser/workingCopyBackupTracker.ts similarity index 100% rename from src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts rename to src/vs/workbench/services/workingCopy/electron-browser/workingCopyBackupTracker.ts diff --git a/src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts b/src/vs/workbench/services/workingCopy/electron-browser/workingCopyHistoryService.ts similarity index 100% rename from src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyHistoryService.ts rename to src/vs/workbench/services/workingCopy/electron-browser/workingCopyHistoryService.ts diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts similarity index 99% rename from src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts rename to src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts index 41d4150230f..b3fb5c37566 100644 --- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupService.test.ts +++ b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupService.test.ts @@ -15,10 +15,10 @@ import { createTextModel } from '../../../../../editor/test/common/testTextModel import { Schemas } from '../../../../../base/common/network.js'; import { FileService } from '../../../../../platform/files/common/fileService.js'; import { LogLevel, NullLogService } from '../../../../../platform/log/common/log.js'; -import { NativeWorkbenchEnvironmentService } from '../../../environment/electron-sandbox/environmentService.js'; +import { NativeWorkbenchEnvironmentService } from '../../../environment/electron-browser/environmentService.js'; import { toBufferOrReadable } from '../../../textfile/common/textfiles.js'; import { IFileService } from '../../../../../platform/files/common/files.js'; -import { NativeWorkingCopyBackupService } from '../../electron-sandbox/workingCopyBackupService.js'; +import { NativeWorkingCopyBackupService } from '../../electron-browser/workingCopyBackupService.js'; import { FileUserDataProvider } from '../../../../../platform/userData/common/fileUserDataProvider.js'; import { bufferToReadable, bufferToStream, streamToBuffer, VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../../../base/common/buffer.js'; import { TestLifecycleService, toTypedWorkingCopyId, toUntypedWorkingCopyId } from '../../../../test/browser/workbenchTestServices.js'; diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupTracker.test.ts similarity index 99% rename from src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts rename to src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupTracker.test.ts index ed1ce98a64c..a7ab03c1289 100644 --- a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyBackupTracker.test.ts +++ b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyBackupTracker.test.ts @@ -8,7 +8,7 @@ import { isMacintosh, isWindows } from '../../../../../base/common/platform.js'; import { join } from '../../../../../base/common/path.js'; import { URI } from '../../../../../base/common/uri.js'; import { hash } from '../../../../../base/common/hash.js'; -import { NativeWorkingCopyBackupTracker } from '../../electron-sandbox/workingCopyBackupTracker.js'; +import { NativeWorkingCopyBackupTracker } from '../../electron-browser/workingCopyBackupTracker.js'; import { TextFileEditorModelManager } from '../../../textfile/common/textFileEditorModelManager.js'; import { IEditorService } from '../../../editor/common/editorService.js'; import { EditorPart } from '../../../../browser/parts/editor/editorPart.js'; @@ -43,7 +43,7 @@ import { generateUuid } from '../../../../../base/common/uuid.js'; import { Schemas } from '../../../../../base/common/network.js'; import { joinPath } from '../../../../../base/common/resources.js'; import { VSBuffer } from '../../../../../base/common/buffer.js'; -import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-sandbox/workbenchTestServices.js'; +import { TestServiceAccessor, workbenchInstantiationService } from '../../../../test/electron-browser/workbenchTestServices.js'; import { UriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentityService.js'; suite('WorkingCopyBackupTracker (native)', function () { diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts similarity index 100% rename from src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryService.test.ts rename to src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryService.test.ts diff --git a/src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts b/src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryTracker.test.ts similarity index 100% rename from src/vs/workbench/services/workingCopy/test/electron-sandbox/workingCopyHistoryTracker.test.ts rename to src/vs/workbench/services/workingCopy/test/electron-browser/workingCopyHistoryTracker.test.ts diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts b/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts similarity index 99% rename from src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts rename to src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts index c285804f40a..cbdca7d06f9 100644 --- a/src/vs/workbench/services/workspaces/electron-sandbox/workspaceEditingService.ts +++ b/src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts @@ -17,7 +17,7 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j import { basename } from '../../../../base/common/resources.js'; import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js'; import { IFileService } from '../../../../platform/files/common/files.js'; -import { INativeWorkbenchEnvironmentService } from '../../environment/electron-sandbox/environmentService.js'; +import { INativeWorkbenchEnvironmentService } from '../../environment/electron-browser/environmentService.js'; import { ILifecycleService, ShutdownReason } from '../../lifecycle/common/lifecycle.js'; import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js'; import { InstantiationType, registerSingleton } from '../../../../platform/instantiation/common/extensions.js'; diff --git a/src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts b/src/vs/workbench/services/workspaces/electron-browser/workspacesService.ts similarity index 100% rename from src/vs/workbench/services/workspaces/electron-sandbox/workspacesService.ts rename to src/vs/workbench/services/workspaces/electron-browser/workspacesService.ts diff --git a/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts b/src/vs/workbench/test/electron-browser/resolveExternal.test.ts similarity index 98% rename from src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts rename to src/vs/workbench/test/electron-browser/resolveExternal.test.ts index 530b5eb4ef2..94f7576fbdd 100644 --- a/src/vs/workbench/test/electron-sandbox/resolveExternal.test.ts +++ b/src/vs/workbench/test/electron-browser/resolveExternal.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import assert from 'assert'; import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../base/test/common/utils.js'; -import { NativeWindow } from '../../electron-sandbox/window.js'; +import { NativeWindow } from '../../electron-browser/window.js'; import { ITunnelService, RemoteTunnel } from '../../../platform/tunnel/common/tunnel.js'; import { URI } from '../../../base/common/uri.js'; import { TestInstantiationService } from '../../../platform/instantiation/test/common/instantiationServiceMock.js'; diff --git a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts similarity index 99% rename from src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts rename to src/vs/workbench/test/electron-browser/workbenchTestServices.ts index 83c50d25e72..84d5af6fe3f 100644 --- a/src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts +++ b/src/vs/workbench/test/electron-browser/workbenchTestServices.ts @@ -5,7 +5,7 @@ import { Event } from '../../../base/common/event.js'; import { workbenchInstantiationService as browserWorkbenchInstantiationService, ITestInstantiationService, TestEncodingOracle, TestEnvironmentService, TestFileDialogService, TestFilesConfigurationService, TestFileService, TestLifecycleService, TestTextFileService } from '../browser/workbenchTestServices.js'; -import { ISharedProcessService } from '../../../platform/ipc/electron-sandbox/services.js'; +import { ISharedProcessService } from '../../../platform/ipc/electron-browser/services.js'; import { INativeHostService, INativeHostOptions, IOSProperties, IOSStatistics } from '../../../platform/native/common/native.js'; import { VSBuffer, VSBufferReadable, VSBufferReadableStream } from '../../../base/common/buffer.js'; import { DisposableStore, IDisposable } from '../../../base/common/lifecycle.js'; @@ -36,7 +36,7 @@ import { ILifecycleService } from '../../services/lifecycle/common/lifecycle.js' import { IWorkingCopyBackupService } from '../../services/workingCopy/common/workingCopyBackup.js'; import { IWorkingCopyService } from '../../services/workingCopy/common/workingCopyService.js'; import { TestContextService } from '../common/workbenchTestServices.js'; -import { NativeTextFileService } from '../../services/textfile/electron-sandbox/nativeTextFileService.js'; +import { NativeTextFileService } from '../../services/textfile/electron-browser/nativeTextFileService.js'; import { insert } from '../../../base/common/arrays.js'; import { Schemas } from '../../../base/common/network.js'; import { FileService } from '../../../platform/files/common/fileService.js'; @@ -44,7 +44,7 @@ import { InMemoryFileSystemProvider } from '../../../platform/files/common/inMem import { NullLogService } from '../../../platform/log/common/log.js'; import { FileUserDataProvider } from '../../../platform/userData/common/fileUserDataProvider.js'; import { IWorkingCopyIdentifier } from '../../services/workingCopy/common/workingCopy.js'; -import { NativeWorkingCopyBackupService } from '../../services/workingCopy/electron-sandbox/workingCopyBackupService.js'; +import { NativeWorkingCopyBackupService } from '../../services/workingCopy/electron-browser/workingCopyBackupService.js'; import { CancellationToken } from '../../../base/common/cancellation.js'; import { UriIdentityService } from '../../../platform/uriIdentity/common/uriIdentityService.js'; import { UserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js'; diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index b05c17aac15..c9df215ea42 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -19,75 +19,75 @@ import './workbench.common.main.js'; //#region --- workbench (desktop main) -import './electron-sandbox/desktop.main.js'; -import './electron-sandbox/desktop.contribution.js'; +import './electron-browser/desktop.main.js'; +import './electron-browser/desktop.contribution.js'; //#endregion //#region --- workbench parts -import './electron-sandbox/parts/dialogs/dialog.contribution.js'; +import './electron-browser/parts/dialogs/dialog.contribution.js'; //#endregion //#region --- workbench services -import './services/textfile/electron-sandbox/nativeTextFileService.js'; -import './services/dialogs/electron-sandbox/fileDialogService.js'; -import './services/workspaces/electron-sandbox/workspacesService.js'; -import './services/menubar/electron-sandbox/menubarService.js'; -import './services/update/electron-sandbox/updateService.js'; -import './services/url/electron-sandbox/urlService.js'; -import './services/lifecycle/electron-sandbox/lifecycleService.js'; -import './services/title/electron-sandbox/titleService.js'; -import './services/host/electron-sandbox/nativeHostService.js'; -import './services/request/electron-sandbox/requestService.js'; -import './services/clipboard/electron-sandbox/clipboardService.js'; -import './services/contextmenu/electron-sandbox/contextmenuService.js'; -import './services/workspaces/electron-sandbox/workspaceEditingService.js'; -import './services/configurationResolver/electron-sandbox/configurationResolverService.js'; -import './services/accessibility/electron-sandbox/accessibilityService.js'; -import './services/keybinding/electron-sandbox/nativeKeyboardLayout.js'; -import './services/path/electron-sandbox/pathService.js'; -import './services/themes/electron-sandbox/nativeHostColorSchemeService.js'; -import './services/extensionManagement/electron-sandbox/extensionManagementService.js'; -import './services/encryption/electron-sandbox/encryptionService.js'; -import './services/browserElements/electron-sandbox/browserElementsService.js'; -import './services/secrets/electron-sandbox/secretStorageService.js'; -import './services/localization/electron-sandbox/languagePackService.js'; -import './services/telemetry/electron-sandbox/telemetryService.js'; -import './services/extensions/electron-sandbox/extensionHostStarter.js'; +import './services/textfile/electron-browser/nativeTextFileService.js'; +import './services/dialogs/electron-browser/fileDialogService.js'; +import './services/workspaces/electron-browser/workspacesService.js'; +import './services/menubar/electron-browser/menubarService.js'; +import './services/update/electron-browser/updateService.js'; +import './services/url/electron-browser/urlService.js'; +import './services/lifecycle/electron-browser/lifecycleService.js'; +import './services/title/electron-browser/titleService.js'; +import './services/host/electron-browser/nativeHostService.js'; +import './services/request/electron-browser/requestService.js'; +import './services/clipboard/electron-browser/clipboardService.js'; +import './services/contextmenu/electron-browser/contextmenuService.js'; +import './services/workspaces/electron-browser/workspaceEditingService.js'; +import './services/configurationResolver/electron-browser/configurationResolverService.js'; +import './services/accessibility/electron-browser/accessibilityService.js'; +import './services/keybinding/electron-browser/nativeKeyboardLayout.js'; +import './services/path/electron-browser/pathService.js'; +import './services/themes/electron-browser/nativeHostColorSchemeService.js'; +import './services/extensionManagement/electron-browser/extensionManagementService.js'; +import './services/encryption/electron-browser/encryptionService.js'; +import './services/browserElements/electron-browser/browserElementsService.js'; +import './services/secrets/electron-browser/secretStorageService.js'; +import './services/localization/electron-browser/languagePackService.js'; +import './services/telemetry/electron-browser/telemetryService.js'; +import './services/extensions/electron-browser/extensionHostStarter.js'; import '../platform/extensionResourceLoader/common/extensionResourceLoaderService.js'; -import './services/localization/electron-sandbox/localeService.js'; -import './services/extensions/electron-sandbox/extensionsScannerService.js'; -import './services/extensionManagement/electron-sandbox/extensionManagementServerService.js'; -import './services/extensionManagement/electron-sandbox/extensionGalleryManifestService.js'; -import './services/extensionManagement/electron-sandbox/extensionTipsService.js'; -import './services/userDataSync/electron-sandbox/userDataSyncService.js'; -import './services/userDataSync/electron-sandbox/userDataAutoSyncService.js'; -import './services/timer/electron-sandbox/timerService.js'; -import './services/environment/electron-sandbox/shellEnvironmentService.js'; -import './services/integrity/electron-sandbox/integrityService.js'; -import './services/workingCopy/electron-sandbox/workingCopyBackupService.js'; -import './services/checksum/electron-sandbox/checksumService.js'; -import '../platform/remote/electron-sandbox/sharedProcessTunnelService.js'; -import './services/tunnel/electron-sandbox/tunnelService.js'; -import '../platform/diagnostics/electron-sandbox/diagnosticsService.js'; -import '../platform/profiling/electron-sandbox/profilingService.js'; -import '../platform/telemetry/electron-sandbox/customEndpointTelemetryService.js'; -import '../platform/remoteTunnel/electron-sandbox/remoteTunnelService.js'; -import './services/files/electron-sandbox/elevatedFileService.js'; -import './services/search/electron-sandbox/searchService.js'; -import './services/workingCopy/electron-sandbox/workingCopyHistoryService.js'; +import './services/localization/electron-browser/localeService.js'; +import './services/extensions/electron-browser/extensionsScannerService.js'; +import './services/extensionManagement/electron-browser/extensionManagementServerService.js'; +import './services/extensionManagement/electron-browser/extensionGalleryManifestService.js'; +import './services/extensionManagement/electron-browser/extensionTipsService.js'; +import './services/userDataSync/electron-browser/userDataSyncService.js'; +import './services/userDataSync/electron-browser/userDataAutoSyncService.js'; +import './services/timer/electron-browser/timerService.js'; +import './services/environment/electron-browser/shellEnvironmentService.js'; +import './services/integrity/electron-browser/integrityService.js'; +import './services/workingCopy/electron-browser/workingCopyBackupService.js'; +import './services/checksum/electron-browser/checksumService.js'; +import '../platform/remote/electron-browser/sharedProcessTunnelService.js'; +import './services/tunnel/electron-browser/tunnelService.js'; +import '../platform/diagnostics/electron-browser/diagnosticsService.js'; +import '../platform/profiling/electron-browser/profilingService.js'; +import '../platform/telemetry/electron-browser/customEndpointTelemetryService.js'; +import '../platform/remoteTunnel/electron-browser/remoteTunnelService.js'; +import './services/files/electron-browser/elevatedFileService.js'; +import './services/search/electron-browser/searchService.js'; +import './services/workingCopy/electron-browser/workingCopyHistoryService.js'; import './services/userDataSync/browser/userDataSyncEnablementService.js'; -import './services/extensions/electron-sandbox/nativeExtensionService.js'; -import '../platform/userDataProfile/electron-sandbox/userDataProfileStorageService.js'; -import './services/auxiliaryWindow/electron-sandbox/auxiliaryWindowService.js'; -import '../platform/extensionManagement/electron-sandbox/extensionsProfileScannerService.js'; -import '../platform/webContentExtractor/electron-sandbox/webContentExtractorService.js'; -import './services/process/electron-sandbox/processService.js'; +import './services/extensions/electron-browser/nativeExtensionService.js'; +import '../platform/userDataProfile/electron-browser/userDataProfileStorageService.js'; +import './services/auxiliaryWindow/electron-browser/auxiliaryWindowService.js'; +import '../platform/extensionManagement/electron-browser/extensionsProfileScannerService.js'; +import '../platform/webContentExtractor/electron-browser/webContentExtractorService.js'; +import './services/process/electron-browser/processService.js'; import { registerSingleton } from '../platform/instantiation/common/extensions.js'; import { IUserDataInitializationService, UserDataInitializationService } from './services/userData/browser/userDataInit.js'; @@ -102,84 +102,84 @@ registerSingleton(IUserDataInitializationService, new SyncDescriptor(UserDataIni //#region --- workbench contributions // Logs -import './contrib/logs/electron-sandbox/logs.contribution.js'; +import './contrib/logs/electron-browser/logs.contribution.js'; // Localizations -import './contrib/localization/electron-sandbox/localization.contribution.js'; +import './contrib/localization/electron-browser/localization.contribution.js'; // Explorer -import './contrib/files/electron-sandbox/fileActions.contribution.js'; +import './contrib/files/electron-browser/fileActions.contribution.js'; // CodeEditor Contributions -import './contrib/codeEditor/electron-sandbox/codeEditor.contribution.js'; +import './contrib/codeEditor/electron-browser/codeEditor.contribution.js'; // Debug -import './contrib/debug/electron-sandbox/extensionHostDebugService.js'; +import './contrib/debug/electron-browser/extensionHostDebugService.js'; // Extensions Management -import './contrib/extensions/electron-sandbox/extensions.contribution.js'; +import './contrib/extensions/electron-browser/extensions.contribution.js'; // Issues -import './contrib/issue/electron-sandbox/issue.contribution.js'; +import './contrib/issue/electron-browser/issue.contribution.js'; // Process Explorer -import './contrib/processExplorer/electron-sandbox/processExplorer.contribution.js'; +import './contrib/processExplorer/electron-browser/processExplorer.contribution.js'; // Remote -import './contrib/remote/electron-sandbox/remote.contribution.js'; +import './contrib/remote/electron-browser/remote.contribution.js'; // Terminal -import './contrib/terminal/electron-sandbox/terminal.contribution.js'; +import './contrib/terminal/electron-browser/terminal.contribution.js'; // Themes import './contrib/themes/browser/themes.test.contribution.js'; -import './services/themes/electron-sandbox/themes.contribution.js'; +import './services/themes/electron-browser/themes.contribution.js'; // User Data Sync -import './contrib/userDataSync/electron-sandbox/userDataSync.contribution.js'; +import './contrib/userDataSync/electron-browser/userDataSync.contribution.js'; // Tags -import './contrib/tags/electron-sandbox/workspaceTagsService.js'; -import './contrib/tags/electron-sandbox/tags.contribution.js'; +import './contrib/tags/electron-browser/workspaceTagsService.js'; +import './contrib/tags/electron-browser/tags.contribution.js'; // Performance -import './contrib/performance/electron-sandbox/performance.contribution.js'; +import './contrib/performance/electron-browser/performance.contribution.js'; // Tasks -import './contrib/tasks/electron-sandbox/taskService.js'; +import './contrib/tasks/electron-browser/taskService.js'; // External terminal -import './contrib/externalTerminal/electron-sandbox/externalTerminal.contribution.js'; +import './contrib/externalTerminal/electron-browser/externalTerminal.contribution.js'; // Webview -import './contrib/webview/electron-sandbox/webview.contribution.js'; +import './contrib/webview/electron-browser/webview.contribution.js'; // Splash -import './contrib/splash/electron-sandbox/splash.contribution.js'; +import './contrib/splash/electron-browser/splash.contribution.js'; // Local History -import './contrib/localHistory/electron-sandbox/localHistory.contribution.js'; +import './contrib/localHistory/electron-browser/localHistory.contribution.js'; // Merge Editor -import './contrib/mergeEditor/electron-sandbox/mergeEditor.contribution.js'; +import './contrib/mergeEditor/electron-browser/mergeEditor.contribution.js'; // Multi Diff Editor import './contrib/multiDiffEditor/browser/multiDiffEditor.contribution.js'; // Remote Tunnel -import './contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.js'; +import './contrib/remoteTunnel/electron-browser/remoteTunnel.contribution.js'; // Chat -import './contrib/chat/electron-sandbox/chat.contribution.js'; -import './contrib/inlineChat/electron-sandbox/inlineChat.contribution.js'; +import './contrib/chat/electron-browser/chat.contribution.js'; +import './contrib/inlineChat/electron-browser/inlineChat.contribution.js'; // Encryption -import './contrib/encryption/electron-sandbox/encryption.contribution.js'; +import './contrib/encryption/electron-browser/encryption.contribution.js'; // Emergency Alert -import './contrib/emergencyAlert/electron-sandbox/emergencyAlert.contribution.js'; +import './contrib/emergencyAlert/electron-browser/emergencyAlert.contribution.js'; // MCP -import './contrib/mcp/electron-sandbox/mcp.contribution.js'; +import './contrib/mcp/electron-browser/mcp.contribution.js'; //#endregion -export { main } from './electron-sandbox/desktop.main.js'; +export { main } from './electron-browser/desktop.main.js'; diff --git a/test/unit/browser/index.js b/test/unit/browser/index.js index e5cf68ccab5..d112d64ea80 100644 --- a/test/unit/browser/index.js +++ b/test/unit/browser/index.js @@ -114,7 +114,7 @@ function ensureIsArray(a) { const testModules = (async function () { - const excludeGlob = '**/{node,electron-sandbox,electron-main,electron-utility}/**/*.test.js'; + const excludeGlob = '**/{node,electron-browser,electron-main,electron-utility}/**/*.test.js'; let isDefaultModules = true; let promise; diff --git a/test/unit/node/index.js b/test/unit/node/index.js index 36c2164dd98..4dc32d7a0cf 100644 --- a/test/unit/node/index.js +++ b/test/unit/node/index.js @@ -57,7 +57,7 @@ Options: const TEST_GLOB = '**/test/**/*.test.js'; const excludeGlobs = [ - '**/{browser,electron-sandbox,electron-main,electron-utility}/**/*.test.js', + '**/{browser,electron-browser,electron-main,electron-utility}/**/*.test.js', '**/vs/platform/environment/test/node/nativeModules.test.js', // native modules are compiled against Electron and this test would fail with node.js '**/vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module '**/vs/workbench/contrib/testing/test/**' // flaky (https://github.com/microsoft/vscode/issues/137853)