Merge pull request #16893 from Microsoft/tyriar/16829

Retain case in workspaces.json paths

src/vs/platform/backup/electron-main/backupMainService.ts

@@ -61,9 +61,6 @@ export class BackupMainService implements IBackupMainService {
 	}
 
 	private pushBackupPathsSync(workspaceIdentifier: string, isEmptyWorkspace: boolean): string {
-		if (!isEmptyWorkspace) {
-			workspaceIdentifier = this.sanitizePath(workspaceIdentifier);
-		}
 		const array = isEmptyWorkspace ? this.backups.emptyWorkspaces : this.backups.folderWorkspaces;
 		if (array.indexOf(workspaceIdentifier) === -1) {
 			array.push(workspaceIdentifier);

src/vs/platform/backup/test/electron-main/backupMainService.test.ts

@@ -242,6 +242,16 @@ suite('BackupMainService', () => {
 				done();
 			});
 		});
+
+		test('should always store the workspace path in workspaces.json using the case given, regardless of whether the file system is case-sensitive', done => {
+			service.registerWindowForBackupsSync(1, false, null, fooFile.fsPath.toUpperCase());
+			assert.deepEqual(service.getWorkspaceBackupPaths(), [fooFile.fsPath.toUpperCase()]);
+			pfs.readFile(backupWorkspacesPath, 'utf-8').then(buffer => {
+				const json = <IBackupWorkspacesFormat>JSON.parse(buffer);
+				assert.deepEqual(json.folderWorkspaces, [fooFile.fsPath.toUpperCase()]);
+				done();
+			});
+		});
 	});
 
 	suite('removeBackupPathSync', () => {