@codingame/monaco-vscode-api 26.2.2 → 28.0.0

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -97,7 +97,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 executor.emitOne(( new MarkdownHover(this, anchor.range, [itemTooltip], false, 0)));
             }
             if (isNonEmptyArray(part.item.hint.textEdits)) {
-                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1269, "Double-click to insert")))], false, 10001)));
+                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1292, "Double-click to insert")))], false, 10001)));
             }
             let partTooltip;
             if (typeof part.part.tooltip === "string") {
@@ -111,13 +111,13 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
             if (part.part.location || part.part.command) {
                 let linkHint;
                 const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === "altKey";
-                const kb = useMetaKey ? isMacintosh ? ( localize(1270, "cmd + click")) : ( localize(1271, "ctrl + click")) : isMacintosh ? ( localize(1272, "option + click")) : ( localize(1273, "alt + click"));
+                const kb = useMetaKey ? isMacintosh ? ( localize(1293, "cmd + click")) : ( localize(1294, "ctrl + click")) : isMacintosh ? ( localize(1295, "option + click")) : ( localize(1296, "alt + click"));
                 if (part.part.location && part.part.command) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1274, "Go to Definition ({0}), right click for more", kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1297, "Go to Definition ({0}), right click for more", kb)));
                 } else if (part.part.location) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1275, "Go to Definition ({0})", kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1298, "Go to Definition ({0})", kb)));
                 } else if (part.part.command) {
-                    linkHint = ( new MarkdownString(`[${( localize(1276, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, {
+                    linkHint = ( new MarkdownString(`[${( localize(1299, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, {
                         isTrusted: true
                     }));
                 }

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

@@ -29,7 +29,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1277, "Show Next Inline Suggestion")),
+            label: ( localize2(1300, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -52,7 +52,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1278, "Show Previous Inline Suggestion")),
+            label: ( localize2(1301, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -87,13 +87,13 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.trigger",
-            label: ( localize2(1279, "Trigger Inline Suggestion")),
+            label: ( localize2(1302, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize(1280, "Triggers an inline suggestion in the editor.")),
+                description: ( localize(1303, "Triggers an inline suggestion in the editor.")),
                 args: [{
                     name: "args",
-                    description: ( localize(1281, "Options for triggering inline suggestions.")),
+                    description: ( localize(1304, "Options for triggering inline suggestions.")),
                     isOptional: true,
                     schema: argsValidator.getJSONSchema()
                 }]
@@ -120,7 +120,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
             if (!controller?.model.get()?.state.get()) {
                 notificationService.notify({
                     severity: Severity$1.Info,
-                    message: ( localize(1282, "No inline suggestion is available."))
+                    message: ( localize(1305, "No inline suggestion is available."))
                 });
             }
         }
@@ -130,7 +130,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.acceptNextWord",
-            label: ( localize2(1283, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1306, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -147,7 +147,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1284, "Accept Word")),
+                title: ( localize(1307, "Accept Word")),
                 group: "primary",
                 order: 2
             }]
@@ -162,7 +162,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.acceptNextLine",
-            label: ( localize2(1285, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1308, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -172,7 +172,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1286, "Accept Line")),
+                title: ( localize(1309, "Accept Line")),
                 group: "secondary",
                 order: 2
             }]
@@ -187,19 +187,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1287, "Accept Inline Suggestion")),
+            label: ( localize2(1310, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1288, "Accept")),
+                title: ( localize(1311, "Accept")),
                 group: "primary",
                 order: 2
             }, {
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1288, "Accept")),
+                title: ( localize(1311, "Accept")),
                 group: "primary",
                 order: 2
             }],
@@ -228,7 +228,7 @@ class AcceptInlineCompletionAlternativeAction extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitAlternativeActionId,
-            label: ( localize2(1289, "Accept Inline Suggestion Alternative Action")),
+            label: ( localize2(1312, "Accept Inline Suggestion Alternative Action")),
             precondition: ( ContextKeyExpr.and(
                 InlineCompletionContextKeys.inlineSuggestionAlternativeActionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -258,11 +258,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1290, "Jump to next inline edit")),
