Fixes to opening VSCode Notebook (#12671)

For #10496

Not sure how, but some changes seem to have gone amiss.

Author: DonJayamanne

src/client/datascience/interactive-ipynb/nativeEditorStorage.ts

@@ -74,12 +74,27 @@ export class NativeEditorStorage implements INotebookStorage {
         return `${path.basename(model.file.fsPath)}-${uuid()}`;
     }
 
-    public load(file: Uri, possibleContents?: string, backupId?: string): Promise<INotebookModel>;
-    // tslint:disable-next-line: unified-signatures
-    public load(file: Uri, possibleContents?: string, skipDirtyContents?: boolean): Promise<INotebookModel>;
-    // tslint:disable-next-line: no-any
-    public load(file: Uri, possibleContents?: string, options?: any): Promise<INotebookModel> {
-        return this.loadFromFile(file, possibleContents, options);
+    public load(
+        file: Uri,
+        possibleContents?: string,
+        backupId?: string,
+        forVSCodeNotebook?: boolean
+    ): Promise<INotebookModel>;
+    public load(
+        file: Uri,
+        possibleContents?: string,
+        // tslint:disable-next-line: unified-signatures
+        skipDirtyContents?: boolean,
+        forVSCodeNotebook?: boolean
+    ): Promise<INotebookModel>;
+    public load(
+        file: Uri,
+        possibleContents?: string,
+        // tslint:disable-next-line: no-any
+        options?: any,
+        forVSCodeNotebook?: boolean
+    ): Promise<INotebookModel> {
+        return this.loadFromFile(file, possibleContents, options, forVSCodeNotebook);
     }
     public async save(model: INotebookModel, _cancellation: CancellationToken): Promise<void> {
         const contents = model.getContent();

src/client/datascience/interactive-ipynb/notebookStorageProvider.ts

@@ -56,20 +56,25 @@ export class NotebookStorageProvider implements INotebookStorageProvider {
     public deleteBackup(model: INotebookModel, backupId?: string) {
         return this.storage.deleteBackup(model, backupId);
     }
-    public load(file: Uri, contents?: string, backupId?: string): Promise<INotebookModel>;
-    // tslint:disable-next-line: unified-signatures
-    public load(file: Uri, contents?: string, skipDirtyContents?: boolean): Promise<INotebookModel>;
+    public load(file: Uri, contents?: string, backupId?: string, forVSCodeNotebook?: boolean): Promise<INotebookModel>;
+    public load(
+        file: Uri,
+        contents?: string,
+        // tslint:disable-next-line: unified-signatures
+        skipDirtyContents?: boolean,
+        forVSCodeNotebook?: boolean
+    ): Promise<INotebookModel>;
 
     // tslint:disable-next-line: no-any
-    public load(file: Uri, contents?: string, options?: any): Promise<INotebookModel> {
+    public load(file: Uri, contents?: string, options?: any, forVSCodeNotebook?: boolean): Promise<INotebookModel> {
         const key = file.toString();
         if (!this.storageAndModels.has(key)) {
             // Every time we load a new untitled file, up the counter past the max value for this counter
             NotebookStorageProvider.untitledCounter = getNextUntitledCounter(
                 file,
                 NotebookStorageProvider.untitledCounter
             );
-            const promise = this.storage.load(file, contents, options);
+            const promise = this.storage.load(file, contents, options, forVSCodeNotebook);
             this.storageAndModels.set(key, promise.then(this.trackModel.bind(this)));
         }
         return this.storageAndModels.get(key)!;