Always load backups using utf-8 encoding and ignore etag

Fixes #14132
microsoft · Nov 4, 2016 · 8ed9c07 · 8ed9c07
1 parent 178c8f8
commit 8ed9c07
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -270,7 +270,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 					let getContentPromise: TPromise<IRawText>;
 					if (backupExists) {
 						const restoreResource = this.backupFileService.getBackupResource(this.resource);
-						const restoreOptions = { acceptTextOnly: true, etag: etag, encoding: this.preferredEncoding };
+						const restoreOptions = { acceptTextOnly: true, encoding: 'utf-8' };
 						getContentPromise = this.textFileService.resolveTextContent(restoreResource, restoreOptions).then(content => content.value);
 					} else {
 						getContentPromise = TPromise.as(content.value);