monaco-editor 0.55.0-dev-20251021 → 0.55.0-dev-20251023

package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -83,7 +83,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
             }
             // (1.2) Inlay dbl-click gesture
             if (isNonEmptyArray(part.item.hint.textEdits)) {
-                executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize(1158, "Double-click to insert"))], false, 10001));
+                executor.emitOne(new MarkdownHover(this, anchor.range, [new MarkdownString().appendText(localize(1163, "Double-click to insert"))], false, 10001));
             }
             // (2) Inlay Label Part Tooltip
             let partTooltip;
@@ -102,19 +102,19 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 const useMetaKey = this._editor.getOption(86 /* EditorOption.multiCursorModifier */) === 'altKey';
                 const kb = useMetaKey
                     ? isMacintosh
-                        ? localize(1159, "cmd + click")
-                        : localize(1160, "ctrl + click")
+                        ? localize(1164, "cmd + click")
+                        : localize(1165, "ctrl + click")
                     : isMacintosh
-                        ? localize(1161, "option + click")
-                        : localize(1162, "alt + click");
+                        ? localize(1166, "option + click")
+                        : localize(1167, "alt + click");
                 if (part.part.location && part.part.command) {
-                    linkHint = new MarkdownString().appendText(localize(1163, 'Go to Definition ({0}), right click for more', kb));
+                    linkHint = new MarkdownString().appendText(localize(1168, 'Go to Definition ({0}), right click for more', kb));
                 }
                 else if (part.part.location) {
-                    linkHint = new MarkdownString().appendText(localize(1164, 'Go to Definition ({0})', kb));
+                    linkHint = new MarkdownString().appendText(localize(1169, 'Go to Definition ({0})', kb));
                 }
                 else if (part.part.command) {
-                    linkHint = new MarkdownString(`[${localize(1165, "Execute Command")}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true });
+                    linkHint = new MarkdownString(`[${localize(1170, "Execute Command")}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true });
                 }
                 if (linkHint) {
                     executor.emitOne(new MarkdownHover(this, anchor.range, [linkHint], false, 10000));

package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commands.js

@@ -1,5 +1,6 @@
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines } from '../../../../../base/common/strings.js';
+import { vUnion, vObj, vOptionalProp, vWithJsonSchemaRef, vUndefined, vBoolean, vString } from '../../../../../base/common/validation.js';
 import { localize2, localize } from '../../../../../nls.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.js';
 import { MenuId, Action2 } from '../../../../../platform/actions/common/actions.js';
@@ -8,8 +9,9 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { KeybindingsRegistry } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { INotificationService, Severity } from '../../../../../platform/notification/common/notification.js';
-import { EditorAction, EditorCommand } from '../../../../browser/editorExtensions.js';
+import { EditorAction } from '../../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../common/editorContextKeys.js';
+import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { Context } from '../../../suggest/browser/suggest.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId, hideInlineCompletionId, toggleShowCollapsedId, jumpToNextInlineEditId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
@@ -25,7 +27,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: localize2(1175, "Show Next Inline Suggestion"),
+            label: localize2(1182, "Show Next Inline Suggestion"),
             precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineSuggestionVisible),
             kbOpts: {
                 weight: 100,
@@ -43,7 +45,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: localize2(1176, "Show Previous Inline Suggestion"),
+            label: localize2(1183, "Show Previous Inline Suggestion"),
             precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineSuggestionVisible),
             kbOpts: {
                 weight: 100,
@@ -56,60 +58,69 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
         controller?.model.get()?.previous();
     }
 }
+const providerIdSchemaUri = 'vscode://schemas/inlineCompletionProviderIdArgs';
+function inlineCompletionProviderGetMatcher(provider) {
+    const result = [];
+    if (provider.providerId) {
+        result.push(provider.providerId.toStringWithoutVersion());
+        result.push(provider.providerId.extensionId + ':*');
+    }
+    return result;
+}
+const argsValidator = vUnion(vObj({
+    showNoResultNotification: vOptionalProp(vBoolean()),
+    providerId: vOptionalProp(vWithJsonSchemaRef(providerIdSchemaUri, vString())),
+    explicit: vOptionalProp(vBoolean()),
+}), vUndefined());
 class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: localize2(1177, "Trigger Inline Suggestion"),
