@codingame/monaco-vscode-api 13.1.6 → 14.0.0

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

@@ -93,8 +93,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1216, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1217, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1227, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1228, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this._dropDownVisible = false; }
@@ -111,7 +111,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1218, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1229, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -134,9 +134,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         this.nodes = h('div.inlineSuggestionsHints', { className: this.withBorder ? '.withBorder' : '' }, [
             h('div@toolBar'),
         ]);
-        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1219, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
+        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1230, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
         this.availableSuggestionCountAction = ( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false));
-        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1220, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
+        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1231, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';

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

@@ -1,11 +1,11 @@
 import { Event } from "../../../../base/common/event.js";
 import { ICodeEditor } from "../../../browser/editorBrowser.js";
 import { AccessibleViewType, AccessibleViewProviderId, IAccessibleViewContentProvider } from "../../../../platform/accessibility/browser/accessibleView.js";
-import { IAccessibleViewImplentation } from "../../../../platform/accessibility/browser/accessibleViewRegistry.js";
+import { IAccessibleViewImplementation } from "../../../../platform/accessibility/browser/accessibleViewRegistry.js";
 import { ServicesAccessor } from "../../../../platform/instantiation/common/instantiation.js";
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { InlineCompletionsModel } from "./model/inlineCompletionsModel.js";
-export declare class InlineCompletionsAccessibleView implements IAccessibleViewImplentation {
+export declare class InlineCompletionsAccessibleView implements IAccessibleViewImplementation {
     readonly type = AccessibleViewType.View;
     readonly priority = 95;
     readonly name = "inline-completions";

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

@@ -1,5 +1,7 @@
+import { IDiffChange } from "../../../../../base/common/diff/diff.js";
 import { Position } from "../../../../common/core/position.js";
 import { SingleTextEdit } from "../../../../common/core/textEdit.js";
 import { ITextModel } from "../../../../common/model.js";
 import { GhostText } from "./ghostText.js";
 export declare function computeGhostText(edit: SingleTextEdit, model: ITextModel, mode: "prefix" | "subword" | "subwordSmart", cursorPosition?: Position, previewSuffixLength?: number): GhostText | undefined;
+export declare function smartDiff(originalValue: string, newValue: string, smartBracketMatching: boolean): (readonly IDiffChange[]) | undefined;

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

@@ -146,4 +146,4 @@ function smartDiff(originalValue, newValue, smartBracketMatching) {
     return ( new LcsDiff({ getElements: () => elements1 }, { getElements: () => elements2 })).ComputeDiff(false).changes;
 }
 
-export { computeGhostText };
+export { computeGhostText, smartDiff };

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

@@ -1,5 +1,5 @@
 import { Disposable } from "../../../../../base/common/lifecycle.js";
-import { IObservable, IReader, ITransaction } from "../../../../../base/common/observable.js";
+import { IObservable, IObservableWithChange, IReader, ITransaction } from "../../../../../base/common/observable.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
@@ -18,7 +18,7 @@ import { SuggestItemInfo } from "./suggestWidgetAdapter.js";
 export declare class InlineCompletionsModel extends Disposable {
     readonly textModel: ITextModel;
     private readonly _selectedSuggestItem;
-    readonly _textModelVersionId: IObservable<number | null, IModelContentChangedEvent | undefined>;
+    readonly _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>;
     private readonly _positions;
     private readonly _debounceValue;
     private readonly _enabled;
@@ -31,16 +31,15 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _onlyRequestInlineEditsSignal;
     private readonly _forceUpdateExplicitlySignal;
     private readonly _selectedInlineCompletionId;
-    private readonly _primaryPosition;
+    readonly primaryPosition: IObservable<Position>;
     private _isAcceptingPartially;
     get isAcceptingPartially(): boolean;
     private readonly _editorObs;
-    private readonly _onlyShowWhenCloseToCursor;
     private readonly _suggestPreviewEnabled;
     private readonly _suggestPreviewMode;
     private readonly _inlineSuggestMode;
     private readonly _inlineEditsEnabled;
-    constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservable<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService);
+    constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService);
     debugGetSelectedSuggestItem(): IObservable<SuggestItemInfo | undefined>;
     getIndentationInfo(reader: IReader): {
         startsWithIndentation: boolean;
@@ -57,11 +56,11 @@ export declare class InlineCompletionsModel extends Disposable {
     collapseInlineEdit(): void;
     private readonly _inlineCompletionItems;
     private readonly _filteredInlineCompletionItems;
-    readonly selectedInlineCompletionIndex: IObservable<number, unknown>;
-    readonly selectedInlineCompletion: IObservable<InlineCompletionWithUpdatedRange | undefined, unknown>;
-    readonly activeCommands: IObservable<Command[], unknown>;
+    readonly selectedInlineCompletionIndex: IObservable<number>;
+    readonly selectedInlineCompletion: IObservable<InlineCompletionWithUpdatedRange | undefined>;
+    readonly activeCommands: IObservable<Command[]>;
     readonly lastTriggerKind: IObservable<InlineCompletionTriggerKind | undefined>;
-    readonly inlineCompletionsCount: IObservable<number | undefined, unknown>;
+    readonly inlineCompletionsCount: IObservable<number | undefined>;
     readonly state: IObservable<{
         kind: "ghostText";
         edits: readonly SingleTextEdit[];
@@ -75,8 +74,8 @@ export declare class InlineCompletionsModel extends Disposable {
         inlineEdit: InlineEdit;
         inlineCompletion: InlineCompletionWithUpdatedRange;
         cursorAtInlineEdit: boolean;
-    } | undefined, unknown>;
-    readonly status: IObservable<"loading" | "ghostText" | "inlineEdit" | "noSuggestion", unknown>;
+    } | undefined>;
+    readonly status: IObservable<"loading" | "ghostText" | "inlineEdit" | "noSuggestion">;
     readonly inlineCompletionState: IObservable<{
         kind: "ghostText";
         edits: readonly SingleTextEdit[];
@@ -84,25 +83,25 @@ export declare class InlineCompletionsModel extends Disposable {
         ghostTexts: readonly GhostTextOrReplacement[];
         suggestItem: SuggestItemInfo | undefined;
         inlineCompletion: InlineCompletionWithUpdatedRange | undefined;
-    } | undefined, unknown>;
+    } | undefined>;
     readonly inlineEditState: IObservable<{
         kind: "inlineEdit";
         edits: readonly SingleTextEdit[];
         inlineEdit: InlineEdit;
         inlineCompletion: InlineCompletionWithUpdatedRange;
         cursorAtInlineEdit: boolean;
-    } | undefined, unknown>;
-    readonly inlineEditAvailable: IObservable<boolean, unknown>;
+    } | undefined>;
+    readonly inlineEditAvailable: IObservable<boolean>;
     private _computeAugmentation;
-    readonly ghostTexts: IObservable<readonly GhostTextOrReplacement[] | undefined, unknown>;
-    readonly primaryGhostText: IObservable<GhostTextOrReplacement | undefined, unknown>;
+    readonly ghostTexts: IObservable<readonly GhostTextOrReplacement[] | undefined>;
+    readonly primaryGhostText: IObservable<GhostTextOrReplacement | undefined>;
     private readonly _tabShouldIndent;
-    readonly tabShouldJumpToInlineEdit: IObservable<boolean, unknown>;
-    readonly tabShouldAcceptInlineEdit: IObservable<boolean, unknown>;
+    readonly tabShouldJumpToInlineEdit: IObservable<boolean>;
+    readonly tabShouldAcceptInlineEdit: IObservable<boolean>;
     private _deltaSelectedInlineCompletionIndex;
     next(): Promise<void>;
     previous(): Promise<void>;
-    accept(editor: ICodeEditor): Promise<void>;
+    accept(editor?: ICodeEditor): Promise<void>;
     acceptNextWord(editor: ICodeEditor): Promise<void>;
     acceptNextLine(editor: ICodeEditor): Promise<void>;
     private _acceptNext;

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

@@ -55,14 +55,13 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._onlyRequestInlineEditsSignal = observableSignal(this);
         this._forceUpdateExplicitlySignal = observableSignal(this);
         this._selectedInlineCompletionId = observableValue(this, undefined);
-        this._primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
+        this.primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
         this._isAcceptingPartially = false;
         this._editorObs = observableCodeEditor(this._editor);
-        this._onlyShowWhenCloseToCursor = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.experimental.onlyShowWhenCloseToCursor));
         this._suggestPreviewEnabled = ( this._editorObs.getOption(EditorOption.suggest).map(v => v.preview));
         this._suggestPreviewMode = ( this._editorObs.getOption(EditorOption.suggest).map(v => v.previewMode));
         this._inlineSuggestMode = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => v.mode));
