debt - get rid of Shell

Benjamin Pasero · Benjamin Pasero · commit 66bd1bce0100 · 2019-02-12T19:23:45.000+01:00
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
@@ -5,7 +5,8 @@
 
 import * as nls from 'vs/nls';
 import * as perf from 'vs/base/common/performance';
-import { Shell } from 'vs/workbench/electron-browser/shell';
+import { Workbench } from 'vs/workbench/electron-browser/workbench';
+import { ElectronWindow } from 'vs/workbench/electron-browser/window';
 import * as browser from 'vs/base/browser/browser';
 import { domContentLoaded } from 'vs/base/browser/dom';
 import { onUnexpectedError } from 'vs/base/common/errors';
@@ -47,6 +48,10 @@ import { createHash } from 'crypto';
 import { IdleValue } from 'vs/base/common/async';
 import { setGlobalLeakWarningThreshold } from 'vs/base/common/event';
 import { GlobalStorageDatabaseChannelClient } from 'vs/platform/storage/node/storageIpc';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IStorageService } from 'vs/platform/storage/common/storage';
+import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 
 gracefulFs.gracefulify(fs); // enable gracefulFs
 
@@ -126,20 +131,35 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
 			const workspaceService = services[0];
 			const storageService = services[1];
 
+			// Core services
+			const serviceCollection = new ServiceCollection();
+			serviceCollection.set(IWorkspaceContextService, workspaceService);
+			serviceCollection.set(IConfigurationService, workspaceService);
+			serviceCollection.set(IEnvironmentService, environmentService);
+			serviceCollection.set(ILogService, logService);
+			serviceCollection.set(IStorageService, storageService);
+
+			mainServices.forEach((serviceIdentifier, serviceInstance) => {
+				serviceCollection.set(serviceIdentifier, serviceInstance);
+			});
+
+			const instantiationService = new InstantiationService(serviceCollection, true);
+
 			return domContentLoaded().then(() => {
 				perf.mark('willStartWorkbench');
 
-				// Create Shell
-				const shell = new Shell(document.body, {
-					contextService: workspaceService,
-					configurationService: workspaceService,
-					environmentService,
-					logService,
-					storageService
-				}, mainServices, mainProcessClient, configuration);
-
-				// Open Shell
-				shell.open();
+				// Startup Workbench
+				const workbench = instantiationService.createInstance(
+					Workbench,
+					document.body,
+					configuration,
+					serviceCollection,
+					mainProcessClient
+				);
+				workbench.startup();
+
+				// Window
+				workbench.getInstantiationService().createInstance(ElectronWindow);
 
 				// Inform user about loading issues from the loader
 				(<any>self).require.config({
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
@@ -351,6 +351,10 @@ export class Workbench extends Disposable implements IPartService {
 			(configuration.filesToOpen && configuration.filesToOpen.length > 0) ||
 			(configuration.filesToDiff && configuration.filesToDiff.length > 0);
 
+		// TODO@Ben debt
+		this._register(mainProcessClient);
+		this._register(logService);
+
 		this.registerErrorHandler();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -351,6 +351,10 @@ export class Workbench extends Disposable implements IPartService {`
`351`	`351`	`(configuration.filesToOpen && configuration.filesToOpen.length > 0) \|\|`
`352`	`352`	`(configuration.filesToDiff && configuration.filesToDiff.length > 0);`
`353`	`353`
	`354`	`+ // TODO@Ben debt`
	`355`	`+ this._register(mainProcessClient);`
	`356`	`+ this._register(logService);`
	`357`	`+`
`354`	`358`	`this.registerErrorHandler();`
`355`	`359`	`}`
`356`	`360`