storage - extract loading of workspace payload

src/vs/workbench/electron-browser/main.ts

@@ -99,8 +99,14 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
 	const logService = createLogService(mainProcessClient, configuration, environmentService);
 	logService.trace('openWorkbench configuration', JSON.stringify(configuration));
 
+	// Resolve a workspace payload that we can get the workspace ID from
+	return createWorkspaceInitializationPayload(configuration, environmentService).then(payload => {
 		return Promise.all([
-		createAndInitializeWorkspaceService(configuration, environmentService),
+
+			// Create and load workspace/configuration service
+			createWorkspaceService(payload, environmentService),
+
+			// Create and load storage service
 			createStorageService(environmentService, logService)
 		]).then(services => {
 			const workspaceService = services[0];
@@ -138,18 +144,19 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
 				});
 			});
 		});
+	});
 }
 
-function createAndInitializeWorkspaceService(configuration: IWindowConfiguration, environmentService: EnvironmentService): Promise<WorkspaceService> {
-	let workspaceInitializationPayload: Promise<IWorkspaceInitializationPayload> = Promise.resolve(void 0);
+function createWorkspaceInitializationPayload(configuration: IWindowConfiguration, environmentService: EnvironmentService): Promise<IWorkspaceInitializationPayload> {
 
 	// Multi-root workspace
 	if (configuration.workspace) {
-		workspaceInitializationPayload = Promise.resolve(configuration.workspace as IMultiFolderWorkspaceInitializationPayload);
+		return Promise.resolve(configuration.workspace as IMultiFolderWorkspaceInitializationPayload);
 	}
 
 	// Single-folder workspace
-	else if (configuration.folderUri) {
+	let workspaceInitializationPayload: Promise<IWorkspaceInitializationPayload> = Promise.resolve(void 0);
+	if (configuration.folderUri) {
 		workspaceInitializationPayload = resolveSingleFolderWorkspaceInitializationPayload(configuration.folderUri, configuration.verbose);
 	}
 
@@ -160,9 +167,7 @@ function createAndInitializeWorkspaceService(configuration: IWindowConfiguration
 			payload = { id: configuration.backupPath ? uri.from({ path: basename(configuration.backupPath), scheme: 'empty' }).toString() : '' } as IEmptyWorkspaceInitializationPayload;
 		}
 
-		const workspaceService = new WorkspaceService(environmentService);
-
-		return workspaceService.initialize(payload).then(() => workspaceService, error => workspaceService);
+		return payload;
 	});
 }
 
@@ -212,6 +217,12 @@ function resolveSingleFolderWorkspaceInitializationPayload(folderUri: ISingleFol
 	});
 }
 
+function createWorkspaceService(payload: IWorkspaceInitializationPayload, environmentService: IEnvironmentService): Promise<WorkspaceService> {
+	const workspaceService = new WorkspaceService(environmentService);
+
+	return workspaceService.initialize(payload).then(() => workspaceService, error => workspaceService);
+}
+
 function createStorageService(environmentService: IEnvironmentService, logService: ILogService): Promise<StorageService> {
 	const storageService = new StorageService(':memory:', logService, environmentService);
 

src/vs/workbench/services/configuration/node/configurationService.ts

@@ -300,7 +300,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		return this._configuration.keys();
 	}
 
-	initialize(arg: IMultiFolderWorkspaceInitializationPayload | ISingleFolderWorkspaceInitializationPayload | IEmptyWorkspaceInitializationPayload, postInitialisationTask: () => void = () => null): Promise<any> {
+	initialize(arg: IWorkspaceInitializationPayload, postInitialisationTask: () => void = () => null): Promise<any> {
 		return this.createWorkspace(arg)
 			.then(workspace => this.updateWorkspaceAndInitializeConfiguration(workspace, postInitialisationTask));
 	}
@@ -327,7 +327,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 		this.jsonEditingService = instantiationService.createInstance(JSONEditingService);
 	}
 
-	private createWorkspace(arg: IMultiFolderWorkspaceInitializationPayload | ISingleFolderWorkspaceInitializationPayload | IEmptyWorkspaceInitializationPayload): Promise<Workspace> {
+	private createWorkspace(arg: IWorkspaceInitializationPayload): Promise<Workspace> {
 		if (isWorkspaceIdentifier(arg)) {
 			return this.createMultiFolderWorkspace(arg);
 		}