@codingame/monaco-vscode-api 22.1.9 → 23.0.0

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.d.ts

@@ -1,6 +1,7 @@
 import { Action2 } from "../../../../../platform/actions/common/actions.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
-import { EditorAction, EditorCommand, ServicesAccessor } from "../../../../browser/editorExtensions.js";
+import { EditorAction, ServicesAccessor } from "../../../../browser/editorExtensions.js";
+import { InlineCompletionsProvider } from "../../../../common/languages.js";
 export declare class ShowNextInlineSuggestionAction extends EditorAction {
     static ID: string;
     constructor();
@@ -11,19 +12,11 @@ export declare class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor();
     run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
+export declare const providerIdSchemaUri = "vscode://schemas/inlineCompletionProviderIdArgs";
+export declare function inlineCompletionProviderGetMatcher(provider: InlineCompletionsProvider): string[];
 export declare class TriggerInlineSuggestionAction extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
-}
-export declare class ExplicitTriggerInlineEditAction extends EditorAction {
-    constructor();
-    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
-}
-export declare class TriggerInlineEditAction extends EditorCommand {
-    constructor();
-    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: {
-        triggerKind?: "automatic" | "explicit";
-    }): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor, args: unknown): Promise<void>;
 }
 export declare class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor();

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.js

@@ -2,6 +2,7 @@
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines } from '../../../../../base/common/strings.js';
+import { vUnion, vObj, vOptionalProp, vBoolean, vWithJsonSchemaRef, vString, vUndefined } 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';
@@ -11,8 +12,9 @@ import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contex
 import { KeybindingWeight, KeybindingsRegistry } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import '../../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../../platform/notification/common/notification.service.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.service.js';
 import { Context } from '../../../suggest/browser/suggest.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId, jumpToNextInlineEditId, hideInlineCompletionId, toggleShowCollapsedId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
@@ -25,7 +27,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1263, "Show Next Inline Suggestion")),
+            label: ( localize2(1264, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -46,7 +48,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1264, "Show Previous Inline Suggestion")),
+            label: ( localize2(1265, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -62,59 +64,68 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
         controller?.model.get()?.previous();
     }
 }
-class TriggerInlineSuggestionAction extends EditorAction {
-    constructor() {
-        super({
-            id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1265, "Trigger Inline Suggestion")),
-            precondition: EditorContextKeys.writable
-        });
-    }
-    async run(accessor, editor) {
-        const controller = InlineCompletionsController.get(editor);
-        await asyncTransaction(async (tx) => {
-            await controller?.model.get()?.triggerExplicitly(tx);
-            controller?.playAccessibilitySignal(tx);
-        });
+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;
 }
