diff --git a/src/vs/code/electron-main/backup.ts b/src/vs/code/electron-main/backup.ts index e1316bde17c..f4ec23ec2a0 100644 --- a/src/vs/code/electron-main/backup.ts +++ b/src/vs/code/electron-main/backup.ts @@ -49,13 +49,13 @@ export interface IBackupMainService { getWorkspaceUntitledFileBackupsSync(workspace: Uri): string[]; /** - * Gets whether the workspace has backups associated with it (ie. if the workspace backup + * Gets whether the workspace has backup(s) associated with it (ie. if the workspace backup * directory exists). * * @param workspace The workspace to evaluate. * @return Whether the workspace has backups. */ - doesWorkspaceHaveBackups(workspace: Uri): boolean; + hasWorkspaceBackup(workspace: Uri): boolean; } export class BackupService implements IBackupMainService { @@ -118,7 +118,7 @@ export class BackupService implements IBackupMainService { } } - public doesWorkspaceHaveBackups(workspace: Uri): boolean { + public hasWorkspaceBackup(workspace: Uri): boolean { return fs.existsSync(this.getWorkspaceBackupDirectory(workspace)); } diff --git a/src/vs/code/electron-main/lifecycle.ts b/src/vs/code/electron-main/lifecycle.ts index 19808670bdb..c40f816ab17 100644 --- a/src/vs/code/electron-main/lifecycle.ts +++ b/src/vs/code/electron-main/lifecycle.ts @@ -167,7 +167,7 @@ export class LifecycleService implements ILifecycleService { // Clear out any workspace backups from workspaces.json that don't have any backups if (vscodeWindow.openedWorkspacePath) { const workspaceResource = Uri.file(vscodeWindow.openedWorkspacePath); - if (!this.backupService.doesWorkspaceHaveBackups(workspaceResource)) { + if (!this.backupService.hasWorkspaceBackup(workspaceResource)) { this.backupService.removeWorkspaceBackupPathSync(workspaceResource); } } diff --git a/src/vs/code/test/electron-main/backup.test.ts b/src/vs/code/test/electron-main/backup.test.ts index 51d09302e80..a76a93dd63a 100644 --- a/src/vs/code/test/electron-main/backup.test.ts +++ b/src/vs/code/test/electron-main/backup.test.ts @@ -140,8 +140,8 @@ suite('BackupService', () => { }); test('doesWorkspaceHaveBackups should return whether the workspace\'s backup exists', () => { - assert.equal(backupService.doesWorkspaceHaveBackups(fooFile), false); + assert.equal(backupService.hasWorkspaceBackup(fooFile), false); fs.mkdirSync(fooWorkspaceBackupDir); - assert.equal(backupService.doesWorkspaceHaveBackups(fooFile), true); + assert.equal(backupService.hasWorkspaceBackup(fooFile), true); }); }); \ No newline at end of file