@codingame/monaco-vscode-api 22.1.9 → 23.0.1

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

@@ -76,24 +76,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._fetchSpecificProviderSignal = observableSignal(this);
         this._selectedInlineCompletionId = observableValue(this, undefined);
         this.primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
+        this.allPositions = derived(this, reader => this._positions.read(reader));
         this._isAcceptingPartially = false;
         this._appearedInsideViewport = derived(this, reader => {
             const state = this.state.read(reader);
             if (!state || !state.inlineCompletion) {
                 return false;
             }
-            const targetRange = state.inlineCompletion.targetRange;
-            const visibleRanges = this._editorObs.editor.getVisibleRanges();
-            if (visibleRanges.length < 1) {
-                return false;
-            }
-            const viewportRange = ( new Range(
-                visibleRanges[0].startLineNumber,
-                visibleRanges[0].startColumn,
-                visibleRanges[visibleRanges.length - 1].endLineNumber,
-                visibleRanges[visibleRanges.length - 1].endColumn
-            ));
-            return viewportRange.containsRange(targetRange);
+            return isSuggestionInViewport(this._editor, state.inlineCompletion);
         });
         this._onDidAccept = ( new Emitter());
         this.onDidAccept = this._onDidAccept.event;
@@ -462,7 +452,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!state || state.kind !== 'inlineEdit') {
                 return false;
             }
-            if (state.inlineCompletion.displayLocation) {
+            if (state.inlineCompletion.hint) {
                 return false;
             }
             const isCurrentModelVersion = state.inlineCompletion.updatedEditModelVersion === this._textModelVersionId.read(reader);
@@ -504,7 +494,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this.showCollapsed.read(reader)) {
                 return true;
             }
-            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
+            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
                 return false;
             }
             return !s.cursorAtInlineEdit.read(reader);
@@ -517,7 +507,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this.showCollapsed.read(reader)) {
                 return false;
             }
-            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader)) {
+            if (this._tabShouldIndent.read(reader)) {
+                return false;
+            }
+            if (this._inAcceptFlow.read(reader) && this._appearedInsideViewport.read(reader) && !s.inlineCompletion.hint?.jumpToEdit) {
                 return true;
             }
             if (s.inlineCompletion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
@@ -526,9 +519,6 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this._jumpedToId.read(reader) === s.inlineCompletion.semanticId) {
                 return true;
             }
-            if (this._tabShouldIndent.read(reader)) {
-                return false;
-            }
             return s.cursorAtInlineEdit.read(reader);
         });
         this._jumpedToId = observableValue(this, undefined);
@@ -681,28 +671,27 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         return availableProviders;
     }
-    async trigger(tx, options) {
+    async trigger(tx, options = {}) {
         subtransaction(tx, tx => {
-            if (options?.onlyFetchInlineEdits) {
+            if (options.onlyFetchInlineEdits) {
                 this._onlyRequestInlineEditsSignal.trigger(tx);
             }
-            if (options?.noDelay) {
+            if (options.noDelay) {
                 this._noDelaySignal.trigger(tx);
             }
             this._isActive.set(true, tx);
+            if (options.explicit) {
+                this._inAcceptFlow.set(true, tx);
+                this._forceUpdateExplicitlySignal.trigger(tx);
+            }
+            if (options.provider) {
+                this._fetchSpecificProviderSignal.trigger(tx, options.provider);
+            }
         });
         await this._fetchInlineCompletionsPromise.get();
     }
     async triggerExplicitly(tx, onlyFetchInlineEdits = false) {
-        subtransaction(tx, tx => {
-            if (onlyFetchInlineEdits) {
-                this._onlyRequestInlineEditsSignal.trigger(tx);
-            }
-            this._isActive.set(true, tx);
-            this._inAcceptFlow.set(true, tx);
-            this._forceUpdateExplicitlySignal.trigger(tx);
-        });
-        await this._fetchInlineCompletionsPromise.get();
+        return this.trigger(tx, { onlyFetchInlineEdits, explicit: true });
     }
     stop(stopReason = 'automatic', tx) {
         subtransaction(tx, tx => {
@@ -804,7 +793,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const additionalEdits = ( completion.additionalTextEdits.map(e => ( new TextReplacement(Range.lift(e.range), e.text ?? ''))));
                 const edit = TextEdit.fromParallelReplacementsUnsorted([...edits, ...additionalEdits]);
                 editor.edit(edit, this._getMetadata(completion, this.textModel.getLanguageId()));
-                if (completion.displayLocation === undefined) {
+                if (completion.hint === undefined) {
                     editor.setSelections(state.kind === 'inlineEdit' ? selections.slice(-1) : selections, 'inlineCompletionAccept');
                 }
                 if (state.kind === 'inlineEdit' && !this._accessibilityService.isMotionReduced()) {
@@ -953,7 +942,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const targetRange = s.inlineCompletion.targetRange;
             const targetPosition = targetRange.getStartPosition();
             this._editor.setPosition(targetPosition, 'inlineCompletions.jump');
-            const isSingleLineChange = targetRange.isSingleLine() && (s.inlineCompletion.displayLocation || !s.inlineCompletion.insertText.includes('\n'));
+            const isSingleLineChange = targetRange.isSingleLine() && (s.inlineCompletion.hint || !s.inlineCompletion.insertText.includes('\n'));
             if (isSingleLineChange) {
                 this._editor.revealPosition(targetPosition);
             }
@@ -961,6 +950,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const revealRange = ( new Range(targetRange.startLineNumber - 1, 1, targetRange.endLineNumber + 1, 1));
                 this._editor.revealRange(revealRange, ScrollType.Immediate);
             }
+            s.inlineCompletion.identity.setJumpTo(tx);
             this._editor.focus();
         });
     }
@@ -1037,5 +1027,19 @@ class FadeoutDecoration extends Disposable {
         }));
     }
 }
