From 0adf97d3d6e3c080bc358f302d585a175ef11bd2 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Fri, 21 Feb 2025 05:23:26 +1100 Subject: [PATCH] Disable notebook synchronizer when using notebook edits (#241371) --- .../notebook/browser/contrib/chatEdit/notebookSynchronizer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts index 5e99759a2c80..dbebccbe2f92 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/chatEdit/notebookSynchronizer.ts @@ -30,6 +30,7 @@ import { SnapshotContext } from '../../../../../services/workingCopy/common/file import { INotebookEditorService } from '../../services/notebookEditorService.js'; import { CellEditState } from '../../notebookBrowser.js'; import { IModelService } from '../../../../../../editor/common/services/model.js'; +import { ChatEditingModifiedDocumentEntry } from '../../../../chat/browser/chatEditing/chatEditingModifiedDocumentEntry.js'; export const INotebookModelSynchronizerFactory = createDecorator('INotebookModelSynchronizerFactory'); @@ -93,7 +94,8 @@ export class NotebookModelSynchronizer extends Disposable { const entryObs = derived((r) => { const sessions = _chatEditingService.editingSessionsObs.read(r); - return sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r); + const entry = sessions.map(s => s.readEntry(model.uri, r)).find(r => !!r); + return entry instanceof ChatEditingModifiedDocumentEntry ? entry : undefined; }).recomputeInitiallyAndOnChange(this._store);