fixes for backupMainService

aeschli · aeschli · commit d501acfc9b86 · 2018-07-19T12:22:17.000+02:00
diff --git a/src/vs/platform/backup/electron-main/backupMainService.ts b/src/vs/platform/backup/electron-main/backupMainService.ts
@@ -182,7 +182,7 @@ export class BackupMainService implements IBackupMainService {
 				workspaceFolders = backups.folderWorkspaces.map(f => URI.file(f));
 			}
 		} catch (e) {
-			// ignore URI parsing expeptions
+			// ignore URI parsing exceptions
 		}
 		this.folderWorkspaces = this.validateFolders(workspaceFolders);
 
@@ -264,7 +264,6 @@ export class BackupMainService implements IBackupMainService {
 			return [];
 		}
 
-
 		const result: string[] = [];
 		const seen: { [id: string]: boolean } = Object.create(null);
 
@@ -281,7 +280,7 @@ export class BackupMainService implements IBackupMainService {
 				if (this.hasBackupsSync(backupPath)) {
 					result.push(backupFolder);
 				} else {
-					this.deleteStaleBackup(backupFolder);
+					this.deleteStaleBackup(backupPath);
 				}
 			}
 		}
@@ -350,7 +349,6 @@ export class BackupMainService implements IBackupMainService {
 				folderURIWorkspaces: this.folderWorkspaces.map(f => f.toString()),
 				emptyWorkspaces: this.emptyWorkspaces
 			};
-
 			extfs.writeFileAndFlushSync(this.workspacesJsonPath, JSON.stringify(backups));
 		} catch (ex) {
 			this.logService.error(`Backup: Could not save workspaces.json: ${ex.toString()}`);

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ export class BackupMainService implements IBackupMainService {`
`182`	`182`	`workspaceFolders = backups.folderWorkspaces.map(f => URI.file(f));`
`183`	`183`	`}`
`184`	`184`	`} catch (e) {`
`185`		`- // ignore URI parsing expeptions`
	`185`	`+ // ignore URI parsing exceptions`
`186`	`186`	`}`
`187`	`187`	`this.folderWorkspaces = this.validateFolders(workspaceFolders);`
`188`	`188`
`@@ -264,7 +264,6 @@ export class BackupMainService implements IBackupMainService {`
`264`	`264`	`return [];`
`265`	`265`	`}`
`266`	`266`
`267`		`-`
`268`	`267`	`const result: string[] = [];`
`269`	`268`	`const seen: { [id: string]: boolean } = Object.create(null);`
`270`	`269`
`@@ -281,7 +280,7 @@ export class BackupMainService implements IBackupMainService {`
`281`	`280`	`if (this.hasBackupsSync(backupPath)) {`
`282`	`281`	`result.push(backupFolder);`
`283`	`282`	`} else {`
`284`		`- this.deleteStaleBackup(backupFolder);`
	`283`	`+ this.deleteStaleBackup(backupPath);`
`285`	`284`	`}`
`286`	`285`	`}`
`287`	`286`	`}`
`@@ -350,7 +349,6 @@ export class BackupMainService implements IBackupMainService {`
`350`	`349`	`folderURIWorkspaces: this.folderWorkspaces.map(f => f.toString()),`
`351`	`350`	`emptyWorkspaces: this.emptyWorkspaces`
`352`	`351`	`};`
`353`		`-`
`354`	`352`	`extfs.writeFileAndFlushSync(this.workspacesJsonPath, JSON.stringify(backups));`
`355`	`353`	`} catch (ex) {`
`356`	`354`	this.logService.error(`Backup: Could not save workspaces.json: ${ex.toString()}`);