+function isSuggestionInViewport(editor, suggestion) {
+    const targetRange = suggestion.targetRange;
+    const visibleRanges = editor.getVisibleRanges();
+    if (visibleRanges.length < 1) {
+        return false;
+    }
+    const viewportRange = ( new Range(
+        visibleRanges[0].startLineNumber,
+        visibleRanges[0].startColumn,
+        visibleRanges[visibleRanges.length - 1].endLineNumber,
+        visibleRanges[visibleRanges.length - 1].endColumn
+    ));
+    return viewportRange.containsRange(targetRange);
+}
 
 export { InlineCompletionsModel, VersionIdChangeReason, getSecondaryEdits };

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

@@ -98,6 +98,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
                 }
             }));
         }
+        this._state.recomputeInitiallyAndOnChange(this._store);
     }
     _updateCompletionsEnablement(enalementSetting) {
         const result = this._configurationService.getValue(enalementSetting);
@@ -209,8 +210,10 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
                     const result = ( suggestions.map(c => ({
                         range: ( c.editRange.toString()),
                         text: c.insertText,
-                        isInlineEdit: !!c.isInlineEdit,
-                        source: c.source.provider.groupId,
+                        hint: c.hint,
+                        isInlineEdit: c.isInlineEdit,
+                        showInlineEditMenu: c.showInlineEditMenu,
+                        providerId: c.source.provider.providerId?.toString(),
                     })));
                     this._log({ sourceId: 'InlineCompletions.fetch', kind: 'end', requestId, durationMs: (Date.now() - startTime.getTime()), error, result, time: Date.now(), didAllProvidersReturn });
                 }
@@ -321,7 +324,6 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             return;
         }
         const emptyEndOfLifeEvent = {
-            id: requestResponseInfo.requestUuid,
             opportunityId: requestResponseInfo.requestUuid,
             noSuggestionReason: requestResponseInfo.noSuggestionReason ?? 'unknown',
             extensionId: 'vscode-core',
@@ -340,7 +342,6 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             timeUntilProviderResponse: undefined,
             viewKind: undefined,
             preceeded: undefined,
-            error: undefined,
             superseded: undefined,
             reason: undefined,
             correlationId: undefined,

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

@@ -1,15 +1,16 @@
-import { IObservable } from "../../../../../base/common/observable.js";
+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";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { Position } from "../../../../common/core/position.js";
-import { PositionOffsetTransformerBase } from "../../../../common/core/text/positionToOffset.js";
 import { Range } from "../../../../common/core/range.js";
-import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletion, Command, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind } from "../../../../common/languages.js";
+import { PositionOffsetTransformerBase } from "../../../../common/core/text/positionToOffset.js";
+import { Command, InlineCompletion, InlineCompletionHintStyle, InlineCompletionEndOfLifeReason, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionHint } from "../../../../common/languages.js";
 import { ITextModel } from "../../../../common/model.js";
