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

Evaluate if an untitled backup exists in UntitledEditorInput

Browse Source
This commit is contained in:
Daniel Imms
2016-11-14 12:59:00 -08:00
parent 7f076284bf
commit e9b07aebd1
7 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
private resource: URI;
private hasAssociatedFilePath: boolean;
private hasBackupToRestore: boolean;
private modeId: string;
private cachedModel: UntitledEditorModel;
@@ -43,7 +42,6 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
resource: URI,
hasAssociatedFilePath: boolean,
modeId: string,
hasBackupToRestore: boolean,
@IInstantiationService private instantiationService: IInstantiationService,
@IWorkspaceContextService private contextService: IWorkspaceContextService,
@IModeService private modeService: IModeService,
@@ -54,7 +52,6 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
this.resource = resource;
this.hasAssociatedFilePath = hasAssociatedFilePath;
this.modeId = modeId;
this.hasBackupToRestore = hasBackupToRestore;
this.toUnbind = [];
this._onDidModelChangeContent = new Emitter<void>();
this._onDidModelChangeEncoding = new Emitter<void>();
@@ -154,19 +151,17 @@ export class UntitledEditorInput extends AbstractUntitledEditorInput {
}
// Otherwise Create Model and load, restoring from backup if necessary
let restorePromise: TPromise<string>;
if (this.hasBackupToRestore) {
// TODO: Pass in only Untitled-x into the constructor, evaluate whether there is a backup here.
const restoreResource = this.backupFileService.getBackupResource(this.resource);
restorePromise = this.textFileService.resolveTextContent(restoreResource).then(rawTextContent => rawTextContent.value.lines.join('\n'));
return this.backupFileService.hasBackup(this.resource).then(hasBackup => {
if (hasBackup) {
// If the resource restored from backup it doesn't have an associated file path
this.hasAssociatedFilePath = false;
// If the resource restored from backup it doesn't have an associated file path
this.hasAssociatedFilePath = false;
} else {
restorePromise = TPromise.as('');
}
const restoreResource = this.backupFileService.getBackupResource(this.resource);
return this.textFileService.resolveTextContent(restoreResource).then(rawTextContent => rawTextContent.value.lines.join('\n'));
}
return restorePromise.then(content => {
return '';
}).then(content => {
const model = this.createModel(content);
return model.load().then((resolvedModel: UntitledEditorModel) => {
this.cachedModel = resolvedModel;