@theia/notebook 1.67.0-next.13 → 1.67.0-next.56

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

@@ -30,6 +30,7 @@ import { NotebookEditorWidget } from '../notebook-editor-widget';
 import { NotebookCellModel } from '../view-model/notebook-cell-model';
 import { CellKind, NotebookCellsChangeType } from '../../common';
 import { NotebookExecutionStateService } from './notebook-execution-state-service';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 
 @injectable()
 export class NotebookContextManager {
@@ -53,6 +54,8 @@ export class NotebookContextManager {
 
     protected cellContexts: Map<number, Record<string, unknown>> = new Map();
 
+    protected notebookViewModel: NotebookViewModel;
+
     init(widget: NotebookEditorWidget): void {
         this._context = widget.node;
         this.scopedStore = this.contextKeyService.createScoped(widget.node);
@@ -61,6 +64,8 @@ export class NotebookContextManager {
 
         this.scopedStore.setContext(NOTEBOOK_VIEW_TYPE, widget?.notebookType);
 
+        this.notebookViewModel = widget.viewModel;
+
         // Kernel related keys
         const kernel = widget?.model ? this.notebookKernelService.getSelectedNotebookKernel(widget.model) : undefined;
         this.scopedStore.setContext(NOTEBOOK_KERNEL_SELECTED, !!kernel);
@@ -81,9 +86,9 @@ export class NotebookContextManager {
         this.scopedStore.setContext(NOTEBOOK_HAS_OUTPUTS, !!widget.model?.cells.find(cell => cell.outputs.length > 0));
 
         // Cell Selection related keys
-        this.scopedStore.setContext(NOTEBOOK_CELL_FOCUSED, !!widget.model?.selectedCell);
-        this.selectedCellChanged(widget.model?.selectedCell);
-        widget.model?.onDidChangeSelectedCell(e => {
+        this.scopedStore.setContext(NOTEBOOK_CELL_FOCUSED, !!widget.viewModel.selectedCell);
+        this.selectedCellChanged(widget.viewModel.selectedCell);
+        widget.viewModel.onDidChangeSelectedCell(e => {
             this.selectedCellChanged(e.cell);
             this.scopedStore.setContext(NOTEBOOK_CELL_FOCUSED, !!e);
         });
@@ -108,12 +113,15 @@ export class NotebookContextManager {
         this.scopedStore.setContext(NOTEBOOK_CELL_TYPE, cell ? cell.cellKind === CellKind.Code ? 'code' : 'markdown' : undefined);
 
         if (cell) {
-            this.scopedStore.setContext(NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, cell.editing);
-            this.scopedStore.setContext(NOTEBOOK_CELL_EDITABLE, cell.cellKind === CellKind.Markup && !cell.editing);
-            this.cellDisposables.push(cell.onDidRequestCellEditChange(cellEdit => {
-                this.scopedStore.setContext(NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, cellEdit);
-                this.scopedStore.setContext(NOTEBOOK_CELL_EDITABLE, cell.cellKind === CellKind.Markup && !cellEdit);
-            }));
+            const cellViewModel = this.notebookViewModel.cellViewModels.get(cell.handle);
+            this.scopedStore.setContext(NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, cellViewModel?.editing);
+            this.scopedStore.setContext(NOTEBOOK_CELL_EDITABLE, cell.cellKind === CellKind.Markup && !cellViewModel?.editing);
+            if (cellViewModel) {
+                this.cellDisposables.push(cellViewModel.onDidRequestCellEditChange(cellEdit => {
+                    this.scopedStore.setContext(NOTEBOOK_CELL_MARKDOWN_EDIT_MODE, cellEdit);
+                    this.scopedStore.setContext(NOTEBOOK_CELL_EDITABLE, cell.cellKind === CellKind.Markup && !cellEdit);
+                }));
+            }
         }
     }
 

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

@@ -31,9 +31,11 @@ import { ModelDecorationOptions } from '@theia/monaco-editor-core/esm/vs/editor/
 import { IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 import { animationFrame } from '@theia/core/lib/browser';
 import { NotebookCellEditorService } from '../service/notebook-cell-editor-service';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 
 interface CellEditorProps {
     notebookModel: NotebookModel;
+    notebookViewModel: NotebookViewModel;
     cell: NotebookCellModel;
     monacoServices: MonacoEditorServices;
     notebookContextManager: NotebookContextManager;
@@ -89,8 +91,14 @@ export class CellEditor extends React.Component<CellEditorProps, {}> {
     protected resizeObserver?: ResizeObserver;
 
     override componentDidMount(): void {
+        const cellViewModel = this.props.notebookViewModel.cellViewModels.get(this.props.cell.handle);
+
+        if (!cellViewModel) {
+            throw new Error('CellViewModel not found for cell ' + this.props.cell.handle);
+        }
+
         this.disposeEditor();
-        this.toDispose.push(this.props.cell.onWillFocusCellEditor(focusRequest => {
+        this.toDispose.push(cellViewModel.onWillFocusCellEditor(focusRequest => {
             this.editor?.getControl().focus();
             const lineCount = this.editor?.getControl().getModel()?.getLineCount();
             if (focusRequest && lineCount !== undefined) {
@@ -104,7 +112,7 @@ export class CellEditor extends React.Component<CellEditorProps, {}> {
             this.props.notebookContextManager.scopedStore.setContext(NOTEBOOK_CELL_CURSOR_LAST_LINE, currentLine === lineCount);
         }));
 
-        this.toDispose.push(this.props.cell.onWillBlurCellEditor(() => this.blurEditor()));
+        this.toDispose.push(cellViewModel.onWillBlurCellEditor(() => this.blurEditor()));
 
         this.toDispose.push(this.props.cell.onDidChangeEditorOptions(options => {
             this.editor?.getControl().updateOptions(options);
@@ -121,7 +129,7 @@ export class CellEditor extends React.Component<CellEditorProps, {}> {
 
         this.toDispose.push(this.props.cell.onDidSelectFindMatch(match => this.centerEditorInView()));
 
-        this.toDispose.push(this.props.notebookModel.onDidChangeSelectedCell(e => {
+        this.toDispose.push(this.props.notebookViewModel.onDidChangeSelectedCell(e => {
             if (e.cell !== this.props.cell && this.editor?.getControl().hasTextFocus()) {
                 this.blurEditor();
             }
@@ -201,7 +209,7 @@ export class CellEditor extends React.Component<CellEditorProps, {}> {
                 notebookModel.cellDirtyChanged(cell, true);
             }));
             this.toDispose.push(this.editor.getControl().onDidFocusEditorText(() => {
-                this.props.notebookModel.setSelectedCell(cell, false);
+                this.props.notebookViewModel.setSelectedCell(cell, false);
                 this.props.notebookCellEditorService.editorFocusChanged(this.editor);
             }));
             this.toDispose.push(this.editor.getControl().onDidBlurEditorText(() => {
@@ -231,7 +239,7 @@ export class CellEditor extends React.Component<CellEditorProps, {}> {
             }));
             this.props.notebookCellEditorService.editorCreated(uri, this.editor);
             this.setMatches();
-            if (notebookModel.selectedCell === cell) {
+            if (this.props.notebookViewModel.selectedCell === cell) {
                 this.editor.getControl().focus();
             }
         }

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

@@ -23,6 +23,7 @@ import { CommandMenu, CommandRegistry, DisposableCollection, MenuModelRegistry,
 import { NotebookCommands, NotebookMenus } from '../contributions/notebook-actions-contribution';
 import { NotebookCellActionContribution } from '../contributions/notebook-cell-actions-contribution';
 import { NotebookContextManager } from '../service/notebook-context-manager';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 
 export interface CellRenderer {
     render(notebookData: NotebookModel, cell: NotebookCellModel, index: number): React.ReactNode
@@ -42,6 +43,7 @@ export function observeCellHeight(ref: HTMLDivElement | null, cell: NotebookCell
 interface CellListProps {
     renderers: Map<CellKind, CellRenderer>;
     notebookModel: NotebookModel;
+    notebookViewModel: NotebookViewModel;
     notebookContext: NotebookContextManager;
     toolbarRenderer: NotebookCellToolbarFactory;
     commandRegistry: CommandRegistry;
@@ -63,18 +65,18 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
 
     constructor(props: CellListProps) {
         super(props);
-        this.state = { selectedCell: props.notebookModel.selectedCell, dragOverIndicator: undefined, scrollIntoView: true };
+        this.state = { selectedCell: props.notebookViewModel.selectedCell, dragOverIndicator: undefined, scrollIntoView: true };
         this.toDispose.push(props.notebookModel.onDidAddOrRemoveCell(e => {
             if (e.newCellIds && e.newCellIds.length > 0) {
                 this.setState({
                     ...this.state,
-                    selectedCell: this.props.notebookModel.cells.find(model => model.handle === e.newCellIds![e.newCellIds!.length - 1]),
+                    selectedCell: props.notebookViewModel.selectedCell,
                     scrollIntoView: true
                 });
             } else {
                 this.setState({
                     ...this.state,
-                    selectedCell: this.props.notebookModel.cells.find(cell => cell === this.state.selectedCell),
+                    selectedCell: props.notebookViewModel.selectedCell,
                     scrollIntoView: false
                 });
             }
@@ -87,7 +89,7 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
             }
         }));
 
-        this.toDispose.push(props.notebookModel.onDidChangeSelectedCell(e => {
+        this.toDispose.push(props.notebookViewModel.onDidChangeSelectedCell(e => {
             this.setState({
                 ...this.state,
                 selectedCell: e.cell,
@@ -103,7 +105,7 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
                 let hasCellFocus = false;
                 let hasFocus = false;
                 if (this.cellListRef.current.contains(document.activeElement)) {
-                    if (this.props.notebookModel.selectedCell) {
+                    if (this.props.notebookViewModel.selectedCell) {
                         hasCellFocus = true;
                     }
                     hasFocus = true;
@@ -121,8 +123,9 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
     override render(): React.ReactNode {
         return <ul className='theia-notebook-cell-list' ref={this.cellListRef} onDragStart={e => this.onDragStart(e)}>
             {this.props.notebookModel.getVisibleCells()
-                .map((cell, index) =>
-                    <React.Fragment key={'cell-' + cell.handle}>
+                .map((cell, index) => {
+                    const cellViewModel = this.props.notebookViewModel.cellViewModels.get(cell.handle);
+                    return <React.Fragment key={'cell-' + cell.handle}>
                         <NotebookCellDivider
                             menuRegistry={this.props.menuRegistry}
                             isVisible={() => this.isEnabled()}
@@ -143,14 +146,14 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
                             ref={ref => {
                                 if (ref && cell === this.state.selectedCell && this.state.scrollIntoView) {
                                     ref.scrollIntoView({ block: 'nearest' });
-                                    if (cell.cellKind === CellKind.Markup && !cell.editing) {
+                                    if (cell.cellKind === CellKind.Markup && !cellViewModel?.editing) {
                                         ref.focus();
                                     }
                                 }
                             }}
                             onClick={e => {
                                 this.setState({ ...this.state, selectedCell: cell });
-                                this.props.notebookModel.setSelectedCell(cell, false);
+                                this.props.notebookViewModel.setSelectedCell(cell, false);
                             }}
                         >
                             <div className='theia-notebook-cell-sidebar'>
@@ -162,13 +165,13 @@ export class NotebookCellListView extends React.Component<CellListProps, Noteboo
                             </div>
                             {this.state.selectedCell === cell &&
                                 this.props.toolbarRenderer.renderCellToolbar(NotebookCellActionContribution.ACTION_MENU, cell, {
-                                    contextMenuArgs: () => [cell], commandArgs: () => [this.props.notebookModel]
+                                    contextMenuArgs: () => [cell], commandArgs: () => [this.props.notebookModel, cell]
                                 })
                             }
                         </li>
                         <CellDropIndicator visible={this.shouldRenderDragOverIndicator(cell, 'bottom')} />
-                    </React.Fragment>
-                )
+                    </React.Fragment>;
+                })
             }
             <NotebookCellDivider
                 menuRegistry={this.props.menuRegistry}

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

@@ -74,15 +74,16 @@ export class NotebookCellToolbarFactory {
         this.toDisposeOnRender = new DisposableCollection();
         const inlineItems: NotebookCellToolbarItem[] = [];
         const menu = this.menuRegistry.getMenu(menuItemPath);
+
+        this.toDisposeOnRender.push(this.notebookContextManager.scopedStore?.onDidChangeContext(() => {
+            this.onDidChangeContextEmitter.fire();
+        }));
+
         if (menu) {
             for (const menuNode of menu.children) {
-
                 const itemPath = [...menuItemPath, menuNode.id];
                 if (menuNode.isVisible(itemPath, this.notebookContextManager.getCellContext(cell.handle), this.notebookContextManager.context, itemOptions.commandArgs?.() ?? [])) {
                     if (RenderedMenuNode.is(menuNode)) {
-                        if (menuNode.onDidChange) {
-                            this.toDisposeOnRender.push(menuNode.onDidChange(() => this.onDidChangeContextEmitter.fire()));
-                        }
                         inlineItems.push(this.createToolbarItem(itemPath, menuNode, itemOptions));
                     }
                 }

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

@@ -38,6 +38,7 @@ import { NotebookCellEditorService } from '../service/notebook-cell-editor-servi
 import { CellOutputWebview } from '../renderers/cell-output-webview';
 import { NotebookCellStatusBarItem, NotebookCellStatusBarItemList, NotebookCellStatusBarService } from '../service/notebook-cell-status-bar-service';
 import { LabelParser } from '@theia/core/lib/browser/label-parser';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 
 @injectable()
 export class NotebookCodeCellRenderer implements CellRenderer {
@@ -83,10 +84,14 @@ export class NotebookCodeCellRenderer implements CellRenderer {
     @inject(LabelParser)
     protected readonly labelParser: LabelParser;
 
+    @inject(NotebookViewModel)
+    protected readonly notebookViewModel: NotebookViewModel;
+
     render(notebookModel: NotebookModel, cell: NotebookCellModel, handle: number): React.ReactNode {
         return <div className='theia-notebook-cell-with-sidebar' ref={ref => observeCellHeight(ref, cell)}>
             <div className='theia-notebook-cell-editor-container'>
                 <CellEditor notebookModel={notebookModel} cell={cell}
+                    notebookViewModel={this.notebookViewModel}
                     monacoServices={this.monacoServices}
                     notebookContextManager={this.notebookContextManager}
                     notebookViewportService={this.notebookViewportService}
@@ -97,7 +102,7 @@ export class NotebookCodeCellRenderer implements CellRenderer {
                     executionStateService={this.executionStateService}
                     cellStatusBarService={this.notebookCellStatusBarService}
                     labelParser={this.labelParser}
-                    onClick={() => cell.requestFocusEditor()} />
+                    onClick={() => this.notebookViewModel.cellViewModels.get(cell.handle)?.requestFocusEditor()} />
             </div >
         </div >;
     }

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

@@ -32,6 +32,7 @@ import * as mark from 'advanced-mark.js';
 import { NotebookCellEditorService } from '../service/notebook-cell-editor-service';
 import { NotebookCellStatusBarService } from '../service/notebook-cell-status-bar-service';
 import { LabelParser } from '@theia/core/lib/browser/label-parser';
+import { NotebookViewModel } from '../view-model/notebook-view-model';
 
 @injectable()
 export class NotebookMarkdownCellRenderer implements CellRenderer {
@@ -59,6 +60,9 @@ export class NotebookMarkdownCellRenderer implements CellRenderer {
     @inject(LabelParser)
     protected readonly labelParser: LabelParser;
 
+    @inject(NotebookViewModel)
+    protected readonly notebookViewModel: NotebookViewModel;
+
     render(notebookModel: NotebookModel, cell: NotebookCellModel): React.ReactNode {
         return <MarkdownCell
             markdownRenderer={this.markdownRenderer}
@@ -67,6 +71,7 @@ export class NotebookMarkdownCellRenderer implements CellRenderer {
             notebookOptionsService={this.notebookOptionsService}
             cell={cell}
             notebookModel={notebookModel}
+            notebookViewModel={this.notebookViewModel}
             notebookContextManager={this.notebookContextManager}
             notebookCellEditorService={this.notebookCellEditorService}
             notebookCellStatusBarService={this.notebookCellStatusBarService}
@@ -95,6 +100,7 @@ interface MarkdownCellProps {
     commandRegistry: CommandRegistry;
     cell: NotebookCellModel;
     notebookModel: NotebookModel;
+    notebookViewModel: NotebookViewModel;
     notebookContextManager: NotebookContextManager;
     notebookOptionsService: NotebookOptionsService;
     notebookCellEditorService: NotebookCellEditorService;
@@ -103,17 +109,30 @@ interface MarkdownCellProps {
 }
 
 function MarkdownCell({
-    markdownRenderer, monacoServices, cell, notebookModel, notebookContextManager,
+    markdownRenderer, monacoServices, cell, notebookModel, notebookViewModel, notebookContextManager,
     notebookOptionsService, commandRegistry, notebookCellEditorService, notebookCellStatusBarService,
     labelParser
 }: MarkdownCellProps): React.JSX.Element {
-    const [editMode, setEditMode] = React.useState(cell.editing);
+    const [editMode, setEditMode] = React.useState(notebookViewModel.cellViewModels.get(cell.handle)?.editing || false);
+    const [, forceUpdate] = React.useReducer(x => x + 1, 0);
     let empty = false;
 
     React.useEffect(() => {
-        const listener = cell.onDidRequestCellEditChange(cellEdit => setEditMode(cellEdit));
-        return () => listener.dispose();
-    }, [editMode]);
+        if (!editMode) {
+            const listener = cell.onDidChangeContent(type => {
+                if (type === 'content') {
+                    forceUpdate();
+                }
+            });
+            return () => listener.dispose();
+        }
+    }, [editMode, cell]);
+
+    React.useEffect(() => {
+        const cellViewModel = notebookViewModel.cellViewModels.get(cell.handle);
+        const listener = cellViewModel?.onDidRequestCellEditChange(cellEdit => setEditMode(cellEdit));
+        return () => listener?.dispose();
+    }, [editMode, notebookViewModel, cell]);
 
     React.useEffect(() => {
         if (!editMode) {
@@ -156,6 +175,7 @@ function MarkdownCell({
     return editMode ?
         (<div className='theia-notebook-markdown-editor-container' key="code" ref={ref => observeCellHeight(ref, cell)}>
             <CellEditor notebookModel={notebookModel} cell={cell}
+                notebookViewModel={notebookViewModel}
                 monacoServices={monacoServices}
                 notebookContextManager={notebookContextManager}
                 notebookCellEditorService={notebookCellEditorService}
@@ -164,10 +184,10 @@ function MarkdownCell({
                 commandRegistry={commandRegistry}
                 cellStatusBarService={notebookCellStatusBarService}
                 labelParser={labelParser}
-                onClick={() => cell.requestFocusEditor()} />
+                onClick={() => notebookViewModel.cellViewModels.get(cell.handle)?.requestFocusEditor()} />
         </div >) :
         (<div className='theia-notebook-markdown-content' key="markdown"
-            onDoubleClick={() => cell.requestEdit()}
+            onDoubleClick={() => notebookViewModel.cellViewModels.get(cell.handle)?.requestEdit()}
             ref={node => {
                 node?.replaceChildren(...markdownContent);
                 observeCellHeight(node, cell);

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

@@ -38,8 +38,6 @@ import { Range } from '@theia/core/shared/vscode-languageserver-protocol';
 export const NotebookCellModelFactory = Symbol('NotebookModelFactory');
 export type NotebookCellModelFactory = (props: NotebookCellModelProps) => NotebookCellModel;
 
-export type CellEditorFocusRequest = number | 'lastLine' | undefined;
-
 export function createNotebookCellModelContainer(parent: interfaces.Container, props: NotebookCellModelProps): interfaces.Container {
     const child = parent.createChild();
 
@@ -109,15 +107,6 @@ export class NotebookCellModel implements NotebookCell, Disposable {
     protected readonly onDidChangeLanguageEmitter = new Emitter<string>();
     readonly onDidChangeLanguage = this.onDidChangeLanguageEmitter.event;
 
-    protected readonly onDidRequestCellEditChangeEmitter = new Emitter<boolean>();
-    readonly onDidRequestCellEditChange = this.onDidRequestCellEditChangeEmitter.event;
-
-    protected readonly onWillFocusCellEditorEmitter = new Emitter<CellEditorFocusRequest>();
-    readonly onWillFocusCellEditor = this.onWillFocusCellEditorEmitter.event;
-
-    protected readonly onWillBlurCellEditorEmitter = new Emitter<void>();
-    readonly onWillBlurCellEditor = this.onWillBlurCellEditorEmitter.event;
-
     protected readonly onDidChangeEditorOptionsEmitter = new Emitter<MonacoEditor.IOptions>();
     readonly onDidChangeEditorOptions = this.onDidChangeEditorOptionsEmitter.event;
 
@@ -165,7 +154,7 @@ export class NotebookCellModel implements NotebookCell, Disposable {
 
     protected _metadata: NotebookCellMetadata;
 
-    protected toDispose = new DisposableCollection();
+    toDispose = new DisposableCollection();
 
     protected _internalMetadata: NotebookCellInternalMetadata;
 
@@ -190,6 +179,10 @@ export class NotebookCellModel implements NotebookCell, Disposable {
         return this.textModel && !this.textModel.isDisposed() ? this.textModel.getText() : this.source;
     }
 
+    get isTextModelWritable(): boolean {
+        return !this.textModel || !this.textModel.readOnly;
+    }
+
     get source(): string {
         return this.props.source;
     }
@@ -231,11 +224,6 @@ export class NotebookCellModel implements NotebookCell, Disposable {
         return this.props.cellKind;
     }
 
-    protected _editing: boolean = false;
-    get editing(): boolean {
-        return this._editing;
-    }
-
     protected _editorOptions: MonacoEditor.IOptions = {};
     get editorOptions(): Readonly<MonacoEditor.IOptions> {
         return this._editorOptions;
@@ -309,28 +297,6 @@ export class NotebookCellModel implements NotebookCell, Disposable {
         this.toDispose.dispose();
     }
 
-    requestEdit(): void {
-        if (!this.textModel || !this.textModel.readOnly) {
-            this._editing = true;
-            this.onDidRequestCellEditChangeEmitter.fire(true);
-        }
-    }
-
-    requestStopEdit(): void {
-        this._editing = false;
-        this.onDidRequestCellEditChangeEmitter.fire(false);
-    }
-
-    requestFocusEditor(focusRequest?: CellEditorFocusRequest): void {
-        this.requestEdit();
-        this.onWillFocusCellEditorEmitter.fire(focusRequest);
-    }
-
-    requestBlurEditor(): void {
-        this.requestStopEdit();
-        this.onWillBlurCellEditorEmitter.fire();
-    }
-
     requestCenterEditor(): void {
         this.onDidRequestCenterEditorEmitter.fire();
     }
@@ -404,6 +370,7 @@ export class NotebookCellModel implements NotebookCell, Disposable {
         this.toDispose.push(ref);
         this.toDispose.push(this.textModel.onDidChangeContent(e => {
             this.props.source = e.model.getText();
+            this.onDidChangeContentEmitter.fire('content');
         }));
         return ref.object;
     }
@@ -422,8 +389,8 @@ export class NotebookCellModel implements NotebookCell, Disposable {
     }
 
     findMatches(options: NotebookEditorFindMatchOptions): NotebookEditorFindMatch[] {
-        if (this.cellKind === CellKind.Markup && !this.editing) {
-            return this.onMarkdownFind?.(options) ?? [];
+        if (this.cellKind === CellKind.Markup && this.onMarkdownFind) {
+            return this.onMarkdownFind(options) ?? [];
         }
         if (!this.textModel) {
             return [];

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

@@ -58,11 +58,6 @@ export interface NotebookModelProps {
     serializer: NotebookSerializer;
 }
 
-export interface SelectedCellChangeEvent {
-    cell: NotebookCellModel | undefined;
-    scrollIntoView: boolean;
-}
-
 @injectable()
 export class NotebookModel implements Saveable, Disposable {
 
@@ -81,9 +76,6 @@ export class NotebookModel implements Saveable, Disposable {
     protected readonly onContentChangedEmitter = new Emitter<void>();
     readonly onContentChanged = this.onContentChangedEmitter.event;
 
-    protected readonly onDidChangeSelectedCellEmitter = new Emitter<SelectedCellChangeEvent>();
-    readonly onDidChangeSelectedCell = this.onDidChangeSelectedCellEmitter.event;
-
     protected readonly onDidDisposeEmitter = new Emitter<void>();
     readonly onDidDispose = this.onDidDisposeEmitter.event;
 
@@ -136,7 +128,6 @@ export class NotebookModel implements Saveable, Disposable {
         return this._selectedText;
     }
 
-    selectedCell?: NotebookCellModel;
     protected dirtyCells: NotebookCellModel[] = [];
 
     cells: NotebookCellModel[];
@@ -179,7 +170,6 @@ export class NotebookModel implements Saveable, Disposable {
         this.onDidSaveNotebookEmitter.dispose();
         this.onDidAddOrRemoveCellEmitter.dispose();
         this.onDidChangeContentEmitter.dispose();
-        this.onDidChangeSelectedCellEmitter.dispose();
         this.cells.forEach(cell => cell.dispose());
         this.onDidDisposeEmitter.fire();
     }
@@ -271,21 +261,11 @@ export class NotebookModel implements Saveable, Disposable {
         }
     }
 
-    setSelectedCell(cell: NotebookCellModel, scrollIntoView?: boolean): void {
-        if (this.selectedCell !== cell) {
-            this.selectedCell = cell;
-            this.onDidChangeSelectedCellEmitter.fire({ cell, scrollIntoView: scrollIntoView ?? true });
-        }
-    }
-
     private addCellOutputListeners(cells: NotebookCellModel[]): void {
         for (const cell of cells) {
             cell.onDidChangeOutputs(() => {
                 this.dirty = true;
             });
-            cell.onDidRequestCellEditChange(() => {
-                this.onContentChangedEmitter.fire();
-            });
         }
     }
 
@@ -318,11 +298,9 @@ export class NotebookModel implements Saveable, Disposable {
                 this.cellDirtyChanged(cell, true);
             }
 
-            let scrollIntoView = true;
             switch (edit.editType) {
                 case CellEditType.Replace:
                     this.replaceCells(edit.index, edit.count, edit.cells, computeUndoRedo, true);
-                    scrollIntoView = edit.cells.length > 0;
                     break;
                 case CellEditType.Output: {
                     if (edit.append) {
@@ -362,11 +340,6 @@ export class NotebookModel implements Saveable, Disposable {
                     this.moveCellToIndex(cellIndex, edit.length, edit.newIdx, computeUndoRedo);
                     break;
             }
-
-            // if selected cell is affected update it because it can potentially have been replaced
-            if (cell === this.selectedCell) {
-                this.setSelectedCell(this.cells[Math.min(cellIndex, this.cells.length - 1)], scrollIntoView);
-            }
         }
 
         this.fireContentChange();
@@ -377,7 +350,7 @@ export class NotebookModel implements Saveable, Disposable {
         this.onContentChangedEmitter.fire();
     }
 
-    protected replaceCells(start: number, deleteCount: number, newCells: CellData[], computeUndoRedo: boolean, requestEdit: boolean): void {
+    protected replaceCells(start: number, deleteCount: number, newCells: CellData[], computeUndoRedo: boolean, externalEvent: boolean): void {
         const cells = newCells.map(cell => {
             const handle = this.nextHandle++;
             return this.cellModelFactory({
@@ -420,12 +393,8 @@ export class NotebookModel implements Saveable, Disposable {
             );
         }
 
-        this.onDidAddOrRemoveCellEmitter.fire({ rawEvent: { kind: NotebookCellsChangeType.ModelChange, changes }, newCellIds: cells.map(cell => cell.handle) });
+        this.onDidAddOrRemoveCellEmitter.fire({ rawEvent: { kind: NotebookCellsChangeType.ModelChange, changes }, newCellIds: cells.map(cell => cell.handle), externalEvent });
         this.onDidChangeContentEmitter.queue({ kind: NotebookCellsChangeType.ModelChange, changes });
-        if (cells.length > 0 && requestEdit) {
-            this.setSelectedCell(cells[cells.length - 1]);
-            cells[cells.length - 1].requestEdit();
-        }
     }
 
     protected changeCellInternalMetadataPartial(cell: NotebookCellModel, internalMetadata: NullablePartialNotebookCellInternalMetadata): void {