From 810f3b298f9ece2f548762a44b06d41c8ffcd334 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 8 Apr 2025 11:36:04 +0200 Subject: [PATCH] fixes https://github.com/microsoft/vscode-copilot/issues/15655 (#245955) --- .../chatEditing/chatEditingCodeEditorIntegration.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts index 2fba23f35fb..e5b5e9c6daf 100644 --- a/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts +++ b/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingCodeEditorIntegration.ts @@ -366,11 +366,12 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito }); } - if (reviewMode || diffMode) { + let extraLines = 0; + if (reviewMode && !diffMode) { const domNode = document.createElement('div'); domNode.className = 'chat-editing-original-zone view-lines line-delete monaco-mouse-cursor-text'; const result = renderLines(source, renderOptions, decorations, domNode); - + extraLines = result.heightInLines; if (!isCreatedContent) { const viewZoneData: IViewZone = { @@ -382,12 +383,14 @@ export class ChatEditingCodeEditorIntegration implements IModifiedFileEntryEdito this._viewZones.push(viewZoneChangeAccessor.addZone(viewZoneData)); } + } + if (reviewMode || diffMode) { // Add content widget for each diff change const widget = this._editor.invokeWithinContext(accessor => { const instaService = accessor.get(IInstantiationService); - return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel()!.getVersionId(), this._editor, isCreatedContent ? 0 : result.heightInLines); + return instaService.createInstance(DiffHunkWidget, diff, diffEntry, this._editor.getModel()!.getVersionId(), this._editor, isCreatedContent ? 0 : extraLines); }); widget.layout(diffEntry.modified.startLineNumber);