hot exit - back to ' ' as separator

Benjamin Pasero · Benjamin Pasero · commit 84620b1fea55 · 2019-05-01T12:03:01.000+02:00
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -166,7 +166,7 @@ export class BackupFileService implements IBackupFileService {
 class BackupFileServiceImpl implements IBackupFileService {
 
 	private static readonly PREAMBLE_END_MARKER = '\n';
-	private static readonly PREAMBLE_META_START_MARKER = '#'; // using a character that is know to be escaped in a URI as separator
+	private static readonly PREAMBLE_META_SEPARATOR = ' '; // using a character that is know to be escaped in a URI as separator
 	private static readonly PREAMBLE_MAX_LENGTH = 10000;
 
 	_serviceBrand: any;
@@ -234,7 +234,7 @@ class BackupFileServiceImpl implements IBackupFileService {
 
 			// With Metadata: URI + META-START + Meta + END
 			if (meta) {
-				const preambleWithMeta = `${resource.toString()}${BackupFileServiceImpl.PREAMBLE_META_START_MARKER}${JSON.stringify(meta)}${BackupFileServiceImpl.PREAMBLE_END_MARKER}`;
+				const preambleWithMeta = `${resource.toString()}${BackupFileServiceImpl.PREAMBLE_META_SEPARATOR}${JSON.stringify(meta)}${BackupFileServiceImpl.PREAMBLE_END_MARKER}`;
 				if (preambleWithMeta.length < BackupFileServiceImpl.PREAMBLE_MAX_LENGTH) {
 					preamble = preambleWithMeta;
 				}
@@ -284,7 +284,7 @@ class BackupFileServiceImpl implements IBackupFileService {
 			}
 
 			// Preamble with metadata: URI + META-START + Meta + END
-			const metaStartIndex = backupPreamble.indexOf(BackupFileServiceImpl.PREAMBLE_META_START_MARKER);
+			const metaStartIndex = backupPreamble.indexOf(BackupFileServiceImpl.PREAMBLE_META_SEPARATOR);
 			if (metaStartIndex > 0) {
 				return URI.parse(backupPreamble.substring(0, metaStartIndex));
 			}
@@ -333,7 +333,7 @@ class BackupFileServiceImpl implements IBackupFileService {
 		factory.getFirstLineText(1);
 
 		let meta: T | undefined;
-		const metaStartIndex = metaRaw.indexOf(BackupFileServiceImpl.PREAMBLE_META_START_MARKER);
+		const metaStartIndex = metaRaw.indexOf(BackupFileServiceImpl.PREAMBLE_META_SEPARATOR);
 		if (metaStartIndex !== -1) {
 			try {
 				meta = JSON.parse(metaRaw.substr(metaStartIndex + 1));
diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
@@ -33,6 +33,7 @@ const workspaceResource = URI.file(platform.isWindows ? 'c:\\workspace' : '/work
 const workspaceBackupPath = path.join(backupHome, hashPath(workspaceResource));
 const fooFile = URI.file(platform.isWindows ? 'c:\\Foo' : '/Foo');
 const customFile = URI.parse('customScheme://some/path');
+const customFileWithFragment = URI.parse('customScheme2://some/path#fragment');
 const barFile = URI.file(platform.isWindows ? 'c:\\Bar' : '/Bar');
 const fooBarFile = URI.file(platform.isWindows ? 'c:\\Foo Bar' : '/Foo Bar');
 const untitledFile = URI.from({ scheme: Schemas.untitled, path: 'Untitled-1' });
@@ -162,7 +163,7 @@ suite('BackupFileService', () => {
 			await service.backupResource(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false), undefined, { etag: '678', orphaned: true });
 			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
 			assert.equal(fs.existsSync(fooBackupPath), true);
-			assert.equal(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()}#{"etag":"678","orphaned":true}\ntest`);
+			assert.equal(fs.readFileSync(fooBackupPath).toString(), `${fooFile.toString()} {"etag":"678","orphaned":true}\ntest`);
 		});
 
 		test('untitled file', async () => {
@@ -390,6 +391,8 @@ suite('BackupFileService', () => {
 
 			await service.backupResource(fooFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false), 1, meta);
 
+			assert.ok(await service.loadBackupResource(fooFile));
+
 			const fileContents = fs.readFileSync(fooBackupPath).toString();
 			assert.equal(fileContents.indexOf(fooFile.toString()), 0);
 
@@ -402,6 +405,24 @@ suite('BackupFileService', () => {
 			assert.ok(!backup.meta);
 		});
 
+		test('should restore the original contents (text file with metadata and fragment URI)', async () => {
+			const contents = [
+				'Lorem ipsum ',
+				'dolor öäü sit amet ',
+				'adipiscing ßß elit',
+				'consectetur '
+			].join('');
+
+			const meta = {
+				etag: 'theEtag',
+				size: 888,
+				mtime: Date.now(),
+				orphaned: false
+			};
+
+			await testResolveBackup(customFileWithFragment, contents, meta);
+		});
+
 		test('should restore the original contents (text file with space in name with metadata)', async () => {
 			const contents = [
 				'Lorem ipsum ',
@@ -445,7 +466,7 @@ suite('BackupFileService', () => {
 
 			await service.backupResource(resource, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false), 1, meta);
 
-			assert.ok(service.loadBackupResource(resource));
+			assert.ok(await service.loadBackupResource(resource));
 
 			const backup = await service.resolveBackupContent<IBackupTestMetaData>(service.toBackupResource(resource));
 			assert.equal(contents, snapshotToString(backup.value.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true)));