-class ExplicitTriggerInlineEditAction extends EditorAction {
+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.triggerInlineEditExplicit',
-            label: ( localize2(1266, "Trigger Next Edit Suggestion")),
+            id: 'editor.action.inlineSuggest.trigger',
+            label: ( localize2(1266, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable,
+            metadata: {
+                description: ( localize(1267, "Triggers an inline suggestion in the editor.")),
+                args: [{
+                        name: 'args',
+                        description: ( localize(1268, "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);
-        await controller?.model.get()?.triggerExplicitly(undefined, true);
-        if (!controller?.model.get()?.inlineEditAvailable.get()) {
-            notificationService.notify({
-                severity: Severity$1.Info,
-                message: ( localize(1267, "No inline edit is available."))
+        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) => {
+            await controller?.model.get()?.trigger(tx, {
+                provider: provider,
+                explicit: validatedArgs?.explicit ?? true,
             });
-        }
-    }
-}
-class TriggerInlineEditAction extends EditorCommand {
-    constructor() {
-        super({
-            id: 'editor.action.inlineSuggest.triggerInlineEdit',
-            precondition: EditorContextKeys.writable,
+            controller?.playAccessibilitySignal(tx);
         });
-    }
-    async runEditorCommand(accessor, editor, args) {
-        const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.trigger(undefined, { onlyFetchInlineEdits: true });
+        if (validatedArgs?.showNoResultNotification) {
+            if (!controller?.model.get()?.state.get()) {
+                notificationService.notify({
+                    severity: Severity$1.Info,
+                    message: ( localize(1269, "No inline suggestion is available."))
+                });
+            }
+        }
     }
 }
 class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1268, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1270, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -131,7 +142,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1269, 'Accept Word')),
+                    title: ( localize(1271, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -146,7 +157,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1270, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1272, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -156,7 +167,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1271, 'Accept Line')),
+                    title: ( localize(1273, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -171,19 +182,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1272, "Accept Inline Suggestion")),
+            label: ( localize2(1274, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1273, "Accept")),
+                    title: ( localize(1275, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1273, "Accept")),
+                    title: ( localize(1275, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -214,11 +225,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1274, "Jump to next inline edit")),
+            label: ( localize2(1276, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1275, "Jump")),
+                    title: ( localize(1277, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -242,7 +253,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1276, "Hide Inline Suggestion")),
+            label: ( localize2(1278, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -253,7 +264,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1277, "Reject")),
+                    title: ( localize(1279, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -272,7 +283,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1278, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1280, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -294,7 +305,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1279, "Always Show Toolbar")),
+            title: ( localize(1281, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -316,7 +327,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1280, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1282, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,
@@ -340,4 +351,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/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js

@@ -3,24 +3,24 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1281, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1282, "Whether the inline suggestion starts with whitespace")))); }
+    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1283, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1284, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1283,
+     1285,
      "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(
-     1284,
+     1286,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorBeforeGhostText = ( new RawContextKey('cursorBeforeGhostText', false, ( localize(1285, "Whether the cursor is at ghost text")))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1286, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1287, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1288, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1289, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1290, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1291, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1292, "Whether the current code editor is showing an inline edits preview")))); }
+    static { this.cursorBeforeGhostText = ( new RawContextKey('cursorBeforeGhostText', false, ( localize(1287, "Whether the cursor is at ghost text")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1288, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1289, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1290, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1291, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1292, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1293, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1294, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js

@@ -20,12 +20,15 @@ import { IKeybindingService } from '../../../../../platform/keybinding/common/ke
 import { hotClassGetOriginalInstance } from '../../../../../platform/observable/common/wrapInHotClass.js';
 import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
 import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
+import { TriggerInlineEditCommandsRegistry } from '../../../../browser/triggerInlineEditCommandsRegistry.js';
 import { getOuterEditor } from '../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { CursorChangeReason } from '../../../../common/cursorEvents.js';
 import { ILanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.service.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.service.js';
+import { FIND_IDS } from '../../../find/browser/findModel.js';
+import { InsertLineAfterAction, InsertLineBeforeAction } from '../../../linesOperations/browser/linesOperations.js';
 import { InlineSuggestionHintsContentWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
 import { TextModelChangeRecorder } from '../model/changeRecorder.js';
 import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
@@ -48,7 +51,7 @@ var InlineCompletionsController_1;
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
     static { InlineCompletionsController_1 = this; }
     static { this._instances = ( new Set()); }
-    static { this.hot = createHotClass(InlineCompletionsController_1); }
+    static { this.hot = createHotClass(this); }
     static { this.ID = 'editor.contrib.inlineCompletionsController'; }
     static getInFocusedEditorOrParent(accessor) {
         const outerEditor = getOuterEditor(accessor);
@@ -172,15 +175,19 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 this.model.get()?.trigger();
             }
         }));
+        const triggerCommands = ( new Set([
+            CoreEditingCommands.Tab.id,
+            CoreEditingCommands.DeleteLeft.id,
+            CoreEditingCommands.DeleteRight.id,
+            inlineSuggestCommitId,
+            'acceptSelectedSuggestion',
+            InsertLineAfterAction.ID,
+            InsertLineBeforeAction.ID,
+            FIND_IDS.NextMatchFindAction,
+            ...TriggerInlineEditCommandsRegistry.getRegisteredCommands(),
+        ]));
         this._register(this._commandService.onDidExecuteCommand((e) => {
-            const commands = ( new Set([
-                CoreEditingCommands.Tab.id,
-                CoreEditingCommands.DeleteLeft.id,
-                CoreEditingCommands.DeleteRight.id,
-                inlineSuggestCommitId,
-                'acceptSelectedSuggestion',
-            ]));
-            if (( commands.has(e.commandId)) && editor.hasTextFocus() && this._enabled.get()) {
+            if (( triggerCommands.has(e.commandId)) && editor.hasTextFocus() && this._enabled.get()) {
                 let noDelay = false;
                 if (e.commandId === inlineSuggestCommitId) {
                     noDelay = true;
@@ -345,7 +352,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1293,
+                1295,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.d.ts

@@ -1,12 +1,11 @@
 import { ICodeEditor, IEditorMouseEvent } from "../../../../browser/editorBrowser.js";
 import { Range } from "../../../../common/core/range.js";
-import { ILanguageService } from "../../../../common/languages/language.service.js";
 import { IModelDecoration } from "../../../../common/model.js";
 import { HoverAnchor, IEditorHoverParticipant, IEditorHoverRenderContext, IHoverPart, IRenderedHoverParts } from "../../../hover/browser/hoverTypes.js";
 import { InlineCompletionsController } from "../controller/inlineCompletionsController.js";
+import { IMarkdownRendererService } from "../../../../../platform/markdown/browser/markdownRenderer.service.js";
 import { IAccessibilityService } from "../../../../../platform/accessibility/common/accessibility.service.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
-import { IOpenerService } from "../../../../../platform/opener/common/opener.service.js";
 import { ITelemetryService } from "../../../../../platform/telemetry/common/telemetry.service.js";
 export declare class InlineCompletionsHover implements IHoverPart {
     readonly owner: IEditorHoverParticipant<InlineCompletionsHover>;
@@ -17,13 +16,12 @@ export declare class InlineCompletionsHover implements IHoverPart {
 }
 export declare class InlineCompletionsHoverParticipant implements IEditorHoverParticipant<InlineCompletionsHover> {
     private readonly _editor;
-    private readonly _languageService;
-    private readonly _openerService;
     private readonly accessibilityService;
     private readonly _instantiationService;
     private readonly _telemetryService;
+    private readonly _markdownRendererService;
     readonly hoverOrdinal: number;
-    constructor(_editor: ICodeEditor, _languageService: ILanguageService, _openerService: IOpenerService, accessibilityService: IAccessibilityService, _instantiationService: IInstantiationService, _telemetryService: ITelemetryService);
+    constructor(_editor: ICodeEditor, accessibilityService: IAccessibilityService, _instantiationService: IInstantiationService, _telemetryService: ITelemetryService, _markdownRendererService: IMarkdownRendererService);
     suggestHoverAnchor(mouseEvent: IEditorMouseEvent): HoverAnchor | null;
     computeSync(anchor: HoverAnchor, lineDecorations: IModelDecoration[]): InlineCompletionsHover[];
     renderHoverParts(context: IEditorHoverRenderContext, hoverParts: InlineCompletionsHover[]): IRenderedHoverParts<InlineCompletionsHover>;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js

@@ -7,15 +7,13 @@ import '../../../../../base/common/observableInternal/index.js';
 import { MouseTargetType } from '../../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { Range } from '../../../../common/core/range.js';
-import { ILanguageService } from '../../../../common/languages/language.service.js';
 import { HoverAnchorType, HoverForeignElementAnchor, RenderedHoverParts } from '../../../hover/browser/hoverTypes.js';
 import { InlineCompletionsController } from '../controller/inlineCompletionsController.js';
 import { InlineSuggestionHintsContentWidget } from './inlineCompletionsHintsWidget.js';
-import { MarkdownRenderer } from '../../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
+import { IMarkdownRendererService } from '../../../../../platform/markdown/browser/markdownRenderer.service.js';
 import { localize } from '../../../../../nls.js';
 import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { GhostTextView } from '../view/ghostText/ghostTextView.js';
 import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
@@ -34,13 +32,12 @@ class InlineCompletionsHover {
     }
 }
 let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant {
-    constructor(_editor, _languageService, _openerService, accessibilityService, _instantiationService, _telemetryService) {
+    constructor(_editor, accessibilityService, _instantiationService, _telemetryService, _markdownRendererService) {
         this._editor = _editor;
-        this._languageService = _languageService;
-        this._openerService = _openerService;
         this.accessibilityService = accessibilityService;
         this._instantiationService = _instantiationService;
         this._telemetryService = _telemetryService;
+        this._markdownRendererService = _markdownRendererService;
         this.hoverOrdinal = 4;
     }
     suggestHoverAnchor(mouseEvent) {
@@ -130,17 +127,17 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(1294, 'There are inline completions here');
+        return localize(1296, 'There are inline completions here');
     }
     renderScreenReaderText(context, part) {
         const disposables = ( new DisposableStore());
         const $$1 = $;
         const markdownHoverElement = $$1('div.hover-row.markdown-hover');
         const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents', { ['aria-live']: 'assertive' }));
-        const renderer = ( new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
         const render = (code) => {
-            const inlineSuggestionAvailable = ( localize(1295, "Suggestion:"));
-            const renderedContents = disposables.add(renderer.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
+            const inlineSuggestionAvailable = ( localize(1297, "Suggestion:"));
+            const renderedContents = disposables.add(this._markdownRendererService.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
+                context: this._editor,
                 asyncRenderCallback: () => {
                     hoverContentsElement.className = 'hover-contents code-hover-contents';
                     context.onContentsChanged();
@@ -163,11 +160,10 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
     }
 };
 InlineCompletionsHoverParticipant = ( __decorate([
-    ( __param(1, ILanguageService)),
-    ( __param(2, IOpenerService)),
-    ( __param(3, IAccessibilityService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, ITelemetryService))
+    ( __param(1, IAccessibilityService)),
+    ( __param(2, IInstantiationService)),
+    ( __param(3, ITelemetryService)),
+    ( __param(4, IMarkdownRendererService))
 ], InlineCompletionsHoverParticipant));
 
 export { InlineCompletionsHover, InlineCompletionsHoverParticipant };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js

@@ -97,11 +97,11 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1296, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1297, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1298, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1299, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
-    static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
+    static { this.hot = createHotClass(this); }
     static { this._dropDownVisible = false; }
     static get dropDownVisible() { return this._dropDownVisible; }
     static { this.id = 0; }
@@ -116,7 +116,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1298, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1300, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -164,9 +164,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1299, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1301, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1300, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1302, '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/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js

@@ -2,9 +2,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, EditorContributionInstantiation, registerEditorAction, registerEditorCommand } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation, 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';
@@ -12,8 +12,6 @@ import { SnoozeInlineCompletion, CancelSnoozeInlineCompletion } from '../../../b
 
 registerEditorContribution(InlineCompletionsController.ID, wrapInHotClass1(InlineCompletionsController.hot), EditorContributionInstantiation.Eventually);
 registerEditorAction(TriggerInlineSuggestionAction);
-registerEditorAction(ExplicitTriggerInlineEditAction);
-registerEditorCommand(( new TriggerInlineEditAction()));
 registerEditorAction(ShowNextInlineSuggestionAction);
 registerEditorAction(ShowPreviousInlineSuggestionAction);
 registerEditorAction(AcceptNextWordOfInlineCompletion);

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

@@ -6,7 +6,7 @@ import { IInstantiationService } from "../../../../../platform/instantiation/com
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
 import { Position } from "../../../../common/core/position.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletion, InlineCompletionTriggerKind, InlineCompletionCommand } from "../../../../common/languages.js";
+import { InlineCompletion, InlineCompletionTriggerKind, InlineCompletionsProvider, InlineCompletionCommand } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { IFeatureDebounceInformation } from "../../../../common/services/languageFeatureDebounce.js";
@@ -44,6 +44,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _fetchSpecificProviderSignal;
     private readonly _selectedInlineCompletionId;
     readonly primaryPosition: IObservableWithChange<Position, void>;
+    readonly allPositions: IObservableWithChange<readonly Position[], void>;
     private _isAcceptingPartially;
     private readonly _appearedInsideViewport;
     get isAcceptingPartially(): boolean;
@@ -79,6 +80,8 @@ export declare class InlineCompletionsModel extends Disposable {
     trigger(tx?: ITransaction, options?: {
         onlyFetchInlineEdits?: boolean;
         noDelay?: boolean;
+        provider?: InlineCompletionsProvider;
+        explicit?: boolean;
     }): Promise<void>;
     triggerExplicitly(tx?: ITransaction, onlyFetchInlineEdits?: boolean): Promise<void>;
     stop(stopReason?: "explicitCancel" | "automatic", tx?: ITransaction): void;