@codingame/monaco-vscode-notebook-service-override 14.0.6 → 15.0.1

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.d.ts

@@ -1,12 +1,9 @@
-import { Disposable, DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
-import { NotebookTextModel } from "../../../common/model/notebookTextModel.js";
-import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
-import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { NotebookCellTextModel } from "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
+import { IEditorWorkerService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service";
+import { NotebookCellTextModel } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/common/model/notebookCellTextModel";
 import { INotebookOriginalCellModelFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.service";
 export declare class NotebookCellDiffDecorator extends DisposableStore {
     readonly modifiedCell: NotebookCellTextModel;
@@ -25,36 +22,3 @@ export declare class NotebookCellDiffDecorator extends DisposableStore {
     private getOrCreateOriginalModel;
     private _updateWithDiff;
 }
-export declare class NotebookInsertedCellDecorator extends Disposable {
-    private readonly notebookEditor;
-    private readonly decorators;
-    constructor(notebookEditor: INotebookEditor);
-    apply(diffInfo: CellDiffInfo[]): void;
-    clear(): void;
-}
-export interface INotebookDeletedCellDecorator {
-    getTop(deletedIndex: number): number | undefined;
-}
-export declare class NotebookDeletedCellDecorator extends Disposable implements INotebookDeletedCellDecorator {
-    private readonly _notebookEditor;
-    private readonly languageService;
-    private readonly zoneRemover;
-    private readonly createdViewZones;
-    private readonly deletedCellInfos;
-    constructor(_notebookEditor: INotebookEditor, languageService: ILanguageService);
-    getTop(deletedIndex: number): number | undefined;
-    apply(diffInfo: CellDiffInfo[], original: NotebookTextModel): void;
-    clear(): void;
-    private _createWidget;
-    private _createWidgetImpl;
-}
-export declare class NotebookDeletedCellWidget extends Disposable {
-    private readonly _notebookEditor;
-    private readonly code;
-    private readonly language;
-    readonly originalIndex: number;
-    private readonly languageService;
-    private readonly container;
-    constructor(_notebookEditor: INotebookEditor, code: string, language: string, container: HTMLElement, originalIndex: number, languageService: ILanguageService);
-    render(): Promise<number>;
-}

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookCellDecorators.js

@@ -1,17 +1,11 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { DisposableStore, toDisposable, Disposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ChatEditingSessionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
 import { EditorOption } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { RenderOptions, LineSource, renderLines } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines';
@@ -20,14 +14,12 @@ import { TrackedRangeStickiness, MinimapPosition, OverviewRulerLane } from '@cod
 import { ModelDecorationOptions } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/textModel';
 import { InlineDecoration, InlineDecorationType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/viewModel';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { tokenizeToString } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/textToHtmlTokenizer';
-import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { createTrustedTypesPolicy } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/trustedTypes';
-import { splitLines } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
-import { DefaultLineHeight } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel';
 import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.service';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { overviewRulerModifiedForeground, minimapGutterModifiedBackground, overviewRulerAddedForeground, minimapGutterAddedBackground, overviewRulerDeletedForeground, minimapGutterDeletedBackground } from '@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
 
 let NotebookCellDiffDecorator = class NotebookCellDiffDecorator extends DisposableStore {
     constructor(notebookEditor, modifiedCell, originalCell, _chatEditingService, _editorWorkerService, originalCellModelFactory) {
@@ -72,15 +64,13 @@ let NotebookCellDiffDecorator = class NotebookCellDiffDecorator extends Disposab
             }
         }));
         const shouldBeReadOnly = derived(this, r => {
-            const editor = editorObs.read(r);
-            if (!editor) {
-                return false;
-            }
-            const value = this._chatEditingService.currentEditingSessionObs.read(r);
-            if (!value || value.state.read(r) !== ChatEditingSessionState.StreamingEdits) {
+            const editorUri = editorObs.read(r)?.getModel()?.uri;
+            if (!editorUri) {
                 return false;
             }
-            return ( value.entries.read(r).some(e => isEqual(e.modifiedURI, editor.getModel()?.uri)));
+            const sessions = this._chatEditingService.editingSessionsObs.read(r);
+            const session = sessions.find(s => ( s.entries.read(r).some(e => isEqual(e.modifiedURI, editorUri))));
+            return session?.state.read(r) === ChatEditingSessionState.StreamingEdits;
         });
         let actualReadonly;
         let actualDeco;
@@ -270,200 +260,6 @@ NotebookCellDiffDecorator = ( __decorate([
     ( __param(4, IEditorWorkerService)),
     ( __param(5, INotebookOriginalCellModelFactory))
 ], NotebookCellDiffDecorator));
-class NotebookInsertedCellDecorator extends Disposable {
-    constructor(notebookEditor) {
-        super();
-        this.notebookEditor = notebookEditor;
-        this.decorators = this._register(( new DisposableStore()));
-    }
-    apply(diffInfo) {
-        const model = this.notebookEditor.textModel;
-        if (!model) {
-            return;
-        }
-        const cells = ( diffInfo.filter(diff => diff.type === 'insert').map((diff) => model.cells[diff.modifiedCellIndex]));
-        const ids = this.notebookEditor.deltaCellDecorations([], ( cells.map(cell => ({
-            handle: cell.handle,
-            options: { className: 'nb-insertHighlight', outputClassName: 'nb-insertHighlight' }
-        }))));
-        this.clear();
-        this.decorators.add(toDisposable(() => {
-            if (!this.notebookEditor.isDisposed) {
-                this.notebookEditor.deltaCellDecorations(ids, []);
-            }
-        }));
-    }
-    clear() {
-        this.decorators.clear();
-    }
-}
-const ttPolicy = createTrustedTypesPolicy('notebookChatEditController', { createHTML: value => value });
-let NotebookDeletedCellDecorator = class NotebookDeletedCellDecorator extends Disposable {
-    constructor(_notebookEditor, languageService) {
-        super();
-        this._notebookEditor = _notebookEditor;
-        this.languageService = languageService;
-        this.zoneRemover = this._register(( new DisposableStore()));
-        this.createdViewZones = ( new Map());
-        this.deletedCellInfos = ( new Map());
-    }
-    getTop(deletedIndex) {
-        const info = this.deletedCellInfos.get(deletedIndex);
-        if (!info) {
-            return;
-        }
-        const cells = this._notebookEditor.getCellsInRange({ start: info.previousIndex, end: info.previousIndex + 1 });
-        if (!cells.length) {
-            return;
-        }
-        const cell = cells[0];
-        const cellHeight = this._notebookEditor.getHeightOfElement(cell);
-        const top = this._notebookEditor.getAbsoluteTopOfElement(cell);
-        return top + cellHeight + info.offset;
-    }
-    apply(diffInfo, original) {
-        this.clear();
-        let currentIndex = 0;
-        const deletedCellsToRender = { cells: [], index: 0 };
-        diffInfo.forEach(diff => {
-            if (diff.type === 'delete') {
-                const deletedCell = original.cells[diff.originalCellIndex];
-                if (deletedCell) {
-                    deletedCellsToRender.cells.push({ cell: deletedCell, originalIndex: diff.originalCellIndex, previousIndex: currentIndex });
-                    deletedCellsToRender.index = currentIndex;
-                }
-            }
-            else {
-                if (deletedCellsToRender.cells.length) {
-                    this._createWidget(deletedCellsToRender.index + 1, deletedCellsToRender.cells);
-                    deletedCellsToRender.cells.length = 0;
-                }
-                currentIndex = diff.modifiedCellIndex;
-            }
-        });
-        if (deletedCellsToRender.cells.length) {
-            this._createWidget(deletedCellsToRender.index + 1, deletedCellsToRender.cells);
-        }
-    }
-    clear() {
-        this.deletedCellInfos.clear();
-        this.zoneRemover.clear();
-    }
-    _createWidget(index, cells) {
-        this._createWidgetImpl(index, cells);
-    }
-    async _createWidgetImpl(index, cells) {
-        const rootContainer = document.createElement('div');
-        const widgets = [];
-        const heights = await Promise.all(( cells.map(async (cell) => {
-            const widget = ( new NotebookDeletedCellWidget(
-                this._notebookEditor,
-                cell.cell.getValue(),
-                cell.cell.language,
-                rootContainer,
-                cell.originalIndex,
-                this.languageService
-            ));
-            widgets.push(widget);
-            const height = await widget.render();
-            this.deletedCellInfos.set(cell.originalIndex, { height, previousIndex: cell.previousIndex, offset: 0 });
-            return height;
-        })));
-        Array.from(( this.deletedCellInfos.keys())).sort((a, b) => a - b).forEach((originalIndex) => {
-            const previousDeletedCell = this.deletedCellInfos.get(originalIndex - 1);
-            if (previousDeletedCell) {
-                const deletedCell = this.deletedCellInfos.get(originalIndex);
-                if (deletedCell) {
-                    deletedCell.offset = previousDeletedCell.height + previousDeletedCell.offset;
-                }
-            }
-        });
-        const totalHeight = heights.reduce((prev, curr) => prev + curr, 0);
-        this._notebookEditor.changeViewZones(accessor => {
-            const notebookViewZone = {
-                afterModelPosition: index,
-                heightInPx: totalHeight + 4,
-                domNode: rootContainer
-            };
-            const id = accessor.addZone(notebookViewZone);
-            accessor.layoutZone(id);
-            this.createdViewZones.set(index, id);
-            this.zoneRemover.add(toDisposable(() => {
-                if (this.createdViewZones.get(index) === id) {
-                    this.createdViewZones.delete(index);
-                }
-                if (!this._notebookEditor.isDisposed) {
-                    this._notebookEditor.changeViewZones(accessor => {
-                        accessor.removeZone(id);
-                        dispose(widgets);
-                    });
-                }
-            }));
-        });
-    }
-};
-NotebookDeletedCellDecorator = ( __decorate([
-    ( __param(1, ILanguageService))
-], NotebookDeletedCellDecorator));
-let NotebookDeletedCellWidget = class NotebookDeletedCellWidget extends Disposable {
-    constructor(_notebookEditor,
-    code, language, container, originalIndex, languageService) {
-        super();
-        this._notebookEditor = _notebookEditor;
-        this.code = code;
-        this.language = language;
-        this.originalIndex = originalIndex;
-        this.languageService = languageService;
-        this.container = append(container, document.createElement('div'));
-        this._register(toDisposable(() => {
-            container.removeChild(this.container);
-        }));
-    }
-    async render() {
-        const code = this.code;
-        const languageId = this.language;
-        const codeHtml = await tokenizeToString(this.languageService, code, languageId);
-        const fontInfo = this._notebookEditor.getBaseCellEditorOptions(languageId).value;
-        const fontFamilyVar = '--notebook-editor-font-family';
-        const fontSizeVar = '--notebook-editor-font-size';
-        const fontWeightVar = '--notebook-editor-font-weight';
-        const editor = ( this._notebookEditor.codeEditors.map(c => c[1])).find(c => c);
-        const layoutInfo = editor?.getOptions().get(EditorOption.layoutInfo);
-        const style = ``
-            + `font-family: var(${fontFamilyVar});`
-            + `font-weight: var(${fontWeightVar});`
-            + `font-size: var(${fontSizeVar});`
-            + fontInfo.lineHeight ? `line-height: ${fontInfo.lineHeight}px;` : ''
-            + layoutInfo?.contentLeft ? `margin-left: ${layoutInfo}px;` : ''
-            + `white-space: pre;`;
-        const rootContainer = this.container;
-        rootContainer.classList.add('code-cell-row');
-        const container = append(rootContainer, $('.cell-inner-container'));
-        const focusIndicatorLeft = append(container, $('.cell-focus-indicator.cell-focus-indicator-side.cell-focus-indicator-left'));
-        const cellContainer = append(container, $('.cell.code'));
-        append(focusIndicatorLeft, $('div.execution-count-label'));
-        const editorPart = append(cellContainer, $('.cell-editor-part'));
-        let editorContainer = append(editorPart, $('.cell-editor-container'));
-        editorContainer = append(editorContainer, $('.code', { style }));
-        if (fontInfo.fontFamily) {
-            editorContainer.style.setProperty(fontFamilyVar, fontInfo.fontFamily);
-        }
-        if (fontInfo.fontSize) {
-            editorContainer.style.setProperty(fontSizeVar, `${fontInfo.fontSize}px`);
-        }
-        if (fontInfo.fontWeight) {
-            editorContainer.style.setProperty(fontWeightVar, fontInfo.fontWeight);
-        }
-        editorContainer.innerHTML = (ttPolicy?.createHTML(codeHtml) || codeHtml);
-        const lineCount = splitLines(code).length;
-        const height = (lineCount * (fontInfo.lineHeight || DefaultLineHeight)) + 12 + 12;
-        const totalHeight = height + 16 + 16;
-        return totalHeight;
-    }
-};
-NotebookDeletedCellWidget = ( __decorate([
-    ( __param(5, ILanguageService))
-], NotebookDeletedCellWidget));
 function areDiffsEqual(a, b) {
     if (a && b) {
         if (a.changes.length !== b.changes.length) {
@@ -533,4 +329,4 @@ function areLineRangeMappinsEqual(a, b) {
     return true;
 }
 
-export { NotebookCellDiffDecorator, NotebookDeletedCellDecorator, NotebookDeletedCellWidget, NotebookInsertedCellDecorator };
+export { NotebookCellDiffDecorator };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.d.ts

@@ -1,12 +1,12 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
 import { IChatEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
-import { CellDiffInfo } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
-import { INotebookDeletedCellDecorator } from "./notebookCellDecorators.js";
+import { CellDiffInfo } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel";
+import { INotebookDeletedCellDecorator } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator";
 export declare class NotebookChatActionsOverlayController extends Disposable {
     private readonly notebookEditor;
     private readonly _chatEditingService;
@@ -14,7 +14,6 @@ export declare class NotebookChatActionsOverlayController extends Disposable {
 }
 export declare class NotebookChatActionsOverlay extends Disposable {
     private readonly notebookEditor;
-    private readonly _editorService;
     private readonly focusedDiff;
     private readonly toolbarNode;
     private added;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatActionsOverlay.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, toDisposable, MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
+import { getNotebookEditorFromEditorPane, CellEditState } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -11,16 +11,13 @@ import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { navigationBearingFakeActionId, AcceptAction, RejectAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatEditorActions';
+import { navigationBearingFakeActionId, AcceptAction, RejectAction } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorActions';
+import { ChatEditingModifiedDocumentEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
 let NotebookChatActionsOverlayController = class NotebookChatActionsOverlayController extends Disposable {
     constructor(notebookEditor, cellDiffInfo, deletedCellDecorator, _chatEditingService, instantiationService) {
@@ -29,9 +26,14 @@ let NotebookChatActionsOverlayController = class NotebookChatActionsOverlayContr
         this._chatEditingService = _chatEditingService;
         const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
         this._register(autorunWithStore((r, store) => {
-            const session = this._chatEditingService.currentEditingSessionObs.read(r);
             const model = notebookModel.read(r);
-            if (!model || !session) {
+            if (!model) {
+                return;
+            }
+            const sessions = this._chatEditingService.editingSessionsObs.read(r);
+            const session = sessions.find(s => s.readEntry(model.uri, r));
+            const entry = session?.readEntry(model.uri, r);
+            if (!session || !entry || !(entry instanceof ChatEditingModifiedDocumentEntry)) {
                 return;
             }
             const entries = session.entries.read(r);
@@ -53,7 +55,6 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
     constructor(notebookEditor, entry, cellDiffInfo, nextEntry, previousEntry, deletedCellDecorator, _editorService, instaService) {
         super();
         this.notebookEditor = notebookEditor;
-        this._editorService = _editorService;
         this.focusedDiff = observableValue('focusedDiff', undefined);
         this.added = false;
         this._register(notebookEditor.onDidBlurWidget(() => {
@@ -88,16 +89,15 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
             },
             menuOptions: { renderShortTitle: true },
             actionViewItemProvider: (action, options) => {
-                const that = this;
                 if (action.id === navigationBearingFakeActionId) {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: false, label: false, keybindingNotRenderedWithLabel: true });
                         }
-                    });
+                    }));
                 }
                 if (action.id === AcceptAction.ID || action.id === RejectAction.ID) {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: false, label: true, keybindingNotRenderedWithLabel: true });
                             this._reveal = this._store.add(( new MutableDisposable()));
@@ -115,32 +115,23 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
                                 if (entry === nextEntry) {
                                     return;
                                 }
-                                const change = nextEntry.diffInfo.get().changes.at(0);
-                                return that._editorService.openEditor({
-                                    resource: nextEntry.modifiedURI,
-                                    options: {
-                                        selection: change && Range.fromPositions({ lineNumber: change.original.startLineNumber, column: 1 }),
-                                        revealIfOpened: false,
-                                        revealIfVisible: false,
-                                    }
-                                }, ACTIVE_GROUP);
                             }));
                             this._reveal.value = store;
                         }
                         get actionRunner() {
                             return super.actionRunner;
                         }
-                    });
+                    }));
                 }
                 if (action.id === 'chatEditor.action.navigateNext' || action.id === 'chatEditor.action.navigatePrevious') {
-                    return new (class extends ActionViewItem {
+                    return this._register(new (class extends ActionViewItem {
                         constructor() {
                             super(undefined, action, { ...options, icon: true, label: false, keybindingNotRenderedWithLabel: true });
                         }
                         set actionRunner(_) {
                             const next = action.id === 'chatEditor.action.navigateNext' ? nextEntry : previousEntry;
                             const direction = action.id === 'chatEditor.action.navigateNext' ? 'next' : 'previous';
-                            super.actionRunner = ( new NextPreviousChangeActionRunner(
+                            super.actionRunner = this._register(( new NextPreviousChangeActionRunner(
                                 notebookEditor,
                                 cellDiffInfo,
                                 entry,
@@ -149,12 +140,12 @@ let NotebookChatActionsOverlay = class NotebookChatActionsOverlay extends Dispos
                                 _editorService,
                                 deletedCellDecorator,
                                 focusedDiff
-                            ));
+                            )));
                         }
                         get actionRunner() {
                             return super.actionRunner;
                         }
-                    });
+                    }));
                 }
                 return undefined;
             }
@@ -294,12 +285,10 @@ class NextPreviousChangeActionRunner extends ActionRunner {
         if (!this.canGoToNextEntry()) {
             return;
         }
-        const change = this.next.diffInfo.get().changes.at(0);
         this.focusedDiff.set(undefined, undefined);
         await this.editorService.openEditor({
             resource: this.next.modifiedURI,
             options: {
-                selection: change && Range.fromPositions({ lineNumber: change.original.startLineNumber, column: 1 }),
                 revealIfOpened: false,
                 revealIfVisible: false,
             }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
+import { INotebookEditor, INotebookEditorContribution } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/notebookBrowser";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 export declare class NotebookChatEditorControllerContrib extends Disposable implements INotebookEditorContribution {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditController.js

@@ -1,28 +1,25 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable, dispose, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
-import { derived, derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
-import { observableFromEvent, debouncedObservable2 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { NotebookDeletedCellDecorator, NotebookInsertedCellDecorator, NotebookCellDiffDecorator } from './notebookCellDecorators.js';
-import './notebookSynchronizer.js';
+import { NotebookCellDiffDecorator } from './notebookCellDecorators.js';
 import { INotebookModelSynchronizerFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.service';
-import './notebookOriginalModelRefFactory.js';
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service';
+import { observableFromEvent, debouncedObservable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { NotebookChatActionsOverlayController } from './notebookChatActionsOverlay.js';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { registerNotebookContribution } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/notebook/browser/notebookEditorExtensions';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import './notebookOriginalCellModelFactory.js';
-import { ctxNotebookHasEditorModification } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { ctxNotebookHasEditorModification } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookChatEditContext';
+import { NotebookDeletedCellDecorator } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookDeletedCellDecorator';
+import { NotebookInsertedCellDecorator } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookInsertedCellDecorator';
+import { ChatEditingModifiedDocumentEntry } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingModifiedDocumentEntry';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import { derived, derivedWithStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let NotebookChatEditorControllerContrib = class NotebookChatEditorControllerContrib extends Disposable {
     static { this.ID = 'workbench.notebook.chatEditorController'; }
@@ -44,13 +41,13 @@ let NotebookChatEditorController = class NotebookChatEditorController extends Di
         this.synchronizerFactory = synchronizerFactory;
         this.instantiationService = instantiationService;
         this._ctxHasEditorModification = ctxNotebookHasEditorModification.bindTo(contextKeyService);
-        this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor));
+        this.deletedCellDecorator = this._register(instantiationService.createInstance(NotebookDeletedCellDecorator, notebookEditor, undefined));
         this.insertedCellDecorator = this._register(instantiationService.createInstance(NotebookInsertedCellDecorator, notebookEditor));
         const notebookModel = observableFromEvent(this.notebookEditor.onDidChangeModel, e => e);
         const originalModel = observableValue('originalModel', undefined);
         const readyToRenderViewzones = observableValue('viewModelAttached', false);
         this._register(Event.once(this.notebookEditor.onDidAttachViewModel)(() => readyToRenderViewzones.set(true, undefined)));
-        const onDidChangeVisibleRanges = debouncedObservable2(observableFromEvent(this.notebookEditor.onDidChangeVisibleRanges, () => this.notebookEditor.visibleRanges), 50);
+        const onDidChangeVisibleRanges = debouncedObservable(observableFromEvent(this.notebookEditor.onDidChangeVisibleRanges, () => this.notebookEditor.visibleRanges), 50);
         const decorators = ( new Map());
         let updatedCellDecoratorsOnceBefore = false;
         let updatedDeletedInsertedDecoratorsOnceBefore = false;
@@ -63,12 +60,13 @@ let NotebookChatEditorController = class NotebookChatEditorController extends Di
         this._register(toDisposable(() => clearDecorators()));
         let notebookSynchronizer;
         const entryObs = derived((r) => {
-            const session = this._chatEditingService.currentEditingSessionObs.read(r);
             const model = notebookModel.read(r);
-            if (!model || !session) {
+            if (!model) {
                 return;
             }
-            return session.readEntry(model.uri, r);
+            const sessions = this._chatEditingService.editingSessionsObs.read(r);
+            const entry = ( sessions.map(s => s.readEntry(model.uri, r))).find(r => !!r);
+            return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined;
         }).recomputeInitiallyAndOnChange(this._store);
         this._register(autorun(r => {
             const entry = entryObs.read(r);
@@ -177,6 +175,5 @@ NotebookChatEditorController = ( __decorate([
     ( __param(4, IInstantiationService)),
     ( __param(5, IContextKeyService))
 ], NotebookChatEditorController));
-registerNotebookContribution(NotebookChatEditorControllerContrib.ID, NotebookChatEditorControllerContrib);
 
 export { NotebookChatEditorControllerContrib };

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.d.ts

@@ -3,8 +3,8 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
 import { CellKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
-import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model";
+import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
+import { IModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service";
 import { INotebookOriginalCellModelFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.service";
 export declare class OriginalNotebookCellModelReferenceCollection extends ReferenceCollection<ITextModel> {
     private readonly modelService;

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalCellModelFactory.js

@@ -4,8 +4,8 @@ import { ReferenceCollection } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { CellKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
-import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
+import { IModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/model.service';
 
 let OriginalNotebookCellModelReferenceCollection = class OriginalNotebookCellModelReferenceCollection extends ReferenceCollection {
     constructor(modelService, _languageService) {

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.d.ts

@@ -3,11 +3,13 @@ import { IModifiedFileEntry } from "@codingame/monaco-vscode-api/vscode/vs/workb
 import { INotebookService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookService.service";
 import { NotebookTextModel } from "../../../common/model/notebookTextModel.js";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { ITextModelService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service";
 import { INotebookOriginalModelReferenceFactory } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookOriginalModelRefFactory.service";
 export declare class OriginalNotebookModelReferenceCollection extends ReferenceCollection<Promise<NotebookTextModel>> {
     private readonly notebookService;
+    private readonly modelService;
     private readonly modelsToDispose;
-    constructor(notebookService: INotebookService);
+    constructor(notebookService: INotebookService, modelService: ITextModelService);
     protected createReferencedObject(key: string, fileEntry: IModifiedFileEntry, viewType: string): Promise<NotebookTextModel>;
     protected destroyReferencedObject(key: string, modelPromise: Promise<NotebookTextModel>): void;
 }