@codingame/monaco-vscode-notebook-service-override 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js

@@ -0,0 +1,37 @@
+
+import 'vscode/vscode/vs/base/common/event';
+import 'vscode/vscode/vs/base/common/htmlContent';
+import 'vscode/vscode/vs/base/common/filters';
+import 'vscode/vscode/vs/base/common/strings';
+import 'vscode/vscode/vs/base/common/themables';
+import 'vscode/vscode/vs/base/common/keyCodes';
+import 'vscode/vscode/vs/base/common/lifecycle';
+import 'marked';
+import 'vscode/vscode/vs/base/common/charCode';
+import 'vscode/vscode/vs/base/common/marshallingIds';
+import 'vscode/vscode/vs/base/common/path';
+import 'vscode/vscode/vs/base/common/platform';
+import 'vscode/vscode/vs/base/common/network';
+import 'vscode/vscode/vs/base/common/resources';
+import 'vscode/vscode/vs/base/browser/dom';
+import 'vscode/vscode/vs/base/browser/dompurify/dompurify';
+import 'vscode/vscode/vs/base/browser/formattedTextRenderer';
+import 'vscode/vscode/vs/base/browser/browser';
+import 'vscode/vscode/vs/base/common/keybindings';
+import 'vscode/vscode/vs/editor/contrib/documentSymbols/browser/outlineModel';
+import 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/editor/common/model';
+import 'vscode/vscode/vs/editor/contrib/folding/browser/foldingRanges';
+import 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import 'vscode/vscode/vs/base/common/codicons';
+import 'vscode/vscode/vs/platform/markers/common/markers';
+import '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookIcons';
+import 'vscode/vscode/vs/editor/common/languages';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+
+var NotebookOutlineConstants;
+(function (NotebookOutlineConstants) {
+    NotebookOutlineConstants[NotebookOutlineConstants["NonHeaderOutlineLevel"] = 7] = "NonHeaderOutlineLevel";
+})(NotebookOutlineConstants || (NotebookOutlineConstants = {}));
+
+export { NotebookOutlineConstants };

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.d.ts

@@ -0,0 +1,56 @@
+import { IResourceUndoRedoElement, UndoRedoElementType } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { ISelectionState, NotebookCellMetadata } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+export interface ITextCellEditingDelegate {
+    insertCell?(index: number, cell: NotebookCellTextModel, endSelections?: ISelectionState): void;
+    deleteCell?(index: number, endSelections?: ISelectionState): void;
+    replaceCell?(index: number, count: number, cells: NotebookCellTextModel[], endSelections?: ISelectionState): void;
+    moveCell?(fromIndex: number, length: number, toIndex: number, beforeSelections: ISelectionState | undefined, endSelections?: ISelectionState): void;
+    updateCellMetadata?(index: number, newMetadata: NotebookCellMetadata): void;
+}
+export declare class MoveCellEdit implements IResourceUndoRedoElement {
+    resource: URI;
+    private fromIndex;
+    private length;
+    private toIndex;
+    private editingDelegate;
+    private beforedSelections;
+    private endSelections;
+    type: UndoRedoElementType.Resource;
+    get label(): "Move Cell" | "Move Cells";
+    code: string;
+    constructor(resource: URI, fromIndex: number, length: number, toIndex: number, editingDelegate: ITextCellEditingDelegate, beforedSelections: ISelectionState | undefined, endSelections: ISelectionState | undefined);
+    undo(): void;
+    redo(): void;
+}
+export declare class SpliceCellsEdit implements IResourceUndoRedoElement {
+    resource: URI;
+    private diffs;
+    private editingDelegate;
+    private beforeHandles;
+    private endHandles;
+    type: UndoRedoElementType.Resource;
+    get label(): "Insert Cells" | "Insert Cell" | "Delete Cells" | "Delete Cell";
+    code: string;
+    constructor(resource: URI, diffs: [
+        number,
+        NotebookCellTextModel[],
+        NotebookCellTextModel[]
+    ][], editingDelegate: ITextCellEditingDelegate, beforeHandles: ISelectionState | undefined, endHandles: ISelectionState | undefined);
+    undo(): void;
+    redo(): void;
+}
+export declare class CellMetadataEdit implements IResourceUndoRedoElement {
+    resource: URI;
+    readonly index: number;
+    readonly oldMetadata: NotebookCellMetadata;
+    readonly newMetadata: NotebookCellMetadata;
+    private editingDelegate;
+    type: UndoRedoElementType.Resource;
+    label: string;
+    code: string;
+    constructor(resource: URI, index: number, oldMetadata: NotebookCellMetadata, newMetadata: NotebookCellMetadata, editingDelegate: ITextCellEditingDelegate);
+    undo(): void;
+    redo(): void | Promise<void>;
+}