-            precondition: EditorContextKeys.writable
+            label: localize2(1184, "Trigger Inline Suggestion"),
+            precondition: EditorContextKeys.writable,
+            metadata: {
+                description: localize(1171, "Triggers an inline suggestion in the editor."),
+                args: [{
+                        name: 'args',
+                        description: localize(1172, "Options for triggering inline suggestions."),
+                        isOptional: true,
+                        schema: argsValidator.getJSONSchema(),
+                    }]
+            }
         });
     }
-    async run(accessor, editor) {
+    async run(accessor, editor, args) {
+        const notificationService = accessor.get(INotificationService);
+        const languageFeaturesService = accessor.get(ILanguageFeaturesService);
         const controller = InlineCompletionsController.get(editor);
+        const validatedArgs = argsValidator.validateOrThrow(args);
+        const provider = validatedArgs?.providerId ?
+            languageFeaturesService.inlineCompletionsProvider.all(editor.getModel())
+                .find(p => inlineCompletionProviderGetMatcher(p).some(m => m === validatedArgs.providerId))
+            : undefined;
         await asyncTransaction(async (tx) => {
             /** @description triggerExplicitly from command */
-            await controller?.model.get()?.triggerExplicitly(tx);
+            await controller?.model.get()?.trigger(tx, {
+                provider: provider,
+                explicit: validatedArgs?.explicit ?? true,
+            });
             controller?.playAccessibilitySignal(tx);
         });
-    }
-}
-class ExplicitTriggerInlineEditAction extends EditorAction {
-    constructor() {
-        super({
-            id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: localize2(1178, "Trigger Next Edit Suggestion"),
-            precondition: EditorContextKeys.writable,
-        });
-    }
-    async run(accessor, editor) {
-        const notificationService = accessor.get(INotificationService);
-        const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.triggerExplicitly(undefined, true);
-        if (!controller?.model.get()?.inlineEditAvailable.get()) {
-            notificationService.notify({
-                severity: Severity.Info,
-                message: localize(1166, "No inline edit is available.")
-            });
+        if (validatedArgs?.showNoResultNotification) {
+            if (!controller?.model.get()?.state.get()) {
+                notificationService.notify({
+                    severity: Severity.Info,
+                    message: localize(1173, "No inline suggestion is available.")
+                });
+            }
         }
     }
 }
-class TriggerInlineEditAction extends EditorCommand {
-    constructor() {
-        super({
-            id: 'editor.action.inlineSuggest.triggerInlineEdit',
-            precondition: EditorContextKeys.writable,
-        });
-    }
-    async runEditorCommand(accessor, editor, args) {
-        const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.trigger(undefined, { onlyFetchInlineEdits: true });
-    }
-}
 class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: localize2(1179, "Accept Next Word Of Inline Suggestion"),
+            label: localize2(1185, "Accept Next Word Of Inline Suggestion"),
             precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineSuggestionVisible),
             kbOpts: {
                 weight: 100 /* KeybindingWeight.EditorContrib */ + 1,
@@ -118,7 +129,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: localize(1167, 'Accept Word'),
+                    title: localize(1174, 'Accept Word'),
                     group: 'primary',
                     order: 2,
                 }],
@@ -133,14 +144,14 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: localize2(1180, "Accept Next Line Of Inline Suggestion"),
+            label: localize2(1186, "Accept Next Line Of Inline Suggestion"),
             precondition: ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineSuggestionVisible),
             kbOpts: {
                 weight: 100 /* KeybindingWeight.EditorContrib */ + 1,
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: localize(1168, 'Accept Line'),
+                    title: localize(1175, 'Accept Line'),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -155,16 +166,16 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: localize2(1181, "Accept Inline Suggestion"),
+            label: localize2(1187, "Accept Inline Suggestion"),
             precondition: ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: localize(1169, "Accept"),
+                    title: localize(1176, "Accept"),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: localize(1170, "Accept"),
+                    title: localize(1177, "Accept"),
                     group: 'primary',
                     order: 2,
                 }],
