Open restored files pinned

src/vs/workbench/electron-browser/workbench.ts

@@ -174,7 +174,7 @@ export class Workbench implements IPartService {
 
 		// Restore any backups if they exist
 		options.filesToRestore = this.backupService.getBackupFiles(workspace.resource.fsPath).map(filePath => {
-			return { resource: Uri.file(filePath) };
+			return { resource: Uri.file(filePath), options: { pinned: true } };
 		});
 
 		this.hasFilesToCreateOpenOrDiff = (options.filesToCreate && options.filesToCreate.length > 0) || (options.filesToOpen && options.filesToOpen.length > 0) || (options.filesToDiff && options.filesToDiff.length > 0) || (options.filesToRestore.length > 0);
@@ -328,7 +328,7 @@ export class Workbench implements IPartService {
 				let filesToRestoreInputPromise = filesToRestore.map(resourceInput => this.editorService.createInput(resourceInput, true));
 				return TPromise.join<EditorInput>(filesToOpenInputPromise.concat(filesToRestoreInputPromise)).then((inputsToOpen) => {
 					inputs.push(...inputsToOpen);
-					options.push(...filesToOpen.map(resourceInput => TextEditorOptions.from(resourceInput)));
+					options.push(...filesToOpen.concat(filesToRestore).map(resourceInput => TextEditorOptions.from(resourceInput)));
 
 					return inputs.map((input, index) => { return { input, options: options[index] }; });
 				});

src/vs/workbench/services/textfile/common/textFileEditorModel.ts

@@ -272,7 +272,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 						return this.createTextEditorModel(restoreContent.value, content.resource).then(() => {
 							this.createTextEditorModelPromise = null;
 
-							this.setDirty(true); // Ensure we are not tracking a stale state
+							// TODO: This does not set the dirty indicator immediately, making it look like the file is not actually dirty
+							this.setDirty(true);
 							this.toDispose.push(this.textEditorModel.onDidChangeRawContent((e: IModelContentChangedEvent) => this.onModelContentChanged(e)));
 
 							return this;