@codingame/monaco-vscode-api 17.2.1 → 18.0.1

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

@@ -5,7 +5,7 @@ import { ICommandService } from "../../../../../platform/commands/common/command
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
 import { Position } from "../../../../common/core/position.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { Command, InlineCompletion, InlineCompletionTriggerKind } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
@@ -36,7 +36,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _noDelaySignal;
     private readonly _fetchSpecificProviderSignal;
     private readonly _selectedInlineCompletionId;
-    readonly primaryPosition: IObservable<Position>;
+    readonly primaryPosition: IObservableWithChange<Position, void>;
     private _isAcceptingPartially;
     get isAcceptingPartially(): boolean;
     private readonly _onDidAccept;
@@ -45,6 +45,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _suggestPreviewEnabled;
     private readonly _suggestPreviewMode;
     private readonly _inlineSuggestMode;
+    private readonly _suppressedInlineCompletionGroupIds;
     private readonly _inlineEditsEnabled;
     private readonly _inlineEditsShowCollapsedEnabled;
     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, _accessibilityService: IAccessibilityService, _languageFeaturesService: ILanguageFeaturesService);
@@ -68,51 +69,51 @@ export declare class InlineCompletionsModel extends Disposable {
     stop(stopReason?: "explicitCancel" | "automatic", tx?: ITransaction): void;
     private readonly _inlineCompletionItems;
     private readonly _filteredInlineCompletionItems;
-    readonly selectedInlineCompletionIndex: IObservable<number>;
-    readonly selectedInlineCompletion: IObservable<InlineCompletionItem | undefined>;
+    readonly selectedInlineCompletionIndex: IObservableWithChange<number, void>;
+    readonly selectedInlineCompletion: IObservableWithChange<InlineCompletionItem | undefined, void>;
     readonly activeCommands: IObservable<Command[]>;
     readonly lastTriggerKind: IObservable<InlineCompletionTriggerKind | undefined>;
-    readonly inlineCompletionsCount: IObservable<number | undefined>;
+    readonly inlineCompletionsCount: IObservableWithChange<number | undefined, void>;
     private readonly _hasVisiblePeekWidgets;
     readonly state: IObservable<{
         kind: "ghostText";
-        edits: readonly SingleTextEdit[];
+        edits: readonly TextReplacement[];
         primaryGhostText: GhostTextOrReplacement;
         ghostTexts: readonly GhostTextOrReplacement[];
         suggestItem: SuggestItemInfo | undefined;
         inlineCompletion: InlineCompletionItem | undefined;
     } | {
         kind: "inlineEdit";
-        edits: readonly SingleTextEdit[];
+        edits: readonly TextReplacement[];
         inlineEdit: InlineEdit;
         inlineCompletion: InlineEditItem;
         cursorAtInlineEdit: IObservable<boolean>;
     } | undefined>;
-    readonly status: IObservable<"loading" | "ghostText" | "inlineEdit" | "noSuggestion">;
-    readonly inlineCompletionState: IObservable<{
+    readonly status: IObservableWithChange<"loading" | "ghostText" | "inlineEdit" | "noSuggestion", void>;
+    readonly inlineCompletionState: IObservableWithChange<{
         kind: "ghostText";
-        edits: readonly SingleTextEdit[];
+        edits: readonly TextReplacement[];
         primaryGhostText: GhostTextOrReplacement;
         ghostTexts: readonly GhostTextOrReplacement[];
         suggestItem: SuggestItemInfo | undefined;
         inlineCompletion: InlineCompletionItem | undefined;
-    } | undefined>;
-    readonly inlineEditState: IObservable<{
+    } | undefined, void>;
+    readonly inlineEditState: IObservableWithChange<{
         kind: "inlineEdit";
-        edits: readonly SingleTextEdit[];
+        edits: readonly TextReplacement[];
         inlineEdit: InlineEdit;
         inlineCompletion: InlineEditItem;
         cursorAtInlineEdit: IObservable<boolean>;
-    } | undefined>;
-    readonly inlineEditAvailable: IObservable<boolean>;
+    } | undefined, void>;
+    readonly inlineEditAvailable: IObservableWithChange<boolean, void>;
     private _computeAugmentation;
-    readonly warning: IObservable<import("../../../../common/languages.js").InlineCompletionWarning | undefined>;
+    readonly warning: IObservableWithChange<import("../../../../common/languages.js").InlineCompletionWarning | undefined, void>;
     readonly ghostTexts: IObservable<readonly GhostTextOrReplacement[] | undefined>;
     readonly primaryGhostText: IObservable<GhostTextOrReplacement | undefined>;
-    readonly showCollapsed: IObservable<boolean>;
+    readonly showCollapsed: IObservableWithChange<boolean, void>;
     private readonly _tabShouldIndent;
-    readonly tabShouldJumpToInlineEdit: IObservable<boolean>;
-    readonly tabShouldAcceptInlineEdit: IObservable<boolean>;
+    readonly tabShouldJumpToInlineEdit: IObservableWithChange<boolean, void>;
+    readonly tabShouldAcceptInlineEdit: IObservableWithChange<boolean, void>;
     private _deltaSelectedInlineCompletionIndex;
     next(): Promise<void>;
     previous(): Promise<void>;
@@ -139,5 +140,5 @@ export declare enum VersionIdChangeReason {
     AcceptWord = 2,
     Other = 3
 }
-export declare function getSecondaryEdits(textModel: ITextModel, positions: readonly Position[], primaryEdit: SingleTextEdit): SingleTextEdit[];
+export declare function getSecondaryEdits(textModel: ITextModel, positions: readonly Position[], primaryEdit: TextReplacement): TextReplacement[];
 export {};

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

@@ -15,12 +15,12 @@ import { observableCodeEditor } from '../../../../browser/observableCodeEditor.j
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { CursorColumns } from '../../../../common/core/cursorColumns.js';
 import { EditOperation } from '../../../../common/core/editOperation.js';
-import { LineRange } from '../../../../common/core/lineRange.js';
+import { LineRange } from '../../../../common/core/ranges/lineRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { Selection } from '../../../../common/core/selection.js';
-import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
-import { TextLength } from '../../../../common/core/textLength.js';
+import { TextEdit, TextReplacement } from '../../../../common/core/edits/textEdit.js';
+import { TextLength } from '../../../../common/core/text/textLength.js';
 import { ScrollType } from '../../../../common/editorCommon.js';
 import { InlineCompletionTriggerKind, InlineCompletionEndOfLifeReasonKind, PartialAcceptTriggerKind } from '../../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.service.js';
@@ -28,18 +28,22 @@ import { EndOfLinePreference } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.service.js';
 import { SnippetController2 } from '../../../snippet/browser/snippetController2.js';
-import { getEndPositionsAfterApplying, subtractPositions, substringPos, addPositions } from '../utils.js';
+import { removeTextReplacementCommonSuffixPrefix, getEndPositionsAfterApplying, subtractPositions, substringPos, addPositions } from '../utils.js';
 import { AnimatedValue, easeOutCubic, ObservableAnimatedValue } from './animation.js';
-import { TextModelChangeRecorder } from './changeRecorder.js';
 import { computeGhostText } from './computeGhostText.js';
 import { ghostTextsOrReplacementsEqual, GhostText, ghostTextOrReplacementEquals } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
 import { InlineEdit } from './inlineEdit.js';
 import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEditHelpers.js';
-import { derived, derivedHandleChanges, derivedOpts } from '../../../../../base/common/observableInternal/derived.js';
-import { observableValue, transaction, subtransaction } from '../../../../../base/common/observableInternal/base.js';
-import { observableSignal, recomputeInitiallyAndOnChange, observableFromEvent, constObservable } from '../../../../../base/common/observableInternal/utils.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { TextModelEditReason } from '../../../../common/textModelEditReason.js';
+import { derived, derivedHandleChanges, derivedOpts } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
+import { recomputeInitiallyAndOnChange } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
+import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     get isAcceptingPartially() { return this._isAcceptingPartially; }
@@ -72,6 +76,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         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._suppressedInlineCompletionGroupIds = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ( new Set(v.experimental.suppressInlineSuggestions))));
         this._inlineEditsEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => !!v.edits.enabled));
         this._inlineEditsShowCollapsedEnabled = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.showCollapsed));
         this._lastShownInlineCompletionInfo = undefined;