+            label: ( localize2(1313, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1291, "Jump")),
+                title: ( localize(1314, "Jump")),
                 group: "primary",
                 order: 1,
                 when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated())
@@ -288,7 +288,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1292, "Hide Inline Suggestion")),
+            label: ( localize2(1315, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -299,7 +299,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1293, "Reject")),
+                title: ( localize(1316, "Reject")),
                 group: "primary",
                 order: 3
             }]
@@ -320,7 +320,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1294, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1317, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true()
         });
     }
@@ -344,7 +344,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1295, "Always Show Toolbar")),
+            title: ( localize(1318, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -366,7 +366,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.dev.extractRepro",
-            label: ( localize(1296, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1319, "Developer: Extract Inline Suggest State")),
             alias: "Developer: Inline Suggest Extract Repro",
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,

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

@@ -0,0 +1,4 @@
+import { ICodeEditor } from "../../../../browser/editorBrowser.js";
+import type { InlineCompletionsController } from "./inlineCompletionsController.js";
+export declare function getInlineCompletionsController(editor: ICodeEditor): InlineCompletionsController | null;
+export declare function setInlineCompletionsControllerGetter(getter: (editor: ICodeEditor) => InlineCompletionsController | null): void;

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

@@ -0,0 +1,11 @@
+
+
+let _getInlineCompletionsController;
+function getInlineCompletionsController(editor) {
+    return _getInlineCompletionsController?.(editor) ?? null;
+}
+function setInlineCompletionsControllerGetter(getter) {
+    _getInlineCompletionsController = getter;
+}
+
+export { getInlineCompletionsController, setInlineCompletionsControllerGetter };

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

@@ -4,52 +4,52 @@ import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
     static {
-        this.inlineSuggestionVisible = ( new RawContextKey("inlineSuggestionVisible", false, ( localize(1297, "Whether an inline suggestion is visible"))));
+        this.inlineSuggestionVisible = ( new RawContextKey("inlineSuggestionVisible", false, ( localize(1320, "Whether an inline suggestion is visible"))));
     }
     static {
         this.inlineSuggestionAlternativeActionVisible = ( new RawContextKey("inlineSuggestionAlternativeActionVisible", false, ( localize(
-            1298,
+            1321,
             "Whether an alternative action for the inline suggestion is visible."
         ))));
     }
     static {
-        this.inlineSuggestionHasIndentation = ( new RawContextKey("inlineSuggestionHasIndentation", false, ( localize(1299, "Whether the inline suggestion starts with whitespace"))));
+        this.inlineSuggestionHasIndentation = ( new RawContextKey("inlineSuggestionHasIndentation", false, ( localize(1322, "Whether the inline suggestion starts with whitespace"))));
     }
     static {
         this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey("inlineSuggestionHasIndentationLessThanTabSize", true, ( localize(
-            1300,
+            1323,
             "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(
-            1301,
+            1324,
             "Whether suggestions should be suppressed for the current suggestion"
         ))));
     }
     static {
-        this.cursorBeforeGhostText = ( new RawContextKey("cursorBeforeGhostText", false, ( localize(1302, "Whether the cursor is at ghost text"))));
+        this.cursorBeforeGhostText = ( new RawContextKey("cursorBeforeGhostText", false, ( localize(1325, "Whether the cursor is at ghost text"))));
     }
     static {
-        this.cursorInIndentation = ( new RawContextKey("cursorInIndentation", false, ( localize(1303, "Whether the cursor is in indentation"))));
+        this.cursorInIndentation = ( new RawContextKey("cursorInIndentation", false, ( localize(1326, "Whether the cursor is in indentation"))));
     }
     static {
-        this.hasSelection = ( new RawContextKey("editor.hasSelection", false, ( localize(1304, "Whether the editor has a selection"))));
+        this.hasSelection = ( new RawContextKey("editor.hasSelection", false, ( localize(1327, "Whether the editor has a selection"))));
     }
     static {
-        this.cursorAtInlineEdit = ( new RawContextKey("cursorAtInlineEdit", false, ( localize(1305, "Whether the cursor is at an inline edit"))));
+        this.cursorAtInlineEdit = ( new RawContextKey("cursorAtInlineEdit", false, ( localize(1328, "Whether the cursor is at an inline edit"))));
     }
     static {
-        this.inlineEditVisible = ( new RawContextKey("inlineEditIsVisible", false, ( localize(1306, "Whether an inline edit is visible"))));
+        this.inlineEditVisible = ( new RawContextKey("inlineEditIsVisible", false, ( localize(1329, "Whether an inline edit is visible"))));
     }
     static {
-        this.tabShouldJumpToInlineEdit = ( new RawContextKey("tabShouldJumpToInlineEdit", false, ( localize(1307, "Whether tab should jump to an inline edit."))));
+        this.tabShouldJumpToInlineEdit = ( new RawContextKey("tabShouldJumpToInlineEdit", false, ( localize(1330, "Whether tab should jump to an inline edit."))));
     }
     static {
-        this.tabShouldAcceptInlineEdit = ( new RawContextKey("tabShouldAcceptInlineEdit", false, ( localize(1308, "Whether tab should accept the inline edit."))));
+        this.tabShouldAcceptInlineEdit = ( new RawContextKey("tabShouldAcceptInlineEdit", false, ( localize(1331, "Whether tab should accept the inline edit."))));
     }
     static {
-        this.inInlineEditsPreviewEditor = ( new RawContextKey("inInlineEditsPreviewEditor", true, ( localize(1309, "Whether the current code editor is showing an inline edits preview"))));
+        this.inInlineEditsPreviewEditor = ( new RawContextKey("inInlineEditsPreviewEditor", true, ( localize(1332, "Whether the current code editor is showing an inline edits preview"))));
     }
 }
 

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

