@codingame/monaco-vscode-api 2.0.3 → 2.1.0

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

@@ -6,8 +6,8 @@ import { localizeWithPath } from '../../../../nls.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
-import { CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, MENU_INLINE_CHAT_WIDGET_TOGGLE, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_FEEDBACK } from '../common/inlineChat.js';
-import { h, addDisposableListener, getWindow, getTotalWidth, Dimension, getTotalHeight, reset, getActiveElement, EventType } from '../../../../base/browser/dom.js';
+import { CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, ACTION_ACCEPT_CHANGES, CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, MENU_INLINE_CHAT_INPUT, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_FEEDBACK } from '../common/inlineChat.js';
+import { h, addDisposableListener, getTotalWidth, Dimension, getTotalHeight, reset, getActiveElement } from '../../../../base/browser/dom.js';
 import { MicrotaskEmitter, Event, Emitter } from '../../../../base/common/event.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
 import { SnippetController2 } from '../../../../editor/contrib/snippet/browser/snippetController2.js';
@@ -21,8 +21,7 @@ import { DEFAULT_FONT_FAMILY } from '../../../browser/style.js';
 import { ResourceLabel } from '../../../browser/labels.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
-import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
-import { invertLineRange, lineRangeAsRange } from './utils.js';
+import { invertLineRange, asRange } from './utils.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
@@ -30,11 +29,9 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { ExpansionState } from './inlineChatSession.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
-import { MenuWorkbenchButtonBar, WorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
+import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
 import { SlashCommandContentWidget } from '../../chat/browser/chatSlashCommandContentWidget.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
-import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { assertType } from '../../../../base/common/types.js';
 import { renderFormattedText } from '../../../../base/browser/formattedTextRenderer.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
@@ -91,6 +88,7 @@ const _inputEditorOptions = {
     suggest: {
         showIcons: false,
         showSnippets: false,
+        showWords: true,
         showStatusBar: false,
     },
     wordWrap: 'on',
@@ -122,7 +120,7 @@ const _previewEditorEditorOptions = {
 let InlineChatWidget = class InlineChatWidget {
     static { InlineChatWidget_1 = this; }
     static { this._modelPool = 1; }
-    constructor(parentEditor, _options, _modelService, _contextKeyService, _languageFeaturesService, _keybindingService, _instantiationService, _accessibilityService, _configurationService, _contextMenuService, _accessibleViewService, _editorWorkerService, _logService, _textModelResolverService, _chatAgentService) {
+    constructor(parentEditor, _options, _modelService, _contextKeyService, _languageFeaturesService, _keybindingService, _instantiationService, _accessibilityService, _configurationService, _accessibleViewService, _editorWorkerService, _logService, _textModelResolverService, _chatAgentService) {
         this.parentEditor = parentEditor;
         this._modelService = _modelService;
         this._contextKeyService = _contextKeyService;
@@ -131,7 +129,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._instantiationService = _instantiationService;
         this._accessibilityService = _accessibilityService;
         this._configurationService = _configurationService;
-        this._contextMenuService = _contextMenuService;
         this._accessibleViewService = _accessibleViewService;
         this._editorWorkerService = _editorWorkerService;
         this._logService = _logService;
@@ -146,8 +143,10 @@ let InlineChatWidget = class InlineChatWidget {
                     ]),
                     h('div.toolbar@editorToolbar'),
                 ]),
+                h('div.widget-toolbar@widgetToolbar')
             ]),
             h('div.progress@progress'),
+            h('div.detectedIntent.hidden@detectedIntent'),
             h('div.previewDiff.hidden@previewDiff'),
             h('div.previewCreateTitle.show-file-icons@previewCreateTitle'),
             h('div.previewCreate.hidden@previewCreate'),
@@ -158,7 +157,6 @@ let InlineChatWidget = class InlineChatWidget {
             h('div.followUps.hidden@followUps'),
             h('div.status@status', [
                 h('div.label.info.hidden@infoLabel'),
-                h('div.actions.hidden@extraToolbar'),
                 h('div.actions.hidden@statusToolbar'),
                 h('div.label.status.hidden@statusLabel'),
                 h('div.actions.hidden@feedbackToolbar'),
@@ -173,12 +171,14 @@ let InlineChatWidget = class InlineChatWidget {
         this._onDidChangeLayout = this._store.add(( new MicrotaskEmitter()));
         this._onDidChangeInput = this._store.add(( new Emitter()));
         this.onDidChangeInput = this._onDidChangeInput.event;
+        this._onRequestWithoutIntentDetection = this._store.add(( new Emitter()));
+        this.onRequestWithoutIntentDetection = this._onRequestWithoutIntentDetection.event;
         this._isLayouting = false;
         this._expansionState = ExpansionState.NOT_CROPPED;
         this._slashCommandDetails = [];
         this._chatMessageDisposables = this._store.add(( new DisposableStore()));
         this._followUpDisposables = this._store.add(( new DisposableStore()));
-        this._extraButtonsCleanup = this._store.add(( new MutableDisposable()));
+        this._slashCommandUsedDisposables = this._store.add(( new DisposableStore()));
         const codeEditorWidgetOptions = {
             isSimpleWidget: true,
             contributions: EditorExtensionsRegistry.getSomeEditorContributions([
@@ -270,13 +270,16 @@ let InlineChatWidget = class InlineChatWidget {
         togglePlaceholder();
         this._slashCommandContentWidget = ( new SlashCommandContentWidget(this._inputEditor));
         this._store.add(this._slashCommandContentWidget);
-        const toolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.editorToolbar, _options.menuId, {
+        this._store.add(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.editorToolbar, _options.menuId, {
             telemetrySource: 'interactiveEditorWidget-toolbar',
             toolbarOptions: { primaryGroup: 'main' }
-        });
-        this._store.add(toolbar);
+        }));
         this._progressBar = ( new ProgressBar(this._elements.progress));
         this._store.add(this._progressBar);
+        this._store.add(this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.widgetToolbar, _options.widgetMenuId, {
+            telemetrySource: 'interactiveEditorWidget-toolbar',
+            toolbarOptions: { primaryGroup: 'main' }
+        }));
         const workbenchMenubarOptions = {
             telemetrySource: 'interactiveEditorWidget-toolbar',
             buttonConfigProvider: action => {
@@ -306,6 +309,7 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(feedbackToolbar);
         this._previewDiffEditor = ( new Lazy(
             () => this._store.add(_instantiationService.createInstance(EmbeddedDiffEditorWidget, this._elements.previewDiff, {
+                useInlineViewWhenSpaceIsLimited: false,
                 ..._previewEditorEditorOptions,
                 onlyShowAccessibleDiffViewer: this._accessibilityService.isScreenReaderOptimized(),
             }, { modifiedEditor: codeEditorWidgetOptions, originalEditor: codeEditorWidgetOptions }, parentEditor))
@@ -322,9 +326,6 @@ let InlineChatWidget = class InlineChatWidget {
         const markdownMessageToolbar = this._instantiationService.createInstance(MenuWorkbenchToolBar, this._elements.messageActions, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, workbenchToolbarOptions);
         this._store.add(markdownMessageToolbar.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
         this._store.add(markdownMessageToolbar);
-        this._store.add(addDisposableListener(this._elements.root, EventType.CONTEXT_MENU, async (event) => {
-            this._onContextMenu(event);
-        }));
         this._store.add(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration("accessibility.verbosity.inlineChat" )) {
                 this._elements.chatMessageContent.ariaLabel = this._accessibleViewService.getOpenAriaHint("accessibility.verbosity.inlineChat" );
@@ -332,13 +333,6 @@ let InlineChatWidget = class InlineChatWidget {
             }
         }));
     }
-    _onContextMenu(e) {
-        const event = ( new StandardMouseEvent(getWindow(this._elements.root), e));
-        this._contextMenuService.showContextMenu({
-            menuId: MENU_INLINE_CHAT_WIDGET_TOGGLE,
-            getAnchor: () => event,
-        });
-    }
     _updateAriaLabel() {
         if (!this._accessibilityService.isScreenReaderOptimized()) {
             return;
@@ -368,22 +362,25 @@ let InlineChatWidget = class InlineChatWidget {
     get domNode() {
         return this._elements.root;
     }
-    layout(dim) {
+    layout(_dim) {
         this._isLayouting = true;
         try {
-            const innerEditorWidth = dim.width - ((getTotalWidth(this._elements.editorToolbar) + 8) );
-            dim = ( new Dimension(innerEditorWidth, dim.height));
+            const widgetToolbarWidth = getTotalWidth(this._elements.widgetToolbar);
+            const editorToolbarWidth = getTotalWidth(this._elements.editorToolbar) + 8 ;
+            const innerEditorWidth = _dim.width - editorToolbarWidth - widgetToolbarWidth;
+            const dim = ( new Dimension(innerEditorWidth, _dim.height));
             if (!this._lastDim || !Dimension.equals(this._lastDim, dim)) {
                 this._lastDim = dim;
                 this._inputEditor.layout(( new Dimension(innerEditorWidth, this._inputEditor.getContentHeight())));
                 this._elements.placeholder.style.width = `${innerEditorWidth }px`;
                 if (this._previewDiffEditor.hasValue) {
                     const previewDiffDim = ( new Dimension(
-                        dim.width,
+                        _dim.width - 12,
                         Math.min(300, Math.max(0, this._previewDiffEditor.value.getContentHeight()))
                     ));
-                    this._previewDiffEditor.value.layout(previewDiffDim);
+                    this._elements.previewDiff.style.width = `${previewDiffDim.width}px`;
                     this._elements.previewDiff.style.height = `${previewDiffDim.height}px`;
+                    this._previewDiffEditor.value.layout(previewDiffDim);
                 }
                 if (this._previewCreateEditor.hasValue) {
                     const previewCreateDim = ( new Dimension(
@@ -408,19 +405,22 @@ let InlineChatWidget = class InlineChatWidget {
     getHeight() {
         const base = getTotalHeight(this._elements.progress) + getTotalHeight(this._elements.status);
         const editorHeight = this._inputEditor.getContentHeight() + 12 ;
+        const detectedIntentHeight = getTotalHeight(this._elements.detectedIntent);
         const followUpsHeight = getTotalHeight(this._elements.followUps);
         const chatResponseHeight = getTotalHeight(this._elements.chatMessage);
         const previewDiffHeight = this._previewDiffEditor.hasValue && this._previewDiffEditor.value.getModel() ? 12 + Math.min(300, Math.max(0, this._previewDiffEditor.value.getContentHeight())) : 0;
         const previewCreateTitleHeight = getTotalHeight(this._elements.previewCreateTitle);
         const previewCreateHeight = this._previewCreateEditor.hasValue && this._previewCreateEditor.value.getModel() ? 18 + Math.min(300, Math.max(0, this._previewCreateEditor.value.getContentHeight())) : 0;
-        return base + editorHeight + followUpsHeight + chatResponseHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + 18  + 8 ;
+        return base + editorHeight + detectedIntentHeight + followUpsHeight + chatResponseHeight + previewDiffHeight + previewCreateTitleHeight + previewCreateHeight + 18  + 8 ;
     }
     updateProgress(show) {
         if (show) {
+            this._progressBar.show();
             this._progressBar.infinite();
         }
         else {
             this._progressBar.stop();
+            this._progressBar.hide();
         }
     }
     get value() {
@@ -464,12 +464,6 @@ let InlineChatWidget = class InlineChatWidget {
         this._elements.infoLabel.classList.toggle('hidden', show);
         this._onDidChangeHeight.fire();
     }
-    setExtraButtons(buttons) {
-        const bar = this._instantiationService.createInstance(WorkbenchButtonBar, this._elements.extraToolbar, { telemetrySource: 'inlineChat' });
-        bar.update(buttons);
-        this._elements.extraToolbar.classList.toggle('hidden', buttons.length === 0);
-        this._extraButtonsCleanup.value = bar;
-    }
     get expansionState() {
         return this._expansionState;
     }
@@ -497,6 +491,7 @@ let InlineChatWidget = class InlineChatWidget {
                 message.message,
                 sessionModel,
                 undefined,
+                undefined,
                 message.requestId,
                 !isIncomplete,
                 false,
@@ -571,15 +566,30 @@ let InlineChatWidget = class InlineChatWidget {
         if (!details) {
             return;
         }
-        this._elements.infoLabel.classList.toggle('hidden', false);
+        this._elements.detectedIntent.classList.toggle('hidden', false);
+        this._slashCommandUsedDisposables.clear();
         const label = ( localizeWithPath(
             'vs/workbench/contrib/inlineChat/browser/inlineChatWidget',
             'slashCommandUsed',
-            "Using {0} to generate response...",
+            "Using {0} to generate response ([[re-run without]])",
             `\`\`/${details.command}\`\``
         ));
-        const e = renderFormattedText(label, { inline: true, renderCodeSegments: true, className: 'slash-command-pill' });
-        reset(this._elements.infoLabel, e);
+        const usingSlashCommandText = renderFormattedText(label, {
+            inline: true,
+            renderCodeSegments: true,
+            className: 'slash-command-pill',
+            actionHandler: {
+                callback: (content) => {
+                    if (content !== '0') {
+                        return;
+                    }
+                    this._elements.detectedIntent.classList.toggle('hidden', true);
+                    this._onRequestWithoutIntentDetection.fire();
+                },
+                disposables: this._slashCommandUsedDisposables,
+            }
+        });
+        reset(this._elements.detectedIntent, usingSlashCommandText);
         this._onDidChangeHeight.fire();
     }
     updateInfo(message) {
@@ -617,10 +627,11 @@ let InlineChatWidget = class InlineChatWidget {
         this.updateChatMessage(undefined);
         this.updateFollowUps(undefined);
         reset(this._elements.statusLabel);
+        this._elements.detectedIntent.classList.toggle('hidden', true);
         this._elements.statusLabel.classList.toggle('hidden', true);
-        this._elements.extraToolbar.classList.add('hidden');
         this._elements.statusToolbar.classList.add('hidden');
         this._elements.feedbackToolbar.classList.add('hidden');
+        this.updateInfo('');
         this.hideCreatePreview();
         this.hideEditsPreview();
         this._onDidChangeHeight.fire();
@@ -631,19 +642,14 @@ let InlineChatWidget = class InlineChatWidget {
     hasFocus() {
         return this.domNode.contains(getActiveElement());
     }
-    async showEditsPreview(textModel0, textModelN, allEdits) {
+    async showEditsPreview(textModel0, textModelN) {
         this._elements.previewDiff.classList.remove('hidden');
-        const languageSelection = { languageId: textModel0.getLanguageId(), onDidChange: Event.None };
-        const modified = this._modelService.createModel(createTextBufferFactoryFromSnapshot(textModel0.createSnapshot()), languageSelection, undefined, true);
-        for (const edits of allEdits) {
-            modified.applyEdits(edits, false);
-        }
-        const diff = await this._editorWorkerService.computeDiff(textModel0.uri, modified.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced');
+        const diff = await this._editorWorkerService.computeDiff(textModel0.uri, textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced');
         if (!diff || diff.changes.length === 0) {
             this.hideEditsPreview();
             return;
         }
-        this._previewDiffEditor.value.setModel({ original: textModel0, modified });
+        this._previewDiffEditor.value.setModel({ original: textModel0, modified: textModelN });
         let originalLineRange = diff.changes[0].original;
         let modifiedLineRange = diff.changes[0].modified;
         for (let i = 1; i < diff.changes.length; i++) {
@@ -654,14 +660,14 @@ let InlineChatWidget = class InlineChatWidget {
         const newStartLine = Math.max(1, originalLineRange.startLineNumber - pad);
         modifiedLineRange = ( new LineRange(newStartLine, modifiedLineRange.endLineNumberExclusive));
         originalLineRange = ( new LineRange(newStartLine, originalLineRange.endLineNumberExclusive));
-        const newEndLineModified = Math.min(modifiedLineRange.endLineNumberExclusive + pad, modified.getLineCount());
+        const newEndLineModified = Math.min(modifiedLineRange.endLineNumberExclusive + pad, textModelN.getLineCount());
         modifiedLineRange = ( new LineRange(modifiedLineRange.startLineNumber, newEndLineModified));
         const newEndLineOriginal = Math.min(originalLineRange.endLineNumberExclusive + pad, textModel0.getLineCount());
         originalLineRange = ( new LineRange(originalLineRange.startLineNumber, newEndLineOriginal));
         const hiddenOriginal = invertLineRange(originalLineRange, textModel0);
-        const hiddenModified = invertLineRange(modifiedLineRange, modified);
-        this._previewDiffEditor.value.getOriginalEditor().setHiddenAreas(( hiddenOriginal.map(lineRangeAsRange)), 'diff-hidden');
-        this._previewDiffEditor.value.getModifiedEditor().setHiddenAreas(( hiddenModified.map(lineRangeAsRange)), 'diff-hidden');
+        const hiddenModified = invertLineRange(modifiedLineRange, textModelN);
+        this._previewDiffEditor.value.getOriginalEditor().setHiddenAreas(( hiddenOriginal.map(lr => asRange(lr, textModel0))), 'diff-hidden');
+        this._previewDiffEditor.value.getModifiedEditor().setHiddenAreas(( hiddenModified.map(lr => asRange(lr, textModelN))), 'diff-hidden');
         this._previewDiffEditor.value.revealLine(modifiedLineRange.startLineNumber, 1 );
         this._onDidChangeHeight.fire();
     }
@@ -727,6 +733,7 @@ let InlineChatWidget = class InlineChatWidget {
         const decorations = this._inputEditor.createDecorationsCollection();
         const updateSlashDecorations = () => {
             this._slashCommandContentWidget.hide();
+            this._elements.detectedIntent.classList.toggle('hidden', true);
             const newDecorations = [];
             for (const command of commands) {
                 const withSlash = `/${command.command}`;
@@ -773,12 +780,11 @@ InlineChatWidget = InlineChatWidget_1 = ( __decorate([
     ( __param(6, IInstantiationService)),
     ( __param(7, IAccessibilityService)),
     ( __param(8, IConfigurationService)),
-    ( __param(9, IContextMenuService)),
-    ( __param(10, IAccessibleViewService)),
-    ( __param(11, IEditorWorkerService)),
-    ( __param(12, ILogService)),
-    ( __param(13, ITextModelService)),
-    ( __param(14, IChatAgentService))
+    ( __param(9, IAccessibleViewService)),
+    ( __param(10, IEditorWorkerService)),
+    ( __param(11, ILogService)),
+    ( __param(12, ITextModelService)),
+    ( __param(13, IChatAgentService))
 ], InlineChatWidget));
 let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
     constructor(editor, _instaService, contextKeyService) {
@@ -791,7 +797,8 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
             this._ctxCursorPosition.reset();
         }));
         this.widget = this._instaService.createInstance(InlineChatWidget, this.editor, {
-            menuId: MENU_INLINE_CHAT_WIDGET,
+            menuId: MENU_INLINE_CHAT_INPUT,
+            widgetMenuId: MENU_INLINE_CHAT_WIDGET,
             statusMenuId: MENU_INLINE_CHAT_WIDGET_STATUS,
             feedbackMenuId: MENU_INLINE_CHAT_WIDGET_FEEDBACK
         });
@@ -884,10 +891,8 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
         this.container.style.marginLeft = `${marginWithoutIndentation}px`;
     }
-    setWidgetMargins(position, indentationWidth) {
-        if (indentationWidth === undefined) {
-            indentationWidth = this._calculateIndentationWidth(position);
-        }
+    setWidgetMargins(position) {
+        const indentationWidth = this._calculateIndentationWidth(position);
         if (this._indentationWidth === indentationWidth) {
             return;
         }

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

@@ -1,5 +1,8 @@
+import { EditOperation } from '../../../../editor/common/core/editOperation.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../editor/common/core/range.js';
+import { AsyncIterableSource } from '../../../../base/common/async.js';
+import { getNWords } from '../../chat/common/chatWordCounter.js';
 function invertLineRange(range, model) {
     if (range.isEmpty) {
         return [];
@@ -13,7 +16,72 @@ function invertLineRange(range, model) {
     }
     return result.filter(r => !r.isEmpty);
 }
-function lineRangeAsRange(r) {
-    return ( new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1));
+function asRange(lineRange, model) {
+    return lineRange.isEmpty
+        ? ( new Range(
+        lineRange.startLineNumber,
+        1,
+        lineRange.startLineNumber,
+        model.getLineLength(lineRange.startLineNumber)
+    ))
+        : ( new Range(
+        lineRange.startLineNumber,
+        1,
+        lineRange.endLineNumberExclusive - 1,
+        model.getLineLength(lineRange.endLineNumberExclusive - 1)
+    ));
 }
-export { invertLineRange, lineRangeAsRange };
+async function performAsyncTextEdit(model, edit, progress, obs) {
+    const [id] = model.deltaDecorations([], [{
+            range: edit.range,
+            options: {
+                description: 'asyncTextEdit',
+                stickiness: 0
+            }
+        }]);
+    let first = true;
+    for await (const part of edit.newText) {
+        if (model.isDisposed()) {
+            break;
+        }
+        const range = model.getDecorationRange(id);
+        if (!range) {
+            throw new Error('FAILED to perform async replace edit because the anchor decoration was removed');
+        }
+        const edit = first
+            ? EditOperation.replace(range, part)
+            : EditOperation.insert(range.getEndPosition(), part);
+        obs?.start();
+        model.pushEditOperations(null, [edit], (undoEdits) => {
+            progress?.report(undoEdits);
+            return null;
+        });
+        obs?.stop();
+        first = false;
+    }
+}
+function asProgressiveEdit(interval, edit, wordsPerSec, token) {
+    wordsPerSec = Math.max(10, wordsPerSec);
+    const stream = ( new AsyncIterableSource());
+    let newText = edit.text ?? '';
+    interval.cancelAndSet(() => {
+        const r = getNWords(newText, 1);
+        stream.emitOne(r.value);
+        newText = newText.substring(r.value.length);
+        if (r.isFullString) {
+            interval.cancel();
+            stream.resolve();
+            d.dispose();
+        }
+    }, 1000 / wordsPerSec);
+    const d = token.onCancellationRequested(() => {
+        interval.cancel();
+        stream.resolve();
+        d.dispose();
+    });
+    return {
+        range: edit.range,
+        newText: stream.asyncIterable
+    };
+}
+export { asProgressiveEdit, asRange, invertLineRange, performAsyncTextEdit };

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -9,7 +9,6 @@ import { Extensions } from '../../../common/configuration.js';
 const IInlineChatService = ( createDecorator('IInlineChatService'));
 const INLINE_CHAT_ID = 'interactiveEditor';
 const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = 'interactiveEditorAccessiblityHelp';
-const INLINE_CHAT_DECORATIONS_ID = 'interactiveEditorDecorations';
 const CTX_INLINE_CHAT_HAS_PROVIDER = ( new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatHasProvider',
@@ -80,11 +79,15 @@ const CTX_INLINE_CHAT_LAST_RESPONSE_TYPE = ( new RawContextKey('inlineChatLastRe
     'inlineChatResponseType',
     "What type was the last response of the current interactive editor session"
 ))));
-const CTX_INLINE_CHAT_RESPONSE_TYPES = ( new RawContextKey('inlineChatResponseTypes', undefined, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
+const CTX_INLINE_CHAT_RESPONSE_TYPES = ( new RawContextKey(
     'inlineChatResponseTypes',
-    "What type was the responses have been receieved"
-))));
+    "empty" ,
+    ( localizeWithPath(
+        'vs/workbench/contrib/inlineChat/common/inlineChat',
+        'inlineChatResponseTypes',
+        "What type was the responses have been receieved"
+    ))
+));
 const CTX_INLINE_CHAT_DID_EDIT = ( new RawContextKey('inlineChatDidEdit', undefined, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatDidEdit',
@@ -121,16 +124,15 @@ const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( new RawContextKey('inlineChatChangeS
     "Whether the current change showing a diff"
 ))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( new RawContextKey('config.inlineChat.mode', "live" ));
-const CTX_INLINE_CHAT_TOOLBAR_ICON_ENABLED = ( new RawContextKey('config.inlineChat.showToolbarIcon', false));
-const ACTION_ACCEPT_CHANGES = 'interactive.acceptChanges';
+const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
+const MENU_INLINE_CHAT_INPUT = MenuId.for('inlineChatInput');
 const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
 const MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE = MenuId.for('inlineChatWidget.markdownMessage');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
 const MENU_INLINE_CHAT_WIDGET_FEEDBACK = MenuId.for('inlineChatWidget.feedback');
 const MENU_INLINE_CHAT_WIDGET_DISCARD = MenuId.for('inlineChatWidget.undo');
-const MENU_INLINE_CHAT_WIDGET_TOGGLE = MenuId.for('inlineChatWidget.toggle');
 registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChat.background',
@@ -176,11 +178,21 @@ const inlineChatDiffInserted = registerColor('inlineChatDiff.inserted', { dark:
     'inlineChatDiff.inserted',
     "Background color of inserted text in the interactive editor input"
 )));
+const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( transparent(diffInserted, 0.6)), light: ( transparent(diffInserted, 0.8)), hcDark: ( transparent(diffInserted, 0.6)), hcLight: ( transparent(diffInserted, 0.8)) }, ( localizeWithPath(
+    'vs/workbench/contrib/inlineChat/common/inlineChat',
+    'editorOverviewRuler.inlineChatInserted',
+    'Overview ruler marker color for inline chat inserted content.'
+)));
 const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)), light: ( transparent(diffRemoved, .5)), hcDark: ( transparent(diffRemoved, .5)), hcLight: ( transparent(diffRemoved, .5)) }, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/common/inlineChat',
     'inlineChatDiff.removed',
     "Background color of removed text in the interactive editor input"
 )));
+registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(diffRemoved, 0.6)), light: ( transparent(diffRemoved, 0.8)), hcDark: ( transparent(diffRemoved, 0.6)), hcLight: ( transparent(diffRemoved, 0.8)) }, ( localizeWithPath(
+    'vs/workbench/contrib/inlineChat/common/inlineChat',
+    'editorOverviewRuler.inlineChatRemoved',
+    'Overview ruler marker color for inline chat removed content.'
+)));
 ( Registry.as(Extensions.ConfigurationMigration)).registerConfigurationMigrations([{
         key: 'interactiveEditor.editMode', migrateFn: (value) => {
             return [['inlineChat.mode', { value: value }]];
@@ -189,11 +201,11 @@ const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', { dark: (
 ( Registry.as(Extensions$1.Configuration)).registerConfiguration({
     id: 'editor',
     properties: {
-        'inlineChat.mode': {
+        ["inlineChat.mode" ]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/common/inlineChat',
                 'mode',
-                "Configure if changes crafted in the interactive editor are applied directly to the document or are previewed first."
+                "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: "livePreview" ,
             type: 'string',
@@ -212,55 +224,38 @@ const inlineChatDiffRemoved = registerColor('inlineChatDiff.removed', { dark: (
                 ( localizeWithPath(
                     'vs/workbench/contrib/inlineChat/common/inlineChat',
                     'mode.live',
-                    "Changes are applied directly to the document but can be highlighted via inline diffs. Ending a session will keep the changes."
+                    "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
-            ]
+            ],
+            tags: ['experimental']
         },
-        'inlineChat.showDiff': {
+        ["inlineChat.finishOnType" ]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'showDiff',
-                "Enable/disable showing the diff when edits are generated. Works only with inlineChat.mode equal to live or livePreview."
+                'finishOnType',
+                "Whether to finish an inline chat session when typing outside of changed regions."
             )),
-            default: true,
+            default: false,
             type: 'boolean'
         },
-        'inlineChat.showGutterIcon': {
+        ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'showGutterIcon',
-                "Controls when the gutter icon for spawning inline chat is shown."
+                'acceptedOrDiscardBeforeSave',
+                "Whether pending inline chat sessions prevent saving."
             )),
-            default: "never" ,
-            type: 'string',
-            enum: ["always" , "mouseover" , "never" ],
-            markdownEnumDescriptions: [
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'showGutterIcon.always',
-                    "Always show the gutter icon."
-                )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'showGutterIcon.mouseover',
-                    "Show the gutter icon when the mouse is over the icon."
-                )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'showGutterIcon.never',
-                    "Never show the gutter icon."
-                )),
-            ]
+            default: true,
+            type: 'boolean'
         },
-        'inlineChat.showToolbarIcon': {
+        ["inlineChat.holdToSpeech" ]: {
             description: ( localizeWithPath(
                 'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'showToolbarIcon',
-                "Controls whether the toolbar icon spawning the inline chat is enabled."
+                'holdToSpeech',
+                "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
-            default: false,
+            default: true,
             type: 'boolean'
         }
     }
 });
-export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_TOOLBAR_ICON_ENABLED, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, IInlineChatService, INLINE_CHAT_DECORATIONS_ID, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_WIDGET_TOGGLE, inlineChatDiffInserted, inlineChatDiffRemoved, inlineChatRegionHighlight };
+export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DID_EDIT, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST, CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_END, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_INNER_CURSOR_START, CTX_INLINE_CHAT_LAST_FEEDBACK, CTX_INLINE_CHAT_LAST_RESPONSE_TYPE, CTX_INLINE_CHAT_MESSAGE_CROP_STATE, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPES, CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, IInlineChatService, INLINE_CHAT_ID, INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, MENU_INLINE_CHAT_INPUT, MENU_INLINE_CHAT_WIDGET, MENU_INLINE_CHAT_WIDGET_DISCARD, MENU_INLINE_CHAT_WIDGET_FEEDBACK, MENU_INLINE_CHAT_WIDGET_MARKDOWN_MESSAGE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatDiffInserted, inlineChatDiffRemoved, inlineChatRegionHighlight, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { assertFn } from '../../../../base/common/assert.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { isDefined } from '../../../../base/common/types.js';
+import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../platform/files/common/files.js';
@@ -30,8 +31,8 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
     get useWorkingCopy() {
         return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
     }
-    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService) {
-        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService);
+    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService, textResourceConfigurationService) {
+        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
         this.base = base;
         this.input1 = input1;
         this.input2 = input2;
@@ -145,6 +146,7 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([
     ( __param(7, ILabelService)),
     ( __param(8, IFileService)),
     ( __param(9, IConfigurationService)),
-    ( __param(10, IFilesConfigurationService))
+    ( __param(10, IFilesConfigurationService)),
+    ( __param(11, ITextResourceConfigurationService))
 ], MergeEditorInput));
 export { MergeEditorInput, MergeEditorInputData };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -452,7 +452,7 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 checkbox: { label: ( localizeWithPath(
                     'vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel',
                     'noMoreWarn',
-                    "Don't ask again"
+                    "Do not ask me again"
                 )) }
             });
             if (checkboxChecked) {