@codingame/monaco-vscode-api 26.2.1 → 27.0.0

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(1318, "Whether an inline suggestion is visible"))));
     }
     static {
         this.inlineSuggestionAlternativeActionVisible = ( new RawContextKey("inlineSuggestionAlternativeActionVisible", false, ( localize(
-            1298,
+            1319,
             "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(1320, "Whether the inline suggestion starts with whitespace"))));
     }
     static {
         this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey("inlineSuggestionHasIndentationLessThanTabSize", true, ( localize(
-            1300,
+            1321,
             "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,
+            1322,
             "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(1323, "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(1324, "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(1325, "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(1326, "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(1327, "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(1328, "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(1329, "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(1330, "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,
+                1331,
                 "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(1332, "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(1333, "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(1334, "Icon for show next parameter hint.")));
+const inlineSuggestionHintsPreviousIcon = registerIcon("inline-suggestion-hints-previous", Codicon.chevronLeft, ( localize(1335, "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(1336, "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(1337, "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;

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

@@ -24,15 +24,18 @@ import { InlineCompletionTriggerKind, Command, InlineCompletionEndOfLifeReasonKi
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.service.js';
 import { offsetEditFromContentChanges } from '../../../../common/model/textModelStringEdit.js';
 import { isCompletionsEnabledFromObject } from '../../../../common/services/completionsEnablement.js';
+import { ITextModelService } from '../../../../common/services/resolverService.service.js';
 import { StructuredLogger, formatRecordableLogEntry } from '../structuredLogger.js';
 import { sendInlineCompletionsEndOfLifeTelemetry } from '../telemetry.js';
 import { wait } from '../utils.js';
 import { InlineSuggestionItem } from './inlineSuggestionItem.js';
 import { provideInlineCompletions, runWhenCancelled } from './provideInlineCompletions.js';
 import { RenameSymbolProcessor } from './renameSymbolProcessor.js';
+import { TextModelValueReference } from './textModelValueReference.js';
 import { recordChangesLazy } from '../../../../../base/common/observableInternal/changeTracker.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { runOnChange } from '../../../../../base/common/observableInternal/utils/runOnChange.js';
 import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
 
 var InlineCompletionsSource_1;
@@ -52,7 +55,8 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         _logService,
         _configurationService,
         _instantiationService,
-        _contextKeyService
+        _contextKeyService,
+        _textModelService
     ) {
         super();
         this._textModel = _textModel;
@@ -64,6 +68,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         this._configurationService = _configurationService;
         this._instantiationService = _instantiationService;
         this._contextKeyService = _contextKeyService;
+        this._textModelService = _textModelService;
         this._updateOperation = this._register(( new MutableDisposable()));
         this._state = observableReducerSettable(this, {
             initial: () => ({
@@ -240,7 +245,25 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
                             continue;
                         }
                         item.addPerformanceMarker("providerReturned");
-                        const i = InlineSuggestionItem.create(item, this._textModel);
+                        const targetUri = item.action?.uri;
+                        let targetModel;
+                        let disposable;
+                        if (targetUri && ( targetUri.toString()) !== ( this._textModel.uri.toString())) {
+                            const modelRef = await this._textModelService.createModelReference(targetUri);
+                            targetModel = modelRef.object.textEditorModel;
+                            disposable = modelRef;
+                        } else {
+                            targetModel = this._textModel;
+                            disposable = undefined;
+                        }
+                        const ref = TextModelValueReference.snapshot(targetModel);
+                        const i = InlineSuggestionItem.create(item, ref);
+                        if (disposable) {
+                            const s = runOnChange(i.identity.onDispose, () => {
+                                disposable?.dispose();
+                                s.dispose();
+                            });
+                        }
                         item.addPerformanceMarker("itemCreated");
                         providerSuggestions.push(i);
                         if (!i.isInlineEdit && !i.showInlineEditMenu && context.triggerKind === InlineCompletionTriggerKind.Automatic) {
@@ -378,7 +401,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             } finally {
                 store.dispose();
                 decreaseLoadingCount();
-                this.sendInlineCompletionsRequestTelemetry(requestResponseInfo);
+                this._sendInlineCompletionsRequestTelemetry(requestResponseInfo);
             }
             return true;
         })();
@@ -387,6 +410,9 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         return promise;
     }
     clear(tx) {
+        if (this._store.isDisposed) {
+            return;
+        }
         this._updateOperation.clear();
         const v = this._state.get();
         this._state.set({
@@ -416,7 +442,16 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             this.clearSuggestWidgetInlineCompletions(tx);
         });
     }
-    sendInlineCompletionsRequestTelemetry(requestResponseInfo) {
+    seedWithCompletion(item, tx) {
+        const s = this._state.get();
+        this._state.set({
+            inlineCompletions: ( new InlineCompletionsState([item], undefined)),
+            suggestWidgetInlineCompletions: InlineCompletionsState.createEmpty()
+        }, tx);
+        s.inlineCompletions.dispose();
+        s.suggestWidgetInlineCompletions.dispose();
+    }
+    _sendInlineCompletionsRequestTelemetry(requestResponseInfo) {
         if (!this._sendRequestData.get() && !this._contextKeyService.getContextKeyValue("isRunningUnificationExperiment")) {
             return;
         }
@@ -492,7 +527,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         this._updateOperation.clear();
     }
 };
-InlineCompletionsSource = InlineCompletionsSource_1 = ( __decorate([( __param(4, ILanguageConfigurationService)), ( __param(5, ILogService)), ( __param(6, IConfigurationService)), ( __param(7, IInstantiationService)), ( __param(8, IContextKeyService))], InlineCompletionsSource));
+InlineCompletionsSource = InlineCompletionsSource_1 = ( __decorate([( __param(4, ILanguageConfigurationService)), ( __param(5, ILogService)), ( __param(6, IConfigurationService)), ( __param(7, IInstantiationService)), ( __param(8, IContextKeyService)), ( __param(9, ITextModelService))], InlineCompletionsSource));
 class UpdateRequest {
     constructor(position, context, versionId, providers) {
         this.position = position;
@@ -546,12 +581,12 @@ class InlineCompletionsState extends Disposable {
         return ( new InlineCompletionsState([], undefined));
     }
     constructor(inlineCompletions, request) {
-        for (const inlineCompletion of inlineCompletions) {
-            inlineCompletion.addRef();
-        }
         super();
         this.inlineCompletions = inlineCompletions;
         this.request = request;
+        for (const inlineCompletion of this.inlineCompletions) {
+            inlineCompletion.addRef();
+        }
         this._register({
             dispose: () => {
                 for (const inlineCompletion of this.inlineCompletions) {
@@ -639,4 +674,4 @@ function moveToFront(item, items) {
     return items;
 }
 
-export { InlineCompletionsSource };
+export { InlineCompletionsSource, InlineCompletionsState };

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

@@ -1,5 +1,4 @@
 import { IObservable, ITransaction } from "../../../../../base/common/observable.js";
-import { URI } from "../../../../../base/common/uri.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
 import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
 import { StringEdit } from "../../../../common/core/edits/stringEdit.js";
@@ -13,9 +12,10 @@ import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inli
 import { InlineSuggestionEditKind } from "./editKind.js";
 import { IInlineSuggestDataAction, IInlineSuggestDataActionEdit, InlineSuggestData, InlineSuggestionList, PartialAcceptance, RenameInfo, SnippetInfo } from "./provideInlineCompletions.js";
 import { InlineSuggestAlternativeAction } from "./InlineSuggestAlternativeAction.js";
+import { TextModelValueReference } from "./textModelValueReference.js";
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
 export declare namespace InlineSuggestionItem {
-    function create(data: InlineSuggestData, textModel: ITextModel, shouldDiffEdit?: boolean): InlineSuggestionItem;
+    function create(data: InlineSuggestData, textModel: TextModelValueReference, shouldDiffEdit?: boolean): InlineSuggestionItem;
 }
 export type InlineSuggestionAction = IInlineSuggestionActionEdit | IInlineSuggestionActionJumpTo;
 export interface IInlineSuggestionActionEdit {
@@ -23,20 +23,30 @@ export interface IInlineSuggestionActionEdit {
     textReplacement: TextReplacement;
     snippetInfo: SnippetInfo | undefined;
     stringEdit: StringEdit;
-    uri: URI | undefined;
+    target: TextModelValueReference;
     alternativeAction: InlineSuggestAlternativeAction | undefined;
 }
 export interface IInlineSuggestionActionJumpTo {
     kind: "jumpTo";
     position: Position;
     offset: number;
-    uri: URI | undefined;
+    target: TextModelValueReference;
 }
 declare abstract class InlineSuggestionItemBase {
     protected readonly _data: InlineSuggestData;
     readonly identity: InlineSuggestionIdentity;
     readonly hint: InlineSuggestHint | undefined;
-    constructor(_data: InlineSuggestData, identity: InlineSuggestionIdentity, hint: InlineSuggestHint | undefined);
+    /**
+     * Reference to the text model this item targets.
+     * For cross-file edits, this may differ from the current editor's model.
+     */
+    readonly originalTextRef: TextModelValueReference;
+    constructor(_data: InlineSuggestData, identity: InlineSuggestionIdentity, hint: InlineSuggestHint | undefined, 
+    /**
+     * Reference to the text model this item targets.
+     * For cross-file edits, this may differ from the current editor's model.
+     */
+    originalTextRef: TextModelValueReference);
     abstract get action(): InlineSuggestionAction | undefined;
     /**
      * A reference to the original inline completion list this inline completion has been constructed from.
@@ -109,7 +119,7 @@ export declare class InlineCompletionItem extends InlineSuggestionItemBase {
     private readonly _originalRange;
     readonly snippetInfo: SnippetInfo | undefined;
     readonly additionalTextEdits: readonly ISingleEditOperation[];
-    static create(data: InlineSuggestData, textModel: ITextModel, action: IInlineSuggestDataActionEdit): InlineCompletionItem;
+    static create(data: InlineSuggestData, textModel: TextModelValueReference, action: IInlineSuggestDataActionEdit): InlineCompletionItem;
     readonly isInlineEdit = false;
     private constructor();
     get action(): IInlineSuggestionActionEdit;
@@ -128,7 +138,8 @@ export declare class InlineEditItem extends InlineSuggestionItemBase {
     private readonly _edits;
     private readonly _lastChangePartOfInlineEdit;
     private readonly _inlineEditModelVersion;
-    static create(data: InlineSuggestData, textModel: ITextModel, shouldDiffEdit?: boolean): InlineEditItem;
+    static createForTest(textModel: TextModelValueReference, range: Range, newText: string): InlineEditItem;
+    static create(data: InlineSuggestData, textModel: TextModelValueReference, shouldDiffEdit?: boolean): InlineEditItem;
     readonly snippetInfo: SnippetInfo | undefined;
     readonly additionalTextEdits: readonly ISingleEditOperation[];
     readonly isInlineEdit = true;