@@ -37,6 +37,7 @@ import { ObservableSuggestWidgetAdapter } from '../model/suggestWidgetAdapter.js
 import { ObservableContextKeyService } from '../utils.js';
 import { InlineSuggestionsView } from '../view/inlineSuggestionsView.js';
 import { inlineSuggestCommitId } from './commandIds.js';
+import { setInlineCompletionsControllerGetter } from './common.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { runOnChange, runOnChangeWithStore } from '../../../../../base/common/observableInternal/utils/runOnChange.js';
 import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
@@ -49,6 +50,7 @@ import { derivedObservableWithCache } from '../../../../../base/common/observabl
 import { waitForState } from '../../../../../base/common/observableInternal/utils/utilsCancellation.js';
 
 var InlineCompletionsController_1;
+setInlineCompletionsControllerGetter(editor => InlineCompletionsController.get(editor));
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
     static {
         InlineCompletionsController_1 = this;
@@ -461,7 +463,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1310,
+                1333,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));
@@ -485,7 +487,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 m.stop("explicitCancel", tx);
                 if (this._focusIsInEditorOrMenu.get()) {
                     for (const ctrl of InlineCompletionsController_1._instances) {
-                        if (ctrl !== this) {
+                        if (ctrl !== this && !ctrl._focusIsInEditorOrMenu.get()) {
                             ctrl.model.get()?.stop("automatic", tx);
                         }
                     }

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

@@ -138,7 +138,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(1311, "There are inline completions here");
+        return localize(1334, "There are inline completions here");
     }
     renderScreenReaderText(context, part) {
         const disposables = ( new DisposableStore());
@@ -148,7 +148,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
             ["aria-live"]: "assertive"
         }));
         const render = code => {
-            const inlineSuggestionAvailable = ( localize(1312, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1335, "Suggestion:"));
             const renderedContents = disposables.add(this._markdownRendererService.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock("text", code), {
                 context: this._editor,
                 asyncRenderCallback: () => {

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

@@ -109,8 +109,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
     }
 };
 InlineCompletionsHintsWidget = ( __decorate([( __param(2, IInstantiationService))], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon("inline-suggestion-hints-next", Codicon.chevronRight, ( localize(1313, "Icon for show next parameter hint.")));
-const inlineSuggestionHintsPreviousIcon = registerIcon("inline-suggestion-hints-previous", Codicon.chevronLeft, ( localize(1314, "Icon for show previous parameter hint.")));
+const inlineSuggestionHintsNextIcon = registerIcon("inline-suggestion-hints-next", Codicon.chevronRight, ( localize(1336, "Icon for show next parameter hint.")));
+const inlineSuggestionHintsPreviousIcon = registerIcon("inline-suggestion-hints-previous", Codicon.chevronLeft, ( localize(1337, "Icon for show previous parameter hint.")));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static {
         InlineSuggestionHintsContentWidget_1 = this;
@@ -193,10 +193,10 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             className: this.withBorder ? "monaco-hover monaco-hover-content" : ""
         }, [this._warningMessageNode.element, h("div@toolBar")]);
         this.previousAction = this._register(
-            this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1315, "Previous")), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon))
+            this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1338, "Previous")), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon))
         );
         this.availableSuggestionCountAction = this._register(( new Action("inlineSuggestionHints.availableSuggestionCount", "", undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1316, "Next")), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1339, "Next")), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(
             this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService)
         );

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