package/vscode/src/vs/workbench/contrib/notebook/common/model/cellEdit.js

@@ -1,3 +1,6 @@
+
+import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+
 class MoveCellEdit {
     get label() {
         return this.length === 1 ? 'Move Cell' : 'Move Cells';
@@ -10,7 +13,7 @@ class MoveCellEdit {
         this.editingDelegate = editingDelegate;
         this.beforedSelections = beforedSelections;
         this.endSelections = endSelections;
-        this.type = 0 ;
+        this.type = UndoRedoElementType.Resource;
         this.code = 'undoredo.textBufferEdit';
     }
     undo() {
@@ -42,7 +45,7 @@ class SpliceCellsEdit {
         this.editingDelegate = editingDelegate;
         this.beforeHandles = beforeHandles;
         this.endHandles = endHandles;
-        this.type = 0 ;
+        this.type = UndoRedoElementType.Resource;
         this.code = 'undoredo.textBufferEdit';
     }
     undo() {
@@ -69,7 +72,7 @@ class CellMetadataEdit {
         this.oldMetadata = oldMetadata;
         this.newMetadata = newMetadata;
         this.editingDelegate = editingDelegate;
-        this.type = 0 ;
+        this.type = UndoRedoElementType.Resource;
         this.label = 'Update Cell Metadata';
         this.code = 'undoredo.textBufferEdit';
     }

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.d.ts

@@ -0,0 +1,101 @@
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { Position } from "vscode/vscode/vs/editor/common/core/position";
+import { ILanguageService } from "vscode/vscode/vs/editor/common/languages/language";
+import { FindMatch } from "vscode/vscode/vs/editor/common/model";
+import { IModelService } from "vscode/vscode/vs/editor/common/services/model";
+import { UndoRedoGroup } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo";
+import { IUndoRedoService } from "vscode/vscode/vs/platform/undoRedo/common/undoRedo.service";
+import { ILanguageDetectionService } from "vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service";
+import { ICellDto2, ICellEditOperation, INotebookSnapshotOptions, INotebookTextModel, ISelectionState, NotebookCellDefaultCollapseConfig, NotebookData, NotebookDocumentMetadata, NotebookTextModelChangedEvent, NotebookTextModelWillAddRemoveEvent, TransientOptions } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { INotebookExecutionStateService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+export declare class NotebookTextModel extends Disposable implements INotebookTextModel {
+    readonly viewType: string;
+    readonly uri: URI;
+    private readonly _undoService;
+    private readonly _modelService;
+    private readonly _languageService;
+    private readonly _languageDetectionService;
+    private readonly _notebookExecutionStateService;
+    private _isDisposed;
+    private readonly _onWillDispose;
+    private readonly _onWillAddRemoveCells;
+    private readonly _onDidChangeContent;
+    readonly onWillDispose: Event<void>;
+    readonly onWillAddRemoveCells: Event<NotebookTextModelWillAddRemoveEvent>;
+    readonly onDidChangeContent: Event<NotebookTextModelChangedEvent>;
+    private _cellhandlePool;
+    private readonly _cellListeners;
+    private _cells;
+    private _defaultCollapseConfig;
+    metadata: NotebookDocumentMetadata;
+    transientOptions: TransientOptions;
+    private _versionId;
+    private _notebookSpecificAlternativeId;
+    private _alternativeVersionId;
+    private _operationManager;
+    private _pauseableEmitter;
+    get length(): number;
+    get cells(): readonly NotebookCellTextModel[];
+    get versionId(): number;
+    get alternativeVersionId(): string;
+    get notebookType(): string;
+    constructor(viewType: string, uri: URI, cells: ICellDto2[], metadata: NotebookDocumentMetadata, options: TransientOptions, _undoService: IUndoRedoService, _modelService: IModelService, _languageService: ILanguageService, _languageDetectionService: ILanguageDetectionService, _notebookExecutionStateService: INotebookExecutionStateService);
+    setCellCollapseDefault(collapseConfig: NotebookCellDefaultCollapseConfig | undefined): void;
+    _initialize(cells: ICellDto2[], triggerDirty?: boolean): void;
+    private _bindCellContentHandler;
+    private _generateAlternativeId;
+    dispose(): void;
+    pushStackElement(): void;
+    private _getCellIndexByHandle;
+    private _getCellIndexWithOutputIdHandleFromEdits;
+    private _getCellIndexWithOutputIdHandle;
+    reset(cells: ICellDto2[], metadata: NotebookDocumentMetadata, transientOptions: TransientOptions): void;
+    createSnapshot(options: INotebookSnapshotOptions): NotebookData;
+    restoreSnapshot(snapshot: NotebookData, transientOptions?: TransientOptions): void;
+    static computeEdits(model: NotebookTextModel, cells: ICellDto2[], executingHandles?: number[]): ICellEditOperation[];
+    private static _computeOutputEdit;
+    private static _commonPrefix;
+    private static _commonSuffix;
+    applyEdits(rawEdits: ICellEditOperation[], synchronous: boolean, beginSelectionState: ISelectionState | undefined, endSelectionsComputer: () => ISelectionState | undefined, undoRedoGroup: UndoRedoGroup | undefined, computeUndoRedo: boolean): boolean;
+    private _doApplyEdits;
+    private _mergeCellEdits;
+    private _getDefaultCollapseState;
+    private _replaceCells;
+    private _increaseVersionId;
+    private _overwriteAlternativeVersionId;
+    private _updateNotebookCellMetadata;
+    private _insertNewCell;
+    private _removeCell;
+    private _replaceNewCells;
+    private _isDocumentMetadataChanged;
+    private _isCellMetadataChanged;
+    private _customMetadataEqual;
+    private _changeCellMetadataPartial;
+    private _changeCellMetadata;
+    private _changeCellInternalMetadataPartial;
+    private _changeCellLanguage;
+    private _spliceNotebookCellOutputs2;
+    private _spliceNotebookCellOutputs;
+    private _appendNotebookCellOutputItems;
+    private _replaceNotebookCellOutputItems;
+    private _moveCellToIdx;
+    private _assertIndex;
+    private _indexIsInvalid;
+    findNextMatch(searchString: string, searchStart: {
+        cellIndex: number;
+        position: Position;
+    }, isRegex: boolean, matchCase: boolean, wordSeparators: string | null, searchEnd?: {
+        cellIndex: number;
+        position: Position;
+    }): {
+        cell: NotebookCellTextModel;
+        match: FindMatch;
+    } | null;
+    findMatches(searchString: string, isRegex: boolean, matchCase: boolean, wordSeparators: string | null): {
+        cell: NotebookCellTextModel;
+        matches: FindMatch[];
+    }[];
+}

package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookTextModel.js

@@ -1,22 +1,28 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { PauseableEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
-import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
-import { NotebookCellTextModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
-import { CellUri, NotebookCellsChangeType, CellKind, diff } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
-import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { LcsDiff } from 'vscode/vscode/vs/base/common/diff/diff';
+import { PauseableEmitter, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { hash } from 'vscode/vscode/vs/base/common/hash';
-import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-chat-interactive-notebook-search-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
-import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { Disposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { filter } from 'vscode/vscode/vs/base/common/objects';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { isDefined } from 'vscode/vscode/vs/base/common/types';
-import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
+import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { TextModel } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { SearchParams } from 'vscode/vscode/vs/editor/common/model/textModelSearch';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { UndoRedoElementType } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo';
+import { IUndoRedoService } from 'vscode/vscode/vs/platform/undoRedo/common/undoRedo.service';
+import { ILanguageDetectionService } from 'vscode/vscode/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.service';
+import { SnapshotContext } from '@codingame/monaco-vscode-9d05a43d-c330-5ff1-937e-fde4a3852931-common/vscode/vs/workbench/services/workingCopy/common/fileWorkingCopy';
+import { CellUri, NotebookCellsChangeType, NotebookCellExecutionState, CellEditType, CellKind, diff } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
+import { INotebookExecutionStateService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service';
+import { SpliceCellsEdit, CellMetadataEdit, MoveCellEdit } from './cellEdit.js';
+import { NotebookCellOutputTextModel } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellOutputTextModel';
+import { NotebookCellTextModel } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel';
 
 var NotebookTextModel_1;
 class StackOperation {
@@ -34,7 +40,7 @@ class StackOperation {
         this._operations = [];
         this._beginSelectionState = undefined;
         this._resultSelectionState = undefined;
-        this.type = 1 ;
+        this.type = UndoRedoElementType.Workspace;
         this._beginSelectionState = selectionState;
         this._beginAlternativeVersionId = beginAlternativeVersionId;
         this._resultAlternativeVersionId = beginAlternativeVersionId;
@@ -158,7 +164,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     get notebookType() {
         return this.viewType;
     }
-    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService) {
+    constructor(viewType, uri, cells, metadata, options, _undoService, _modelService, _languageService, _languageDetectionService, _notebookExecutionStateService) {
         super();
         this.viewType = viewType;
         this.uri = uri;
@@ -166,6 +172,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         this._modelService = _modelService;
         this._languageService = _languageService;
         this._languageDetectionService = _languageDetectionService;
+        this._notebookExecutionStateService = _notebookExecutionStateService;
         this._isDisposed = false;
         this._onWillDispose = this._register(( new Emitter()));
         this._onWillAddRemoveCells = this._register(( new Emitter()));
@@ -354,19 +361,57 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     }
     reset(cells, metadata, transientOptions) {
         this.transientOptions = transientOptions;
-        const edits = NotebookTextModel_1.computeEdits(this, cells);
+        const executions = this._notebookExecutionStateService.getCellExecutionsForNotebook(this.uri);
+        const executingCellHandles = ( executions.filter(exe => exe.state === NotebookCellExecutionState.Executing).map(exe => exe.cellHandle));
+        const edits = NotebookTextModel_1.computeEdits(this, cells, executingCellHandles);
         this.applyEdits([
             ...edits,
-            { editType: 5 , metadata }
+            { editType: CellEditType.DocumentMetadata, metadata }
         ], true, undefined, () => undefined, undefined, false);
     }
-    static computeEdits(model, cells) {
+    createSnapshot(options) {
+        const transientOptions = options.transientOptions ?? this.transientOptions;
+        const data = {
+            metadata: filter(this.metadata, key => !transientOptions.transientDocumentMetadata[key]),
+            cells: [],
+        };
+        let outputSize = 0;
+        for (const cell of this.cells) {
+            const cellData = {
+                cellKind: cell.cellKind,
+                language: cell.language,
+                mime: cell.mime,
+                source: cell.getValue(),
+                outputs: [],
+                internalMetadata: cell.internalMetadata
+            };
+            if (options.context === SnapshotContext.Backup && options.outputSizeLimit > 0) {
+                cell.outputs.forEach(output => {
+                    output.outputs.forEach(item => {
+                        outputSize += item.data.byteLength;
+                    });
+                });
+                if (outputSize > options.outputSizeLimit) {
+                    throw ( new Error('Notebook too large to backup'));
+                }
+            }
+            cellData.outputs = !transientOptions.transientOutputs ? cell.outputs : [];
+            cellData.metadata = filter(cell.metadata, key => !transientOptions.transientCellMetadata[key]);
+            data.cells.push(cellData);
+        }
+        return data;
+    }
+    restoreSnapshot(snapshot, transientOptions) {
+        this.reset(snapshot.cells, snapshot.metadata, transientOptions ?? this.transientOptions);
+    }
+    static computeEdits(model, cells, executingHandles = []) {
         const edits = [];
-        const commonPrefix = this._commonPrefix(model.cells, model.cells.length, 0, cells, cells.length, 0);
+        const isExecuting = (cell) => executingHandles.includes(cell.handle);
+        const commonPrefix = this._commonPrefix(model.cells, model.cells.length, 0, cells, cells.length, 0, isExecuting);
         if (commonPrefix > 0) {
             for (let i = 0; i < commonPrefix; i++) {
                 edits.push({
-                    editType: 3 ,
+                    editType: CellEditType.Metadata,
                     index: i,
                     metadata: cells[i].metadata ?? {}
                 }, ...this._computeOutputEdit(i, model.cells[i].outputs, cells[i].outputs));
@@ -375,20 +420,20 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (model.cells.length === cells.length && commonPrefix === model.cells.length) {
             return edits;
         }
-        const commonSuffix = this._commonSuffix(model.cells, model.cells.length - commonPrefix, commonPrefix, cells, cells.length - commonPrefix, commonPrefix);
+        const commonSuffix = this._commonSuffix(model.cells, model.cells.length - commonPrefix, commonPrefix, cells, cells.length - commonPrefix, commonPrefix, isExecuting);
         if (commonSuffix > 0) {
-            edits.push({ editType: 1 , index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
+            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix - commonSuffix, cells: cells.slice(commonPrefix, cells.length - commonSuffix) });
         }
         else if (commonPrefix > 0) {
-            edits.push({ editType: 1 , index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
+            edits.push({ editType: CellEditType.Replace, index: commonPrefix, count: model.cells.length - commonPrefix, cells: cells.slice(commonPrefix) });
         }
         else {
-            edits.push({ editType: 1 , index: 0, count: model.cells.length, cells });
+            edits.push({ editType: CellEditType.Replace, index: 0, count: model.cells.length, cells });
         }
         if (commonSuffix > 0) {
             for (let i = commonSuffix; i > 0; i--) {
                 edits.push({
-                    editType: 3 ,
+                    editType: CellEditType.Metadata,
                     index: model.cells.length - i,
                     metadata: cells[cells.length - i].metadata ?? {}
                 }, ...this._computeOutputEdit(model.cells.length - i, model.cells[model.cells.length - i].outputs, cells[cells.length - i].outputs));
@@ -400,7 +445,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         if (a.length !== b.length) {
             return [
                 {
-                    editType: 2 ,
+                    editType: CellEditType.Output,
                     index: index,
                     outputs: b,
                     append: false
@@ -412,25 +457,25 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         return ( b.map((output, i) => {
             return {
-                editType: 7 ,
+                editType: CellEditType.OutputItems,
                 outputId: a[i].outputId,
                 items: output.outputs,
                 append: false
             };
         }));
     }
-    static _commonPrefix(a, aLen, aDelta, b, bLen, bDelta) {
+    static _commonPrefix(a, aLen, aDelta, b, bLen, bDelta, isExecuting) {
         const maxResult = Math.min(aLen, bLen);
         let result = 0;
-        for (let i = 0; i < maxResult && a[aDelta + i].fastEqual(b[bDelta + i]); i++) {
+        for (let i = 0; i < maxResult && a[aDelta + i].fastEqual(b[bDelta + i], isExecuting(a[aDelta + i])); i++) {
             result++;
         }
         return result;
     }
-    static _commonSuffix(a, aLen, aDelta, b, bLen, bDelta) {
+    static _commonSuffix(a, aLen, aDelta, b, bLen, bDelta, isExecuting) {
         const maxResult = Math.min(aLen, bLen);
         let result = 0;
-        for (let i = 0; i < maxResult && a[aDelta + aLen - i - 1].fastEqual(b[bDelta + bLen - i - 1]); i++) {
+        for (let i = 0; i < maxResult && a[aDelta + aLen - i - 1].fastEqual(b[bDelta + bLen - i - 1], isExecuting(a[aDelta + aLen - i - 1])); i++) {
             result++;
         }
         return result;
@@ -471,15 +516,15 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     return null;
                 }
             }
-            else if (edit.editType !== 5 ) {
+            else if (edit.editType !== CellEditType.DocumentMetadata) {
                 throw ( new Error('Invalid cell edit'));
             }
             return {
                 edit,
                 cellIndex,
-                end: ((edit.editType === 5) )
+                end: (edit.editType === CellEditType.DocumentMetadata)
                     ? undefined
-                    : (edit.editType === 1  ? edit.index + edit.count : cellIndex),
+                    : (edit.editType === CellEditType.Replace ? edit.index + edit.count : cellIndex),
                 originalIndex: index
             };
         })).filter(isDefined);
@@ -511,7 +556,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const replaceEdits = [];
             const otherEdits = [];
             editsOnSameIndex.forEach(edit => {
-                if (edit.edit.editType === 1 ) {
+                if (edit.edit.editType === CellEditType.Replace) {
                     replaceEdits.push(edit);
                 }
                 else {
@@ -523,10 +568,10 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         const flattenEdits = edits.flat();
         for (const { edit, cellIndex } of flattenEdits) {
             switch (edit.editType) {
-                case 1 :
+                case CellEditType.Replace:
                     this._replaceCells(edit.index, edit.count, edit.cells, synchronous, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 2 : {
+                case CellEditType.Output: {
                     this._assertIndex(cellIndex);
                     const cell = this._cells[cellIndex];
                     if (edit.append) {
@@ -537,7 +582,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                     }
                     break;
                 }
-                case 7 :
+                case CellEditType.OutputItems:
                     {
                         this._assertIndex(cellIndex);
                         const cell = this._cells[cellIndex];
@@ -549,26 +594,26 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                         }
                     }
                     break;
-                case 3 :
+                case CellEditType.Metadata:
                     this._assertIndex(edit.index);
                     this._changeCellMetadata(this._cells[edit.index], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 8 :
+                case CellEditType.PartialMetadata:
                     this._assertIndex(cellIndex);
                     this._changeCellMetadataPartial(this._cells[cellIndex], edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 9 :
+                case CellEditType.PartialInternalMetadata:
                     this._assertIndex(cellIndex);
                     this._changeCellInternalMetadataPartial(this._cells[cellIndex], edit.internalMetadata);
                     break;
-                case 4 :
+                case CellEditType.CellLanguage:
                     this._assertIndex(edit.index);
                     this._changeCellLanguage(this._cells[edit.index], edit.language, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 5 :
+                case CellEditType.DocumentMetadata:
                     this._updateNotebookCellMetadata(edit.metadata, computeUndoRedo, beginSelectionState, undoRedoGroup);
                     break;
-                case 6 :
+                case CellEditType.Move:
                     this._moveCellToIdx(edit.index, edit.length, edit.newIdx, synchronous, computeUndoRedo, beginSelectionState, undefined, undoRedoGroup);
                     break;
             }
@@ -579,17 +624,17 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         rawEdits.forEach(edit => {
             if (mergedEdits.length) {
                 const last = mergedEdits[mergedEdits.length - 1];
-                if (last.edit.editType === 2
+                if (last.edit.editType === CellEditType.Output
                     && last.edit.append
-                    && edit.edit.editType === 2
+                    && edit.edit.editType === CellEditType.Output
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.outputs = [...last.edit.outputs, ...edit.edit.outputs];
                 }
-                else if (last.edit.editType === 2
+                else if (last.edit.editType === CellEditType.Output
                     && !last.edit.append
                     && last.edit.outputs.length === 0
-                    && edit.edit.editType === 2
+                    && edit.edit.editType === CellEditType.Output
                     && edit.edit.append
                     && last.cellIndex === edit.cellIndex) {
                     last.edit.append = false;
@@ -702,7 +747,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
                 const that = this;
                 this._operationManager.pushEditOperation(new (class {
                     constructor() {
-                        this.type = 0 ;
+                        this.type = UndoRedoElementType.Resource;
                         this.label = 'Update Cell Metadata';
                         this.code = 'undoredo.textBufferEdit';
                     }
@@ -893,7 +938,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
             const that = this;
             this._operationManager.pushEditOperation(new (class {
                 constructor() {
-                    this.type = 0 ;
+                    this.type = UndoRedoElementType.Resource;
                     this.label = 'Update Cell Language';
                     this.code = 'undoredo.textBufferEdit';
                 }
@@ -1011,7 +1056,7 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
     _indexIsInvalid(index) {
         return index < 0 || index >= this._cells.length;
     }
-    findNextMatch(searchString, searchStart, isRegex, matchCase, wordSeparators) {
+    findNextMatch(searchString, searchStart, isRegex, matchCase, wordSeparators, searchEnd) {
         this._assertIndex(searchStart.cellIndex);
         const searchParams = ( new SearchParams(searchString, isRegex, matchCase, wordSeparators));
         const searchData = searchParams.parseSearchRequest();
@@ -1020,29 +1065,60 @@ let NotebookTextModel = NotebookTextModel_1 = class NotebookTextModel extends Di
         }
         let cellIndex = searchStart.cellIndex;
         let searchStartPosition = searchStart.position;
-        while (cellIndex < this._cells.length) {
+        let searchEndCell = this._cells.length;
+        while (cellIndex < searchEndCell) {
             const cell = this._cells[cellIndex];
+            const wrapFlag = searchEnd && cellIndex === searchEnd.cellIndex && searchStartPosition.isBefore(searchEnd.position);
             const searchRange = ( new Range(
                 searchStartPosition.lineNumber,
                 searchStartPosition.column,
-                cell.textBuffer.getLineCount(),
-                cell.textBuffer.getLineMaxColumn(cell.textBuffer.getLineCount())
+                (wrapFlag) ? searchEnd.position.lineNumber : cell.textBuffer.getLineCount(),
+                (wrapFlag) ? searchEnd.position.column : cell.textBuffer.getLineMaxColumn(cell.textBuffer.getLineCount())
             ));
             const result = cell.textBuffer.findMatchesLineByLine(searchRange, searchData, false, 1);
             if (result.length > 0) {
                 return { cell, match: result[0] };
             }
+            else if (wrapFlag) {
+                break;
+            }
             cellIndex++;
-            searchStartPosition = { lineNumber: 1, column: 1 };
+            if (searchEnd && cellIndex >= this._cells.length) {
+                cellIndex = 0;
+                searchEndCell = searchEnd.cellIndex + 1;
+            }
+            searchStartPosition = ( new Position(1, 1));
         }
         return null;
     }
+    findMatches(searchString, isRegex, matchCase, wordSeparators) {
+        const searchParams = ( new SearchParams(searchString, isRegex, matchCase, wordSeparators));
+        const searchData = searchParams.parseSearchRequest();
+        if (!searchData) {
+            return [];
+        }
+        const results = [];
+        for (const cell of this._cells) {
+            const searchRange = ( new Range(
+                1,
+                1,
+                cell.textBuffer.getLineCount(),
+                cell.textBuffer.getLineMaxColumn(cell.textBuffer.getLineCount())
+            ));
+            const matches = cell.textBuffer.findMatchesLineByLine(searchRange, searchData, false, 1000);
+            if (matches.length > 0) {
+                results.push({ cell, matches: matches });
+            }
+        }
+        return results;
+    }
 };
 NotebookTextModel = NotebookTextModel_1 = ( __decorate([
     ( __param(5, IUndoRedoService)),
     ( __param(6, IModelService)),
     ( __param(7, ILanguageService)),
-    ( __param(8, ILanguageDetectionService))
+    ( __param(8, ILanguageDetectionService)),
+    ( __param(9, INotebookExecutionStateService))
 ], NotebookTextModel));
 class OutputSequence {
     constructor(outputs) {

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverServiceImpl.d.ts

@@ -0,0 +1,29 @@
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+import { IResolvedNotebookEditorModel, NotebookEditorModelCreationOptions } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
+import { IReference } from "vscode/vscode/vs/base/common/lifecycle";
+import { INotebookService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
+import { Event } from "vscode/vscode/vs/base/common/event";
+import { IExtensionService } from "vscode/vscode/vs/workbench/services/extensions/common/extensions.service";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { INotebookConflictEvent, IUntitledNotebookResource } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService";
+import { INotebookEditorModelResolverService } from "vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service";
+export declare class NotebookModelResolverServiceImpl implements INotebookEditorModelResolverService {
+    private readonly _notebookService;
+    private readonly _extensionService;
+    private readonly _uriIdentService;
+    readonly _serviceBrand: undefined;
+    private readonly _data;
+    readonly onDidSaveNotebook: Event<URI>;
+    readonly onDidChangeDirty: Event<IResolvedNotebookEditorModel>;
+    private readonly _onWillFailWithConflict;
+    readonly onWillFailWithConflict: Event<INotebookConflictEvent>;
+    constructor(instantiationService: IInstantiationService, _notebookService: INotebookService, _extensionService: IExtensionService, _uriIdentService: IUriIdentityService);
+    dispose(): void;
+    isDirty(resource: URI): boolean;
+    private createUntitledUri;
+    private validateResourceViewType;
+    createUntitledNotebookTextModel(viewType: string): Promise<import("./model/notebookTextModel.js").NotebookTextModel>;
+    resolve(resource: URI, viewType?: string, options?: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+    resolve(resource: IUntitledNotebookResource, viewType: string, options: NotebookEditorModelCreationOptions): Promise<IReference<IResolvedNotebookEditorModel>>;
+}