@@ -183,7 +188,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 jumpedTo => !!jumpedTo && jumpedTo === this._inlineCompletionItems.get()?.inlineEdit?.semanticId
             ));
             const providers = changeSummary.provider ? [changeSummary.provider] : this._languageFeaturesService.inlineCompletionsProvider.all(this.textModel);
-            return this._source.fetch(providers, cursorPosition, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, !!changeSummary.provider);
+            const suppressedProviderGroupIds = this._suppressedInlineCompletionGroupIds.get();
+            const availableProviders = providers.filter(provider => !(provider.groupId && ( suppressedProviderGroupIds.has(provider.groupId))));
+            return this._source.fetch(availableProviders, cursorPosition, context, itemToPreserve?.identity, changeSummary.shouldDebounce, userJumpedToActiveCompletion, !!changeSummary.provider);
         });
         this._inlineCompletionItems = derivedOpts({ owner: this }, reader => {
             const c = this._source.inlineCompletions.read(reader);
@@ -274,7 +281,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const commands = inlineEditResult.source.inlineSuggestions.commands;
                 const inlineEdit = ( new InlineEdit(edit, commands ?? [], inlineEditResult));
                 const edits = inlineEditResult.updatedEdit;
-                const e = edits ? TextEdit.fromOffsetEdit(edits, ( new TextModelText(this.textModel))).edits : [edit];
+                const e = edits ? TextEdit.fromStringEdit(edits, ( new TextModelText(this.textModel))).replacements : [edit];
                 return { kind: 'inlineEdit', inlineEdit, inlineCompletion: inlineEditResult, edits: e, cursorAtInlineEdit };
             }
             const suggestItem = this._selectedSuggestItem.read(reader);
@@ -370,6 +377,27 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return v?.primaryGhostText;
         });