@@ -88,8 +88,8 @@ export declare class InlineCompletionsModel extends Disposable {
     }): Promise<void>;
     triggerExplicitly(tx?: ITransaction, onlyFetchInlineEdits?: boolean): Promise<void>;
     stop(stopReason?: "explicitCancel" | "automatic", tx?: ITransaction): void;
+    private readonly _inlineSuggestionItems;
     private readonly _inlineCompletionItems;
-    private readonly _filteredInlineCompletionItems;
     readonly selectedInlineCompletionIndex: IObservableWithChange<number, void>;
     readonly selectedInlineCompletion: IObservableWithChange<InlineCompletionItem | undefined, void>;
     readonly activeCommands: IObservable<InlineCompletionCommand[]>;
@@ -153,6 +153,11 @@ export declare class InlineCompletionsModel extends Disposable {
     readonly inAcceptFlow: IObservable<boolean>;
     jump(): void;
     handleInlineSuggestionShown(inlineCompletion: InlineSuggestionItem, viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData, timeWhenShown: number): Promise<void>;
+    /**
+     * Transplants an inline completion from another model to this one.
+     * Used for cross-file inline edits.
+     */
+    transplantCompletion(item: InlineSuggestionItem): void;
 }
 interface Repro {
     documentValue: string;

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

@@ -43,6 +43,7 @@ import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { IDefaultAccountService } from '../../../../../platform/defaultAccount/common/defaultAccount.service.js';
 import { Schemas } from '../../../../../base/common/network.js';
+import { getInlineCompletionsController } from '../controller/common.js';
 import { derived, derivedHandleChanges, derivedOpts } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
@@ -108,7 +109,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return isSuggestionInViewport(this._editor, state.inlineSuggestion);
         });
-        this._onDidAccept = ( new Emitter());
+        this._onDidAccept = this._register(( new Emitter()));
         this.onDidAccept = this._onDidAccept.event;
         this._lastShownInlineCompletionInfo = undefined;
         this._lastAcceptedInlineCompletionInfo = undefined;
@@ -241,10 +242,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     };
                 }
             }
-            const itemToPreserveCandidate = this.selectedInlineCompletion.read(undefined) ?? this._inlineCompletionItems.read(undefined)?.inlineEdit;
+            const itemToPreserveCandidate = this.selectedInlineCompletion.read(undefined) ?? this._inlineSuggestionItems.read(undefined)?.inlineEdit;
             const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable ? itemToPreserveCandidate : undefined;
             const userJumpedToActiveCompletion = ( this._jumpedToId.map(
-                jumpedTo => !!jumpedTo && jumpedTo === this._inlineCompletionItems.read(undefined)?.inlineEdit?.semanticId
+                jumpedTo => !!jumpedTo && jumpedTo === this._inlineSuggestionItems.read(undefined)?.inlineEdit?.semanticId
             ));
             const providers = changeSummary.provider ? {
                 providers: [changeSummary.provider],
@@ -265,7 +266,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 requestInfo
             );
         });