@@ -195,11 +206,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: localize2(1182, "Jump to next inline edit"),
+            label: localize2(1188, "Jump to next inline edit"),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: localize(1171, "Jump"),
+                    title: localize(1178, "Jump"),
                     group: 'primary',
                     order: 1,
                     when: InlineCompletionContextKeys.cursorAtInlineEdit.toNegated(),
@@ -223,7 +234,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: localize2(1183, "Hide Inline Suggestion"),
+            label: localize2(1189, "Hide Inline Suggestion"),
             precondition: ContextKeyExpr.or(InlineCompletionContextKeys.inlineSuggestionVisible, InlineCompletionContextKeys.inlineEditVisible),
             kbOpts: {
                 weight: 100 /* KeybindingWeight.EditorContrib */ + 90, // same as hiding the suggest widget
@@ -231,7 +242,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: localize(1172, "Reject"),
+                    title: localize(1179, "Reject"),
                     group: 'primary',
                     order: 3,
                 }]
@@ -250,7 +261,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: localize2(1184, "Toggle Inline Suggestions Show Collapsed"),
+            label: localize2(1190, "Toggle Inline Suggestions Show Collapsed"),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -272,7 +283,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: localize(1173, "Always Show Toolbar"),
+            title: localize(1180, "Always Show Toolbar"),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -294,7 +305,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: localize(1174, "Developer: Extract Inline Suggest State"),
+            label: localize(1181, "Developer: Extract Inline Suggest State"),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: ContextKeyExpr.or(InlineCompletionContextKeys.inlineEditVisible, InlineCompletionContextKeys.inlineSuggestionVisible),
         });
@@ -315,4 +326,4 @@ class DevExtractReproSample extends EditorAction {
     }
 }
 
-export { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, ExplicitTriggerInlineEditAction, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ToggleInlineCompletionShowCollapsed, TriggerInlineEditAction, TriggerInlineSuggestionAction };
+export { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ToggleInlineCompletionShowCollapsed, TriggerInlineSuggestionAction, inlineCompletionProviderGetMatcher, providerIdSchemaUri };

package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js

