@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -22,7 +22,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
 import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { MenuItemAction, 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';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -30,7 +30,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { asCssVariableName, asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
-import { editorForeground, editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import { editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
 import { inputBackground } from '../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../platform/theme/common/colors/listColors.js';
 import '../../../../platform/theme/common/colors/menuColors.js';
@@ -42,8 +42,8 @@ import { AccessibilityVerbositySettingId } from '../../accessibility/browser/acc
 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';
+import { isWelcomeVM, isResponseVM } from '../../chat/common/chatViewModel.js';
+import { inlineChatForeground, inlineChatBackground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED, InlineChatConfigKeys } from '../common/inlineChat.js';
 import { ChatWidget } from '../../chat/browser/chatWidget.js';
 import { chatRequestBackground } from '../../chat/common/chatColors.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
@@ -52,6 +52,7 @@ 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';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { TextOnlyMenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 var HunkAccessibleDiffViewer_1;
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
 let InlineChatWidget = class InlineChatWidget {
@@ -68,14 +69,13 @@ let InlineChatWidget = class InlineChatWidget {
         this._elements = h('div.inline-chat@root', [
             h('div.chat-widget@chatWidget'),
             h('div.progress@progress'),
-            h('div.followUps.hidden@followUps'),
             h('div.previewDiff.hidden@previewDiff'),
             h('div.accessibleViewer@accessibleViewer'),
             h('div.status@status', [
                 h('div.label.info.hidden@infoLabel'),
-                h('div.actions.hidden@statusToolbar'),
+                h('div.actions.text-style.hidden@toolbar1'),
+                h('div.actions.button-style.hidden@toolbar2'),
                 h('div.label.status.hidden@statusLabel'),
-                h('div.actions.hidden@feedbackToolbar'),
             ]),
         ]);
         this._store = ( (new DisposableStore()));
@@ -86,7 +86,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._isLayouting = false;
         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,
@@ -94,28 +93,14 @@ let InlineChatWidget = class InlineChatWidget {
         ]))), this._store);
         this._chatWidget = scopedInstaService.createInstance(ChatWidget, location, { resource: true }, {
             defaultElementHeight: 32,
-            renderStyle: 'compact',
-            renderInputOnTop: true,
+            renderStyle: 'minimal',
+            renderInputOnTop: false,
             renderFollowups: true,
             supportsFileReferences: true,
-            editorOverflowWidgetsDomNode: options.editorOverflowWidgetsDomNode,
-            rendererOptions: options.rendererOptions,
-            menus: {
-                executeToolbar: options.inputMenuId,
-                inputSideToolbar: options.widgetMenuId,
-                telemetrySource: options.telemetrySource
-            },
-            filter: item => {
-                if (isWelcomeVM(item)) {
-                    return false;
-                }
-                if (isRequestVM(item)) {
-                    return allowRequests;
-                }
-                return true;
-            },
+            filter: item => !isWelcomeVM(item),
+            ...options.chatWidgetViewOptions
         }, {
-            listForeground: editorForeground,
+            listForeground: inlineChatForeground,
             listBackground: inlineChatBackground,
             inputEditorBackground: inputBackground,
             resultEditorBackground: editorBackground
@@ -124,31 +109,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._elements.chatWidget.style.setProperty(asCssVariableName(chatRequestBackground), asCssVariable(inlineChatBackground));
         this._chatWidget.setVisible(true);
         this._store.add(this._chatWidget);
-        const viewModelListener = this._store.add(( (new MutableDisposable())));
-        this._store.add(this._chatWidget.onDidChangeViewModel(() => {
-            const model = this._chatWidget.viewModel;
-            if (!model) {
-                allowRequests = false;
-                viewModelListener.clear();
-                return;
-            }
-            const updateAllowRequestsFilter = () => {
-                let requestCount = 0;
-                for (const item of model.getItems()) {
-                    if (isRequestVM(item)) {
-                        if (++requestCount >= 2) {
-                            break;
-                        }
-                    }
-                }
-                const newAllowRequest = requestCount >= 2;
-                if (newAllowRequest !== allowRequests) {
-                    allowRequests = newAllowRequest;
-                    this._chatWidget.refilter();
-                }
-            };
-            viewModelListener.value = model.onDidChange(updateAllowRequestsFilter);
-        }));
         const viewModelStore = this._store.add(( (new DisposableStore())));
         this._store.add(this._chatWidget.onDidChangeViewModel(() => {
             viewModelStore.clear();
@@ -169,32 +129,38 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(this._chatWidget.inputEditor.onDidFocusEditorWidget(() => this._ctxInputEditorFocused.set(true)));
         this._store.add(this._chatWidget.inputEditor.onDidBlurEditorWidget(() => this._ctxInputEditorFocused.set(false)));
         const statusMenuId = options.statusMenuId instanceof MenuId ? options.statusMenuId : options.statusMenuId.menu;
+        const statusToolbarMenu = scopedInstaService.createInstance(MenuWorkbenchToolBar, this._elements.toolbar1, statusMenuId, {
+            hiddenItemStrategy: HiddenItemStrategy.NoHide,
+            telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+            actionViewItemProvider: action => action instanceof MenuItemAction ? this._instantiationService.createInstance(TextOnlyMenuEntryActionViewItem, action, { conversational: true }) : undefined,
+            toolbarOptions: { primaryGroup: '0_main' },
+            menuOptions: { renderShortTitle: true },
+            label: true,
+            icon: false
+        });
+        this._store.add(statusToolbarMenu.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
+        this._store.add(statusToolbarMenu);
         const statusMenuOptions = options.statusMenuId instanceof MenuId ? undefined : options.statusMenuId.options;
-        const statusButtonBar = this._instantiationService.createInstance(MenuWorkbenchButtonBar, this._elements.statusToolbar, statusMenuId, statusMenuOptions);
+        const statusButtonBar = scopedInstaService.createInstance(MenuWorkbenchButtonBar, this._elements.toolbar2, statusMenuId, {
+            toolbarOptions: { primaryGroup: '0_main' },
+            telemetrySource: options.chatWidgetViewOptions?.menus?.telemetrySource,
+            menuOptions: { renderShortTitle: true },
+            ...statusMenuOptions,
+        });
         this._store.add(statusButtonBar.onDidChange(() => this._onDidChangeHeight.fire()));
         this._store.add(statusButtonBar);
-        const workbenchToolbarOptions = {
-            hiddenItemStrategy: HiddenItemStrategy.NoHide,
-            toolbarOptions: {
-                primaryGroup: () => true,
-                useSeparatorsInPrimaryActions: true
-            }
-        };
-        if (options.feedbackMenuId) {
-            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);
-        }
+        const toggleToolbar = () => this._elements.status.classList.toggle('text', this._configurationService.getValue(InlineChatConfigKeys.ExpTextButtons));
+        this._store.add(this._configurationService.onDidChangeConfiguration(e => e.affectsConfiguration(InlineChatConfigKeys.ExpTextButtons) && toggleToolbar()));
+        toggleToolbar();
         this._store.add(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
                 this._updateAriaLabel();
             }
         }));
         this._elements.root.tabIndex = 0;
-        this._elements.followUps.tabIndex = 0;
         this._elements.statusLabel.tabIndex = 0;
         this._updateAriaLabel();
-        this._store.add(this._hoverService.setupUpdatableHover(getDefaultHoverDelegate('element'), this._elements.statusLabel, () => {
+        this._store.add(this._hoverService.setupManagedHover(getDefaultHoverDelegate('element'), this._elements.statusLabel, () => {
             return this._elements.statusLabel.dataset['title'];
         }));
         this._store.add(this._chatService.onDidPerformUserAction(e => {
@@ -253,22 +219,20 @@ let InlineChatWidget = class InlineChatWidget {
     _doLayout(dimension) {
         const extraHeight = this._getExtraHeight();
         const progressHeight = getTotalHeight(this._elements.progress);
-        const followUpsHeight = getTotalHeight(this._elements.followUps);
         const statusHeight = getTotalHeight(this._elements.status);
         this._elements.root.style.height = `${dimension.height - extraHeight}px`;
         this._elements.root.style.width = `${dimension.width}px`;
         this._elements.progress.style.width = `${dimension.width}px`;
-        this._chatWidget.layout(dimension.height - progressHeight - followUpsHeight - statusHeight - extraHeight, dimension.width);
+        this._chatWidget.layout(dimension.height - progressHeight - statusHeight - extraHeight, dimension.width);
     }
     get contentHeight() {
         const data = {
-            followUpsHeight: getTotalHeight(this._elements.followUps),
             chatWidgetContentHeight: this._chatWidget.contentHeight,
             progressHeight: getTotalHeight(this._elements.progress),
             statusHeight: getTotalHeight(this._elements.status),
             extraHeight: this._getExtraHeight()
         };
-        const result = data.progressHeight + data.chatWidgetContentHeight + data.followUpsHeight + data.statusHeight + data.extraHeight;
+        const result = data.progressHeight + data.chatWidgetContentHeight + data.statusHeight + data.extraHeight;
         return result;
     }
     get minHeight() {
@@ -285,7 +249,7 @@ let InlineChatWidget = class InlineChatWidget {
         return value;
     }
     _getExtraHeight() {
-        return 12  + 2  + 12 ;
+        return 4  + 2  + 4 ;
     }
     updateProgress(show) {
         if (show) {
@@ -317,8 +281,9 @@ let InlineChatWidget = class InlineChatWidget {
         this._chatWidget.setInputPlaceholder(value);
     }
     updateToolbar(show) {
-        this._elements.statusToolbar.classList.toggle('hidden', !show);
-        this._elements.feedbackToolbar.classList.toggle('hidden', !show);
+        this._elements.root.classList.toggle('toolbar', show);
+        this._elements.toolbar1.classList.toggle('hidden', !show);
+        this._elements.toolbar2.classList.toggle('hidden', !show);
         this._elements.status.classList.toggle('actions', show);
         this._elements.infoLabel.classList.toggle('hidden', show);
         this._onDidChangeHeight.fire();
@@ -328,12 +293,12 @@ let InlineChatWidget = class InlineChatWidget {
         if (!viewModel) {
             return undefined;
         }
-        for (const item of viewModel.getItems()) {
-            if (isResponseVM(item)) {
-                return viewModel.codeBlockModelCollection.get(viewModel.sessionId, item, codeBlockIndex)?.model;
-            }
+        const items = viewModel.getItems().filter(i => isResponseVM(i));
+        if (!items.length) {
+            return;
         }
-        return undefined;
+        const item = items[items.length - 1];
+        return viewModel.codeBlockModelCollection.get(viewModel.sessionId, item, codeBlockIndex)?.model;
     }
     get responseContent() {
         const requests = this._chatWidget.viewModel?.model.getRequests();
@@ -342,9 +307,6 @@ let InlineChatWidget = class InlineChatWidget {
         }
         return tail(requests)?.response?.response.asString();
     }
-    get usesDefaultChatModel() {
-        return this.getChatModel() === this._defaultChatModel;
-    }
     getChatModel() {
         return this._chatWidget.viewModel?.model ?? this._defaultChatModel;
     }
@@ -353,7 +315,7 @@ let InlineChatWidget = class InlineChatWidget {
     }
     addToHistory(input) {
         if (this._chatWidget.viewModel?.model === this._defaultChatModel) {
-            this._chatWidget.input.acceptInput(input);
+            this._chatWidget.input.acceptInput(true);
         }
     }
     updateChatMessage(message, isIncomplete, isCodeBlockEditable) {
@@ -426,9 +388,10 @@ let InlineChatWidget = class InlineChatWidget {
         this.updateChatMessage(undefined);
         reset(this._elements.statusLabel);
         this._elements.statusLabel.classList.toggle('hidden', true);
-        this._elements.statusToolbar.classList.add('hidden');
-        this._elements.feedbackToolbar.classList.add('hidden');
+        this._elements.toolbar1.classList.add('hidden');
+        this._elements.toolbar2.classList.add('hidden');
         this.updateInfo('');
+        this.chatWidget.setModel(this._defaultChatModel, {});
         this._elements.accessibleViewer.classList.toggle('hidden', true);
         this._onDidChangeHeight.fire();
     }
@@ -453,7 +416,7 @@ InlineChatWidget = ( (__decorate([
 const defaultAriaLabel = ( localizeWithPath(_moduleId, 2, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     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);
+        super(location, { ...options, chatWidgetViewOptions: { ...options.chatWidgetViewOptions, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() } }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
         this._parentEditor = _parentEditor;
         this._accessibleViewer = this._store.add(( (new MutableDisposable())));
     }

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

@@ -4,31 +4,28 @@ import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
-import { Range } from '../../../../editor/common/core/range.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_ACCEPT_CHANGES, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET_STATUS, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_ACCEPT_CHANGES, MENU_INLINE_CHAT_EXECUTE, InlineChatConfigKeys, EditMode } from '../common/inlineChat.js';
 import { EditorBasedInlineChatWidget } from './inlineChatWidget.js';
-import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { StableEditorBottomScrollState } from '../../../../editor/browser/stableEditorScroll.js';
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
 const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget";
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
-    constructor(location, editor, _instaService, contextKeyService, configurationService) {
+    constructor(location, editor, _instaService, _logService, contextKeyService, configurationService) {
         super(editor, { showFrame: false, showArrow: false, isAccessible: true, className: 'inline-chat-widget', keepEditorSelection: true, showInHiddenAreas: true, ordinal: 10000 });
         this._instaService = _instaService;
+        this._logService = _logService;
         this._ctxCursorPosition = CTX_INLINE_CHAT_OUTER_CURSOR_POSITION.bindTo(contextKeyService);
         this._disposables.add(toDisposable(() => {
             this._ctxCursorPosition.reset();
         }));
         this.widget = this._instaService.createInstance(EditorBasedInlineChatWidget, location, this.editor, {
-            telemetrySource: 'interactiveEditorWidget-toolbar',
-            inputMenuId: MenuId.ChatExecute,
-            widgetMenuId: MENU_INLINE_CHAT_WIDGET,
             statusMenuId: {
                 menu: MENU_INLINE_CHAT_WIDGET_STATUS,
                 options: {
@@ -45,19 +42,36 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
                     }
                 }
             },
-            rendererOptions: {
-                renderTextEditsAsSummary: (uri) => {
-                    return isEqual(uri, editor.getModel()?.uri)
-                        && configurationService.getValue(InlineChatConfigKeys.Mode) === EditMode.Live;
+            chatWidgetViewOptions: {
+                menus: {
+                    executeToolbar: MENU_INLINE_CHAT_EXECUTE,
+                    telemetrySource: 'interactiveEditorWidget-toolbar',
                 },
+                rendererOptions: {
+                    renderTextEditsAsSummary: (uri) => {
+                        return isEqual(uri, editor.getModel()?.uri)
+                            && configurationService.getValue(InlineChatConfigKeys.Mode) === EditMode.Live;
+                    },
+                }
             }
         });
+        this._disposables.add(this.widget);
+        let scrollState;
+        this._disposables.add(this.widget.chatWidget.onWillMaybeChangeHeight(() => {
+            if (this.position) {
+                scrollState = StableEditorBottomScrollState.capture(this.editor);
+            }
+        }));
         this._disposables.add(this.widget.onDidChangeHeight(() => {
             if (this.position) {
-                this._relayout(this._computeHeight().linesValue);
+                scrollState ??= StableEditorBottomScrollState.capture(this.editor);
+                const height = this._computeHeight();
+                this._relayout(height.linesValue);
+                scrollState.restore(this.editor);
+                scrollState = undefined;
+                this._revealTopOfZoneWidget(this.position, height);
             }
         }));
-        this._disposables.add(this.widget);
         this.create();
         this._disposables.add(addDisposableListener(this.domNode, 'click', e => {
             if (!this.editor.hasWidgetFocus() && !this.widget.hasFocus()) {
@@ -86,14 +100,12 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         container.appendChild(this.widget.domNode);
     }
     _doLayout(heightInPixel) {
-        const width = Math.min(640, this._availableSpaceGivenIndentation(this._indentationWidth));
+        const info = this.editor.getLayoutInfo();
+        let width = info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth);
+        width = Math.min(640, width);
         this._dimension = ( (new Dimension(width, heightInPixel)));
         this.widget.layout(this._dimension);
     }
-    _availableSpaceGivenIndentation(indentationWidth) {
-        const info = this.editor.getLayoutInfo();
-        return info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + (indentationWidth ?? 0));
-    }
     _computeHeight() {
         const chatContentHeight = this.widget.contentHeight;
         const editorHeight = this.editor.getLayoutInfo().height;
@@ -114,78 +126,55 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.container.style.marginLeft = `${marginWithoutIndentation}px`;
         const height = this._computeHeight();
         super.show(position, height.linesValue);
-        this._setWidgetMargins(position);
         this.widget.chatWidget.setVisible(true);
         this.widget.focus();
         scrollState.restore(this.editor);
-        if (position.lineNumber > 1) {
-            this.editor.revealRangeNearTopIfOutsideViewport(Range.fromPositions(position.delta(-1)), ScrollType.Immediate);
-        }
-        else {
-            const lineTop = this.editor.getTopForLineNumber(position.lineNumber);
-            const zoneTop = lineTop - height.pixelsValue;
-            const spaceBelowLine = this.editor.getScrollHeight() - this.editor.getBottomForLineNumber(position.lineNumber);
-            const minTop = this.editor.getScrollTop() - spaceBelowLine;
-            const newTop = Math.max(zoneTop, minTop);
-            if (newTop < this.editor.getScrollTop()) {
-                this.editor.setScrollTop(newTop, ScrollType.Immediate);
-            }
-        }
+        this._revealTopOfZoneWidget(position, height);
     }
     updatePositionAndHeight(position) {
-        super.updatePositionAndHeight(position, this._computeHeight().linesValue);
-        this._setWidgetMargins(position);
-    }
-    _getWidth(info) {
-        return info.width - info.minimap.minimapWidth;
-    }
-    updateBackgroundColor(newPosition, wholeRange) {
-        assertType(this.container);
-        const widgetLineNumber = newPosition.lineNumber;
-        this.container.classList.toggle('inside-selection', widgetLineNumber > wholeRange.startLineNumber && widgetLineNumber < wholeRange.endLineNumber);
+        const scrollState = StableEditorBottomScrollState.capture(this.editor);
+        const height = this._computeHeight();
+        super.updatePositionAndHeight(position, height.linesValue);
+        scrollState.restore(this.editor);
+        this._revealTopOfZoneWidget(position, height);
     }
-    _calculateIndentationWidth(position) {
-        const viewModel = this.editor._getViewModel();
-        if (!viewModel) {
-            return 0;
-        }
-        const visibleRange = viewModel.getCompletelyVisibleViewRange();
-        if (!visibleRange.containsPosition(position)) {
-            return 0;
+    _revealTopOfZoneWidget(position, height) {
+        const lineNumber = position.lineNumber <= 1 ? 1 : 1 + position.lineNumber;
+        const scrollTop = this.editor.getScrollTop();
+        const lineTop = this.editor.getTopForLineNumber(lineNumber);
+        const zoneTop = lineTop - height.pixelsValue;
+        const editorHeight = this.editor.getLayoutInfo().height;
+        const lineBottom = this.editor.getBottomForLineNumber(lineNumber);
+        let newScrollTop = zoneTop;
+        let forceScrollTop = false;
+        if (lineBottom >= (scrollTop + editorHeight)) {
+            newScrollTop = lineBottom - editorHeight;
+            forceScrollTop = true;
         }
-        let indentationLevel = viewModel.getLineFirstNonWhitespaceColumn(position.lineNumber);
-        let indentationLineNumber = position.lineNumber;
-        for (let lineNumber = position.lineNumber; lineNumber >= visibleRange.startLineNumber; lineNumber--) {
-            const currentIndentationLevel = viewModel.getLineFirstNonWhitespaceColumn(lineNumber);
-            if (currentIndentationLevel !== 0) {
-                indentationLineNumber = lineNumber;
-                indentationLevel = currentIndentationLevel;
-                break;
-            }
+        if (newScrollTop < scrollTop || forceScrollTop) {
+            this._logService.trace('[IE] REVEAL zone', { zoneTop, lineTop, lineBottom, scrollTop, newScrollTop, forceScrollTop });
+            this.editor.setScrollTop(newScrollTop, ScrollType.Immediate);
         }
-        return Math.max(0, this.editor.getOffsetForColumn(indentationLineNumber, indentationLevel));
     }
-    _setWidgetMargins(position) {
-        const indentationWidth = this._calculateIndentationWidth(position);
-        if (this._indentationWidth === indentationWidth) {
-            return;
-        }
-        this._indentationWidth = this._availableSpaceGivenIndentation(indentationWidth) > 400 ? indentationWidth : 0;
-        this.widget.domNode.style.marginLeft = `${this._indentationWidth}px`;
-        this.widget.domNode.style.marginRight = `${this.editor.getLayoutInfo().minimap.minimapWidth}px`;
+    revealRange(range, isLastLine) {
+    }
+    _getWidth(info) {
+        return info.width - info.minimap.minimapWidth;
     }
     hide() {
-        this.container.classList.remove('inside-selection');
+        const scrollState = StableEditorBottomScrollState.capture(this.editor);
         this._ctxCursorPosition.reset();
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
         status(( localizeWithPath(_moduleId, 0, 'Closed inline chat widget')));
+        scrollState.restore(this.editor);
     }
 };
 InlineChatZoneWidget = ( (__decorate([
     ( (__param(2, IInstantiationService))),
-    ( (__param(3, IContextKeyService))),
-    ( (__param(4, IConfigurationService)))
+    ( (__param(3, ILogService))),
+    ( (__param(4, IContextKeyService))),
+    ( (__param(5, IConfigurationService)))
 ], InlineChatZoneWidget)));
 export { InlineChatZoneWidget };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .zone-widget-container.inside-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit;margin-top:8px;padding:0 8px 8px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding:6px 4px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .progress{position:relative}.monaco-workbench .part.editor>.content .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .inline-chat .status{align-items:center;display:flex;justify-content:space-between;margin-top:3px}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:inline-flex;font-size:12px;overflow:hidden}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto}.monaco-workbench .inline-chat .status .label.hidden{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 5px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent .value{overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .inline-chat .followUps{padding:5px}.monaco-workbench .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-workbench .inline-chat .followUps.hidden{display:none}.monaco-workbench .inline-chat .chatMessage{padding:0 3px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-workbench .inline-chat .chatMessage.hidden{display:none}.monaco-workbench .inline-chat .status .actions{display:flex;padding-top:3px}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:6px}.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .inline-chat .status .actions .monaco-text-button{padding:2px 4px;white-space:nowrap}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item{padding:0 2px}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .preview{display:none}.monaco-workbench .inline-chat .previewCreate,.monaco-workbench .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-workbench .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .inline-chat .diff-review.hidden,.monaco-workbench .inline-chat .previewCreate.hidden,.monaco-workbench .inline-chat .previewCreateTitle.hidden,.monaco-workbench .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .inline-chat-toolbar{display:flex}.monaco-workbench .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-workbench .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .interactive-session .interactive-input-and-execute-toolbar .monaco-editor .inline-chat-slash-command{background-color:var(--vscode-chat-slashCommandBackground);border-radius:2px;color:var(--vscode-chat-slashCommandForeground);padding:1px}.monaco-workbench .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-workbench .margin-view-overlays,.monaco-workbench .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-workbench .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
+var css = ".monaco-workbench .zone-widget.inline-chat-widget{z-index:3}.monaco-workbench .zone-widget.inline-chat-widget .interactive-session{max-width:unset}.monaco-workbench .inline-chat{background:var(--vscode-inlineChat-background);border:1px solid var(--vscode-inlineChat-border);border-radius:4px;box-shadow:0 2px 4px 0 var(--vscode-widget-shadow);color:inherit}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part{padding:4px 6px 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-input-part .interactive-input-and-execute-toolbar{border-radius:2px;width:100%}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list{padding:4px 0 0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact{gap:6px;padding-left:6px;padding-right:20px;padding-top:2px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .header .avatar{outline-offset:-1px}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.interactive-item-compact .chat-notification-widget{border:none;margin-bottom:0;padding:0}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-request{border:none}.monaco-workbench .inline-chat .chat-widget .interactive-session .interactive-list .interactive-item-container.minimal>.header{right:10px;top:5px}.monaco-workbench .inline-chat .progress{position:relative}.monaco-workbench .part.editor>.content .inline-chat .progress .monaco-progress-container{top:0}.monaco-workbench .inline-chat>.status{align-items:center;display:flex;justify-content:space-between;padding:4px 6px 0}.monaco-workbench .inline-chat .status .actions.hidden{display:none}.monaco-workbench .inline-chat .status .label{color:var(--vscode-descriptionForeground);display:flex;font-size:11px;overflow:hidden;white-space:nowrap}.monaco-workbench .inline-chat .status .label.info{margin-right:auto;padding-left:2px}.monaco-workbench .inline-chat .status .label.status{margin-left:auto}.monaco-workbench .inline-chat .status .label.hidden{display:none}.monaco-workbench .inline-chat .status .label.error{color:var(--vscode-errorForeground)}.monaco-workbench .inline-chat .status .label.warn{color:var(--vscode-editorWarning-foreground)}.monaco-workbench .inline-chat .status .label>.codicon{font-size:12px;line-height:18px;padding:0 3px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent .value{overflow:hidden;-webkit-user-select:text;user-select:text}.monaco-workbench .inline-chat .followUps{padding:5px}.monaco-workbench .inline-chat .followUps .interactive-session-followups .monaco-button{color:var(--vscode-textLink-foreground);display:block;font-size:12px}.monaco-workbench .inline-chat .followUps.hidden{display:none}.monaco-workbench .inline-chat .chatMessage{padding:0 3px}.monaco-workbench .inline-chat .chatMessage .chatMessageContent{padding:2px}.monaco-workbench .inline-chat .chatMessage.hidden{display:none}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget .toolbar{display:flex;height:18px;.actions-container{gap:3px}.action-item.text-only .action-label{border-radius:2px;font-size:12px;line-height:16px;padding:0 4px}.monaco-action-bar .action-item.menu-entry.text-only+.action-item:not(.text-only)>.monaco-dropdown .action-label{font-size:12px;height:unset;line-height:16px;width:unset}}.monaco-workbench .inline-chat .status .actions,.monaco-workbench .inline-chat-content-widget.contents .toolbar{.monaco-action-bar .action-item.menu-entry.text-only:first-of-type .action-label{background-color:var(--vscode-button-background);color:var(--vscode-button-foreground)}}.monaco-workbench .inline-chat .status{.actions.text-style{display:none}.actions.button-style{display:inherit}}.monaco-workbench .inline-chat .status.text{.actions.text-style{display:inherit}.actions.button-style{display:none}}.monaco-workbench .inline-chat .status .actions>.monaco-button,.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown{margin-right:4px}.monaco-workbench .inline-chat .status .actions>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon{display:flex}.monaco-workbench .inline-chat .status .actions>.monaco-button.codicon:before{align-self:center}.monaco-workbench .inline-chat .status .actions .monaco-text-button{padding:0 2px;white-space:nowrap}.monaco-workbench .inline-chat .status .monaco-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat .status .monaco-toolbar .action-item.button-item .action-label:is(:hover,:focus){background-color:var(--vscode-button-hoverBackground)}.monaco-workbench .inline-chat .preview{display:none}.monaco-workbench .inline-chat .previewCreate,.monaco-workbench .inline-chat .previewDiff{border:1px solid var(--vscode-inlineChat-border);border-radius:2px;display:inherit;margin:6px 0}.monaco-workbench .inline-chat .previewCreateTitle{padding-top:6px}.monaco-workbench .inline-chat .diff-review.hidden,.monaco-workbench .inline-chat .previewCreate.hidden,.monaco-workbench .inline-chat .previewCreateTitle.hidden,.monaco-workbench .inline-chat .previewDiff.hidden{display:none}.monaco-workbench .inline-chat-toolbar{display:flex}.monaco-workbench .inline-chat-toolbar>.monaco-button{margin-right:6px}.monaco-workbench .inline-chat-toolbar .action-label.checked{background-color:var(--vscode-inputOption-activeBackground);color:var(--vscode-inputOption-activeForeground);outline:1px solid var(--vscode-inputOption-activeBorder)}.monaco-workbench .inline-chat-inserted-range{background-color:var(--vscode-inlineChatDiff-inserted)}.monaco-workbench .inline-chat-inserted-range-linehighlight{background-color:var(--vscode-diffEditor-insertedLineBackground)}.monaco-workbench .inline-chat-original-zone2{background-color:var(--vscode-diffEditor-removedLineBackground);opacity:.8}.monaco-workbench .inline-chat-lines-inserted-range{background-color:var(--vscode-diffEditor-insertedTextBackground)}.monaco-workbench .inline-chat-block-selection{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .interactive-session .interactive-input-and-execute-toolbar .monaco-editor .inline-chat-slash-command{background-color:var(--vscode-chat-slashCommandBackground);border-radius:2px;color:var(--vscode-chat-slashCommandForeground);padding:1px}.monaco-workbench .inline-chat-slash-command-detail{opacity:.5}.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-editor-background,.monaco-workbench .inline-chat-diff-widget .monaco-diff-editor .monaco-workbench .margin-view-overlays,.monaco-workbench .inline-chat-newfile-widget{background-color:var(--vscode-inlineChat-regionHighlight)}.monaco-workbench .inline-chat-newfile-widget .title{align-items:center;display:flex;justify-content:space-between}.monaco-workbench .inline-chat-newfile-widget .title .detail{margin-left:4px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget{display:flex;margin-left:auto;margin-right:8px}.monaco-workbench .inline-chat-newfile-widget .buttonbar-widget>.monaco-button{display:inline-flex;margin-left:4px;white-space:nowrap}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{cursor:pointer;display:block;transition:opacity .2s ease-in-out}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque{opacity:.5}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent{opacity:0}.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-opaque:hover,.monaco-workbench .glyph-margin-widgets .cgmr.codicon-inline-chat-transparent:hover{opacity:1}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-workbench .inline-chat-content-widget{background-color:var(--vscode-inlineChat-background);border-radius:4px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);padding:6px;z-index:50}.monaco-workbench .inline-chat-content-widget .hidden{display:none}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session{max-width:unset}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact{padding:0}.monaco-workbench .inline-chat-content-widget .message{color:var(--vscode-descriptionForeground);display:inline-flex;font-size:11px;overflow:hidden}.monaco-workbench .inline-chat-content-widget .message>.codicon{font-size:12px;line-height:18px;padding-right:5px}";
+var css = ".monaco-workbench .inline-chat-content-widget{background-color:var(--vscode-inlineChat-background);border-radius:4px;box-shadow:0 4px 8px var(--vscode-inlineChat-shadow);padding:6px;z-index:50}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-session{max-width:unset}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part .interactive-execute-toolbar{margin-bottom:1px}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-input-part.compact{padding:0}.monaco-workbench .inline-chat-content-widget.interactive-session .interactive-list{display:none}.monaco-workbench .inline-chat-content-widget.interactive-session .toolbar{display:none;padding-top:4px}";
 n(css,{});
 export { css, css as default };