-        this._inlineCompletionItems = derivedOpts({
+        this._inlineSuggestionItems = derivedOpts({
             owner: this
         }, reader => {
             const c = this._source.inlineCompletions.read(reader);
@@ -292,16 +293,16 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 inlineEdit
             };
         });
-        this._filteredInlineCompletionItems = derivedOpts({
+        this._inlineCompletionItems = derivedOpts({
             owner: this,
             equalsFn: arrayEqualsC()
         }, reader => {
-            const c = this._inlineCompletionItems.read(reader);
+            const c = this._inlineSuggestionItems.read(reader);
             return c?.inlineCompletions ?? [];
         });
         this.selectedInlineCompletionIndex = derived(this, reader => {
             const selectedInlineCompletionId = this._selectedInlineCompletionId.read(reader);
-            const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
+            const filteredCompletions = this._inlineCompletionItems.read(reader);
             const idx = this._selectedInlineCompletionId === undefined ? -1 : filteredCompletions.findIndex(v => v.semanticId === selectedInlineCompletionId);
             if (idx === -1) {
                 this._selectedInlineCompletionId.set(undefined, undefined);
@@ -310,7 +311,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return idx;
         });
         this.selectedInlineCompletion = derived(this, reader => {
-            const filteredCompletions = this._filteredInlineCompletionItems.read(reader);
+            const filteredCompletions = this._inlineCompletionItems.read(reader);
             const idx = this.selectedInlineCompletionIndex.read(reader);
             return filteredCompletions[idx];
         });
@@ -320,7 +321,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }, r => this.selectedInlineCompletion.read(r)?.source.inlineSuggestions.commands ?? []);
         this.inlineCompletionsCount = derived(this, reader => {
             if (this.lastTriggerKind.read(reader) === InlineCompletionTriggerKind.Explicit) {
-                return this._filteredInlineCompletionItems.read(reader).length;
+                return this._inlineCompletionItems.read(reader).length;
             } else {
                 return undefined;
             }
@@ -361,7 +362,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this._suppressInSnippetMode.read(reader) && this._isInSnippetMode.read(reader)) {
                 return undefined;
             }
-            const item = this._inlineCompletionItems.read(reader);
+            const item = this._inlineSuggestionItems.read(reader);
             const inlineEditResult = item?.inlineEdit;
             if (inlineEditResult) {
                 if (this._hasVisiblePeekWidgets.read(reader)) {
@@ -372,8 +373,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 ));
                 const stringEdit = inlineEditResult.action?.kind === "edit" ? inlineEditResult.action.stringEdit : undefined;
                 const replacements = stringEdit ? TextEdit.fromStringEdit(stringEdit, ( new TextModelText(this.textModel))).replacements : [];
-                const nextEditUri = (item.inlineEdit?.command?.id === "vscode.open" || item.inlineEdit?.command?.id === "_workbench.open") &&
+                let nextEditUri = (item.inlineEdit?.command?.id === "vscode.open" || item.inlineEdit?.command?.id === "_workbench.open") &&
                 item.inlineEdit?.command.arguments?.length ? ( URI.from(item.inlineEdit?.command.arguments[0])) : undefined;
+                if (!inlineEditResult.originalTextRef.targets(this.textModel)) {
+                    nextEditUri = inlineEditResult.originalTextRef.uri;
+                }
                 return {
                     kind: "inlineEdit",
                     inlineSuggestion: inlineEditResult,
@@ -840,7 +844,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async _deltaSelectedInlineCompletionIndex(delta) {
         await this.triggerExplicitly();
-        const completions = this._filteredInlineCompletionItems.get() || [];
+        const completions = this._inlineCompletionItems.get() || [];
         if (completions.length > 0) {
             const newIdx = (this.selectedInlineCompletionIndex.get() + delta + completions.length) % completions.length;
             this._selectedInlineCompletionId.set(completions[newIdx].semanticId, undefined);
@@ -896,7 +900,18 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         try {
             let followUpTrigger = false;
             editor.pushUndoStop();
-            if (isNextEditUri)
+            if (!completion.originalTextRef.targets(this.textModel)) {
+                const targetEditor = await this._codeEditorService.openCodeEditor({
+                    resource: completion.originalTextRef.uri
+                }, this._editor);
+                if (targetEditor) {
+                    const controller = getInlineCompletionsController(targetEditor);
+                    const m = controller?.model.get();
+                    targetEditor.focus();
+                    m?.transplantCompletion(completion);
+                    targetEditor.revealLineInCenter(completion.targetRange.startLineNumber);
+                }
+            } else if (isNextEditUri)
                 {} else if (completion.action?.kind === "edit") {
                 const action = completion.action;
                 if (alternativeAction && action.alternativeAction) {
@@ -1085,6 +1100,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return;
         }
         const suggestion = s.inlineSuggestion;
+        if (!suggestion.originalTextRef.targets(this.textModel)) {
+            this.accept(this._editor);
+            return;
+        }
         suggestion.addRef();
         try {
             transaction(tx => {
@@ -1117,6 +1136,15 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     async handleInlineSuggestionShown(inlineCompletion, viewKind, viewData, timeWhenShown) {
         await inlineCompletion.reportInlineEditShown(this._commandService, viewKind, viewData, this.textModel, timeWhenShown);
     }
+    transplantCompletion(item) {
+        item.addRef();
+        transaction(tx => {
+            this._source.seedWithCompletion(item, tx);
+            this._isActive.set(true, tx);
+            this._inAcceptFlow.set(true, tx);
+            this.dontRefetchSignal.trigger(tx);
+        });
+    }
 };
 InlineCompletionsModel = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, ICommandService)), ( __param(9, ILanguageConfigurationService)), ( __param(10, IAccessibilityService)), ( __param(11, ILanguageFeaturesService)), ( __param(12, ICodeEditorService)), ( __param(13, IInlineCompletionsService)), ( __param(14, IDefaultAccountService))], InlineCompletionsModel));
 var VersionIdChangeReason;

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

@@ -10,6 +10,7 @@ import { InlineCompletionsProvider } 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";
+import { ITextModelService } from "../../../../common/services/resolverService.service.js";
 import { IModelContentChangedEvent } from "../../../../common/textModelEvents.js";
 import { InlineSuggestionIdentity, InlineSuggestionItem } from "./inlineSuggestionItem.js";
 import { InlineCompletionContextWithoutUuid, InlineSuggestRequestInfo } from "./provideInlineCompletions.js";
@@ -23,6 +24,7 @@ export declare class InlineCompletionsSource extends Disposable {
     private readonly _configurationService;
     private readonly _instantiationService;
     private readonly _contextKeyService;
+    private readonly _textModelService;
     private static _requestId;
     private readonly _updateOperation;
     private readonly _loggingEnabled;
@@ -33,7 +35,7 @@ export declare class InlineCompletionsSource extends Disposable {
     readonly suggestWidgetInlineCompletions: IObservable<InlineCompletionsState>;
     private readonly _renameProcessor;
     private _completionsEnabled;
-    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService);
+    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _textModelService: ITextModelService);
     private _updateCompletionsEnablement;
     readonly clearOperationOnTextModelChange: IObservableWithChange<undefined, void>;
     private _log;
@@ -42,7 +44,12 @@ export declare class InlineCompletionsSource extends Disposable {
     fetch(providers: InlineCompletionsProvider[], providersLabel: string | undefined, context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, requestInfo: InlineSuggestRequestInfo): Promise<boolean>;
     clear(tx: ITransaction): void;
     seedInlineCompletionsWithSuggestWidget(): void;
-    private sendInlineCompletionsRequestTelemetry;
+    /**
+     * Seeds the inline completions with an external inline completion item.
+     * Used when transplanting a completion from one model to another (cross-file edits).
+     */
+    seedWithCompletion(item: InlineSuggestionItem, tx: ITransaction): void;
+    private _sendInlineCompletionsRequestTelemetry;
     clearSuggestWidgetInlineCompletions(tx: ITransaction): void;
     cancelUpdate(): void;
 }
@@ -55,7 +62,7 @@ declare class UpdateRequest {
     satisfies(other: UpdateRequest): boolean;
     get isExplicitRequest(): boolean;
 }
-declare class InlineCompletionsState extends Disposable {
+export declare class InlineCompletionsState extends Disposable {
     readonly inlineCompletions: readonly InlineSuggestionItem[];
     readonly request: UpdateRequest | undefined;
     static createEmpty(): InlineCompletionsState;