@@ -6,18 +6,18 @@ import { localize } from '../../../../../nls.js';
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = new RawContextKey('inlineSuggestionVisible', false, localize(1185, "Whether an inline suggestion is visible")); }
-    static { this.inlineSuggestionHasIndentation = new RawContextKey('inlineSuggestionHasIndentation', false, localize(1186, "Whether the inline suggestion starts with whitespace")); }
-    static { this.inlineSuggestionHasIndentationLessThanTabSize = new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, localize(1187, "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab")); }
-    static { this.suppressSuggestions = new RawContextKey('inlineSuggestionSuppressSuggestions', undefined, localize(1188, "Whether suggestions should be suppressed for the current suggestion")); }
-    static { this.cursorBeforeGhostText = new RawContextKey('cursorBeforeGhostText', false, localize(1189, "Whether the cursor is at ghost text")); }
-    static { this.cursorInIndentation = new RawContextKey('cursorInIndentation', false, localize(1190, "Whether the cursor is in indentation")); }
-    static { this.hasSelection = new RawContextKey('editor.hasSelection', false, localize(1191, "Whether the editor has a selection")); }
-    static { this.cursorAtInlineEdit = new RawContextKey('cursorAtInlineEdit', false, localize(1192, "Whether the cursor is at an inline edit")); }
-    static { this.inlineEditVisible = new RawContextKey('inlineEditIsVisible', false, localize(1193, "Whether an inline edit is visible")); }
-    static { this.tabShouldJumpToInlineEdit = new RawContextKey('tabShouldJumpToInlineEdit', false, localize(1194, "Whether tab should jump to an inline edit.")); }
-    static { this.tabShouldAcceptInlineEdit = new RawContextKey('tabShouldAcceptInlineEdit', false, localize(1195, "Whether tab should accept the inline edit.")); }
-    static { this.inInlineEditsPreviewEditor = new RawContextKey('inInlineEditsPreviewEditor', true, localize(1196, "Whether the current code editor is showing an inline edits preview")); }
+    static { this.inlineSuggestionVisible = new RawContextKey('inlineSuggestionVisible', false, localize(1191, "Whether an inline suggestion is visible")); }
+    static { this.inlineSuggestionHasIndentation = new RawContextKey('inlineSuggestionHasIndentation', false, localize(1192, "Whether the inline suggestion starts with whitespace")); }
+    static { this.inlineSuggestionHasIndentationLessThanTabSize = new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, localize(1193, "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab")); }
+    static { this.suppressSuggestions = new RawContextKey('inlineSuggestionSuppressSuggestions', undefined, localize(1194, "Whether suggestions should be suppressed for the current suggestion")); }
+    static { this.cursorBeforeGhostText = new RawContextKey('cursorBeforeGhostText', false, localize(1195, "Whether the cursor is at ghost text")); }
+    static { this.cursorInIndentation = new RawContextKey('cursorInIndentation', false, localize(1196, "Whether the cursor is in indentation")); }
+    static { this.hasSelection = new RawContextKey('editor.hasSelection', false, localize(1197, "Whether the editor has a selection")); }
+    static { this.cursorAtInlineEdit = new RawContextKey('cursorAtInlineEdit', false, localize(1198, "Whether the cursor is at an inline edit")); }
+    static { this.inlineEditVisible = new RawContextKey('inlineEditIsVisible', false, localize(1199, "Whether an inline edit is visible")); }
+    static { this.tabShouldJumpToInlineEdit = new RawContextKey('tabShouldJumpToInlineEdit', false, localize(1200, "Whether tab should jump to an inline edit.")); }
+    static { this.tabShouldAcceptInlineEdit = new RawContextKey('tabShouldAcceptInlineEdit', false, localize(1201, "Whether tab should accept the inline edit.")); }
+    static { this.inInlineEditsPreviewEditor = new RawContextKey('inInlineEditsPreviewEditor', true, localize(1202, "Whether the current code editor is showing an inline edits preview")); }
 }
 
 export { InlineCompletionContextKeys };

package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js

@@ -373,7 +373,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         const accessibleViewKeybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView');
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(169 /* EditorOption.inlineCompletionsAccessibilityVerbose */)) {
-            hint = localize(1197, "Inspect this in the accessible view ({0})", accessibleViewKeybinding.getAriaLabel());
+            hint = localize(1203, "Inspect this in the accessible view ({0})", accessibleViewKeybinding.getAriaLabel());
         }
         alert(hint ? content + ', ' + hint : content);
     }

package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js

@@ -123,7 +123,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         const markdownHoverElement = $$1('div.hover-row.markdown-hover');
         const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents', { ['aria-live']: 'assertive' }));
         const render = (code) => {
-            const inlineSuggestionAvailable = localize(1198, "Suggestion:");
+            const inlineSuggestionAvailable = localize(1204, "Suggestion:");
             const renderedContents = disposables.add(this._markdownRendererService.render(new MarkdownString().appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
                 context: this._editor,
                 asyncRenderCallback: () => {

package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js

@@ -101,8 +101,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = __decorate([
     __param(2, IInstantiationService)
 ], InlineCompletionsHintsWidget);
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, localize(1199, 'Icon for show next parameter hint.'));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, localize(1200, 'Icon for show previous parameter hint.'));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, localize(1205, 'Icon for show next parameter hint.'));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, localize(1206, 'Icon for show previous parameter hint.'));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(this); }
@@ -114,7 +114,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = localize(1201, '{0} ({1})', label, kb.getLabel());
+            tooltip = localize(1207, '{0} ({1})', label, kb.getLabel());
         }
         action.tooltip = tooltip;
         return action;
@@ -162,9 +162,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, localize(1202, 'Previous'), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, localize(1208, 'Previous'), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, localize(1203, 'Next'), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, localize(1209, 'Next'), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';

package/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js

@@ -1,9 +1,9 @@
 import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { wrapInHotClass1 } from '../../../../platform/observable/common/wrapInHotClass.js';
