Fixes to reverting notebooks (microsoft#12410)

ericsnowcurrently · Jun 18, 2020 · ae8903d · ae8903d
1 parent 2003e01
commit ae8903d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts b/src/client/datascience/interactive-ipynb/nativeEditorStorage.ts
@@ -632,9 +632,12 @@ export class NativeEditorStorage implements INotebookStorage {
                         await this.fileSystem.writeFile(filePath, contents);
                     }
                 } else {
-                    await this.fileSystem
-                        .deleteFile(filePath)
-                        .catch((ex) => traceError('Failed to delete hotExit file. Possible it does not exist', ex));
+                    await this.fileSystem.deleteFile(filePath).catch((ex) => {
+                        // No need to log error if file doesn't exist.
+                        if (!isFileNotFoundError(ex)) {
+                            traceError('Failed to delete hotExit file. Possible it does not exist', ex);
+                        }
+                    });
                 }
             }
         } catch (exc) {

diff --git a/src/client/datascience/notebook/contentProvider.ts b/src/client/datascience/notebook/contentProvider.ts
@@ -65,7 +65,10 @@ export class NotebookContentProvider implements VSCodeNotebookContentProvider {
                 metadata: { cellEditable: false, editable: false, runnable: false }
             };
         }
-        const model = await this.notebookStorage.load(uri, undefined, !openContext.backupId);
+        // If there's no backup id, then skip loading dirty contents.
+        const model = await (openContext.backupId
+            ? this.notebookStorage.load(uri, undefined, openContext.backupId)
+            : this.notebookStorage.load(uri, undefined, true));
         // If experiment is not enabled, then this method was invoked as user opted to try and open using the new API.
         if (!this.useVSCodeNotebookEditorApi) {
             updateModelForUseWithVSCodeNotebook(model);