Store backup metadata for untitled files

src/vs/workbench/common/editor/untitledEditorModel.ts

@@ -160,7 +160,9 @@ export class UntitledEditorModel extends StringEditorModel implements IEncodingS
 		// Check for backups first
 		return this.backupFileService.loadBackupResource(this.resource).then(backupResource => {
 			if (backupResource) {
-				return this.textFileService.resolveTextContent(backupResource, BACKUP_FILE_RESOLVE_OPTIONS).then(rawTextContent => rawTextContent.value.lines.join('\n'));
+				return this.textFileService.resolveTextContent(backupResource, BACKUP_FILE_RESOLVE_OPTIONS).then(rawTextContent => {
+					return this.backupFileService.parseBackupContent(rawTextContent);
+				});
 			}
 
 			return null;

src/vs/workbench/services/backup/node/backupFileService.ts

@@ -154,9 +154,8 @@ export class BackupFileService implements IBackupFileService {
 				return void 0; // return early if backup version id matches requested one
 			}
 
-			if (resource.scheme === 'file') {
-				content = `${resource.toString()}\n${content}`;
-			}
+			// Add metadata to top of file
+			content = `${resource.toString()}\n${content}`;
 
 			return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => model.add(backupResource, versionId));
 		});

src/vs/workbench/services/backup/test/backupFileService.test.ts

@@ -117,7 +117,7 @@ suite('BackupFileService', () => {
 		service.backupResource(untitledFile, 'test').then(() => {
 			assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
 			assert.equal(fs.existsSync(untitledBackupPath), true);
-			assert.equal(fs.readFileSync(untitledBackupPath), 'test');
+			assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\ntest`);
 			done();
 		});
 	});