-import { registerEditorContribution, registerEditorAction, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
-import { TriggerInlineSuggestionAction, ExplicitTriggerInlineEditAction, TriggerInlineEditAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptInlineCompletion, ToggleInlineCompletionShowCollapsed, HideInlineCompletion, JumpToNextInlineEdit, ToggleAlwaysShowInlineSuggestionToolbar, DevExtractReproSample } from './controller/commands.js';
+import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptInlineCompletion, ToggleInlineCompletionShowCollapsed, HideInlineCompletion, JumpToNextInlineEdit, ToggleAlwaysShowInlineSuggestionToolbar, DevExtractReproSample } from './controller/commands.js';
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
 import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
 import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
@@ -15,8 +15,6 @@ import { SnoozeInlineCompletion, CancelSnoozeInlineCompletion } from '../../../b
  *--------------------------------------------------------------------------------------------*/
 registerEditorContribution(InlineCompletionsController.ID, wrapInHotClass1(InlineCompletionsController.hot), 3 /* EditorContributionInstantiation.Eventually */);
 registerEditorAction(TriggerInlineSuggestionAction);
-registerEditorAction(ExplicitTriggerInlineEditAction);
-registerEditorCommand(new TriggerInlineEditAction());
 registerEditorAction(ShowNextInlineSuggestionAction);
 registerEditorAction(ShowPreviousInlineSuggestionAction);
 registerEditorAction(AcceptNextWordOfInlineCompletion);

package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js

@@ -672,28 +672,27 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         return availableProviders;
     }
