No empty cell for native notebooks (#13524)

Author: DonJayamanne

src/client/datascience/jupyter/kernels/kernel.ts

@@ -138,8 +138,6 @@ export class Kernel implements IKernel {
         } else {
             await this.validate(this.uri);
             const metadata = ((getDefaultNotebookContent().metadata || {}) as unknown) as nbformat.INotebookMetadata;
-            // tslint:disable-next-line: no-suspicious-comment
-            // TODO: Just pass the `this.metadata` into the func.
             updateNotebookMetadata(metadata, this.metadata);
 
             this._notebookPromise = this.notebookProvider.getOrCreateNotebook({

src/client/datascience/notebookStorage/nativeEditorStorage.ts

@@ -348,9 +348,11 @@ export class NativeEditorStorage implements INotebookStorage {
             };
         });
 
-        // Make sure at least one
-        if (remapped.length === 0) {
-            remapped.splice(0, 0, this.createEmptyCell(uuid()));
+        if (!forVSCodeNotebook) {
+            // Make sure at least one
+            if (remapped.length === 0) {
+                remapped.splice(0, 0, this.createEmptyCell(uuid()));
+            }
         }
         const pythonNumber = json ? await this.extractPythonMainVersion(json) : 3;
 

src/client/datascience/notebookStorage/notebookStorageProvider.ts

@@ -110,7 +110,7 @@ export class NotebookStorageProvider implements INotebookStorageProvider {
         const uri = this.getNextNewNotebookUri(forVSCodeNotebooks);
 
         // Always skip loading from the hot exit file. When creating a new file we want a new file.
-        return this.getOrCreateModel(uri, contents, true);
+        return this.getOrCreateModel(uri, contents, true, forVSCodeNotebooks);
     }
 
     private getNextNewNotebookUri(forVSCodeNotebooks?: boolean): Uri {

src/client/datascience/notebookStorage/vscNotebookModel.ts

@@ -4,6 +4,7 @@
 import type { nbformat } from '@jupyterlab/coreutils';
 import { Memento, Uri } from 'vscode';
 import { NotebookDocument } from '../../../../types/vscode-proposed';
+import { IVSCodeNotebook } from '../../common/application/types';
 import { ICryptoUtils } from '../../common/types';
 import { NotebookModelChange } from '../interactive-common/interactiveWindowTypes';
 import {
@@ -41,12 +42,29 @@ export class VSCodeNotebookModel extends BaseNotebookModel {
         return this.document?.isDirty === true;
     }
     public get cells(): ICell[] {
+        // Possible the document has been closed/disposed
+        if (this.isDisposed) {
+            return [];
+        }
+
         // When a notebook is not trusted, return original cells.
         // This is because the VSCode NotebookDocument object will not have any output in the cells.
         return this.document && this.isTrusted
             ? this.document.cells.map((cell) => createCellFromVSCNotebookCell(cell, this))
             : this._cells;
     }
+    public get isDisposed() {
+        // Possible the document has been closed/disposed
+        if (
+            this.document &&
+            this.vscodeNotebook &&
+            !this.vscodeNotebook?.notebookDocuments.find((doc) => doc === this.document)
+        ) {
+            return true;
+        }
+        return this._isDisposed === true;
+    }
+
     private document?: NotebookDocument;
     public get notebookContentWithoutCells(): Partial<nbformat.INotebookContent> {
         return {
@@ -63,7 +81,8 @@ export class VSCodeNotebookModel extends BaseNotebookModel {
         crypto: ICryptoUtils,
         json: Partial<nbformat.INotebookContent> = {},
         indentAmount: string = ' ',
-        pythonNumber: number = 3
+        pythonNumber: number = 3,
+        private readonly vscodeNotebook?: IVSCodeNotebook
     ) {
         super(isTrusted, file, cells, globalMemento, crypto, json, indentAmount, pythonNumber);
     }