@codingame/monaco-vscode-api 26.2.1 → 27.0.0

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js

@@ -14,7 +14,9 @@ import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { computeEditKind } from './editKind.js';
 import { inlineCompletionIsVisible } from './inlineCompletionIsVisible.js';
+import { InlineSuggestData } from './provideInlineCompletions.js';
 import { InlineSuggestAlternativeAction } from './InlineSuggestAlternativeAction.js';
+import { TextModelValueReference } from './textModelValueReference.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 
@@ -32,15 +34,25 @@ var InlineSuggestionItem;
 function hashInlineSuggestionAction(action) {
     const obj = action?.kind === "edit" ? {
         ...action,
-        alternativeAction: ( InlineSuggestAlternativeAction.toString(action.alternativeAction))
-    } : action;
+        alternativeAction: ( InlineSuggestAlternativeAction.toString(action.alternativeAction)),
+        target: action?.target.uri.toString()
+    } : {
+        ...action,
+        target: action?.target.uri.toString()
+    };
     return JSON.stringify(obj);
 }
 class InlineSuggestionItemBase {
-    constructor(_data, identity, hint) {
+    constructor(
+        _data,
+        identity,
+        hint,
+        originalTextRef
+    ) {
         this._data = _data;
         this.identity = identity;
         this.hint = hint;
+        this.originalTextRef = originalTextRef;
     }
     get source() {
         return this._data.source;
@@ -147,7 +159,7 @@ class InlineSuggestionIdentity {
         this._onDispose = observableSignal(this);
         this.onDispose = this._onDispose;
         this._jumpedTo = observableValue(this, false);
-        this._refCount = 1;
+        this._refCount = 0;
         this.id = "InlineCompletionIdentity" + InlineSuggestionIdentity.idCounter++;
     }
     static {
@@ -194,7 +206,7 @@ class InlineSuggestHint {
 class InlineCompletionItem extends InlineSuggestionItemBase {
     static create(data, textModel, action) {
         const identity = ( new InlineSuggestionIdentity());
-        const transformer = getPositionOffsetTransformerFromTextModel(textModel);
+        const transformer = textModel.getTransformer();
         const insertText = action.insertText.replace(/\r\n|\r|\n/g, textModel.getEOL());
         const edit = reshapeInlineCompletion(( new StringReplacement(transformer.getOffsetRange(action.range), insertText)), textModel);
         const trimmedEdit = edit.removeCommonSuffixAndPrefix(textModel.getValue());
@@ -209,7 +221,8 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
             data.additionalTextEdits,
             data,
             identity,
-            displayLocation
+            displayLocation,
+            textModel
         ));
     }
     constructor(
@@ -221,9 +234,10 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
         additionalTextEdits,
         data,
         identity,
-        displayLocation
+        displayLocation,
+        originalTextRef
     ) {
-        super(data, identity, displayLocation);
+        super(data, identity, displayLocation, originalTextRef);
         this._edit = _edit;
         this._trimmedEdit = _trimmedEdit;
         this._textEdit = _textEdit;
@@ -238,8 +252,8 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
             textReplacement: this.getSingleTextEdit(),
             snippetInfo: this.snippetInfo,
             stringEdit: ( new StringEdit([this._trimmedEdit])),
-            uri: undefined,
-            alternativeAction: undefined
+            alternativeAction: undefined,
+            target: this.originalTextRef
         };
     }
     get hash() {
@@ -258,10 +272,14 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
             this.additionalTextEdits,
             this._data,
             identity,
-            this.hint
+            this.hint,
+            this.originalTextRef
         ));
     }
     withEdit(textModelEdit, textModel) {
+        if (!this.originalTextRef.targets(textModel)) {
+            return this;
+        }
         const newEditRange = applyEditsToRanges([this._edit.replaceRange], textModelEdit);
         if (newEditRange.length === 0) {
             return undefined;
@@ -286,7 +304,8 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
             this.additionalTextEdits,
             this._data,
             this.identity,
-            newDisplayLocation
+            newDisplayLocation,
+            this.originalTextRef
         ));
     }
     canBeReused(model, position) {
@@ -309,18 +328,28 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
     }
 }
 class InlineEditItem extends InlineSuggestionItemBase {
+    static createForTest(textModel, range, newText) {
+        const action = {
+            kind: "edit",
+            snippetInfo: undefined,
+            insertText: newText,
+            range: range,
+            uri: textModel.uri,
+            alternativeAction: undefined
+        };
+        return InlineEditItem.create(InlineSuggestData.createForTest(action, textModel.uri), textModel);
+    }
     static create(data, textModel, shouldDiffEdit = true) {
         let action;
         let edits = [];
         if (data.action?.kind === "edit") {
             const offsetEdit = shouldDiffEdit ? getDiffedStringEdit(textModel, data.action.range, data.action.insertText) : getStringEdit(textModel, data.action.range, data.action.insertText);
-            const text = ( new TextModelText(textModel));
-            const textEdit = TextEdit.fromStringEdit(offsetEdit, text);
-            const singleTextEdit = offsetEdit.isEmpty() ? ( new TextReplacement(( new Range(1, 1, 1, 1)), "")) : textEdit.toReplacement(text);
+            const textEdit = TextEdit.fromStringEdit(offsetEdit, textModel);
+            const singleTextEdit = offsetEdit.isEmpty() ? ( new TextReplacement(( new Range(1, 1, 1, 1)), "")) : textEdit.toReplacement(textModel);
             edits = ( offsetEdit.replacements.map(edit => {
                 const replacedRange = Range.fromPositions(
                     textModel.getPositionAt(edit.replaceRange.start),
-                    textModel.getPositionAt(edit.replaceRange.endExclusive)
+                    textModel.getTransformer().getPosition(edit.replaceRange.endExclusive)
                 );
                 const replacedText = textModel.getValueInRange(replacedRange);
                 return SingleUpdatedNextEdit.create(edit, replacedText);
@@ -330,15 +359,15 @@ class InlineEditItem extends InlineSuggestionItemBase {
                 snippetInfo: data.action.snippetInfo,
                 stringEdit: offsetEdit,
                 textReplacement: singleTextEdit,
-                uri: data.action.uri,
-                alternativeAction: data.action.alternativeAction
+                alternativeAction: data.action.alternativeAction,
+                target: textModel
             };
         } else if (data.action?.kind === "jumpTo") {
             action = {
                 kind: "jumpTo",
                 position: data.action.position,
-                offset: textModel.getOffsetAt(data.action.position),
-                uri: data.action.uri
+                offset: textModel.getTransformer().getOffset(data.action.position),
+                target: textModel
             };
         } else {
             action = undefined;
@@ -348,7 +377,16 @@ class InlineEditItem extends InlineSuggestionItemBase {
         }
         const identity = ( new InlineSuggestionIdentity());
         const hint = data.hint ? InlineSuggestHint.create(data.hint) : undefined;
-        return ( new InlineEditItem(action, data, identity, edits, hint, false, textModel.getVersionId()));
+        return ( new InlineEditItem(
+            action,
+            data,
+            identity,
+            edits,
+            hint,
+            false,
+            textModel.getVersionId(),
+            textModel
+        ));
     }
     constructor(
         _action,
@@ -357,9 +395,10 @@ class InlineEditItem extends InlineSuggestionItemBase {
         _edits,
         hint,
         _lastChangePartOfInlineEdit = false,
-        _inlineEditModelVersion
+        _inlineEditModelVersion,
+        originalTextRef
     ) {
-        super(data, identity, hint);
+        super(data, identity, hint, originalTextRef);
         this._action = _action;
         this._edits = _edits;
         this._lastChangePartOfInlineEdit = _lastChangePartOfInlineEdit;
@@ -382,13 +421,17 @@ class InlineEditItem extends InlineSuggestionItemBase {
             this._edits,
             this.hint,
             this._lastChangePartOfInlineEdit,
-            this._inlineEditModelVersion
+            this._inlineEditModelVersion,
+            this.originalTextRef
         ));
     }
     canBeReused(model, position) {
         return this._lastChangePartOfInlineEdit && this.updatedEditModelVersion === model.getVersionId();
     }
     withEdit(textModelChanges, textModel) {
+        if (!this.originalTextRef.targets(textModel)) {
+            return this;
+        }
         const edit = this._applyTextModelChanges(textModelChanges, this._edits, textModel);
         return edit;
     }
@@ -397,6 +440,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
         let lastChangePartOfInlineEdit = false;
         let inlineEditModelVersion = this._inlineEditModelVersion;
         let newAction;
+        const updatedTarget = TextModelValueReference.snapshot(textModel);
         if (this.action?.kind === "edit") {
             edits = ( edits.map(innerEdit => innerEdit.applyTextModelChanges(textModelChanges)));
             if (( edits.some(edit => edit.edit === undefined))) {
@@ -421,8 +465,8 @@ class InlineEditItem extends InlineSuggestionItemBase {
                 textReplacement: newTextEdit,
                 snippetInfo: this.snippetInfo,
                 stringEdit: newEdit,
-                uri: this.action.uri,
-                alternativeAction: this.action.alternativeAction
+                alternativeAction: this.action.alternativeAction,
+                target: updatedTarget
             };
         } else if (this.action?.kind === "jumpTo") {
             const jumpToOffset = this.action.offset;
@@ -435,7 +479,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
                 kind: "jumpTo",
                 position: newJumpToPosition,
                 offset: newJumpToOffset,
-                uri: this.action.uri
+                target: updatedTarget
             };
         } else {
             newAction = undefined;
@@ -454,7 +498,8 @@ class InlineEditItem extends InlineSuggestionItemBase {
             edits,
             newDisplayLocation,
             lastChangePartOfInlineEdit,
-            inlineEditModelVersion
+            inlineEditModelVersion,
+            updatedTarget
         ));
     }
     computeEditKind(model) {
@@ -467,7 +512,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
 }
 function getDiffedStringEdit(textModel, editRange, replaceText) {
     const eol = textModel.getEOL();
-    const editOriginalText = textModel.getValueInRange(editRange);
+    const editOriginalText = textModel.getValueOfRange(editRange);
     const editReplaceText = replaceText.replace(/\r\n|\r|\n/g, eol);
     const diffAlgorithm = linesDiffComputers.getDefault();
     const lineDiffs = diffAlgorithm.computeDiff(splitLines(editOriginalText), splitLines(editReplaceText), {
@@ -484,19 +529,16 @@ function getDiffedStringEdit(textModel, editRange, replaceText) {
     const modifiedText = ( new StringText(editReplaceText));
     const offsetEdit = ( new StringEdit(( innerChanges.map(c => {
         const rangeInModel = addRangeToPos(editRange.getStartPosition(), c.originalRange);
-        const originalRange = getPositionOffsetTransformerFromTextModel(textModel).getOffsetRange(rangeInModel);
+        const originalRange = textModel.getTransformer().getOffsetRange(rangeInModel);
         const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
         const edit = ( new StringReplacement(originalRange, replaceText));
-        const originalText = textModel.getValueInRange(rangeInModel);
+        const originalText = textModel.getValueOfRange(rangeInModel);
         return reshapeInlineEdit(edit, originalText, innerChanges.length, textModel);
     }))));
     return offsetEdit;
 }
 function getStringEdit(textModel, editRange, replaceText) {
-    return ( new StringEdit([( new StringReplacement(
-        getPositionOffsetTransformerFromTextModel(textModel).getOffsetRange(editRange),
-        replaceText
-    ))]));
+    return ( new StringEdit([( new StringReplacement(textModel.getTransformer().getOffsetRange(editRange), replaceText))]));
 }
 class SingleUpdatedNextEdit {
     static create(edit, replacedText) {
@@ -624,7 +666,7 @@ function reshapeInlineEdit(edit, originalText, totalInnerEdits, textModel) {
         ));
     }
     if (totalInnerEdits === 1 && edit.replaceRange.isEmpty && edit.newText.includes(eol)) {
-        const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+        const startPosition = textModel.getTransformer().getPosition(edit.replaceRange.start);
         const hasTextOnInsertionLine = textModel.getLineLength(startPosition.lineNumber) !== 0;
         if (hasTextOnInsertionLine) {
             edit = reshapeMultiLineInsertion(edit, textModel);
@@ -653,7 +695,7 @@ function reshapeMultiLineInsertion(edit, textModel) {
         return edit;
     }
     const eol = textModel.getEOL();
-    const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+    const startPosition = textModel.getTransformer().getPosition(edit.replaceRange.start);
     const startColumn = startPosition.column;
     const startLineNumber = startPosition.lineNumber;
     if (startColumn === 1 && startLineNumber > 1 && edit.newText.endsWith(eol) && !edit.newText.startsWith(eol)) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.d.ts

@@ -83,6 +83,7 @@ export declare class InlineSuggestData {
     private readonly _requestInfo;
     private readonly _providerRequestInfo;
     private readonly _correlationId;
+    static createForTest(action: IInlineSuggestDataAction | undefined, targetUri: URI): InlineSuggestData;
     private _didShow;
     private _timeUntilShown;
     private _timeUntilActuallyShown;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js

@@ -10,7 +10,7 @@ import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
-import { InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
+import { InlineCompletionTriggerKind, InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
 import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
 import { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
 import { ErrorResult, getReadonlyEmptyArray } from '../utils.js';
@@ -255,6 +255,58 @@ function toInlineSuggestData(
     ));
 }
 class InlineSuggestData {
+    static createForTest(action, targetUri) {
+        const mockInlineCompletion = {
+            insertText: action?.kind === "edit" ? action.insertText : "",
+            range: action?.kind === "edit" ? action.range : undefined,
+            isInlineEdit: true
+        };
+        const mockProvider = {
+            provideInlineCompletions: () => ({
+                items: []
+            }),
+            disposeInlineCompletions: () => {}
+        };
+        const mockSource = ( new InlineSuggestionList({
+            items: [mockInlineCompletion]
+        }, [], mockProvider));
+        const mockContext = {
+            triggerKind: InlineCompletionTriggerKind.Explicit,
+            selectedSuggestionInfo: undefined,
+            requestUuid: "test-" + Date.now(),
+            earliestShownDateTime: 0,
+            includeInlineCompletions: true,
+            includeInlineEdits: false,
+            requestIssuedDateTime: Date.now()
+        };
+        const mockRequestInfo = {
+            startTime: Date.now(),
+            sku: undefined,
+            editorType: InlineCompletionEditorType.TextEditor,
+            languageId: "plaintext",
+            availableProviders: [],
+            reason: "",
+            typingInterval: 0,
+            typingIntervalCharacterCount: 0
+        };
+        const mockProviderRequestInfo = {
+            startTime: Date.now(),
+            endTime: Date.now()
+        };
+        return ( new InlineSuggestData(
+            action,
+            undefined,
+            [],
+            mockInlineCompletion,
+            mockSource,
+            mockContext,
+            true,
+            false,
+            mockRequestInfo,
+            mockProviderRequestInfo,
+            undefined
+        ));
+    }
     get action() {
         return this._action;
     }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.js

@@ -22,6 +22,7 @@ import { InlineSuggestionItem } from './inlineSuggestionItem.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { IRenameSymbolTrackerService } from '../../../../browser/services/renameSymbolTrackerService.service.js';
 import { ICodeEditorService } from '../../../../browser/services/codeEditorService.service.js';
+import { TextModelValueReference } from './textModelValueReference.js';
 
 var RenameKind;
 (function(RenameKind) {
@@ -479,11 +480,11 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         });
         const command = {
             id: renameSymbolCommandId,
-            title: ( localize(1317, "Rename")),
+            title: ( localize(1338, "Rename")),
             arguments: [source, this._renameRunnable]
         };
         const alternativeAction = {
-            label: ( localize(1317, "Rename")),
+            label: ( localize(1338, "Rename")),
             icon: Codicon.replaceAll,
             command,
             count: this._renameRunnable.getCount()
@@ -496,7 +497,8 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
             alternativeAction,
             uri: textModel.uri
         };
-        return InlineSuggestionItem.create(suggestItem.withAction(renameAction), textModel, false);
+        const ref = TextModelValueReference.snapshot(textModel);
+        return InlineSuggestionItem.create(suggestItem.withAction(renameAction), ref, false);
     }
     async checkRenamePrecondition(suggestItem, textModel, position, oldName, newName, lastSymbolRename) {
         const no = {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/textModelValueReference.d.ts

@@ -0,0 +1,30 @@
+import { URI } from "../../../../../base/common/uri.js";
+import { Position } from "../../../../common/core/position.js";
+import { Range } from "../../../../common/core/range.js";
+import { AbstractText } from "../../../../common/core/text/abstractText.js";
+import { TextLength } from "../../../../common/core/text/textLength.js";
+import { ITextModel } from "../../../../common/model.js";
+/**
+ * An immutable view of a text model at a specific version.
+ * Like TextModelText but throws if the underlying model has changed.
+ * This ensures data read from the reference is consistent with
+ * the version at construction time.
+ */
+export declare class TextModelValueReference extends AbstractText {
+    private readonly _textModel;
+    private readonly _version;
+    static snapshot(textModel: ITextModel): TextModelValueReference;
+    private constructor();
+    get uri(): URI;
+    get version(): number;
+    private _assertValid;
+    targets(textModel: ITextModel): boolean;
+    getValueOfRange(range: Range): string;
+    getLineLength(lineNumber: number): number;
+    get length(): TextLength;
+    getEOL(): string;
+    getPositionAt(offset: number): Position;
+    getValueInRange(range: Range): string;
+    getVersionId(): number;
+    dangerouslyGetUnderlyingModel(): ITextModel;
+}

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/textModelValueReference.js

@@ -0,0 +1,65 @@
+
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { AbstractText } from '../../../../common/core/text/abstractText.js';
+import { TextLength } from '../../../../common/core/text/textLength.js';
+
+class TextModelValueReference extends AbstractText {
+    static snapshot(textModel) {
+        return ( new TextModelValueReference(textModel));
+    }
+    constructor(_textModel) {
+        super();
+        this._textModel = _textModel;
+        this._version = _textModel.getVersionId();
+    }
+    get uri() {
+        return this._textModel.uri;
+    }
+    get version() {
+        return this._version;
+    }
+    _assertValid() {
+        if (this._textModel.getVersionId() !== this._version) {
+            onUnexpectedError(( new Error(
+                `TextModel has changed: expected version ${this._version}, got ${this._textModel.getVersionId()}`
+            )));
+        }
+    }
+    targets(textModel) {
+        return ( this._textModel.uri.toString()) === ( textModel.uri.toString());
+    }
+    getValueOfRange(range) {
+        this._assertValid();
+        return this._textModel.getValueInRange(range);
+    }
+    getLineLength(lineNumber) {
+        this._assertValid();
+        return this._textModel.getLineLength(lineNumber);
+    }
+    get length() {
+        this._assertValid();
+        const lastLineNumber = this._textModel.getLineCount();
+        const lastLineLen = this._textModel.getLineLength(lastLineNumber);
+        return ( new TextLength(lastLineNumber - 1, lastLineLen));
+    }
+    getEOL() {
+        this._assertValid();
+        return this._textModel.getEOL();
+    }
+    getPositionAt(offset) {
+        this._assertValid();
+        return this._textModel.getPositionAt(offset);
+    }
+    getValueInRange(range) {
+        this._assertValid();
+        return this._textModel.getValueInRange(range);
+    }
+    getVersionId() {
+        return this._version;
+    }
+    dangerouslyGetUnderlyingModel() {
+        return this._textModel;
+    }
+}
+
+export { TextModelValueReference };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.d.ts

@@ -12,7 +12,7 @@ export declare class GutterIndicatorMenuContent {
     private readonly _keybindingService;
     private readonly _commandService;
     private readonly _inlineEditsShowCollapsed;
-    constructor(_editorObs: ObservableCodeEditor, _data: InlineSuggestionGutterMenuData, _close: (focusEditor: boolean) => void, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService);
+    constructor(_editorObs: ObservableCodeEditor, _data: InlineSuggestionGutterMenuData, _close: (focusEditor: boolean, commandId?: string) => void, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService);
     toDisposableLiveElement(): LiveElement;
     private _createHoverContent;
     private _getKeybinding;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js

@@ -66,24 +66,39 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
                 isActive: ( activeElement.map(v => v === options.id)),
                 onHoverChange: v => activeElement.set(v ? options.id : undefined, undefined),
                 onAction: () => {
-                    this._close(true);
-                    return this._commandService.executeCommand(
-                        typeof options.commandId === "string" ? options.commandId : options.commandId.get(),
-                        ...(options.commandArgs ?? [])
-                    );
+                    const commandId = typeof options.commandId === "string" ? options.commandId : options.commandId.get();
+                    this._close(true, commandId);
+                    return this._commandService.executeCommand(commandId, ...(options.commandArgs ?? []));
                 }
             };
         };
+        const extensionCommandGroups = ( this._data.extensionCommands.map(group => ( group.map((c, idx) => option(createOptionArgs({
+            id: c.command.id + "_" + idx,
+            title: c.command.title,
+            icon: c.icon ?? Codicon.symbolEvent,
+            commandId: c.command.id,
+            commandArgs: c.command.arguments
+        }))))));
+        const extensionCommandNodes = [];
+        for (const group of extensionCommandGroups) {
+            if (group.length > 0) {
+                extensionCommandNodes.push(separator());
+                extensionCommandNodes.push(...group);
+            }
+        }
+        if (this._data.extensionCommandsOnly) {
+            return hoverContent(extensionCommandNodes.slice(1));
+        }
         const title = header(this._data.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: "gotoAndAccept",
-            title: ( localize(1318, "Go To / Accept")),
+            title: ( localize(1339, "Go To / Accept")),
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: "reject",
-            title: ( localize(1319, "Reject")),
+            title: ( localize(1340, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -93,34 +108,27 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             icon: this._data.alternativeAction.icon,
             commandId: inlineSuggestCommitAlternativeActionId
         })) : undefined;
-        const extensionCommands = ( this._data.extensionCommands.map((c, idx) => option(createOptionArgs({
-            id: c.command.id + "_" + idx,
-            title: c.command.title,
-            icon: c.icon ?? Codicon.symbolEvent,
-            commandId: c.command.id,
-            commandArgs: c.command.arguments
-        }))));
         const modelOptions = [];
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ? option(createOptionArgs({
             id: "showExpanded",
-            title: ( localize(1320, "Show Expanded")),
+            title: ( localize(1341, "Show Expanded")),
             icon: Codicon.expandAll,
             commandId: toggleShowCollapsedId
         })) : option(createOptionArgs({
             id: "showCollapsed",
-            title: ( localize(1321, "Show Collapsed")),
+            title: ( localize(1342, "Show Collapsed")),
             icon: Codicon.collapseAll,
             commandId: toggleShowCollapsedId
         }))));
         const snooze = option(createOptionArgs({
             id: "snooze",
-            title: ( localize(1322, "Snooze")),
+            title: ( localize(1343, "Snooze")),
             icon: Codicon.bellSlash,
             commandId: "editor.action.inlineSuggest.snooze"
         }));
         const settings = option(createOptionArgs({
             id: "settings",
-            title: ( localize(1323, "Settings")),
+            title: ( localize(1344, "Settings")),
             icon: Codicon.gear,
             commandId: "workbench.action.openSettings",
             commandArgs: ["@tag:nextEditSuggestions"]
@@ -144,10 +152,9 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             toggleCollapsedMode,
             modelOptions.length ? separator() : undefined,
             ...modelOptions,
-            extensionCommands.length ? separator() : undefined,
             snooze,
             settings,
-            ...extensionCommands,
+            ...extensionCommandNodes,
             actionBarFooter ? separator() : undefined,
             actionBarFooter
         ]);

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.d.ts

@@ -12,6 +12,8 @@ import { InlineSuggestionItem } from "../../../model/inlineSuggestionItem.js";
 import { InlineCompletionsModel } from "../../../model/inlineCompletionsModel.js";
 import { InlineSuggestAlternativeAction } from "../../../model/InlineSuggestAlternativeAction.js";
 import { ThemeIcon } from "../../../../../../../base/common/themables.js";
+import { IUserInteractionService } from "../../../../../../../platform/userInteraction/browser/userInteractionService.service.js";
+import { Event } from "../../../../../../../base/common/event.js";
 /**
  * Customization options for the gutter indicator appearance and behavior.
  */
@@ -30,12 +32,13 @@ export declare class InlineEditsGutterIndicatorData {
 export declare class InlineSuggestionGutterMenuData {
     readonly action: Command | undefined;
     readonly displayName: string;
-    readonly extensionCommands: InlineCompletionCommand[];
+    readonly extensionCommands: InlineCompletionCommand[][];
     readonly alternativeAction: InlineSuggestAlternativeAction | undefined;
     readonly modelInfo: IInlineCompletionModelInfo | undefined;
     readonly setModelId: ((modelId: string) => Promise<void>) | undefined;
+    readonly extensionCommandsOnly: boolean;
     static fromInlineSuggestion(suggestion: InlineSuggestionItem): InlineSuggestionGutterMenuData;
-    constructor(action: Command | undefined, displayName: string, extensionCommands: InlineCompletionCommand[], alternativeAction: InlineSuggestAlternativeAction | undefined, modelInfo: IInlineCompletionModelInfo | undefined, setModelId: ((modelId: string) => Promise<void>) | undefined);
+    constructor(action: Command | undefined, displayName: string, extensionCommands: InlineCompletionCommand[][], alternativeAction: InlineSuggestAlternativeAction | undefined, modelInfo: IInlineCompletionModelInfo | undefined, setModelId: ((modelId: string) => Promise<void>) | undefined, extensionCommandsOnly?: boolean);
 }
 export declare class SimpleInlineSuggestModel {
     readonly accept: () => void;
@@ -54,7 +57,10 @@ export declare class InlineEditsGutterIndicator extends Disposable {
     private readonly _instantiationService;
     private readonly _accessibilityService;
     private readonly _themeService;
-    constructor(_editorObs: ObservableCodeEditor, _data: IObservable<InlineEditsGutterIndicatorData | undefined>, _tabAction: IObservable<InlineEditTabAction>, _verticalOffset: IObservable<number>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, _themeService: IThemeService);
+    private readonly _userInteractionService;
+    private readonly _onDidCloseWithCommand;
+    readonly onDidCloseWithCommand: Event<string>;
+    constructor(_editorObs: ObservableCodeEditor, _data: IObservable<InlineEditsGutterIndicatorData | undefined>, _tabAction: IObservable<InlineEditTabAction>, _verticalOffset: IObservable<number>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, _themeService: IThemeService, _userInteractionService: IUserInteractionService);
     private readonly _isHoveredOverInlineEditDebounced;
     private readonly _modifierPressed;
     private readonly _gutterIndicatorStyles;