@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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;

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

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

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

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

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

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

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

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

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

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