@theia/notebook 1.47.0-next.0 → 1.47.1

package/src/browser/service/notebook-execution-state-service.ts

@@ -18,7 +18,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, DisposableCollection, Emitter, URI } from '@theia/core';
+import { Disposable, DisposableCollection, Emitter, URI, generateUuid } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { NotebookService } from './notebook-service';
 import {
@@ -27,7 +27,6 @@ import {
 } from '../../common';
 import { CellPartialInternalMetadataEditByHandle, CellEditOperation } from '../notebook-types';
 import { NotebookModel } from '../view-model/notebook-model';
-import { v4 } from 'uuid';
 
 export type CellExecuteUpdate = CellExecuteOutputEdit | CellExecuteOutputItemEdit | CellExecutionStateUpdate;
 
@@ -178,7 +177,7 @@ export class CellExecution implements Disposable {
             editType: CellEditType.PartialInternalMetadata,
             handle: this.cellHandle,
             internalMetadata: {
-                executionId: v4(),
+                executionId: generateUuid(),
                 runStartTime: undefined,
                 runEndTime: undefined,
                 lastRunSuccess: undefined,

package/src/browser/service/notebook-kernel-service.ts

@@ -54,6 +54,11 @@ export interface NotebookKernel {
     // ID of the extension providing this kernel
     readonly extensionId: string;
 
+    readonly localResourceRoot: URI;
+    readonly preloadUris: URI[];
+    readonly preloadProvides: string[];
+
+    readonly handle: number;
     label: string;
     description?: string;
     detail?: string;

package/src/browser/service/notebook-model-resolver-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Emitter, URI } from '@theia/core';
+import { Emitter, Resource, ResourceProvider, URI } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { UriComponents } from '@theia/core/lib/common/uri';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -34,6 +34,9 @@ export class NotebookModelResolverService {
     @inject(FileService)
     protected fileService: FileService;
 
+    @inject(ResourceProvider)
+    protected resourceProvider: ResourceProvider;
+
     @inject(NotebookService)
     protected notebookService: NotebookService;
 
@@ -60,9 +63,9 @@ export class NotebookModelResolverService {
             throw new Error(`Missing viewType for '${resource}'`);
         }
 
-        const notebookData = await this.resolveExistingNotebookData(resource, viewType!);
-
-        const notebookModel = await this.notebookService.createNotebookModel(notebookData, viewType, resource);
+        const actualResource = await this.resourceProvider(resource);
+        const notebookData = await this.resolveExistingNotebookData(actualResource, viewType!);
+        const notebookModel = await this.notebookService.createNotebookModel(notebookData, viewType, actualResource);
 
         notebookModel.onDirtyChanged(() => this.onDidChangeDirtyEmitter.fire(notebookModel));
         notebookModel.onDidSaveNotebook(() => this.onDidSaveNotebookEmitter.fire(notebookModel.uri.toComponents()));
@@ -103,8 +106,8 @@ export class NotebookModelResolverService {
         return this.resolve(resource, viewType);
     }
 
-    protected async resolveExistingNotebookData(resource: URI, viewType: string): Promise<NotebookData> {
-        if (resource.scheme === 'untitled') {
+    protected async resolveExistingNotebookData(resource: Resource, viewType: string): Promise<NotebookData> {
+        if (resource.uri.scheme === 'untitled') {
 
             return {
                 cells: [
@@ -118,10 +121,11 @@ export class NotebookModelResolverService {
                 metadata: {}
             };
         } else {
-            const file = await this.fileService.readFile(resource);
-
-            const dataProvider = await this.notebookService.getNotebookDataProvider(viewType);
-            const notebook = await dataProvider.serializer.toNotebook(file.value);
+            const [dataProvider, contents] = await Promise.all([
+                this.notebookService.getNotebookDataProvider(viewType),
+                this.fileService.readFile(resource.uri)
+            ]);
+            const notebook = await dataProvider.serializer.toNotebook(contents.value);
 
             return notebook;
         }

package/src/browser/service/notebook-renderer-messaging-service.ts

@@ -19,8 +19,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Emitter } from '@theia/core';
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import { Disposable } from '@theia/core/shared/vscode-languageserver-protocol';
+import { NotebookEditorWidgetService } from './notebook-editor-widget-service';
 
 interface RendererMessage {
     editorId: string;
@@ -50,6 +51,9 @@ export class NotebookRendererMessagingService implements Disposable {
     private readonly willActivateRendererEmitter = new Emitter<string>();
     readonly onWillActivateRenderer = this.willActivateRendererEmitter.event;
 
+    @inject(NotebookEditorWidgetService)
+    private readonly editorWidgetService: NotebookEditorWidgetService;
+
     private readonly activations = new Map<string /* rendererId */, undefined | RendererMessage[]>();
     private readonly scopedMessaging = new Map<string /* editorId */, RendererMessaging>();
 
@@ -86,6 +90,10 @@ export class NotebookRendererMessagingService implements Disposable {
 
         const messaging: RendererMessaging = {
             postMessage: (rendererId, message) => this.postMessage(editorId, rendererId, message),
+            receiveMessage: async (rendererId, message) => {
+                this.editorWidgetService.getNotebookEditor(editorId)?.postRendererMessage(rendererId, message);
+                return true;
+            },
             dispose: () => this.scopedMessaging.delete(editorId),
         };
 

package/src/browser/service/notebook-service.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Disposable, DisposableCollection, Emitter, URI } from '@theia/core';
+import { Disposable, DisposableCollection, Emitter, Resource, URI } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { NotebookData, TransientOptions } from '../../common';
@@ -101,14 +101,14 @@ export class NotebookService implements Disposable {
         });
     }
 
-    async createNotebookModel(data: NotebookData, viewType: string, uri: URI): Promise<NotebookModel> {
+    async createNotebookModel(data: NotebookData, viewType: string, resource: Resource): Promise<NotebookModel> {
         const serializer = this.notebookProviders.get(viewType)?.serializer;
         if (!serializer) {
             throw new Error('no notebook serializer for ' + viewType);
         }
 
-        const model = this.notebookModelFactory({ data, uri, viewType, serializer });
-        this.notebookModels.set(uri.toString(), model);
+        const model = this.notebookModelFactory({ data, resource, viewType, serializer });
+        this.notebookModels.set(resource.uri.toString(), model);
         // Resolve cell text models right after creating the notebook model
         // This ensures that all text models are available in the plugin host
         await Promise.all(model.cells.map(e => e.resolveTextModel()));

package/src/browser/style/index.css

@@ -26,11 +26,14 @@
 }
 
 .theia-notebook-cell {
-  cursor: grab;
   display: flex;
   margin: 10px 0px;
 }
 
+.theia-notebook-cell.draggable {
+  cursor: grab;
+}
+
 .theia-notebook-cell:hover .theia-notebook-cell-marker {
   visibility: visible;
 }
@@ -161,9 +164,20 @@
   flex-direction: column;
 }
 
+.theia-notebook-main-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
+
+.theia-notebook-scroll-container {
+    flex: 1;
+    overflow: hidden;
+    position: relative;
+}
+
 .theia-notebook-main-toolbar {
-  position: sticky;
-  top: 0;
   background: var(--theia-editor-background);
   display: flex;
   flex-direction: row;

package/src/browser/view/notebook-cell-list-view.tsx

@@ -64,11 +64,13 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
             {this.props.notebookModel.cells
                 .map((cell, index) =>
                     <React.Fragment key={'cell-' + cell.handle}>
-                        <NotebookCellDivider onAddNewCell={(kind: CellKind) => this.onAddNewCell(kind, index)}
+                        <NotebookCellDivider
+                            isVisible={() => this.isEnabled()}
+                            onAddNewCell={(kind: CellKind) => this.onAddNewCell(kind, index)}
                             onDrop={e => this.onDrop(e, index)}
                             onDragOver={e => this.onDragOver(e, cell, 'top')} />
                         {this.shouldRenderDragOverIndicator(cell, 'top') && <CellDropIndicator />}
-                        <li className={'theia-notebook-cell' + (this.state.selectedCell === cell ? ' focused' : '')}
+                        <li className={'theia-notebook-cell' + (this.state.selectedCell === cell ? ' focused' : '') + (this.isEnabled() ? ' draggable' : '')}
                             onClick={() => {
                                 this.setState({ selectedCell: cell });
                                 this.props.notebookModel.setSelectedCell(cell);
@@ -89,7 +91,9 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
                     </React.Fragment>
                 )
             }
-            <NotebookCellDivider onAddNewCell={(kind: CellKind) => this.onAddNewCell(kind, this.props.notebookModel.cells.length)}
+            <NotebookCellDivider
+                isVisible={() => this.isEnabled()}
+                onAddNewCell={(kind: CellKind) => this.onAddNewCell(kind, this.props.notebookModel.cells.length)}
                 onDrop={e => this.onDrop(e, this.props.notebookModel.cells.length - 1)}
                 onDragOver={e => this.onDragOver(e, this.props.notebookModel.cells[this.props.notebookModel.cells.length - 1], 'bottom')} />
         </ul>;
@@ -105,18 +109,33 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
 
     protected onDragStart(event: React.DragEvent<HTMLLIElement>, index: number): void {
         event.stopPropagation();
+        if (!this.isEnabled()) {
+            event.preventDefault();
+            return;
+        }
         event.dataTransfer.setData('text/theia-notebook-cell-index', index.toString());
         event.dataTransfer.setData('text/plain', this.props.notebookModel.cells[index].source);
     }
 
     protected onDragOver(event: React.DragEvent<HTMLLIElement>, cell: NotebookCellModel, position?: 'top' | 'bottom'): void {
+        if (!this.isEnabled()) {
+            return;
+        }
         event.preventDefault();
         event.stopPropagation();
         // show indicator
         this.setState({ ...this.state, dragOverIndicator: { cell, position: position ?? event.nativeEvent.offsetY < event.currentTarget.clientHeight / 2 ? 'top' : 'bottom' } });
     }
 
+    protected isEnabled(): boolean {
+        return !Boolean(this.props.notebookModel.readOnly);
+    }
+
     protected onDrop(event: React.DragEvent<HTMLLIElement>, dropElementIndex: number): void {
+        if (!this.isEnabled()) {
+            this.setState({ dragOverIndicator: undefined });
+            return;
+        }
         const index = parseInt(event.dataTransfer.getData('text/theia-notebook-cell-index'));
         const isTargetBelow = index < dropElementIndex;
         let newIdx = this.state.dragOverIndicator?.position === 'top' ? dropElementIndex : dropElementIndex + 1;
@@ -133,15 +152,18 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
     }
 
     protected onAddNewCell(kind: CellKind, index: number): void {
-        this.props.commandRegistry.executeCommand(NotebookCommands.ADD_NEW_CELL_COMMAND.id,
-            this.props.notebookModel,
-            kind,
-            index
-        );
+        if (this.isEnabled()) {
+            this.props.commandRegistry.executeCommand(NotebookCommands.ADD_NEW_CELL_COMMAND.id,
+                this.props.notebookModel,
+                kind,
+                index
+            );
+        }
     }
 
     protected shouldRenderDragOverIndicator(cell: NotebookCellModel, position: 'top' | 'bottom'): boolean {
-        return this.state.dragOverIndicator !== undefined &&
+        return this.isEnabled() &&
+            this.state.dragOverIndicator !== undefined &&
             this.state.dragOverIndicator.cell === cell &&
             this.state.dragOverIndicator.position === position;
     }
@@ -149,16 +171,17 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
 }
 
 export interface NotebookCellDividerProps {
+    isVisible: () => boolean;
     onAddNewCell: (type: CellKind) => void;
     onDrop: (event: React.DragEvent<HTMLLIElement>) => void;
     onDragOver: (event: React.DragEvent<HTMLLIElement>) => void;
 }
 
-export function NotebookCellDivider({ onAddNewCell, onDrop, onDragOver }: NotebookCellDividerProps): React.JSX.Element {
+export function NotebookCellDivider({ isVisible, onAddNewCell, onDrop, onDragOver }: NotebookCellDividerProps): React.JSX.Element {
     const [hover, setHover] = React.useState(false);
 
     return <li className='theia-notebook-cell-divider' onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)} onDrop={onDrop} onDragOver={onDragOver}>
-        {hover && <div className='theia-notebook-add-cell-buttons'>
+        {hover && isVisible() && <div className='theia-notebook-add-cell-buttons'>
             <button className='theia-notebook-add-cell-button' onClick={() => onAddNewCell(CellKind.Code)} title={nls.localizeByDefault('Add Code Cell')}>
                 <div className={codicon('add') + ' theia-notebook-add-cell-button-icon'} />
                 {nls.localizeByDefault('Code')}

package/src/browser/view/notebook-cell-toolbar-factory.tsx

@@ -29,6 +29,7 @@ export interface NotebookCellToolbarItem {
     icon?: string;
     label?: string;
     onClick: (e: React.MouseEvent) => void;
+    isVisible: () => boolean;
     contextKeys?: Set<string>
 }
 
@@ -87,6 +88,7 @@ export class NotebookCellToolbarFactory {
                         args: [notebookModel, cell, output]
                     }) :
                 () => this.commandRegistry.executeCommand(menuNode.command!, notebookModel, cell, output),
+            isVisible: () => menuPath ? true : Boolean(this.commandRegistry.getVisibleHandler(menuNode.command!, notebookModel, cell, output)),
             contextKeys: menuNode.when ? this.contextKeyService.parseKeys(menuNode.when) : undefined
         };
     }

package/src/browser/view/notebook-cell-toolbar.tsx

@@ -56,7 +56,7 @@ export class NotebookCellToolbar extends NotebookCellActionBar {
 
     override render(): React.ReactNode {
         return <div className='theia-notebook-cell-toolbar'>
-            {this.state.inlineItems.map(item => this.renderItem(item))}
+            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
         </div>;
     }
 
@@ -66,7 +66,7 @@ export class NotebookCellSidebar extends NotebookCellActionBar {
 
     override render(): React.ReactNode {
         return <div className='theia-notebook-cell-sidebar'>
-            {this.state.inlineItems.map(item => this.renderItem(item))}
+            {this.state.inlineItems.filter(e => e.isVisible()).map(item => this.renderItem(item))}
         </div>;
     }
 }

package/src/browser/view/notebook-code-cell-view.tsx

@@ -61,7 +61,7 @@ export class NotebookCodeCellRenderer implements CellRenderer {
                 </div>
             </div>
             <div className='theia-notebook-cell-with-sidebar'>
-                <NotebookCodeCellOutputs cell={cell} outputWebviewFactory={this.cellOutputWebviewFactory}
+                <NotebookCodeCellOutputs cell={cell} notebook={notebookModel} outputWebviewFactory={this.cellOutputWebviewFactory}
                     renderSidebar={() =>
                         this.notebookCellToolbarFactory.renderSidebar(NotebookCellActionContribution.OUTPUT_SIDEBAR_MENU, notebookModel, cell, cell.outputs[0])} />
             </div>
@@ -166,6 +166,7 @@ export class NotebookCodeCellStatus extends React.Component<NotebookCodeCellStat
 
 interface NotebookCellOutputProps {
     cell: NotebookCellModel;
+    notebook: NotebookModel;
     outputWebviewFactory: CellOutputWebviewFactory;
     renderSidebar: () => React.ReactNode;
 }
@@ -182,14 +183,14 @@ export class NotebookCodeCellOutputs extends React.Component<NotebookCellOutputP
     }
 
     override async componentDidMount(): Promise<void> {
-        const { cell, outputWebviewFactory } = this.props;
+        const { cell, notebook, outputWebviewFactory } = this.props;
         this.toDispose.push(cell.onDidChangeOutputs(async () => {
             if (!this.outputsWebviewPromise && cell.outputs.length > 0) {
-                this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
+                this.outputsWebviewPromise = outputWebviewFactory(cell, notebook).then(webview => {
                     this.outputsWebview = webview;
                     this.forceUpdate();
                     return webview;
-                    });
+                });
                 this.forceUpdate();
             } else if (this.outputsWebviewPromise && cell.outputs.length === 0 && cell.internalMetadata.runEndTime) {
                 (await this.outputsWebviewPromise).dispose();
@@ -199,7 +200,7 @@ export class NotebookCodeCellOutputs extends React.Component<NotebookCellOutputP
             }
         }));
         if (cell.outputs.length > 0) {
-            this.outputsWebviewPromise = outputWebviewFactory(cell).then(webview => {
+            this.outputsWebviewPromise = outputWebviewFactory(cell, notebook).then(webview => {
                 this.outputsWebview = webview;
                 this.forceUpdate();
                 return webview;

package/src/browser/view/notebook-main-toolbar.tsx

@@ -13,7 +13,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-import { CommandRegistry, CompoundMenuNodeRole, DisposableCollection, MenuModelRegistry, MenuNode, nls } from '@theia/core';
+import { ArrayUtils, CommandRegistry, CompoundMenuNodeRole, DisposableCollection, MenuModelRegistry, MenuNode, nls } from '@theia/core';
 import * as React from '@theia/core/shared/react';
 import { codicon } from '@theia/core/lib/browser';
 import { NotebookCommands, NotebookMenus } from '../contributions/notebook-actions-contribution';
@@ -98,12 +98,16 @@ export class NotebookMainToolbar extends React.Component<NotebookMainToolbarProp
 
     protected renderMenuItem(item: MenuNode): React.ReactNode {
         if (item.role === CompoundMenuNodeRole.Group) {
-            const itemNodes = item.children?.map(child => this.renderMenuItem(child)).filter(child => !!child);
+            const itemNodes = ArrayUtils.coalesce(item.children?.map(child => this.renderMenuItem(child)) ?? []);
             return <React.Fragment key={item.id}>
                 {itemNodes}
                 {itemNodes && itemNodes.length > 0 && <span key={`${item.id}-separator`} className='theia-notebook-toolbar-separator'></span>}
             </React.Fragment>;
         } else if (!item.when || this.props.contextKeyService.match(item.when)) {
+            const visibleCommand = Boolean(this.props.commandRegistry.getVisibleHandler(item.command ?? '', this.props.notebookModel));
+            if (!visibleCommand) {
+                return undefined;
+            }
             const title = (this.props.commandRegistry.getCommand(item.command ?? '') as NotebookCommand)?.tooltip ?? item.label;
             return <div key={item.id} title={title} className='theia-notebook-main-toolbar-item action-label'
                 onClick={() => {

package/src/browser/view-model/notebook-cell-model.ts

@@ -150,7 +150,7 @@ export class NotebookCellModel implements NotebookCell, Disposable {
 
     }
 
-    textModel: MonacoEditorModel;
+    protected textModel?: MonacoEditorModel;
 
     protected htmlContext: HTMLLIElement;
 
@@ -220,12 +220,14 @@ export class NotebookCellModel implements NotebookCell, Disposable {
         this.onDidChangeInternalMetadataEmitter.dispose();
         this.onDidChangeLanguageEmitter.dispose();
         this.notebookCellContextManager.dispose();
-        this.textModel.dispose();
+        this.textModel?.dispose();
         this.toDispose.dispose();
     }
 
     requestEdit(): void {
-        this.onDidRequestCellEditChangeEmitter.fire(true);
+        if (!this.textModel || !this.textModel.readOnly) {
+            this.onDidRequestCellEditChangeEmitter.fire(true);
+        }
     }
 
     requestStopEdit(): void {

package/src/browser/view-model/notebook-model.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { Disposable, Emitter, URI } from '@theia/core';
+import { Disposable, Emitter, Event, Resource, URI } from '@theia/core';
 import { Saveable, SaveOptions } from '@theia/core/lib/browser';
 import {
     CellData, CellEditType, CellUri, NotebookCellInternalMetadata,
@@ -28,6 +28,7 @@ import { NotebookCellModel, NotebookCellModelFactory } from './notebook-cell-mod
 import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
 import { UndoRedoService } from '@theia/editor/lib/browser/undo-redo-service';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 
 export const NotebookModelFactory = Symbol('NotebookModelFactory');
 
@@ -42,10 +43,10 @@ export function createNotebookModelContainer(parent: interfaces.Container, props
 
 const NotebookModelProps = Symbol('NotebookModelProps');
 export interface NotebookModelProps {
-    data: NotebookData,
-    uri: URI,
-    viewType: string,
-    serializer: NotebookSerializer,
+    data: NotebookData;
+    resource: Resource;
+    viewType: string;
+    serializer: NotebookSerializer;
 }
 
 @injectable()
@@ -63,6 +64,10 @@ export class NotebookModel implements Saveable, Disposable {
     protected readonly onDidChangeContentEmitter = new Emitter<NotebookContentChangedEvent[]>();
     readonly onDidChangeContent = this.onDidChangeContentEmitter.event;
 
+    get onDidChangeReadOnly(): Event<boolean | MarkdownString> {
+        return this.props.resource.onDidChangeReadOnly ?? Event.None;
+    }
+
     @inject(FileService)
     protected readonly fileService: FileService;
 
@@ -81,7 +86,7 @@ export class NotebookModel implements Saveable, Disposable {
 
     protected nextHandle: number = 0;
 
-    protected _dirty: boolean = false;
+    protected _dirty = false;
 
     set dirty(dirty: boolean) {
         this._dirty = dirty;
@@ -92,13 +97,17 @@ export class NotebookModel implements Saveable, Disposable {
         return this._dirty;
     }
 
+    get readOnly(): boolean | MarkdownString {
+        return this.props.resource.readOnly ?? false;
+    }
+
     selectedCell?: NotebookCellModel;
     protected dirtyCells: NotebookCellModel[] = [];
 
     cells: NotebookCellModel[];
 
     get uri(): URI {
-        return this.props.uri;
+        return this.props.resource.uri;
     }
 
     get viewType(): string {
@@ -112,7 +121,7 @@ export class NotebookModel implements Saveable, Disposable {
         this.dirty = false;
 
         this.cells = this.props.data.cells.map((cell, index) => this.cellModelFactory({
-            uri: CellUri.generate(this.props.uri, index),
+            uri: CellUri.generate(this.props.resource.uri, index),
             handle: index,
             source: cell.source,
             language: cell.language,
@@ -294,7 +303,7 @@ export class NotebookModel implements Saveable, Disposable {
         }
     }
 
-    private replaceCells(start: number, deleteCount: number, newCells: CellData[], computeUndoRedo: boolean): void {
+    protected async replaceCells(start: number, deleteCount: number, newCells: CellData[], computeUndoRedo: boolean): Promise<void> {
         const cells = newCells.map(cell => {
             const handle = this.nextHandle++;
             return this.cellModelFactory({
@@ -325,11 +334,15 @@ export class NotebookModel implements Saveable, Disposable {
                 async () => this.replaceCells(start, deleteCount, newCells, false));
         }
 
+        // Ensure that all text model have been created
+        // Otherwise we run into a race condition once we fire `onDidChangeContent`
+        await Promise.all(cells.map(cell => cell.resolveTextModel()));
+
         this.onDidAddOrRemoveCellEmitter.fire({ rawEvent: { kind: NotebookCellsChangeType.ModelChange, changes }, newCellIds: cells.map(cell => cell.handle) });
         this.onDidChangeContentEmitter.fire([{ kind: NotebookCellsChangeType.ModelChange, changes }]);
     }
 
-    private changeCellInternalMetadataPartial(cell: NotebookCellModel, internalMetadata: NullablePartialNotebookCellInternalMetadata): void {
+    protected changeCellInternalMetadataPartial(cell: NotebookCellModel, internalMetadata: NullablePartialNotebookCellInternalMetadata): void {
         const newInternalMetadata: NotebookCellInternalMetadata = {
             ...cell.internalMetadata
         };
@@ -345,7 +358,7 @@ export class NotebookModel implements Saveable, Disposable {
         ]);
     }
 
-    private updateNotebookMetadata(metadata: NotebookDocumentMetadata, computeUndoRedo: boolean): void {
+    protected updateNotebookMetadata(metadata: NotebookDocumentMetadata, computeUndoRedo: boolean): void {
         const oldMetadata = this.metadata;
         if (computeUndoRedo) {
             this.undoRedoService.pushElement(this.uri,
@@ -358,7 +371,7 @@ export class NotebookModel implements Saveable, Disposable {
         this.onDidChangeContentEmitter.fire([{ kind: NotebookCellsChangeType.ChangeDocumentMetadata, metadata: this.metadata }]);
     }
 
-    private changeCellLanguage(cell: NotebookCellModel, languageId: string, computeUndoRedo: boolean): void {
+    protected changeCellLanguage(cell: NotebookCellModel, languageId: string, computeUndoRedo: boolean): void {
         if (cell.language === languageId) {
             return;
         }
@@ -368,7 +381,7 @@ export class NotebookModel implements Saveable, Disposable {
         this.onDidChangeContentEmitter.fire([{ kind: NotebookCellsChangeType.ChangeCellLanguage, index: this.cells.indexOf(cell), language: languageId }]);
     }
 
-    private moveCellToIndex(fromIndex: number, length: number, toIndex: number, computeUndoRedo: boolean): boolean {
+    protected moveCellToIndex(fromIndex: number, length: number, toIndex: number, computeUndoRedo: boolean): boolean {
         if (computeUndoRedo) {
             this.undoRedoService.pushElement(this.uri,
                 async () => { this.moveCellToIndex(toIndex, length, fromIndex, false); },
@@ -383,7 +396,7 @@ export class NotebookModel implements Saveable, Disposable {
         return true;
     }
 
-    private getCellIndexByHandle(handle: number): number {
+    protected getCellIndexByHandle(handle: number): number {
         return this.cells.findIndex(c => c.handle === handle);
     }
 }