@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js

@@ -8,15 +8,17 @@ import { StableEditorScrollState } from '../../../../editor/browser/stableEditor
 import { RenderOptions, LineSource, renderLines } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { OverviewRulerLane } from '../../../../editor/common/model.js';
+import { OverviewRulerLane, MinimapPosition, TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
-import { InlineDecoration } from '../../../../editor/common/viewModel.js';
+import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
+import { SaveReason } from '../../../common/editor.js';
 import { countWords } from '../../chat/common/chatWordCounter.js';
-import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, InlineChatConfigKeys, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted } from '../common/inlineChat.js';
+import { HunkState } from './inlineChatSession.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
@@ -46,7 +48,6 @@ let EditModeStrategy = class EditModeStrategy {
         this._store = ( (new DisposableStore()));
         this._onDidAccept = this._store.add(( (new Emitter())));
         this._onDidDiscard = this._store.add(( (new Emitter())));
-        this._editCount = 0;
         this.onDidAccept = this._onDidAccept.event;
         this.onDidDiscard = this._onDidDiscard.event;
     }
@@ -67,7 +68,7 @@ let EditModeStrategy = class EditModeStrategy {
                 if (ignoreLocal && isEqual(item.uri, this._session.textModelN.uri)) {
                     continue;
                 }
-                await editor.apply(request.response, item);
+                await editor.apply(request.response, item, undefined);
                 if (item.uri.scheme === Schemas.untitled) {
                     const untitled = this._textFileService.untitled.get(item.uri);
                     if (untitled) {
@@ -79,7 +80,7 @@ let EditModeStrategy = class EditModeStrategy {
         for (const untitledModel of untitledModels) {
             if (!untitledModel.isDisposed()) {
                 await untitledModel.resolve();
-                await untitledModel.save({ reason: 1  });
+                await untitledModel.save({ reason: SaveReason.EXPLICIT });
             }
         }
     }
@@ -92,28 +93,6 @@ let EditModeStrategy = class EditModeStrategy {
     async discardHunk() {
         this._onDidDiscard.fire();
     }
-    async _makeChanges(edits, obs, opts, progress) {
-        if (++this._editCount === 1) {
-            this._editor.pushUndoStop();
-        }
-        if (opts) {
-            const durationInSec = opts.duration / 1000;
-            for (const edit of edits) {
-                const wordCount = countWords(edit.text ?? '');
-                const speed = wordCount / durationInSec;
-                const asyncEdit = asProgressiveEdit(( (new WindowIntervalTimer(this._zone.domNode))), edit, speed, opts.token);
-                await performAsyncTextEdit(this._session.textModelN, asyncEdit, progress, obs);
-            }
-        }
-        else {
-            obs.start();
-            this._session.textModelN.pushEditOperations(null, edits, (undoEdits) => {
-                progress?.report(undoEdits);
-                return null;
-            });
-            obs.stop();
-        }
-    }
     getWholeRangeDecoration() {
         const ranges = [this._session.wholeRange.value];
         const newDecorations = ( (ranges.map(
@@ -145,16 +124,11 @@ let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
     async apply() {
         await super._doApplyChanges(false);
     }
-    async makeChanges(edits, obs) {
+    async makeChanges() {
     }
-    async makeProgressiveChanges(edits, obs, opts) {
-    }
-    async undoChanges(altVersionId) {
-        const { textModelN } = this._session;
-        await undoModelUntil(textModelN, altVersionId);
-    }
-    async renderChanges(response) {
+    async makeProgressiveChanges() {
     }
+    async renderChanges(response) { }
     hasFocus() {
         return this._zone.widget.hasFocus();
     }
@@ -180,15 +154,16 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 color: themeColorFromId(overviewRulerInlineChatDiffInserted),
             },
             minimap: {
-                position: 1 ,
+                position: MinimapPosition.Inline,
                 color: themeColorFromId(minimapInlineChatDiffInserted),
             }
         });
         this._decoInsertedTextRange = ModelDecorationOptions.register({
             description: 'inline-chat-inserted-range-linehighlight',
             className: 'inline-chat-inserted-range',
-            stickiness: 1 ,
+            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         });
+        this._editCount = 0;
         this.acceptHunk = () => super.acceptHunk();
         this.discardHunk = () => super.discardHunk();
         this._hunkDisplayData = ( (new Map()));
@@ -220,14 +195,10 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         this._resetDiff();
         return super.cancel();
     }
-    async undoChanges(altVersionId) {
-        const { textModelN } = this._session;
-        await undoModelUntil(textModelN, altVersionId);
-    }
-    async makeChanges(edits, obs) {
-        return this._makeChanges(edits, obs, undefined, undefined);
+    async makeChanges(edits, obs, undoStopBefore) {
+        return this._makeChanges(edits, obs, undefined, undefined, undoStopBefore);
     }
-    async makeProgressiveChanges(edits, obs, opts) {
+    async makeProgressiveChanges(edits, obs, opts, undoStopBefore) {
         const progress = ( (new Progress(edits => {
             const newLines = ( (new Set()));
             for (const edit of edits) {
@@ -243,7 +214,30 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             }
             this._progressiveEditingDecorations.append(newDecorations);
         })));
-        return this._makeChanges(edits, obs, opts, progress);
+        return this._makeChanges(edits, obs, opts, progress, undoStopBefore);
+    }
+    async _makeChanges(edits, obs, opts, progress, undoStopBefore) {
+        if (undoStopBefore) {
+            this._editor.pushUndoStop();
+        }
+        this._editCount++;
+        if (opts) {
+            const durationInSec = opts.duration / 1000;
+            for (const edit of edits) {
+                const wordCount = countWords(edit.text ?? '');
+                const speed = wordCount / durationInSec;
+                const asyncEdit = asProgressiveEdit(( (new WindowIntervalTimer(this._zone.domNode))), edit, speed, opts.token);
+                await performAsyncTextEdit(this._session.textModelN, asyncEdit, progress, obs);
+            }
+        }
+        else {
+            obs.start();
+            this._session.textModelN.pushEditOperations(null, edits, (undoEdits) => {
+                progress?.report(undoEdits);
+                return null;
+            });
+            obs.stop();
+        }
     }
     async renderChanges(response) {
         this._progressiveEditingDecorations.clear();
@@ -286,7 +280,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                         const result = renderLines(source, renderOptions, [( (new InlineDecoration(
                              (new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)),
                             '',
-                            0
+                            InlineDecorationType.Regular
                         )))], domNode);
                         const viewZoneData = {
                             afterLineNumber: -1,
@@ -327,7 +321,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                             assertType(widgetData);
                             const candidates = [];
                             for (const item of this._session.hunkData.getInfo()) {
-                                if (item.getState() === 0 ) {
+                                if (item.getState() === HunkState.Pending) {
                                     candidates.push(item.getRangesN()[0].getStartPosition().delta(-1));
                                 }
                             }
@@ -368,7 +362,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                         };
                         this._hunkDisplayData.set(hunkData, data);
                     }
-                    else if (hunkData.getState() !== 0 ) {
+                    else if (hunkData.getState() !== HunkState.Pending) {
                         data.remove();
                     }
                     else {
@@ -379,7 +373,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                             ? modifiedRangeNow.startLineNumber - zoneLineNumber
                             : zoneLineNumber - modifiedRangeNow.endLineNumber;
                     }
-                    if (hunkData.getState() === 0  && (!widgetData || data.distance < widgetData.distance)) {
+                    if (hunkData.getState() === HunkState.Pending && (!widgetData || data.distance < widgetData.distance)) {
                         widgetData = data;
                     }
                 }
@@ -396,7 +390,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 this._editor.revealPositionInCenterIfOutsideViewport(widgetData.position);
                 const remainingHunks = this._session.hunkData.pending;
                 this._updateSummaryMessage(remainingHunks, this._session.hunkData.size);
-                const mode = this._configService.getValue("inlineChat.accessibleDiffView" );
+                const mode = this._configService.getValue(InlineChatConfigKeys.AccessibleDiffView);
                 if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
                     this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
                 }
@@ -409,7 +403,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             else if (this._hunkDisplayData.size > 0) {
                 let oneAccepted = false;
                 for (const hunkData of this._session.hunkData.getInfo()) {
-                    if (hunkData.getState() === 1 ) {
+                    if (hunkData.getState() === HunkState.Accepted) {
                         oneAccepted = true;
                         break;
                     }
@@ -426,24 +420,24 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         return renderHunks()?.position;
     }
     _updateSummaryMessage(remaining, total) {
-        const needsReview = this._configService.getValue("inlineChat.acceptedOrDiscardBeforeSave" );
+        const needsReview = this._configService.getValue(InlineChatConfigKeys.AcceptedOrDiscardBeforeSave);
         let message;
         if (total === 0) {
             message = ( localizeWithPath(_moduleId, 0, "Nothing changed."));
         }
         else if (remaining === 1) {
             message = needsReview
-                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or Discard 1 change."))
+                ? ( localizeWithPath(_moduleId, 1, "$(info) Accept or discard 1 change"))
                 : ( localizeWithPath(_moduleId, 2, "1 change"));
         }
         else {
             message = needsReview
-                ? ( localizeWithPath(_moduleId, 3, "$(info) Accept or Discard {0} changes.", remaining))
+                ? ( localizeWithPath(_moduleId, 3, "$(info) Accept or Discard {0} changes", remaining))
                 : ( localizeWithPath(_moduleId, 4, "{0} changes", total));
         }
         let title;
         if (needsReview) {
-            title = ( localizeWithPath(_moduleId, 5, "Review (accept or discard) all changes before continuing."));
+            title = ( localizeWithPath(_moduleId, 5, "Review (accept or discard) all changes before continuing"));
         }
         this._zone.widget.updateStatus(message, { title });
     }
@@ -462,11 +456,6 @@ LiveStrategy = ( (__decorate([
     ( (__param(7, ITextFileService))),
     ( (__param(8, IInstantiationService)))
 ], LiveStrategy)));
-async function undoModelUntil(model, targetAltVersion) {
-    while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
-        await model.undo();
-    }
-}
 function changeDecorationsAndViewZones(editor, callback) {
     editor.changeDecorations(decorationsAccessor => {
         editor.changeViewZones(viewZoneAccessor => {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js

@@ -1,10 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { h, trackFocus, getTotalHeight, reset, getActiveElement, Dimension } from '../../../../base/browser/dom.js';
+import { h, trackFocus, getTotalHeight, reset, getActiveElement } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
-import { Lazy } from '../../../../base/common/lazy.js';
 import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
@@ -14,14 +13,15 @@ import '../../../../base/common/cancellation.js';
 import { isNonEmptyArray, tail } from '../../../../base/common/arrays.js';
 import './media/inlineChat.css.js';
 import { AccessibleDiffViewer } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
-import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
-import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -38,8 +38,9 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.service.js';
-import { ChatFollowups } from '../../chat/browser/chatFollowups.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { ChatModel } from '../../chat/common/chatModel.js';
 import { isWelcomeVM, isRequestVM, isResponseVM } from '../../chat/common/chatViewModel.js';
 import { inlineChatBackground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from '../common/inlineChat.js';
@@ -47,9 +48,6 @@ import { ChatWidget } from '../../chat/browser/chatWidget.js';
 import { chatRequestBackground } from '../../chat/common/chatColors.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
-import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
-import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
-import { SuggestController } from '../../../../editor/contrib/suggest/browser/suggestController.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
@@ -86,14 +84,14 @@ let InlineChatWidget = class InlineChatWidget {
         this._onDidChangeInput = this._store.add(( (new Emitter())));
         this.onDidChangeInput = this._onDidChangeInput.event;
         this._isLayouting = false;
-        this._followUpDisposables = this._store.add(( (new DisposableStore())));
         this._progressBar = ( (new ProgressBar(this._elements.progress)));
         this._store.add(this._progressBar);
         let allowRequests = false;
+        this.scopedContextKeyService = this._store.add(_contextKeyService.createScoped(this._elements.chatWidget));
         const scopedInstaService = _instantiationService.createChild(( (new ServiceCollection([
             IContextKeyService,
-            this._store.add(_contextKeyService.createScoped(this._elements.chatWidget))
-        ]))));
+            this.scopedContextKeyService
+        ]))), this._store);
         this._chatWidget = scopedInstaService.createInstance(ChatWidget, location, { resource: true }, {
             defaultElementHeight: 32,
             renderStyle: 'compact',
@@ -176,19 +174,19 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(statusButtonBar.onDidChange(() => this._onDidChangeHeight.fire()));
         this._store.add(statusButtonBar);
         const workbenchToolbarOptions = {
-            hiddenItemStrategy: -1 ,
+            hiddenItemStrategy: HiddenItemStrategy.NoHide,
             toolbarOptions: {
                 primaryGroup: () => true,
                 useSeparatorsInPrimaryActions: true
             }
         };
         if (options.feedbackMenuId) {
-            const feedbackToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.feedbackToolbar, options.feedbackMenuId, { ...workbenchToolbarOptions, hiddenItemStrategy: 0  });
+            const feedbackToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.feedbackToolbar, options.feedbackMenuId, { ...workbenchToolbarOptions, hiddenItemStrategy: HiddenItemStrategy.Ignore });
             this._store.add(feedbackToolbar.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
             this._store.add(feedbackToolbar);
         }
         this._store.add(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration("accessibility.verbosity.inlineChat" )) {
+            if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
                 this._updateAriaLabel();
             }
         }));
@@ -210,11 +208,11 @@ let InlineChatWidget = class InlineChatWidget {
         this.setChatModel(this._defaultChatModel);
     }
     _updateAriaLabel() {
-        this._elements.root.ariaLabel = this._accessibleViewService.getOpenAriaHint("accessibility.verbosity.inlineChat" );
+        this._elements.root.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
         if (this._accessibilityService.isScreenReaderOptimized()) {
             let label = defaultAriaLabel;
-            if (this._configurationService.getValue("accessibility.verbosity.inlineChat" )) {
-                const kbLabel = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getLabel();
+            if (this._configurationService.getValue(AccessibilityVerbositySettingId.InlineChat)) {
+                const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
                 label = kbLabel
                     ? ( localizeWithPath(
                     _moduleId,
@@ -274,16 +272,16 @@ let InlineChatWidget = class InlineChatWidget {
         return result;
     }
     get minHeight() {
-        let maxWidgetHeight = 100;
+        let maxWidgetOutputHeight = 100;
         for (const item of this._chatWidget.viewModel?.getItems() ?? []) {
             if (isResponseVM(item) && ( (item.response.value.some(r => r.kind === 'textEditGroup' && !r.state?.applied)))) {
-                maxWidgetHeight = 270;
+                maxWidgetOutputHeight = 270;
                 break;
             }
         }
         let value = this.contentHeight;
         value -= this._chatWidget.contentHeight;
-        value += Math.min(maxWidgetHeight, this._chatWidget.contentHeight);
+        value += Math.min(this._chatWidget.input.contentHeight + maxWidgetOutputHeight, this._chatWidget.contentHeight);
         return value;
     }
     _getExtraHeight() {
@@ -389,17 +387,6 @@ let InlineChatWidget = class InlineChatWidget {
             }
         };
     }
-    updateFollowUps(items, onFollowup) {
-        this._followUpDisposables.clear();
-        this._elements.followUps.classList.toggle('hidden', !items || items.length === 0);
-        reset(this._elements.followUps);
-        if (items && items.length > 0 && onFollowup) {
-            this._followUpDisposables.add(this._instantiationService.createInstance(ChatFollowups, this._elements.followUps, items, ChatAgentLocation.Editor, undefined, onFollowup));
-        }
-        this._onDidChangeHeight.fire();
-    }
-    updateSlashCommands(commands) {
-    }
     updateInfo(message) {
         this._elements.infoLabel.classList.toggle('hidden', !message);
         const renderedMessage = renderLabelWithIcons(message);
@@ -437,7 +424,6 @@ let InlineChatWidget = class InlineChatWidget {
     reset() {
         this._chatWidget.saveState();
         this.updateChatMessage(undefined);
-        this.updateFollowUps(undefined);
         reset(this._elements.statusLabel);
         this._elements.statusLabel.classList.toggle('hidden', true);
         this._elements.statusToolbar.classList.add('hidden');
@@ -465,44 +451,14 @@ InlineChatWidget = ( (__decorate([
     ( (__param(10, IHoverService)))
 ], InlineChatWidget)));
 const defaultAriaLabel = ( localizeWithPath(_moduleId, 2, "Inline Chat Input"));
-const codeEditorWidgetOptions = {
-    isSimpleWidget: true,
-    contributions: EditorExtensionsRegistry.getSomeEditorContributions([
-        SnippetController2.ID,
-        SuggestController.ID
-    ])
-};
-const _previewEditorEditorOptions = {
-    scrollbar: { useShadows: false, alwaysConsumeMouseWheel: false, ignoreHorizontalScrollbarInContentHeight: true, },
-    renderMarginRevertIcon: false,
-    diffCodeLens: false,
-    scrollBeyondLastLine: false,
-    stickyScroll: { enabled: false },
-    originalAriaLabel: ( localizeWithPath(_moduleId, 3, 'Original')),
-    modifiedAriaLabel: ( localizeWithPath(_moduleId, 4, 'Modified')),
-    diffAlgorithm: 'advanced',
-    readOnly: true,
-    isInEmbeddedEditor: true
-};
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
-    constructor(_parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService) {
-        super(ChatAgentLocation.Editor, { ...options, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
+    constructor(location, _parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService) {
+        super(location, { ...options, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
         this._parentEditor = _parentEditor;
         this._accessibleViewer = this._store.add(( (new MutableDisposable())));
-        this._previewDiffModel = this._store.add(( (new MutableDisposable())));
-        this._previewDiffEditor = ( (new Lazy(
-            () => this._store.add(instantiationService.createInstance(EmbeddedDiffEditorWidget, this._elements.previewDiff, {
-                useInlineViewWhenSpaceIsLimited: false,
-                ..._previewEditorEditorOptions,
-                onlyShowAccessibleDiffViewer: accessibilityService.isScreenReaderOptimized(),
-            }, { modifiedEditor: codeEditorWidgetOptions, originalEditor: codeEditorWidgetOptions }, _parentEditor))
-        )));
     }
     get contentHeight() {
         let result = super.contentHeight;
-        if (this._previewDiffEditor.hasValue && this._previewDiffEditor.value.getModel()) {
-            result += 14 + Math.min(300, this._previewDiffEditor.value.getContentHeight());
-        }
         if (this._accessibleViewer.value) {
             result += this._accessibleViewer.value.height;
         }
@@ -510,16 +466,6 @@ let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends Inli
     }
     _doLayout(dimension) {
         let newHeight = dimension.height;
-        if (this._previewDiffEditor.hasValue) {
-            const previewDiffDim = ( (new Dimension(
-                dimension.width - 12,
-                Math.min(300, this._previewDiffEditor.value.getContentHeight())
-            )));
-            this._elements.previewDiff.style.width = `${previewDiffDim.width}px`;
-            this._elements.previewDiff.style.height = `${previewDiffDim.height}px`;
-            this._previewDiffEditor.value.layout(previewDiffDim);
-            newHeight -= previewDiffDim.height + 14;
-        }
         if (this._accessibleViewer.value) {
             this._accessibleViewer.value.width = dimension.width - 12;
             newHeight -= this._accessibleViewer.value.height;
@@ -528,7 +474,6 @@ let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends Inli
         this._elements.root.style.height = `${dimension.height - this._getExtraHeight()}px`;
     }
     reset() {
-        this.hideEditsPreview();
         this._accessibleViewer.clear();
         super.reset();
     }
@@ -538,54 +483,17 @@ let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends Inli
         this._accessibleViewer.value = this._instantiationService.createInstance(HunkAccessibleDiffViewer, this._elements.accessibleViewer, session, hunkData, ( (new AccessibleHunk(this._parentEditor, session, hunkData))));
         this._onDidChangeHeight.fire();
     }
-    showEditsPreview(hunks, textModel0, textModelN) {
-        if (hunks.size === 0) {
-            this.hideEditsPreview();
-            return;
-        }
-        this._elements.previewDiff.classList.remove('hidden');
-        this._previewDiffEditor.value.setModel({ original: textModel0, modified: textModelN });
-        let originalLineRange;
-        let modifiedLineRange;
-        for (const item of hunks.getInfo()) {
-            const [first0] = item.getRanges0();
-            const [firstN] = item.getRangesN();
-            originalLineRange = !originalLineRange ? LineRange.fromRangeInclusive(first0) : originalLineRange.join(LineRange.fromRangeInclusive(first0));
-            modifiedLineRange = !modifiedLineRange ? LineRange.fromRangeInclusive(firstN) : modifiedLineRange.join(LineRange.fromRangeInclusive(firstN));
-        }
-        if (!originalLineRange || !modifiedLineRange) {
-            this.hideEditsPreview();
-            return;
-        }
-        const hiddenOriginal = LineRange.invert(originalLineRange, textModel0);
-        const hiddenModified = LineRange.invert(modifiedLineRange, textModelN);
-        this._previewDiffEditor.value.getOriginalEditor().setHiddenAreas(( (hiddenOriginal.map(lr => LineRange.asRange(lr, textModel0)))), 'diff-hidden');
-        this._previewDiffEditor.value.getModifiedEditor().setHiddenAreas(( (hiddenModified.map(lr => LineRange.asRange(lr, textModelN)))), 'diff-hidden');
-        this._previewDiffEditor.value.revealLine(modifiedLineRange.startLineNumber, 1 );
-        this._onDidChangeHeight.fire();
-    }
-    hideEditsPreview() {
-        this._elements.previewDiff.classList.add('hidden');
-        if (this._previewDiffEditor.hasValue) {
-            this._previewDiffEditor.value.setModel(null);
-        }
-        this._previewDiffModel.clear();
-        this._onDidChangeHeight.fire();
-    }
-    showsAnyPreview() {
-        return !this._elements.previewDiff.classList.contains('hidden');
-    }
 };
 EditorBasedInlineChatWidget = ( (__decorate([
-    ( (__param(2, IContextKeyService))),
-    ( (__param(3, IKeybindingService))),
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IAccessibilityService))),
-    ( (__param(6, IConfigurationService))),
-    ( (__param(7, IAccessibleViewService))),
-    ( (__param(8, ITextModelService))),
-    ( (__param(9, IChatService))),
-    ( (__param(10, IHoverService)))
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, IInstantiationService))),
+    ( (__param(6, IAccessibilityService))),
+    ( (__param(7, IConfigurationService))),
+    ( (__param(8, IAccessibleViewService))),
+    ( (__param(9, ITextModelService))),
+    ( (__param(10, IChatService))),
+    ( (__param(11, IHoverService)))
 ], EditorBasedInlineChatWidget)));
 let HunkAccessibleDiffViewer = HunkAccessibleDiffViewer_1 = class HunkAccessibleDiffViewer extends AccessibleDiffViewer {
     set width(value) {
@@ -596,7 +504,7 @@ let HunkAccessibleDiffViewer = HunkAccessibleDiffViewer_1 = class HunkAccessible
         const diff = observableValue('diff', HunkAccessibleDiffViewer_1._asMapping(hunk));
         const diffs = derived(r => [diff.read(r)]);
         const lines = Math.min(10, 8 + diff.get().changedLineCount);
-        const height = models.getModifiedOptions().get(67 ) * lines;
+        const height = models.getModifiedOptions().get(EditorOption.lineHeight) * lines;
         super(parentNode, constObservable(true), () => { }, constObservable(false), width, constObservable(height), diffs, models, instantiationService);
         this.height = height;
         this._width2 = width;
@@ -642,7 +550,7 @@ class AccessibleHunk {
     originalReveal(range) {
     }
     modifiedReveal(range) {
-        this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], 0 );
+        this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], ScrollType.Smooth);
     }
     modifiedSetSelection(range) {
     }