Merge from vscode 1ec43773e37997841c5af42b33ddb180e9735bf2

src/vs/workbench/services/backup/common/backupFileService.ts

@@ -165,6 +165,10 @@ export class BackupFileService implements IBackupFileService {
 		return this.impl.discardBackup(resource);
 	}
 
+	discardBackups(): Promise<void> {
+		return this.impl.discardBackups();
+	}
+
 	getBackups(): Promise<URI[]> {
 		return this.impl.getBackups();
 	}
@@ -260,6 +264,14 @@ class BackupFileServiceImpl extends Disposable implements IBackupFileService {
 		});
 	}
 
+	async discardBackups(): Promise<void> {
+		const model = await this.ready;
+
+		await this.deleteIgnoreFileNotFound(this.backupWorkspacePath);
+
+		model.clear();
+	}
+
 	discardBackup(resource: URI): Promise<void> {
 		const backupResource = this.toBackupResource(resource);
 
@@ -429,6 +441,10 @@ export class InMemoryBackupFileService implements IBackupFileService {
 		this.backups.delete(this.toBackupResource(resource).toString());
 	}
 
+	async discardBackups(): Promise<void> {
+		this.backups.clear();
+	}
+
 	toBackupResource(resource: URI): URI {
 		return URI.file(join(resource.scheme, this.hashPath(resource)));
 	}