-import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, PartialAcceptance, SnippetInfo } from "./provideInlineCompletions.js";
 import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
+import { InlineSuggestData, InlineSuggestionList, PartialAcceptance, SnippetInfo } from "./provideInlineCompletions.js";
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
 export declare namespace InlineSuggestionItem {
     function create(data: InlineSuggestData, textModel: ITextModel): InlineSuggestionItem;
@@ -17,8 +18,8 @@ export declare namespace InlineSuggestionItem {
 declare abstract class InlineSuggestionItemBase {
     protected readonly _data: InlineSuggestData;
     readonly identity: InlineSuggestionIdentity;
-    readonly displayLocation: InlineSuggestDisplayLocation | undefined;
-    constructor(_data: InlineSuggestData, identity: InlineSuggestionIdentity, displayLocation: InlineSuggestDisplayLocation | undefined);
+    readonly hint: InlineSuggestHint | undefined;
+    constructor(_data: InlineSuggestData, identity: InlineSuggestionIdentity, hint: InlineSuggestHint | undefined);
     /**
      * A reference to the original inline completion list this inline completion has been constructed from.
      * Used for event data to ensure referential equality.
@@ -54,7 +55,6 @@ declare abstract class InlineSuggestionItemBase {
     reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo, partialAcceptance: PartialAcceptance): void;
     reportEndOfLife(reason: InlineCompletionEndOfLifeReason): void;
     setEndOfLifeReason(reason: InlineCompletionEndOfLifeReason): void;
-    reportInlineEditError(reason: string): void;
     setIsPreceeded(item: InlineSuggestionItem): void;
     setNotShownReasonIfNotSet(reason: string): void;
     /**
@@ -66,18 +66,22 @@ export declare class InlineSuggestionIdentity {
     private static idCounter;
     private readonly _onDispose;
     readonly onDispose: IObservable<void>;
+    private readonly _jumpedTo;
+    get jumpedTo(): IObservable<boolean>;
     private _refCount;
     readonly id: string;
     addRef(): void;
     removeRef(): void;
+    setJumpTo(tx: ITransaction | undefined): void;
 }
-declare class InlineSuggestDisplayLocation implements IDisplayLocation {
+export declare class InlineSuggestHint {
     readonly range: Range;
-    readonly label: string;
-    readonly kind: InlineCompletionDisplayLocationKind;
-    static create(displayLocation: IDisplayLocation): InlineSuggestDisplayLocation;
+    readonly content: string;
+    readonly style: InlineCompletionHintStyle;
+    readonly jumpToEdit: boolean;
+    static create(displayLocation: InlineCompletionHint): InlineSuggestHint;
     private constructor();
-    withEdit(edit: StringEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestDisplayLocation | undefined;
+    withEdit(edit: StringEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestHint | undefined;
 }
 export declare class InlineCompletionItem extends InlineSuggestionItemBase {
     private readonly _edit;
@@ -100,6 +104,7 @@ export declare function inlineCompletionIsVisible(singleTextEdit: TextReplacemen
 export declare class InlineEditItem extends InlineSuggestionItemBase {
     private readonly _edit;
     private readonly _textEdit;
+    readonly uri: URI | undefined;
     private readonly _edits;
     private readonly _lastChangePartOfInlineEdit;
     private readonly _inlineEditModelVersion;

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

@@ -4,23 +4,24 @@ import { matchesSubString } from '../../../../../base/common/filters.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines, commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
 import { applyEditsToRanges, StringReplacement, StringEdit } from '../../../../common/core/edits/stringEdit.js';
-import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
+import { TextEdit, TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextEdit } from '../../../../common/core/edits/textEdit.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { StringText } from '../../../../common/core/text/abstractText.js';
+import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { TextLength } from '../../../../common/core/text/textLength.js';
 import { linesDiffComputers } from '../../../../common/diff/linesDiffComputers.js';
 import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { EndOfLinePreference } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
-import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 
 var InlineSuggestionItem;
 (function (InlineSuggestionItem) {
     function create(data, textModel) {
-        if (!data.isInlineEdit) {
+        if (!data.isInlineEdit && !data.uri) {
             return InlineCompletionItem.create(data, textModel);
         }
         else {
@@ -30,19 +31,19 @@ var InlineSuggestionItem;
     InlineSuggestionItem.create = create;
 })(InlineSuggestionItem || (InlineSuggestionItem = {}));
 class InlineSuggestionItemBase {
-    constructor(_data, identity, displayLocation) {
+    constructor(_data, identity, hint) {
         this._data = _data;
         this.identity = identity;
-        this.displayLocation = displayLocation;
+        this.hint = hint;
     }
     get source() { return this._data.source; }
     get isFromExplicitRequest() { return this._data.context.triggerKind === InlineCompletionTriggerKind.Explicit; }
     get forwardStable() { return this.source.inlineSuggestions.enableForwardStability ?? false; }
     get editRange() { return this.getSingleTextEdit().range; }
-    get targetRange() { return this.displayLocation?.range ?? this.editRange; }
+    get targetRange() { return this.hint?.range && !this.hint.jumpToEdit ? this.hint?.range : this.editRange; }
     get insertText() { return this.getSingleTextEdit().text; }
     get semanticId() { return this.hash; }
-    get action() { return this._sourceInlineCompletion.action; }
+    get action() { return this._sourceInlineCompletion.gutterMenuLinkAction; }
     get command() { return this._sourceInlineCompletion.command; }
     get warning() { return this._sourceInlineCompletion.warning; }
     get showInlineEditMenu() { return !!this._sourceInlineCompletion.showInlineEditMenu; }
@@ -76,9 +77,6 @@ class InlineSuggestionItemBase {
     setEndOfLifeReason(reason) {
         this._data.setEndOfLifeReason(reason);
     }
-    reportInlineEditError(reason) {
-        this._data.reportInlineEditError(reason);
-    }
     setIsPreceeded(item) {
         this._data.setIsPreceeded(item.partialAccepts);
     }
@@ -93,10 +91,14 @@ class InlineSuggestionIdentity {
     constructor() {
         this._onDispose = observableSignal(this);
         this.onDispose = this._onDispose;
+        this._jumpedTo = observableValue(this, false);
         this._refCount = 1;
         this.id = 'InlineCompletionIdentity' + InlineSuggestionIdentity.idCounter++;
     }
     static { this.idCounter = 0; }
+    get jumpedTo() {
+        return this._jumpedTo;
+    }
     addRef() {
         this._refCount++;
     }
@@ -106,15 +108,24 @@ class InlineSuggestionIdentity {
             this._onDispose.trigger(undefined);
         }
     }
+    setJumpTo(tx) {
+        this._jumpedTo.set(true, tx);
+    }
 }
-class InlineSuggestDisplayLocation {
+class InlineSuggestHint {
     static create(displayLocation) {
-        return ( new InlineSuggestDisplayLocation(displayLocation.range, displayLocation.label, displayLocation.kind));
+        return ( new InlineSuggestHint(
+            Range.lift(displayLocation.range),
+            displayLocation.content,
+            displayLocation.style,
+            displayLocation.jumpToEdit
+        ));
     }
-    constructor(range, label, kind) {
+    constructor(range, content, style, jumpToEdit) {
         this.range = range;
-        this.label = label;
-        this.kind = kind;
+        this.content = content;
+        this.style = style;
+        this.jumpToEdit = jumpToEdit;
     }
     withEdit(edit, positionOffsetTransformer) {
         const offsetRange = ( new OffsetRange(
@@ -126,7 +137,7 @@ class InlineSuggestDisplayLocation {
             return undefined;
         }
         const newRange = positionOffsetTransformer.getRange(newOffsetRange);
-        return ( new InlineSuggestDisplayLocation(newRange, this.label, this.kind));
+        return ( new InlineSuggestHint(newRange, this.content, this.style, this.jumpToEdit));
     }
 }
 class InlineCompletionItem extends InlineSuggestionItemBase {
@@ -137,7 +148,7 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
         const edit = reshapeInlineCompletion(( new StringReplacement(transformer.getOffsetRange(data.range), insertText)), textModel);
         const trimmedEdit = edit.removeCommonSuffixAndPrefix(textModel.getValue());
         const textEdit = transformer.getTextReplacement(edit);
-        const displayLocation = data.displayLocation ? InlineSuggestDisplayLocation.create(data.displayLocation) : undefined;
+        const displayLocation = data.hint ? InlineSuggestHint.create(data.hint) : undefined;
         return ( new InlineCompletionItem(
             edit,
             trimmedEdit,
@@ -174,7 +185,7 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
             this.additionalTextEdits,
             this._data,
             identity,
-            this.displayLocation
+            this.hint
         ));
     }
     withEdit(textModelEdit, textModel) {
@@ -185,7 +196,7 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
         const newEdit = ( new StringReplacement(newEditRange[0], this._textEdit.text));
         const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
         const newTextEdit = positionOffsetTransformer.getTextReplacement(newEdit);
-        let newDisplayLocation = this.displayLocation;
+        let newDisplayLocation = this.hint;
         if (newDisplayLocation) {
             newDisplayLocation = newDisplayLocation.withEdit(textModelEdit, positionOffsetTransformer);
             if (!newDisplayLocation) {
@@ -254,29 +265,31 @@ class InlineEditItem extends InlineSuggestionItemBase {
         const offsetEdit = getStringEdit(textModel, data.range, data.insertText);
         const text = ( new TextModelText(textModel));
         const textEdit = TextEdit.fromStringEdit(offsetEdit, text);
-        const singleTextEdit = textEdit.toReplacement(text);
+        const singleTextEdit = offsetEdit.isEmpty() ? ( new TextReplacement(( new Range(1, 1, 1, 1)), '')) : textEdit.toReplacement(text);
         const identity = ( new InlineSuggestionIdentity());
         const edits = ( offsetEdit.replacements.map(edit => {
             const replacedRange = Range.fromPositions(textModel.getPositionAt(edit.replaceRange.start), textModel.getPositionAt(edit.replaceRange.endExclusive));
             const replacedText = textModel.getValueInRange(replacedRange);
             return SingleUpdatedNextEdit.create(edit, replacedText);
         }));
-        const displayLocation = data.displayLocation ? InlineSuggestDisplayLocation.create(data.displayLocation) : undefined;
+        const hint = data.hint ? InlineSuggestHint.create(data.hint) : undefined;
         return ( new InlineEditItem(
             offsetEdit,
             singleTextEdit,
+            data.uri,
             data,
             identity,
             edits,
-            displayLocation,
+            hint,
             false,
             textModel.getVersionId()
         ));
     }
-    constructor(_edit, _textEdit, data, identity, _edits, displayLocation, _lastChangePartOfInlineEdit = false, _inlineEditModelVersion) {
-        super(data, identity, displayLocation);
+    constructor(_edit, _textEdit, uri, data, identity, _edits, hint, _lastChangePartOfInlineEdit = false, _inlineEditModelVersion) {
+        super(data, identity, hint);
         this._edit = _edit;
         this._textEdit = _textEdit;
+        this.uri = uri;
         this._edits = _edits;
         this._lastChangePartOfInlineEdit = _lastChangePartOfInlineEdit;
         this._inlineEditModelVersion = _inlineEditModelVersion;
@@ -293,10 +306,11 @@ class InlineEditItem extends InlineSuggestionItemBase {
         return ( new InlineEditItem(
             this._edit,
             this._textEdit,
+            this.uri,
             this._data,
             identity,
             this._edits,
-            this.displayLocation,
+            this.hint,
             this._lastChangePartOfInlineEdit,
             this._inlineEditModelVersion
         ));
@@ -329,7 +343,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
         const newEdit = ( new StringEdit(( edits.map(edit => edit.edit))));
         const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
         const newTextEdit = positionOffsetTransformer.getTextEdit(newEdit).toReplacement(( new TextModelText(textModel)));
-        let newDisplayLocation = this.displayLocation;
+        let newDisplayLocation = this.hint;
         if (newDisplayLocation) {
             newDisplayLocation = newDisplayLocation.withEdit(textModelChanges, positionOffsetTransformer);
             if (!newDisplayLocation) {
@@ -339,6 +353,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
         return ( new InlineEditItem(
             newEdit,
             newTextEdit,
+            this.uri,
             this._data,
             this.identity,
             edits,
@@ -523,4 +538,4 @@ function reshapeMultiLineInsertion(edit, textModel) {
     return edit;
 }
 
-export { InlineCompletionItem, InlineEditItem, InlineSuggestionIdentity, InlineSuggestionItem, inlineCompletionIsVisible };
+export { InlineCompletionItem, InlineEditItem, InlineSuggestHint, InlineSuggestionIdentity, InlineSuggestionItem, inlineCompletionIsVisible };

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

@@ -6,10 +6,11 @@ import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, ProviderId } from "../../../../common/languages.js";
+import { InlineCompletionEndOfLifeReason, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, ProviderId, InlineCompletionHint } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
+import { URI } from "../../../../../base/common/uri.js";
 export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, "requestUuid">;
 export declare function provideInlineCompletions(providers: InlineCompletionsProvider[], position: Position, model: ITextModel, context: InlineCompletionContextWithoutUuid, requestInfo: InlineSuggestRequestInfo, languageConfigurationService?: ILanguageConfigurationService): IInlineCompletionProviderResult;
 /** If the token is eventually cancelled, this will not leak either. */
@@ -42,13 +43,13 @@ export type InlineSuggestViewData = {
     editorType: InlineCompletionEditorType;
     renderData?: InlineCompletionViewData;
     viewKind?: InlineCompletionViewKind;
-    error?: string;
 };
 export declare class InlineSuggestData {
     readonly range: Range;
     readonly insertText: string;
     readonly snippetInfo: SnippetInfo | undefined;
-    readonly displayLocation: IDisplayLocation | undefined;
+    readonly uri: URI | undefined;
+    readonly hint: InlineCompletionHint | undefined;
     readonly additionalTextEdits: readonly ISingleEditOperation[];
     readonly sourceInlineCompletion: InlineCompletion;
     readonly source: InlineSuggestionList;
@@ -70,7 +71,7 @@ export declare class InlineSuggestData {
     private _isPreceeded;
     private _partiallyAcceptedCount;
     private _partiallyAcceptedSinceOriginal;
-    constructor(range: Range, insertText: string, snippetInfo: SnippetInfo | undefined, displayLocation: IDisplayLocation | undefined, additionalTextEdits: readonly ISingleEditOperation[], sourceInlineCompletion: InlineCompletion, source: InlineSuggestionList, context: InlineCompletionContext, isInlineEdit: boolean, _requestInfo: InlineSuggestRequestInfo, _providerRequestInfo: InlineSuggestProviderRequestInfo, _correlationId: string | undefined);
+    constructor(range: Range, insertText: string, snippetInfo: SnippetInfo | undefined, uri: URI | undefined, hint: InlineCompletionHint | undefined, additionalTextEdits: readonly ISingleEditOperation[], sourceInlineCompletion: InlineCompletion, source: InlineSuggestionList, context: InlineCompletionContext, isInlineEdit: boolean, _requestInfo: InlineSuggestRequestInfo, _providerRequestInfo: InlineSuggestProviderRequestInfo, _correlationId: string | undefined);
     get showInlineEditMenu(): boolean;
     get partialAccepts(): PartialAcceptance;
     getSingleTextEdit(): TextReplacement;
@@ -82,7 +83,6 @@ export declare class InlineSuggestData {
      * If no reason was set, the default reason is used.
     */
     reportEndOfLife(reason?: InlineCompletionEndOfLifeReason): void;
-    reportInlineEditError(message: string): void;
     setIsPreceeded(partialAccepts: PartialAcceptance): void;
     setNotShownReason(reason: string): void;
     /**
@@ -96,11 +96,6 @@ export interface SnippetInfo {
     snippet: string;
     range: Range;
 }
-export interface IDisplayLocation {
-    range: Range;
-    label: string;
-    kind: InlineCompletionDisplayLocationKind;
-}
 export declare enum InlineCompletionEditorType {
     TextEditor = "textEditor",
     DiffEditor = "diffEditor",

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

@@ -20,6 +20,7 @@ import { InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInt
 import { isDefined } from '../../../../../base/common/types.js';
 import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
 import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
+import { URI } from '../../../../../base/common/uri.js';
 
 function provideInlineCompletions(providers, position, model, context, requestInfo, languageConfigurationService) {
     const requestUuid = prefixedUuid('icr');
@@ -48,12 +49,14 @@ function provideInlineCompletions(providers, position, model, context, requestIn
                 const result = await queryProvider.get(p);
                 if (result) {
                     for (const item of result.inlineSuggestions.items) {
-                        if (item.isInlineEdit || typeof item.insertText !== 'string') {
+                        if (item.isInlineEdit || typeof item.insertText !== 'string' && item.insertText !== undefined) {
                             return undefined;
                         }
-                        const t = ( new TextReplacement(Range.lift(item.range) ?? defaultReplaceRange, item.insertText));
-                        if (inlineCompletionIsVisible(t, undefined, model, position)) {
-                            return undefined;
+                        if (item.insertText !== undefined) {
+                            const t = ( new TextReplacement(Range.lift(item.range) ?? defaultReplaceRange, item.insertText));
+                            if (inlineCompletionIsVisible(t, undefined, model, position)) {
+                                return undefined;
+                            }
                         }
                     }
                 }
@@ -136,6 +139,11 @@ function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, text
         }
         snippetInfo = undefined;
     }
+    else if (inlineCompletion.insertText === undefined) {
+        insertText = '';
+        snippetInfo = undefined;
+        range = ( new Range(1, 1, 1, 1));
+    }
     else if ('snippet' in inlineCompletion.insertText) {
         const preBracketCompletionLength = inlineCompletion.insertText.snippet.length;
         if (languageConfigurationService && inlineCompletion.completeBracketPairs) {
@@ -166,16 +174,12 @@ function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, text
     else {
         assertNever();
     }
-    const displayLocation = inlineCompletion.displayLocation ? {
-        range: Range.lift(inlineCompletion.displayLocation.range),
-        label: inlineCompletion.displayLocation.label,
-        kind: inlineCompletion.displayLocation.kind
-    } : undefined;
     return ( new InlineSuggestData(
         range,
         insertText,
         snippetInfo,
-        displayLocation,
+        URI.revive(inlineCompletion.uri),
+        inlineCompletion.hint,
         inlineCompletion.additionalTextEdits || getReadonlyEmptyArray(),
         inlineCompletion,
         source,
@@ -187,11 +191,12 @@ function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, text
     ));
 }
 class InlineSuggestData {
-    constructor(range, insertText, snippetInfo, displayLocation, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit, _requestInfo, _providerRequestInfo, _correlationId) {
+    constructor(range, insertText, snippetInfo, uri, hint, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit, _requestInfo, _providerRequestInfo, _correlationId) {
         this.range = range;
         this.insertText = insertText;
         this.snippetInfo = snippetInfo;
-        this.displayLocation = displayLocation;
+        this.uri = uri;
+        this.hint = hint;
         this.additionalTextEdits = additionalTextEdits;
         this.sourceInlineCompletion = sourceInlineCompletion;
         this.source = source;
@@ -279,7 +284,6 @@ class InlineSuggestData {
                 requestReason: this._requestInfo.reason,
                 viewKind: this._viewData.viewKind,
                 notShownReason: this._notShownReason,
-                error: this._viewData.error,
                 typingInterval: this._requestInfo.typingInterval,
                 typingIntervalCharacterCount: this._requestInfo.typingIntervalCharacterCount,
                 availableProviders: ( this._requestInfo.availableProviders.map(p => ( p.toString()))).join(','),
@@ -288,14 +292,6 @@ class InlineSuggestData {
             this.source.provider.handleEndOfLifetime(this.source.inlineSuggestions, this.sourceInlineCompletion, reason, summary);
         }
     }
-    reportInlineEditError(message) {
-        if (this._viewData.error) {
-            this._viewData.error += `; ${message}`;
-        }
-        else {
-            this._viewData.error = message;
-        }
-    }
     setIsPreceeded(partialAccepts) {
         this._isPreceeded = true;
         if (this._partiallyAcceptedSinceOriginal.characters !== 0 || this._partiallyAcceptedSinceOriginal.ratio !== 0 || this._partiallyAcceptedSinceOriginal.count !== 0) {

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

@@ -1,10 +1,6 @@
 import { DataChannelForwardingTelemetryService } from "../../../../platform/dataChannel/browser/forwardingTelemetryService.js";
 export declare function sendInlineCompletionsEndOfLifeTelemetry(dataChannel: DataChannelForwardingTelemetryService, endOfLifeSummary: InlineCompletionEndOfLifeEvent): void;
 export type InlineCompletionEndOfLifeEvent = {
-    /**
-     * @deprecated To be removed at one point in favor of opportunityId
-     */
-    id: string;
     opportunityId: string;
     requestReason: string;
     editorType: string;
@@ -30,7 +26,6 @@ export type InlineCompletionEndOfLifeEvent = {
     partiallyAcceptedCharactersSinceOriginal: number | undefined;
     preceeded: boolean | undefined;
     superseded: boolean | undefined;
-    error: string | undefined;
     notShownReason: string | undefined;
     viewKind: string | undefined;
     cursorColumnDistance: number | undefined;