Skip to content

Commit f751359

Browse files
author
Benjamin Pasero
committed
sandbox - move workbench environment service into electron-sandbox
1 parent 9fd7fc0 commit f751359

34 files changed

Lines changed: 86 additions & 53 deletions

File tree

‎src/vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as
77
import { Registry } from 'vs/platform/registry/common/platform';
88
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
99
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
10-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
10+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
11+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1112
import { DefaultConfigurationExportHelper } from 'vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper';
1213

1314
export class ExtensionPoints implements IWorkbenchContribution {

‎src/vs/workbench/contrib/configExporter/electron-browser/configurationExportHelper.ts‎

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

66
import { writeFile } from 'vs/base/node/pfs';
77
import product from 'vs/platform/product/common/product';
8-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
8+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
9+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
910
import { Registry } from 'vs/platform/registry/common/platform';
1011
import { IConfigurationNode, IConfigurationRegistry, Extensions, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
1112
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';

‎src/vs/workbench/contrib/extensions/electron-browser/extensions.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import { ExtensionHostProfileService } from 'vs/workbench/contrib/extensions/ele
2020
import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsInput';
2121
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
2222
import { ExtensionsAutoProfiler } from 'vs/workbench/contrib/extensions/electron-browser/extensionsAutoProfiler';
23-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
23+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
24+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
2425
import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-browser/extensionsActions';
2526
import { ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement';
2627
import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/browser/extensionsWorkbenchService';

‎src/vs/workbench/contrib/extensions/electron-browser/extensionsActions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { localize } from 'vs/nls';
77
import { Action } from 'vs/base/common/actions';
88
import { IFileService } from 'vs/platform/files/common/files';
99
import { URI } from 'vs/base/common/uri';
10-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
10+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
11+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1112
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
1213
import { Schemas } from 'vs/base/common/network';
1314

‎src/vs/workbench/contrib/issue/electron-browser/issueService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import { IExtensionManagementService } from 'vs/platform/extensionManagement/com
1212
import { IWorkbenchExtensionEnablementService } from 'vs/workbench/services/extensionManagement/common/extensionManagement';
1313
import { getZoomLevel } from 'vs/base/browser/browser';
1414
import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issue';
15-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
15+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
16+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1617
import { ExtensionType } from 'vs/platform/extensions/common/extensions';
1718
import { platform } from 'process';
1819
import { IProductService } from 'vs/platform/product/common/productService';

‎src/vs/workbench/contrib/logs/electron-browser/logsActions.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { join } from 'vs/base/common/path';
88
import { URI } from 'vs/base/common/uri';
99
import * as nls from 'vs/nls';
1010
import { IElectronService } from 'vs/platform/electron/electron-sandbox/electron';
11-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
11+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
12+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1213
import { IFileService } from 'vs/platform/files/common/files';
1314

1415
export class OpenLogsFolderAction extends Action {

‎src/vs/workbench/contrib/performance/electron-browser/startupProfiler.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { exists, readdir, readFile, rimraf } from 'vs/base/node/pfs';
88
import { ITextModelService } from 'vs/editor/common/services/resolverService';
99
import { localize } from 'vs/nls';
1010
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
11-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
11+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
12+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1213
import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
1314
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
1415
import { PerfviewInput } from 'vs/workbench/contrib/performance/browser/perfviewEditor';

‎src/vs/workbench/contrib/performance/electron-browser/startupTimings.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { timeout } from 'vs/base/common/async';
88
import { promisify } from 'util';
99
import { onUnexpectedError } from 'vs/base/common/errors';
1010
import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
11-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
11+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
12+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
1213
import { ILifecycleService, StartupKind, StartupKindToString } from 'vs/platform/lifecycle/common/lifecycle';
1314
import { IProductService } from 'vs/platform/product/common/productService';
1415
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

‎src/vs/workbench/contrib/remote/electron-browser/remote.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import { DownloadServiceChannel } from 'vs/platform/download/common/downloadIpc'
2323
import { LoggerChannel } from 'vs/platform/log/common/logIpc';
2424
import { ipcRenderer } from 'vs/base/parts/sandbox/electron-sandbox/globals';
2525
import { IDiagnosticInfoOptions, IRemoteDiagnosticInfo } from 'vs/platform/diagnostics/common/diagnostics';
26-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
26+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
27+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
2728
import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
2829
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
2930
import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry';

‎src/vs/workbench/contrib/splash/electron-browser/partsSplash.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import { DEFAULT_EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor
1818
import { Extensions, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
1919
import * as themes from 'vs/workbench/common/theme';
2020
import { IWorkbenchLayoutService, Parts, Position } from 'vs/workbench/services/layout/browser/layoutService';
21-
import { IWorkbenchEnvironmentService, INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
21+
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
22+
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
2223
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
2324
import { URI } from 'vs/base/common/uri';
2425
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';

0 commit comments

Comments
 (0)