fix microsoft#77419

Benjamin Pasero · Benjamin Pasero · commit 4968e0a712a5 · 2019-08-07T11:21:31.000+02:00
diff --git a/src/vs/workbench/services/backup/common/backupFileService.ts b/src/vs/workbench/services/backup/common/backupFileService.ts
@@ -111,15 +111,10 @@ export class BackupFileService implements IBackupFileService {
 	private impl: IBackupFileService;
 
 	constructor(
-		@IWorkbenchEnvironmentService environmentService: IWorkbenchEnvironmentService,
-		@IFileService fileService: IFileService
+		@IWorkbenchEnvironmentService private environmentService: IWorkbenchEnvironmentService,
+		@IFileService protected fileService: IFileService
 	) {
-		const backupWorkspaceResource = environmentService.configuration.backupWorkspaceResource;
-		if (backupWorkspaceResource) {
-			this.impl = new BackupFileServiceImpl(backupWorkspaceResource, this.hashPath, fileService);
-		} else {
-			this.impl = new InMemoryBackupFileService(this.hashPath);
-		}
+		this.initialize();
 	}
 
 	protected hashPath(resource: URI): string {
@@ -128,9 +123,25 @@ export class BackupFileService implements IBackupFileService {
 		return hash(str).toString(16);
 	}
 
-	initialize(backupWorkspaceResource: URI): void {
+	private initialize(): void {
+		const backupWorkspaceResource = this.environmentService.configuration.backupWorkspaceResource;
+		if (backupWorkspaceResource) {
+			this.impl = new BackupFileServiceImpl(backupWorkspaceResource, this.hashPath, this.fileService);
+		} else {
+			this.impl = new InMemoryBackupFileService(this.hashPath);
+		}
+	}
+
+	reinitialize(): void {
+
+		// Re-init implementation (unless we are running in-memory)
 		if (this.impl instanceof BackupFileServiceImpl) {
-			this.impl.initialize(backupWorkspaceResource);
+			const backupWorkspaceResource = this.environmentService.configuration.backupWorkspaceResource;
+			if (backupWorkspaceResource) {
+				this.impl.initialize(backupWorkspaceResource);
+			} else {
+				this.impl = new InMemoryBackupFileService(this.hashPath);
+			}
 		}
 	}
 
diff --git a/src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts b/src/vs/workbench/services/workspace/electron-browser/workspaceEditingService.ts
@@ -397,11 +397,15 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {
 
 		const result = await this.windowService.enterWorkspace(path);
 		if (result) {
+
+			// Migrate storage to new workspace
 			await this.migrateStorage(result.workspace);
 
 			// Reinitialize backup service
+			this.environmentService.configuration.backupPath = result.backupPath;
+			this.environmentService.configuration.backupWorkspaceResource = result.backupPath ? toBackupWorkspaceResource(result.backupPath, this.environmentService) : undefined;
 			if (this.backupFileService instanceof BackupFileService) {
-				this.backupFileService.initialize(toBackupWorkspaceResource(result.backupPath!, this.environmentService));
+				this.backupFileService.reinitialize();
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -397,11 +397,15 @@ export class WorkspaceEditingService implements IWorkspaceEditingService {`
`397`	`397`
`398`	`398`	`const result = await this.windowService.enterWorkspace(path);`
`399`	`399`	`if (result) {`
	`400`	`+`
	`401`	`+ // Migrate storage to new workspace`
`400`	`402`	`await this.migrateStorage(result.workspace);`
`401`	`403`
`402`	`404`	`// Reinitialize backup service`
	`405`	`+ this.environmentService.configuration.backupPath = result.backupPath;`
	`406`	`+ this.environmentService.configuration.backupWorkspaceResource = result.backupPath ? toBackupWorkspaceResource(result.backupPath, this.environmentService) : undefined;`
`403`	`407`	`if (this.backupFileService instanceof BackupFileService) {`
`404`		`- this.backupFileService.initialize(toBackupWorkspaceResource(result.backupPath!, this.environmentService));`
	`408`	`+ this.backupFileService.reinitialize();`
`405`	`409`	`}`
`406`	`410`	`}`
`407`	`411`