-    async trigger(tx, options) {
+    async trigger(tx, options = {}) {
         subtransaction(tx, tx => {
-            if (options?.onlyFetchInlineEdits) {
+            if (options.onlyFetchInlineEdits) {
                 this._onlyRequestInlineEditsSignal.trigger(tx);
             }
-            if (options?.noDelay) {
+            if (options.noDelay) {
                 this._noDelaySignal.trigger(tx);
             }
             this._isActive.set(true, tx);
+            if (options.explicit) {
+                this._inAcceptFlow.set(true, tx);
+                this._forceUpdateExplicitlySignal.trigger(tx);
+            }
+            if (options.provider) {
+                this._fetchSpecificProviderSignal.trigger(tx, options.provider);
+            }
         });
         await this._fetchInlineCompletionsPromise.get();
     }
     async triggerExplicitly(tx, onlyFetchInlineEdits = false) {
-        subtransaction(tx, tx => {
-            if (onlyFetchInlineEdits) {
-                this._onlyRequestInlineEditsSignal.trigger(tx);
-            }
-            this._isActive.set(true, tx);
-            this._inAcceptFlow.set(true, tx);
-            this._forceUpdateExplicitlySignal.trigger(tx);
-        });
-        await this._fetchInlineCompletionsPromise.get();
+        return this.trigger(tx, { onlyFetchInlineEdits, explicit: true });
     }
     stop(stopReason = 'automatic', tx) {
         subtransaction(tx, tx => {

package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js

@@ -3,16 +3,16 @@ import { matchesSubString } from '../../../../../base/common/filters.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines, commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
 import { StringReplacement, applyEditsToRanges, StringEdit } from '../../../../common/core/edits/stringEdit.js';
-import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { TextEdit, TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit } from '../../../../common/core/edits/textEdit.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { StringText } from '../../../../common/core/text/abstractText.js';
+import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { TextLength } from '../../../../common/core/text/textLength.js';
 import { linesDiffComputers } from '../../../../common/diff/linesDiffComputers.js';
 import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
-import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 
 /*---------------------------------------------------------------------------------------------
@@ -235,7 +235,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
         const offsetEdit = getStringEdit(textModel, data.range, data.insertText);
         const text = new TextModelText(textModel);
         const textEdit = TextEdit.fromStringEdit(offsetEdit, text);
-        const singleTextEdit = textEdit.toReplacement(text);
+        const singleTextEdit = offsetEdit.isEmpty() ? new TextReplacement(new Range(1, 1, 1, 1), '') : textEdit.toReplacement(text); // FIXME: .toReplacement() can throw because offsetEdit is empty because we get an empty diff in getStringEdit after diffing
         const identity = new InlineSuggestionIdentity();
         const edits = offsetEdit.replacements.map(edit => {
             const replacedRange = Range.fromPositions(textModel.getPositionAt(edit.replaceRange.start), textModel.getPositionAt(edit.replaceRange.endExclusive));

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

@@ -78,13 +78,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${localize(1204, "Go To")} / ${localize(1205, "Accept")}`,
+            title: `${localize(1210, "Go To")} / ${localize(1211, "Accept")}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: localize(1206, "Reject"),
+            title: localize(1212, "Reject"),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -98,25 +98,25 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: localize(1207, "Show Expanded"),
+                title: localize(1213, "Show Expanded"),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: localize(1208, "Show Collapsed"),
+                title: localize(1214, "Show Collapsed"),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             })));
         const snooze = option(createOptionArgs({
             id: 'snooze',
-            title: localize(1209, "Snooze"),
+            title: localize(1215, "Snooze"),
             icon: Codicon.bellSlash,
             commandId: 'editor.action.inlineSuggest.snooze'
         }));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: localize(1210, "Settings"),
+            title: localize(1216, "Settings"),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']

package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.js

@@ -7,6 +7,9 @@ import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
  *--------------------------------------------------------------------------------------------*/
 class InlineEditWithChanges {
     get lineEdit() {
+        if (this.edit.replacements.length === 0) {
+            return new LineReplacement(new LineRange(1, 1), []);
+        }
         return LineReplacement.fromSingleTextEdit(this.edit.toReplacement(this.originalText), this.originalText);
     }
     get originalLineRange() { return this.lineEdit.lineRange; }

package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.js

@@ -17,7 +17,7 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? localize(1211, "Inline Edit");
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? localize(1217, "Inline Edit");
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
         this.isInDiffEditor = this._model.isInDiffEditor;
         this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;

package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.js

@@ -1,3 +1,4 @@
+import { $ } from '../../../../../../base/browser/dom.js';
 import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
 import { BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
@@ -5,9 +6,9 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import '../../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
-import { Range } from '../../../../../common/core/range.js';
 import { TextReplacement } from '../../../../../common/core/edits/textEdit.js';
+import { Range } from '../../../../../common/core/range.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { StringText } from '../../../../../common/core/text/abstractText.js';
 import { TextLength } from '../../../../../common/core/text/textLength.js';
 import { RangeMapping, lineRangeMappingFromRangeMappings } from '../../../../../common/diff/rangeMapping.js';
@@ -25,7 +26,6 @@ import { InlineEditsWordReplacementView } from './inlineEditsViews/inlineEditsWo
 import { OriginalEditorInlineDiffView } from './inlineEditsViews/originalEditorInlineDiffView.js';
 import { createReindentEdit, applyEditToModifiedRangeMappings } from './utils/utils.js';
 import './view.css';
-import { $ } from '../../../../../../base/browser/dom.js';
 import { derived, derivedOpts } from '../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { mapObservableArrayCached } from '../../../../../../base/common/observableInternal/utils/utils.js';
@@ -336,9 +336,9 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             modified: newText.getValueOfRange(m.modifiedRange)
         }));
         const cursorPosition = inlineEdit.cursorPosition;
-        const startsWithEOL = stringChanges[0].modified.startsWith(textModel.getEOL());
+        const startsWithEOL = stringChanges.length === 0 ? false : stringChanges[0].modified.startsWith(textModel.getEOL());
         const viewData = {
-            cursorColumnDistance: inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
+            cursorColumnDistance: inlineEdit.edit.replacements.length === 0 ? 0 : inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
             cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber + (startsWithEOL && inlineEdit.lineEdit.lineRange.startLineNumber >= cursorPosition.lineNumber ? 1 : 0),
             lineCountOriginal: inlineEdit.lineEdit.lineRange.length,
             lineCountModified: inlineEdit.lineEdit.newLines.length,