Remove IWorkspaceContextService as dep on BackupService

Tyriar · Tyriar · commit 9d4ec9999d19 · 2016-10-14T12:07:40.000-07:00
The dep can't be fulfilled on main process
diff --git a/src/vs/platform/backup/node/backupService.ts b/src/vs/platform/backup/node/backupService.ts
@@ -10,7 +10,6 @@ import * as crypto from 'crypto';
 import * as fs from 'original-fs';
 import * as arrays from 'vs/base/common/arrays';
 import Uri from 'vs/base/common/uri';
-import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IBackupService } from 'vs/platform/backup/common/backup';
 
@@ -28,21 +27,12 @@ export class BackupService implements IBackupService {
 	private fileContent: IBackupFormat;
 
 	constructor(
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IWorkspaceContextService contextService?: IWorkspaceContextService
+		@IEnvironmentService private environmentService: IEnvironmentService
 	) {
-		// IWorkspaceContextService will not exist on the main process
-		if (!contextService) {
-			return;
-		}
-
-		// Hot exit is disabled for empty workspaces
-		const workspace = contextService.getWorkspace();
-		if (!workspace) {
-			return;
-		}
+	}
 
-		this.workspaceResource = workspace.resource;
+	public setCurrentWorkspace(resource: Uri): void {
+		this.workspaceResource = resource;
 	}
 
 	public getWorkspaceBackupPaths(): string[] {
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
@@ -247,6 +247,7 @@ export class WorkbenchShell {
 
 		// Backup
 		const backupService = instantiationService.createInstance(BackupService);
+		backupService.setCurrentWorkspace(this.contextService.getWorkspace().resource);
 		serviceCollection.set(IBackupService, backupService);
 
 		// Storage
