Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistently use utf-8 for backup encoding

Browse Source 
Fixes #15514
This commit is contained in:
Daniel Imms
2016-11-18 10:59:14 -08:00
parent 7b79c70c38
commit 272b6922d3
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/common/editor/untitledEditorInput.ts
View File

@@ -18,7 +18,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import Event, { Emitter } from 'vs/base/common/event';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { IBackupFileService, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
/**
* An editor input to be used for untitled text buffers.
@@ -161,7 +161,7 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
if (hasBackup) {
const restoreResource = this.backupFileService.getBackupResource(this.resource);
return this.textFileService.resolveTextContent(restoreResource).then(rawTextContent => rawTextContent.value.lines.join('\n'));
return this.textFileService.resolveTextContent(restoreResource, BACKUP_FILE_RESOLVE_OPTIONS).then(rawTextContent => rawTextContent.value.lines.join('\n'));
}
return '';