cleanup

Author: amunger

src/vs/workbench/services/workingCopy/common/workingCopyService.ts

@@ -69,13 +69,14 @@ export interface IWorkingCopyService {
 	readonly dirtyWorkingCopies: readonly IWorkingCopy[];
 
 	/**
-	 * The number of dirty working copies that are registered.
+	 * The number of modified working copies that are registered,
+	 * including scratchpads, which are never dirty.
 	 */
 	readonly modifiedCount: number;
 
 	/**
 	 * All working copies with unsaved changes,
-	 * including scratchpads, which are never dirty
+	 * including scratchpads, which are never dirty.
 	 */
 	readonly modifiedWorkingCopies: readonly IWorkingCopy[];
 

src/vs/workbench/services/workingCopy/electron-sandbox/workingCopyBackupTracker.ts

@@ -208,9 +208,11 @@ export class NativeWorkingCopyBackupTracker extends WorkingCopyBackupTracker imp
 	}
 
 	private showErrorDialog(msg: string, workingCopies: readonly IWorkingCopy[], error?: Error): void {
+		const modifiedWorkingCopies = workingCopies.filter(workingCopy => workingCopy.isModified());
+
 		const advice = localize('backupErrorDetails', "Try saving or reverting the editors with unsaved changes first and then try again.");
-		const detail = workingCopies.length
-			? getFileNamesMessage(workingCopies.map(x => x.name)) + '\n' + advice
+		const detail = modifiedWorkingCopies.length
+			? getFileNamesMessage(modifiedWorkingCopies.map(x => x.name)) + '\n' + advice
 			: advice;
 
 		this.dialogService.error(msg, detail);

src/vs/workbench/services/workingCopy/test/common/workingCopyService.test.ts

@@ -48,6 +48,7 @@ suite('WorkingCopyService', () => {
 		assert.strictEqual(onDidRegister.length, 1);
 		assert.strictEqual(onDidRegister[0], copy1);
 		assert.strictEqual(service.dirtyCount, 0);
+		assert.strictEqual(service.modifiedCount, 0);
 		assert.strictEqual(service.isDirty(resource1), false);
 		assert.strictEqual(service.has(resource1), true);
 		assert.strictEqual(service.has(copy1), true);
@@ -64,8 +65,9 @@ suite('WorkingCopyService', () => {
 		assert.strictEqual(copy1.isDirty(), true);
 		assert.strictEqual(service.dirtyCount, 1);
 		assert.strictEqual(service.dirtyWorkingCopies.length, 1);
-		assert.strictEqual(service.modifiedWorkingCopies.length, 1);
 		assert.strictEqual(service.dirtyWorkingCopies[0], copy1);
+		assert.strictEqual(service.modifiedCount, 1);
+		assert.strictEqual(service.modifiedWorkingCopies.length, 1);
 		assert.strictEqual(service.modifiedWorkingCopies[0], copy1);
 		assert.strictEqual(service.workingCopies.length, 1);
 		assert.strictEqual(service.workingCopies[0], copy1);