+        this._jumpedToId = observableValue(this, undefined);
+        this._inAcceptFlow = observableValue(this, false);
+        this.inAcceptFlow = this._inAcceptFlow;
+        const 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);
+        });
         this.showCollapsed = derived(this, reader => {
             const state = this.state.read(reader);
             if (!state || state.kind !== 'inlineEdit') {
@@ -417,6 +445,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this.showCollapsed.read(reader)) {
                 return true;
             }
+            if (this._inAcceptFlow.read(reader) && appearedInsideViewport.read(reader)) {
+                return false;
+            }
             return !s.cursorAtInlineEdit.read(reader);
         });
         this.tabShouldAcceptInlineEdit = derived(this, reader => {
@@ -427,6 +458,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (this.showCollapsed.read(reader)) {
                 return false;
             }
+            if (this._inAcceptFlow.read(reader) && appearedInsideViewport.read(reader)) {
+                return true;
+            }
             if (s.inlineCompletion.targetRange.startLineNumber === this._editorObs.cursorLineNumber.read(reader)) {
                 return true;
             }
@@ -438,9 +472,6 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return s.cursorAtInlineEdit.read(reader);
         });
-        this._jumpedToId = observableValue(this, undefined);
-        this._inAcceptFlow = observableValue(this, false);
-        this.inAcceptFlow = this._inAcceptFlow;
         this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletionsPromise));
         this._register(autorun(reader => {
             const item = this.inlineCompletionState.read(reader);
@@ -598,11 +629,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     async next() { await this._deltaSelectedInlineCompletionIndex(1); }
     async previous() { await this._deltaSelectedInlineCompletionIndex(-1); }
     _getMetadata(completion, type = undefined) {
-        return {
+        return ( new TextModelEditReason({
             extensionId: completion.source.provider.groupId,
             nes: completion.isInlineEdit,
-            type
-        };
+            type,
+            requestUuid: completion.requestUuid,
+        }));
     }
     async accept(editor = this._editor) {
         if (editor.getModel() !== this.textModel) {
@@ -628,7 +660,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         editor.pushUndoStop();
         if (completion.snippetInfo) {
-            TextModelChangeRecorder.editWithMetadata(this._getMetadata(completion), () => {
+            TextModelEditReason.editWithReason(this._getMetadata(completion), () => {
                 editor.executeEdits('inlineSuggestion.accept', [
                     EditOperation.replace(completion.editRange, ''),
                     ...completion.additionalTextEdits
@@ -639,8 +671,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         }
         else {
             const edits = state.edits;
-            const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
-            TextModelChangeRecorder.editWithMetadata(this._getMetadata(completion), () => {
+            let minimalEdits = edits;
+            if (state.kind === 'ghostText') {
+                minimalEdits = removeTextReplacementCommonSuffixPrefix(edits, this.textModel);
+            }
+            const selections = ( getEndPositionsAfterApplying(minimalEdits).map(p => Selection.fromPositions(p)));
+            TextModelEditReason.editWithReason(this._getMetadata(completion), () => {
                 editor.executeEdits('inlineSuggestion.accept', [
                     ...( edits.map(edit => EditOperation.replace(edit.range, edit.text))),
                     ...completion.additionalTextEdits
@@ -736,10 +772,10 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 editor.pushUndoStop();
                 const replaceRange = Range.fromPositions(cursorPosition, ghostTextPos);
                 const newText = editor.getModel().getValueInRange(replaceRange) + partialGhostTextVal;
-                const primaryEdit = ( new SingleTextEdit(replaceRange, newText));
+                const primaryEdit = ( new TextReplacement(replaceRange, newText));
                 const edits = [primaryEdit, ...getSecondaryEdits(this.textModel, positions, primaryEdit)];
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
-                TextModelChangeRecorder.editWithMetadata(this._getMetadata(completion, type), () => {
+                TextModelEditReason.editWithReason(this._getMetadata(completion, type), () => {
                     editor.executeEdits('inlineSuggestion.accept', ( edits.map(edit => EditOperation.replace(edit.range, edit.text))));
                 });
                 editor.setSelections(selections, 'inlineCompletionPartialAccept');
@@ -839,7 +875,7 @@ function getSecondaryEdits(textModel, positions, primaryEdit) {
         const textAfterSecondaryCursor = textModel.getValueInRange(Range.fromPositions(pos, posEnd));
         const l = commonPrefixLength(replacedTextAfterPrimaryCursor, textAfterSecondaryCursor);
         const range = Range.fromPositions(pos, pos.delta(0, l));
-        return ( new SingleTextEdit(range, secondaryEditText));
+        return ( new TextReplacement(range, secondaryEditText));
     }));
 }
 class FadeoutDecoration extends Disposable {

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

@@ -3,15 +3,15 @@ import { IObservable, IObservableWithChange, ITransaction } from "../../../../..
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.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 { StringEdit } from "../../../../common/core/edits/stringEdit.js";
 import { Position } from "../../../../common/core/position.js";
-import { InlineCompletionContext, InlineCompletionsProvider } from "../../../../common/languages.js";
+import { InlineCompletionsProvider } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { IFeatureDebounceInformation } from "../../../../common/services/languageFeatureDebounce.js";
 import { IModelContentChangedEvent } from "../../../../common/textModelEvents.js";
 import { InlineSuggestionIdentity, InlineSuggestionItem } from "./inlineSuggestionItem.js";
-import { InlineCompletionProviderResult } from "./provideInlineCompletions.js";
+import { InlineCompletionContextWithoutUuid, InlineCompletionProviderResult } from "./provideInlineCompletions.js";
 export declare class InlineCompletionsSource extends Disposable {
     private readonly _textModel;
     private readonly _versionId;
@@ -28,11 +28,11 @@ export declare class InlineCompletionsSource extends Disposable {
     readonly inlineCompletions: IObservable<InlineCompletionsState>;
     readonly suggestWidgetInlineCompletions: IObservable<InlineCompletionsState>;
     constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService);
-    readonly clearOperationOnTextModelChange: IObservable<undefined>;
+    readonly clearOperationOnTextModelChange: IObservableWithChange<undefined, void>;
     private _log;
     private readonly _loadingCount;
     readonly loading: IObservable<boolean>;
-    fetch(providers: InlineCompletionsProvider[], position: Position, context: InlineCompletionContext, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, providerhasChangedCompletion: boolean): Promise<boolean>;
+    fetch(providers: InlineCompletionsProvider[], position: Position, context: InlineCompletionContextWithoutUuid, activeInlineCompletion: InlineSuggestionIdentity | undefined, withDebounce: boolean, userJumpedToActiveCompletion: IObservable<boolean>, providerhasChangedCompletion: boolean): Promise<boolean>;
     clear(tx: ITransaction): void;
     seedInlineCompletionsWithSuggestWidget(): void;
     clearSuggestWidgetInlineCompletions(tx: ITransaction): void;
@@ -40,9 +40,9 @@ export declare class InlineCompletionsSource extends Disposable {
 }
 declare class UpdateRequest {
     readonly position: Position;
-    readonly context: InlineCompletionContext;
+    readonly context: InlineCompletionContextWithoutUuid;
     readonly versionId: number;
-    constructor(position: Position, context: InlineCompletionContext, versionId: number);
+    constructor(position: Position, context: InlineCompletionContextWithoutUuid, versionId: number);
     satisfies(other: UpdateRequest): boolean;
     get isExplicitRequest(): boolean;
 }
@@ -53,7 +53,7 @@ declare class InlineCompletionsState extends Disposable {
     constructor(inlineCompletions: readonly InlineSuggestionItem[], request: UpdateRequest | undefined);
     private _findById;
     private _findByHash;
-    createStateWithAppliedEdit(edit: OffsetEdit, textModel: ITextModel): InlineCompletionsState;
+    createStateWithAppliedEdit(edit: StringEdit, textModel: ITextModel): InlineCompletionsState;
     createStateWithAppliedResults(update: InlineCompletionProviderResult, request: UpdateRequest, textModel: ITextModel, itemToPreserve: InlineSuggestionIdentity | undefined): InlineCompletionsState;
     clone(): InlineCompletionsState;
 }

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

@@ -6,23 +6,24 @@ import { CancellationTokenSource } from '../../../../../base/common/cancellation
 import { equalsIfDefined, itemEquals } from '../../../../../base/common/equals.js';
 import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { observableReducerSettable } from '../../../../../base/common/observableInternal/reducer.js';
+import { observableReducerSettable } from '../../../../../base/common/observableInternal/experimental/reducer.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
-import { OffsetEdit } from '../../../../common/core/offsetEdit.js';
+import { StringEdit } from '../../../../common/core/edits/stringEdit.js';
 import { InlineCompletionTriggerKind, InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../../common/languages/languageConfigurationRegistry.service.js';
-import { OffsetEdits } from '../../../../common/model/textModelOffsetEdit.js';
+import { offsetEditFromContentChanges } from '../../../../common/model/textModelStringEdit.js';
 import { StructuredLogger, formatRecordableLogEntry } from '../structuredLogger.js';
 import { wait } from '../utils.js';
 import { InlineSuggestionItem } from './inlineSuggestionItem.js';
 import { provideInlineCompletions } from './provideInlineCompletions.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { recordChanges } from '../../../../../base/common/observableInternal/changeTracker.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
-import { observableValue, transaction } from '../../../../../base/common/observableInternal/base.js';
 
 var InlineCompletionsSource_1;
 let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
@@ -51,10 +52,10 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             },
             changeTracker: recordChanges({ versionId: this._versionId }),
             update: (reader, previousValue, changes) => {
-                const edit = OffsetEdit.join(( changes.changes.map(
-                    c => c.change ? OffsetEdits.fromContentChanges(c.change.changes) : OffsetEdit.empty
+                const edit = StringEdit.compose(( changes.changes.map(
+                    c => c.change ? offsetEditFromContentChanges(c.change.changes) : StringEdit.empty
                 )).filter(isDefined));
-                if (edit.isEmpty) {
+                if (edit.isEmpty()) {
                     return previousValue;
                 }
                 try {
@@ -112,7 +113,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
                 }
                 const requestId = InlineCompletionsSource_1._requestId++;
                 if (this._loggingEnabled.get() || this._structuredFetchLogger.isEnabled.get()) {
-                    this._log({ sourceId: 'InlineCompletions.fetch', kind: 'start', requestId, modelUri: ( this._textModel.uri.toString()), modelVersion: this._textModel.getVersionId(), context: { triggerKind: context.triggerKind }, time: Date.now() });
+                    this._log({ sourceId: 'InlineCompletions.fetch', kind: 'start', requestId, modelUri: this._textModel.uri, modelVersion: this._textModel.getVersionId(), context: { triggerKind: context.triggerKind }, time: Date.now() });
                 }
                 const startTime = ( new Date());
                 let providerResult = undefined;

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

@@ -1,11 +1,11 @@
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { Command } from "../../../../common/languages.js";
 import { InlineSuggestionItem } from "./inlineSuggestionItem.js";
 export declare class InlineEdit {
-    readonly edit: SingleTextEdit;
+    readonly edit: TextReplacement;
     readonly commands: readonly Command[];
     readonly inlineCompletion: InlineSuggestionItem;
-    constructor(edit: SingleTextEdit, commands: readonly Command[], inlineCompletion: InlineSuggestionItem);
+    constructor(edit: TextReplacement, commands: readonly Command[], inlineCompletion: InlineSuggestionItem);
     get range(): import("../../../../common/core/range.js").Range;
     get text(): string;
     equals(other: InlineEdit): boolean;

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

@@ -6,8 +6,8 @@ import { ICommandService } from '../../../../../platform/commands/common/command
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { InlineEditTriggerKind } from '../../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.service.js';
-import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import { autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableSignalFromEvent } from '../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 
 var InlineEditsAdapterContribution_1;
 let InlineEditsAdapterContribution = class InlineEditsAdapterContribution extends Disposable {

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

@@ -1,11 +1,11 @@
 import { IObservable } from "../../../../../base/common/observable.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
 import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
-import { OffsetEdit } from "../../../../common/core/offsetEdit.js";
+import { StringEdit } from "../../../../common/core/edits/stringEdit.js";
 import { Position } from "../../../../common/core/position.js";
-import { PositionOffsetTransformerBase } from "../../../../common/core/positionToOffset.js";
+import { PositionOffsetTransformerBase } from "../../../../common/core/text/positionToOffset.js";
 import { Range } from "../../../../common/core/range.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { InlineCompletion, Command, InlineCompletionWarning, PartialAcceptInfo, InlineCompletionEndOfLifeReason } from "../../../../common/languages.js";
 import { ITextModel } from "../../../../common/model.js";
 import { IDisplayLocation, InlineSuggestData, InlineSuggestionList, SnippetInfo } from "./provideInlineCompletions.js";
@@ -31,9 +31,10 @@ declare abstract class InlineSuggestionItemBase {
     get showInlineEditMenu(): boolean;
     get hash(): string;
     get shownCommand(): Command | undefined;
+    get requestUuid(): string;
     private get _sourceInlineCompletion();
-    abstract getSingleTextEdit(): SingleTextEdit;
-    abstract withEdit(userEdit: OffsetEdit, textModel: ITextModel): InlineSuggestionItem | undefined;
+    abstract getSingleTextEdit(): TextReplacement;
+    abstract withEdit(userEdit: StringEdit, textModel: ITextModel): InlineSuggestionItem | undefined;
     abstract withIdentity(identity: InlineSuggestionIdentity): InlineSuggestionItem;
     abstract canBeReused(model: ITextModel, position: Position): boolean;
     addRef(): void;
@@ -59,7 +60,7 @@ declare class InlineSuggestDisplayLocation implements IDisplayLocation {
     readonly label: string;
     static create(displayLocation: IDisplayLocation, textmodel: ITextModel): InlineSuggestDisplayLocation;
     private constructor();
-    withEdit(edit: OffsetEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestDisplayLocation | undefined;
+    withEdit(edit: StringEdit, positionOffsetTransformer: PositionOffsetTransformerBase): InlineSuggestDisplayLocation | undefined;
 }
 export declare class InlineCompletionItem extends InlineSuggestionItemBase {
     private readonly _edit;
@@ -70,9 +71,9 @@ export declare class InlineCompletionItem extends InlineSuggestionItemBase {
     static create(data: InlineSuggestData, textModel: ITextModel): InlineCompletionItem;
     readonly isInlineEdit = false;
     private constructor();
-    getSingleTextEdit(): SingleTextEdit;
+    getSingleTextEdit(): TextReplacement;
     withIdentity(identity: InlineSuggestionIdentity): InlineCompletionItem;
-    withEdit(textModelEdit: OffsetEdit, textModel: ITextModel): InlineCompletionItem | undefined;
+    withEdit(textModelEdit: StringEdit, textModel: ITextModel): InlineCompletionItem | undefined;
     canBeReused(model: ITextModel, position: Position): boolean;
     isVisible(model: ITextModel, cursorPosition: Position): boolean;
 }
@@ -88,11 +89,11 @@ export declare class InlineEditItem extends InlineSuggestionItemBase {
     readonly isInlineEdit = true;
     private constructor();
     get updatedEditModelVersion(): number;
-    get updatedEdit(): OffsetEdit;
-    getSingleTextEdit(): SingleTextEdit;
+    get updatedEdit(): StringEdit;
+    getSingleTextEdit(): TextReplacement;
     withIdentity(identity: InlineSuggestionIdentity): InlineEditItem;
     canBeReused(model: ITextModel, position: Position): boolean;
-    withEdit(textModelChanges: OffsetEdit, textModel: ITextModel): InlineEditItem | undefined;
+    withEdit(textModelChanges: StringEdit, textModel: ITextModel): InlineEditItem | undefined;
     private _applyTextModelChanges;
 }
 export {};