-        this._inlineEditsEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.experimental?.enabled));
+        this._inlineEditsEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.enabled));
         this._preserveCurrentCompletionReasons = ( new Set([
             VersionIdChangeReason.Redo,
             VersionIdChangeReason.Undo,
@@ -113,7 +112,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                     this._source.clearSuggestWidgetInlineCompletions(tx);
                 });
             }
-            const cursorPosition = this._primaryPosition.get();
+            const cursorPosition = this.primaryPosition.get();
             if (changeSummary.dontRefetch) {
                 return Promise.resolve(true);
             }
@@ -123,7 +122,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 includeInlineCompletions: !changeSummary.onlyRequestInlineEdits,
                 includeInlineEdits: this._inlineEditsEnabled.read(reader),
             };
-            const itemToPreserveCandidate = this.selectedInlineCompletion.get();
+            const itemToPreserveCandidate = this.selectedInlineCompletion.get() ?? this._inlineCompletionItems.get()?.inlineEdit;
             const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable
                 ? itemToPreserveCandidate : undefined;
             return this._source.fetch(cursorPosition, context, itemToPreserve);
@@ -134,11 +133,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (!c) {
                 return undefined;
             }
-            const cursorPosition = this._primaryPosition.read(reader);
+            const cursorPosition = this.primaryPosition.read(reader);
             let inlineEdit = undefined;
             const visibleCompletions = [];
             for (const completion of c.inlineCompletions) {
-                if (!completion.inlineCompletion.sourceInlineCompletion.isInlineEdit) {
+                if (!completion.sourceInlineCompletion.isInlineEdit) {
                     if (completion.isVisible(this.textModel, cursorPosition, reader)) {
                         visibleCompletions.push(completion);
                     }
@@ -175,7 +174,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const idx = this.selectedInlineCompletionIndex.read(reader);
             return filteredCompletions[idx];
         });
-        this.activeCommands = derivedOpts({ owner: this, equalsFn: itemsEquals() }, r => this.selectedInlineCompletion.read(r)?.inlineCompletion.source.inlineCompletions.commands ?? []);
+        this.activeCommands = derivedOpts({ owner: this, equalsFn: itemsEquals() }, r => this.selectedInlineCompletion.read(r)?.source.inlineCompletions.commands ?? []);
         this.lastTriggerKind = ( this._source.inlineCompletions.map(this, v => v?.request.context.triggerKind));
         this.inlineCompletionsCount = derived(this, reader => {
             if (this.lastTriggerKind.read(reader) === InlineCompletionTriggerKind.Explicit) {
@@ -204,26 +203,28 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }, (reader) => {
             const model = this.textModel;
             const item = this._inlineCompletionItems.read(reader);
-            if (item?.inlineEdit) {
-                let edit = item.inlineEdit.toSingleTextEdit(reader);
+            const inlineEditResult = item?.inlineEdit;
+            if (inlineEditResult) {
+                let edit = inlineEditResult.toSingleTextEdit(reader);
                 edit = singleTextRemoveCommonPrefix(edit, model);
-                const cursorPos = this._primaryPosition.read(reader);
+                const cursorPos = this.primaryPosition.read(reader);
                 const cursorAtInlineEdit = LineRange.fromRangeInclusive(edit.range).addMargin(1, 1).contains(cursorPos.lineNumber);
-                const cursorDist = LineRange.fromRange(edit.range).distanceToLine(this._primaryPosition.read(reader).lineNumber);
-                if (this._onlyShowWhenCloseToCursor.read(reader) && cursorDist > 3 && !item.inlineEdit.request.isExplicitRequest && !this._inAcceptFlow.read(reader)) {
+                const cursorInsideShowRange = cursorAtInlineEdit || (inlineEditResult.inlineCompletion.cursorShowRange?.containsPosition(cursorPos) ?? true);
+                if (!cursorInsideShowRange && !this._inAcceptFlow.read(reader)) {
                     return undefined;
                 }
+                LineRange.fromRange(edit.range).distanceToLine(this.primaryPosition.read(reader).lineNumber);
                 const currentItemIsCollapsed = false;
-                const commands = item.inlineEdit.inlineCompletion.source.inlineCompletions.commands;
+                const commands = inlineEditResult.inlineCompletion.source.inlineCompletions.commands;
                 const renderExplicitly = this._jumpedTo.read(reader);
                 const inlineEdit = ( new InlineEdit(
                     edit,
                     currentItemIsCollapsed,
                     renderExplicitly,
                     commands ?? [],
-                    item.inlineEdit.inlineCompletion
+                    inlineEditResult.inlineCompletion
                 ));
-                return { kind: 'inlineEdit', inlineEdit, inlineCompletion: item.inlineEdit, edits: [edit], cursorAtInlineEdit };
+                return { kind: 'inlineEdit', inlineEdit, inlineCompletion: inlineEditResult, edits: [edit], cursorAtInlineEdit };
             }
             this._jumpedTo.set(false, undefined);
             const suggestItem = this._selectedSuggestItem.read(reader);
@@ -281,7 +282,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return 'noSuggestion';
         });
-        this.inlineCompletionState = derived(reader => {
+        this.inlineCompletionState = derived(this, reader => {
             const s = this.state.read(reader);
             if (!s || s.kind !== 'ghostText') {
                 return undefined;
@@ -291,14 +292,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return s;
         });
-        this.inlineEditState = derived(reader => {
+        this.inlineEditState = derived(this, reader => {
             const s = this.state.read(reader);
             if (!s || s.kind !== 'inlineEdit') {
                 return undefined;
             }
             return s;
         });
-        this.inlineEditAvailable = derived(reader => {
+        this.inlineEditAvailable = derived(this, reader => {
             const s = this.inlineEditState.read(reader);
             return !!s;
         });
@@ -317,6 +318,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return v?.primaryGhostText;
         });
         this._tabShouldIndent = derived(this, reader => {
+            if (this._inAcceptFlow.read(reader)) {
+                return false;
+            }
             function isMultiLine(range) {
                 return range.startLineNumber !== range.endLineNumber;
             }
@@ -375,6 +379,18 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 }
             }
         }));
+        this._register(autorun(reader => {
+            const inlineCompletions = this._source.inlineCompletions.read(reader);
+            if (!inlineCompletions) {
+                return;
+            }
+            for (const inlineCompletion of inlineCompletions.inlineCompletions) {
+                const singleEdit = inlineCompletion.toSingleTextEdit(reader);
+                if (singleEdit.isEmpty) {
+                    this.stop();
+                }
+            }
+        }));
         this._register(autorun(reader => {
             this._editorObs.versionId.read(reader);
             this._inAcceptFlow.set(false, undefined);
@@ -435,6 +451,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._onlyRequestInlineEditsSignal.trigger(tx);
             }
             this._isActive.set(true, tx);
+            this._inAcceptFlow.set(true, tx);
             this._forceUpdateExplicitlySignal.trigger(tx);
         });
         await this._fetchInlineCompletionsPromise.get();
@@ -442,9 +459,11 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     stop(stopReason = 'automatic', tx) {
         subtransaction(tx, tx => {
             if (stopReason === 'explicitCancel') {
-                const completion = this.state.get()?.inlineCompletion?.inlineCompletion;
-                if (completion && completion.source.provider.handleRejection) {
-                    completion.source.provider.handleRejection(completion.source.inlineCompletions, completion.sourceInlineCompletion);
+                const inlineCompletion = this.state.get()?.inlineCompletion;
+                const source = inlineCompletion?.source;
+                const sourceInlineCompletion = inlineCompletion?.sourceInlineCompletion;
+                if (sourceInlineCompletion && source?.provider.handleRejection) {
+                    source.provider.handleRejection(source.inlineCompletions, sourceInlineCompletion);
                 }
             }
             this._isActive.set(false, tx);
@@ -484,7 +503,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async next() { await this._deltaSelectedInlineCompletionIndex(1); }
     async previous() { await this._deltaSelectedInlineCompletionIndex(-1); }
-    async accept(editor) {
+    async accept(editor = this._editor) {
         if (editor.getModel() !== this.textModel) {
             throw ( new BugIndicatingError());
         }
@@ -627,8 +646,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         if (!augmentedCompletion) {
             return;
         }
-        const inlineCompletion = augmentedCompletion.completion.inlineCompletion;
-        inlineCompletion.source.provider.handlePartialAccept?.(inlineCompletion.source.inlineCompletions, inlineCompletion.sourceInlineCompletion, itemEdit.text.length, {
+        const source = augmentedCompletion.completion.source;
+        const sourceInlineCompletion = augmentedCompletion.completion.sourceInlineCompletion;
+        source.provider.handlePartialAccept?.(source.inlineCompletions, sourceInlineCompletion, itemEdit.text.length, {
             kind: PartialAcceptTriggerKind.Suggest,
         });
     }
@@ -648,8 +668,16 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         transaction(tx => {
             this._jumpedTo.set(true, tx);
             this.dontRefetchSignal.trigger(tx);
-            this._editor.setPosition(s.inlineEdit.range.getStartPosition(), 'inlineCompletions.jump');
-            this._editor.revealLine(s.inlineEdit.range.startLineNumber);
+            const edit = s.inlineCompletion.toSingleTextEdit(undefined);
+            this._editor.setPosition(edit.range.getStartPosition(), 'inlineCompletions.jump');
+            const isSingleLineChange = edit.range.startLineNumber === edit.range.endLineNumber && !edit.text.includes('\n');
+            if (isSingleLineChange) {
+                this._editor.revealPosition(edit.range.getStartPosition());
+            }
+            else {
+                const revealRange = ( new Range(edit.range.startLineNumber - 1, 1, edit.range.endLineNumber + 1, 1));
+                this._editor.revealRange(revealRange, ScrollType.Immediate);
+            }
             this._editor.focus();
         });
     }

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

@@ -1,10 +1,11 @@
 import { Disposable, IDisposable } from "../../../../../base/common/lifecycle.js";
-import { IObservable, IReader, ITransaction } from "../../../../../base/common/observable.js";
+import { IObservable, IReader, ISettableObservable, ITransaction } from "../../../../../base/common/observable.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
 import { IContextKeyService } from "../../../../../platform/contextkey/common/contextkey.service.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ILogService } from "../../../../../platform/log/common/log.service.js";
+import { OffsetEdit } from "../../../../common/core/offsetEdit.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
 import { SingleTextEdit } from "../../../../common/core/textEdit.js";
@@ -13,6 +14,7 @@ import { ILanguageConfigurationService } from "../../../../common/languages/lang
 import { ITextModel } from "../../../../common/model.js";
 import { IFeatureDebounceInformation } from "../../../../common/services/languageFeatureDebounce.js";
 import { ILanguageFeaturesService } from "../../../../common/services/languageFeatures.js";
+import { IModelContentChangedEvent } from "../../../../common/textModelEvents.js";
 import { InlineCompletionItem, InlineCompletionProviderResult } from "./provideInlineCompletions.js";
 export declare class InlineCompletionsSource extends Disposable {
     private readonly _textModel;
@@ -25,13 +27,14 @@ export declare class InlineCompletionsSource extends Disposable {
     private readonly _instantiationService;
     private static _requestId;
     private readonly _updateOperation;
-    readonly inlineCompletions: import("../../../../../base/common/observable.js").ISettableObservable<UpToDateInlineCompletions | undefined, void> & IDisposable;
-    readonly suggestWidgetInlineCompletions: import("../../../../../base/common/observable.js").ISettableObservable<UpToDateInlineCompletions | undefined, void> & IDisposable;
+    readonly inlineCompletions: ISettableObservable<UpToDateInlineCompletions | undefined, void> & IDisposable;
+    readonly suggestWidgetInlineCompletions: ISettableObservable<UpToDateInlineCompletions | undefined, void> & IDisposable;
     private readonly _loggingEnabled;
+    private readonly _invalidationDelay;
     private readonly _structuredFetchLogger;
     constructor(_textModel: ITextModel, _versionId: IObservable<number | null>, _debounceValue: IFeatureDebounceInformation, _languageFeaturesService: ILanguageFeaturesService, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
     private _log;
-    readonly loading: import("../../../../../base/common/observable.js").ISettableObservable<boolean, void>;
+    readonly loading: ISettableObservable<boolean, void>;
     fetch(position: Position, context: InlineCompletionContext, activeInlineCompletion: InlineCompletionWithUpdatedRange | undefined): Promise<boolean>;
     clear(tx: ITransaction): void;
     clearSuggestWidgetInlineCompletions(tx: ITransaction): void;
@@ -50,11 +53,13 @@ export declare class UpToDateInlineCompletions implements IDisposable {
     readonly request: UpdateRequest;
     private readonly _textModel;
     private readonly _versionId;
+    private readonly _invalidationDelay;
     private readonly _inlineCompletions;
     get inlineCompletions(): ReadonlyArray<InlineCompletionWithUpdatedRange>;
     private _refCount;
     private readonly _prependedInlineCompletionItems;
-    constructor(inlineCompletionProviderResult: InlineCompletionProviderResult, request: UpdateRequest, _textModel: ITextModel, _versionId: IObservable<number | null>);
+    constructor(inlineCompletionProviderResult: InlineCompletionProviderResult, request: UpdateRequest, _textModel: ITextModel, _versionId: IObservable<number | null>, _invalidationDelay: IObservable<number>);
+    acceptTextModelChangeEvent(e: IModelContentChangedEvent, tx: ITransaction): void;
     clone(): this;
     dispose(): void;
     prepend(inlineCompletion: InlineCompletionItem, range: Range, addRefToSource: boolean): void;
@@ -64,11 +69,21 @@ export declare class InlineCompletionWithUpdatedRange {
     readonly decorationId: string;
     private readonly _textModel;
     private readonly _modelVersion;
+    private readonly _invalidationDelay;
     readonly request: UpdateRequest;
     readonly semanticId: string;
     get forwardStable(): boolean;
     private readonly _updatedRange;
-    constructor(inlineCompletion: InlineCompletionItem, decorationId: string, _textModel: ITextModel, _modelVersion: IObservable<number | null>, request: UpdateRequest);
+    private _inlineEdit;
+    get inlineEdit(): IObservable<OffsetEdit | null>;
+    get source(): import("./provideInlineCompletions.js").InlineCompletionList;
+    get sourceInlineCompletion(): import("../../../../common/languages.js").InlineCompletion;
+    get isInlineEdit(): boolean | undefined;
+    private _invalidationTime;
+    private _lastChangePartOfInlineEdit;
+    constructor(inlineCompletion: InlineCompletionItem, decorationId: string, _textModel: ITextModel, _modelVersion: IObservable<number | null>, _invalidationDelay: IObservable<number>, request: UpdateRequest);
+    private _toIndividualEdits;
+    acceptTextModelChangeEvent(e: IModelContentChangedEvent, tx: ITransaction): void;
     toInlineCompletion(reader: IReader | undefined): InlineCompletionItem;
     toSingleTextEdit(reader: IReader | undefined): SingleTextEdit;
     isVisible(model: ITextModel, cursorPosition: Position, reader: IReader | undefined): boolean;
@@ -91,7 +106,7 @@ export declare class StructuredLogger<T extends IRecordableLogEntry> extends Dis
     static cast<T extends IRecordableLogEntry>(): typeof StructuredLogger<T>;
     private readonly _contextKeyValue;
     constructor(_contextKey: string, _contextKeyService: IContextKeyService, _commandService: ICommandService);
-    readonly isEnabled: IObservable<boolean, unknown>;
+    readonly isEnabled: IObservable<boolean>;
     log(data: T): boolean;
 }
 export declare function observableContextKey<T>(key: string, contextKeyService: IContextKeyService): IObservable<T | undefined>;