@codingame/monaco-vscode-api 17.2.1 → 18.0.0

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

@@ -3,18 +3,19 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { matchesSubString } from '../../../../../base/common/filters.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines, commonPrefixLength, commonSuffixLength } from '../../../../../base/common/strings.js';
-import { applyEditsToRanges, SingleOffsetEdit, OffsetEdit } from '../../../../common/core/offsetEdit.js';
-import { OffsetRange } from '../../../../common/core/offsetRange.js';
-import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/positionToOffset.js';
+import { applyEditsToRanges, StringReplacement, StringEdit } from '../../../../common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Range } from '../../../../common/core/range.js';
-import { SingleTextEdit, TextEdit, StringText } from '../../../../common/core/textEdit.js';
-import { TextLength } from '../../../../common/core/textLength.js';
+import { TextEdit } from '../../../../common/core/edits/textEdit.js';
+import { StringText } from '../../../../common/core/text/abstractText.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 { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+import { getPositionOffsetTransformerFromTextModel } from '../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
+import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 
 var InlineSuggestionItem;
 (function (InlineSuggestionItem) {
@@ -52,6 +53,7 @@ class InlineSuggestionItemBase {
         ]);
     }
     get shownCommand() { return this._sourceInlineCompletion.shownCommand; }
+    get requestUuid() { return this._data.context.requestUuid; }
     get _sourceInlineCompletion() { return this._data.sourceInlineCompletion; }
     addRef() {
         this.identity.addRef();
@@ -120,13 +122,15 @@ class InlineSuggestDisplayLocation {
 class InlineCompletionItem extends InlineSuggestionItemBase {
     static create(data, textModel) {
         const identity = ( new InlineSuggestionIdentity());
-        const textEdit = ( new SingleTextEdit(data.range, data.insertText));
-        const edit = getPositionOffsetTransformerFromTextModel(textModel).getSingleOffsetEdit(textEdit);
+        const transformer = getPositionOffsetTransformerFromTextModel(textModel);
+        const insertText = data.insertText.replace(/\r\n|\r|\n/g, textModel.getEOL());
+        const edit = reshapeInlineCompletion(( new StringReplacement(transformer.getOffsetRange(data.range), insertText)), textModel);
+        const textEdit = transformer.getSingleTextEdit(edit);
         const displayLocation = data.displayLocation ? InlineSuggestDisplayLocation.create(data.displayLocation, textModel) : undefined;
         return ( new InlineCompletionItem(
             edit,
             textEdit,
-            data.range,
+            textEdit.range,
             data.snippetInfo,
             data.additionalTextEdits,
             data,
@@ -161,7 +165,7 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
         if (newEditRange.length === 0) {
             return undefined;
         }
-        const newEdit = ( new SingleOffsetEdit(newEditRange[0], this._textEdit.text));
+        const newEdit = ( new StringReplacement(newEditRange[0], this._textEdit.text));
         const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
         const newTextEdit = positionOffsetTransformer.getSingleTextEdit(newEdit);
         let newDisplayLocation = this.displayLocation;
@@ -223,12 +227,12 @@ class InlineCompletionItem extends InlineSuggestionItemBase {
 }
 class InlineEditItem extends InlineSuggestionItemBase {
     static create(data, textModel) {
-        const offsetEdit = getOffsetEdit(textModel, data.range, data.insertText);
+        const offsetEdit = getStringEdit(textModel, data.range, data.insertText);
         const text = ( new TextModelText(textModel));
-        const textEdit = TextEdit.fromOffsetEdit(offsetEdit, text);
-        const singleTextEdit = textEdit.toSingle(text);
+        const textEdit = TextEdit.fromStringEdit(offsetEdit, text);
+        const singleTextEdit = textEdit.toReplacement(text);
         const identity = ( new InlineSuggestionIdentity());
-        const edits = ( offsetEdit.edits.map(edit => {
+        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);
@@ -298,9 +302,9 @@ class InlineEditItem extends InlineSuggestionItemBase {
         if (edits.length === 0) {
             return undefined;
         }
-        const newEdit = ( new OffsetEdit(( edits.map(edit => edit.edit))));
+        const newEdit = ( new StringEdit(( edits.map(edit => edit.edit))));
         const positionOffsetTransformer = getPositionOffsetTransformerFromTextModel(textModel);
-        const newTextEdit = positionOffsetTransformer.getTextEdit(newEdit).toSingle(( new TextModelText(textModel)));
+        const newTextEdit = positionOffsetTransformer.getTextEdit(newEdit).toReplacement(( new TextModelText(textModel)));
         let newDisplayLocation = this.displayLocation;
         if (newDisplayLocation) {
             newDisplayLocation = newDisplayLocation.withEdit(textModelChanges, positionOffsetTransformer);
@@ -320,7 +324,7 @@ class InlineEditItem extends InlineSuggestionItemBase {
         ));
     }
 }
-function getOffsetEdit(textModel, editRange, replaceText) {
+function getStringEdit(textModel, editRange, replaceText) {
     const eol = textModel.getEOL();
     const editOriginalText = textModel.getValueInRange(editRange);
     const editReplaceText = replaceText.replace(/\r\n|\r|\n/g, eol);
@@ -337,13 +341,13 @@ function getOffsetEdit(textModel, editRange, replaceText) {
         return TextLength.ofRange(range).createRange(start.addToPosition(pos));
     }
     const modifiedText = ( new StringText(editReplaceText));
-    const offsetEdit = ( new OffsetEdit(( innerChanges.map(c => {
+    const offsetEdit = ( new StringEdit(( innerChanges.map(c => {
         const rangeInModel = addRangeToPos(editRange.getStartPosition(), c.originalRange);
         const originalRange = getPositionOffsetTransformerFromTextModel(textModel).getOffsetRange(rangeInModel);
         const replaceText = modifiedText.getValueOfRange(c.modifiedRange);
-        const edit = ( new SingleOffsetEdit(originalRange, replaceText));
+        const edit = ( new StringReplacement(originalRange, replaceText));
         const originalText = textModel.getValueInRange(rangeInModel);
-        return reshapeEdit(edit, originalText, innerChanges.length, textModel);
+        return reshapeInlineEdit(edit, originalText, innerChanges.length, textModel);
     }))));
     return offsetEdit;
 }
@@ -396,8 +400,8 @@ class SingleUpdatedNextEdit {
         let editReplaceText = edit.newText;
         let editHasChanged = false;
         const shouldPreserveEditShape = this._prefixLength > 0 || this._suffixLength > 0;
-        for (let i = textModelChanges.edits.length - 1; i >= 0; i--) {
-            const change = textModelChanges.edits[i];
+        for (let i = textModelChanges.replacements.length - 1; i >= 0; i--) {
+            const change = textModelChanges.replacements[i];
             const isInsertion = change.newText.length > 0 && change.replaceRange.isEmpty;
             if (isInsertion && !shouldPreserveEditShape && change.replaceRange.start === editStart && editReplaceText.startsWith(change.newText)) {
                 editStart += change.newText.length;
@@ -436,33 +440,44 @@ class SingleUpdatedNextEdit {
             return undefined;
         }
         if (this._trimmedNewText.length === 0 && editStart + this._prefixLength === editEnd - this._suffixLength) {
-            return { edit: ( new SingleOffsetEdit(( new OffsetRange(editStart + this._prefixLength, editStart + this._prefixLength)), '')), editHasChanged: true };
+            return { edit: ( new StringReplacement(( new OffsetRange(editStart + this._prefixLength, editStart + this._prefixLength)), '')), editHasChanged: true };
         }
-        return { edit: ( new SingleOffsetEdit(( new OffsetRange(editStart, editEnd)), editReplaceText)), editHasChanged };
+        return { edit: ( new StringReplacement(( new OffsetRange(editStart, editEnd)), editReplaceText)), editHasChanged };
     }
 }
-function reshapeEdit(edit, originalText, totalInnerEdits, textModel) {
+function reshapeInlineCompletion(edit, textModel) {
+    const eol = textModel.getEOL();
+    if (edit.replaceRange.isEmpty && edit.newText.includes(eol)) {
+        edit = reshapeMultiLineInsertion(edit, textModel);
+    }
+    return edit;
+}
+function reshapeInlineEdit(edit, originalText, totalInnerEdits, textModel) {
     const eol = textModel.getEOL();
     if (edit.newText.endsWith(eol) && originalText.endsWith(eol)) {
-        edit = ( new SingleOffsetEdit(
+        edit = ( new StringReplacement(
             edit.replaceRange.deltaEnd(-eol.length),
             edit.newText.slice(0, -eol.length)
         ));
     }
     if (totalInnerEdits === 1 && edit.replaceRange.isEmpty && edit.newText.includes(eol)) {
-        edit = reshapeMultiLineInsertion(edit, textModel);
+        const startPosition = textModel.getPositionAt(edit.replaceRange.start);
+        const hasTextOnInsertionLine = textModel.getLineLength(startPosition.lineNumber) !== 0;
+        if (hasTextOnInsertionLine) {
+            edit = reshapeMultiLineInsertion(edit, textModel);
+        }
     }
     if (totalInnerEdits === 1) {
         const prefixLength = commonPrefixLength(originalText, edit.newText);
         const suffixLength = commonSuffixLength(originalText.slice(prefixLength), edit.newText.slice(prefixLength));
         if (prefixLength + suffixLength === originalText.length) {
-            return ( new SingleOffsetEdit(
+            return ( new StringReplacement(
                 edit.replaceRange.deltaStart(prefixLength).deltaEnd(-suffixLength),
                 edit.newText.substring(prefixLength, edit.newText.length - suffixLength)
             ));
         }
         if (prefixLength + suffixLength === edit.newText.length) {
-            return ( new SingleOffsetEdit(edit.replaceRange.deltaStart(prefixLength).deltaEnd(-suffixLength), ''));
+            return ( new StringReplacement(edit.replaceRange.deltaStart(prefixLength).deltaEnd(-suffixLength), ''));
         }
     }
     return edit;
@@ -478,8 +493,8 @@ function reshapeMultiLineInsertion(edit, textModel) {
     const startPosition = textModel.getPositionAt(edit.replaceRange.start);
     const startColumn = startPosition.column;
     const startLineNumber = startPosition.lineNumber;
-    if (startColumn === 1 && startLineNumber > 1 && textModel.getLineLength(startLineNumber) !== 0 && edit.newText.endsWith(eol) && !edit.newText.startsWith(eol)) {
-        return ( new SingleOffsetEdit(edit.replaceRange.delta(-1), eol + edit.newText.slice(0, -eol.length)));
+    if (startColumn === 1 && startLineNumber > 1 && edit.newText.endsWith(eol) && !edit.newText.startsWith(eol)) {
+        return ( new StringReplacement(edit.replaceRange.delta(-1), eol + edit.newText.slice(0, -eol.length)));
     }
     return edit;
 }

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

@@ -4,17 +4,18 @@ import { ICommandService } from "../../../../../platform/commands/common/command
 import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { InlineCompletionEndOfLifeReason, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
-export declare function provideInlineCompletions(providers: InlineCompletionsProvider[], positionOrRange: Position | Range, model: ITextModel, context: InlineCompletionContext, baseToken?: CancellationToken, languageConfigurationService?: ILanguageConfigurationService): Promise<InlineCompletionProviderResult>;
+export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, "requestUuid">;
+export declare function provideInlineCompletions(providers: InlineCompletionsProvider[], positionOrRange: Position | Range, model: ITextModel, context: InlineCompletionContextWithoutUuid, baseToken?: CancellationToken, languageConfigurationService?: ILanguageConfigurationService): Promise<InlineCompletionProviderResult>;
 export declare class InlineCompletionProviderResult implements IDisposable {
     readonly completions: readonly InlineSuggestData[];
     private readonly hashs;
     private readonly providerResults;
     constructor(completions: readonly InlineSuggestData[], hashs: Set<string>, providerResults: readonly InlineSuggestionList[]);
-    has(edit: SingleTextEdit): boolean;
+    has(edit: TextReplacement): boolean;
     isEmpty(): boolean;
     dispose(): void;
 }
@@ -33,7 +34,7 @@ export declare class InlineSuggestData {
     private _lastSetEndOfLifeReason;
     constructor(range: Range, insertText: string, snippetInfo: SnippetInfo | undefined, displayLocation: IDisplayLocation | undefined, additionalTextEdits: readonly ISingleEditOperation[], sourceInlineCompletion: InlineCompletion, source: InlineSuggestionList, context: InlineCompletionContext, isInlineEdit: boolean);
     get showInlineEditMenu(): boolean;
-    getSingleTextEdit(): SingleTextEdit;
+    getSingleTextEdit(): TextReplacement;
     reportInlineEditShown(commandService: ICommandService, updatedInsertText: string): Promise<void>;
     reportPartialAccept(acceptedCharacters: number, info: PartialAcceptInfo): void;
     reportEndOfLife(reason?: InlineCompletionEndOfLifeReason): void;

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

@@ -6,11 +6,11 @@ import { onUnexpectedExternalError } from '../../../../../base/common/errors.js'
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { SetMap } from '../../../../../base/common/map.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
-import { SingleOffsetEdit } from '../../../../common/core/offsetEdit.js';
-import { OffsetRange } from '../../../../common/core/offsetRange.js';
+import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
+import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
-import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { InlineCompletionTriggerKind, InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
 import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
@@ -273,7 +273,7 @@ class InlineSuggestData {
     }
     get showInlineEditMenu() { return this.sourceInlineCompletion.showInlineEditMenu ?? false; }
     getSingleTextEdit() {
-        return ( new SingleTextEdit(this.range, this.insertText));
+        return ( new TextReplacement(this.range, this.insertText));
     }
     async reportInlineEditShown(commandService, updatedInsertText) {
         if (this._didShow) {
@@ -336,9 +336,9 @@ function getDefaultRange(position, model) {
 }
 function closeBrackets(text, position, model, languageConfigurationService) {
     const currentLine = model.getLineContent(position.lineNumber);
-    const edit = SingleOffsetEdit.replace(( new OffsetRange(position.column - 1, currentLine.length)), text);
-    const proposedLineTokens = model.tokenization.tokenizeLinesAt(position.lineNumber, [edit.apply(currentLine)]);
-    const textTokens = proposedLineTokens?.[0].sliceZeroCopy(edit.getRangeAfterApply());
+    const edit = StringReplacement.replace(( new OffsetRange(position.column - 1, currentLine.length)), text);
+    const proposedLineTokens = model.tokenization.tokenizeLinesAt(position.lineNumber, [edit.replace(currentLine)]);
+    const textTokens = proposedLineTokens?.[0].sliceZeroCopy(edit.getRangeAfterReplace());
     if (!textTokens) {
         return text;
     }

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

@@ -1,5 +1,5 @@
 import { Range } from "../../../../common/core/range.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { ITextModel } from "../../../../common/model.js";
-export declare function singleTextRemoveCommonPrefix(edit: SingleTextEdit, model: ITextModel, validModelRange?: Range): SingleTextEdit;
-export declare function singleTextEditAugments(edit: SingleTextEdit, base: SingleTextEdit): boolean;
+export declare function singleTextRemoveCommonPrefix(edit: TextReplacement, model: ITextModel, validModelRange?: Range): TextReplacement;
+export declare function singleTextEditAugments(edit: TextReplacement, base: TextReplacement): boolean;

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

@@ -1,8 +1,8 @@
 
 import { commonPrefixLength } from '../../../../../base/common/strings.js';
 import { Range } from '../../../../common/core/range.js';
-import { TextLength } from '../../../../common/core/textLength.js';
-import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextLength } from '../../../../common/core/text/textLength.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { EndOfLinePreference } from '../../../../common/model.js';
 
 function singleTextRemoveCommonPrefix(edit, model, validModelRange) {
@@ -16,7 +16,7 @@ function singleTextRemoveCommonPrefix(edit, model, validModelRange) {
     const start = TextLength.ofText(valueToReplace.substring(0, commonPrefixLen)).addToPosition(edit.range.getStartPosition());
     const text = normalizedText.substring(commonPrefixLen);
     const range = Range.fromPositions(start, edit.range.getEndPosition());
-    return ( new SingleTextEdit(range, text));
+    return ( new TextReplacement(range, text));
 }
 function singleTextEditAugments(edit, base) {
     return edit.text.startsWith(base.text) && rangeExtends(edit.range, base.range);

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

@@ -3,7 +3,7 @@ import { Disposable } from "../../../../../base/common/lifecycle.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
-import { SingleTextEdit } from "../../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
 import { CompletionItemKind, SelectedSuggestionInfo } from "../../../../common/languages.js";
 import { ITextModel } from "../../../../common/model.js";
 import { CompletionItem } from "../../../suggest/browser/suggest.js";
@@ -20,7 +20,7 @@ export declare class SuggestWidgetAdaptor extends Disposable {
     get selectedItem(): SuggestItemInfo | undefined;
     private _onDidSelectedItemChange;
     readonly onDidSelectedItemChange: Event<void>;
-    constructor(editor: ICodeEditor, suggestControllerPreselector: () => SingleTextEdit | undefined, onWillAccept: (item: SuggestItemInfo) => void);
+    constructor(editor: ICodeEditor, suggestControllerPreselector: () => TextReplacement | undefined, onWillAccept: (item: SuggestItemInfo) => void);
     private update;
     private getSuggestItemInfo;
     stopForceRenderingAbove(): void;
@@ -35,7 +35,7 @@ export declare class SuggestItemInfo {
     private constructor();
     equals(other: SuggestItemInfo): boolean;
     toSelectedSuggestionInfo(): SelectedSuggestionInfo;
-    getSingleTextEdit(): SingleTextEdit;
+    getSingleTextEdit(): TextReplacement;
 }
 export declare class ObservableSuggestWidgetAdapter extends Disposable {
     private readonly _editorObs;
@@ -43,7 +43,7 @@ export declare class ObservableSuggestWidgetAdapter extends Disposable {
     private readonly _suggestControllerPreselector;
     private readonly _suggestWidgetAdaptor;
     readonly selectedItem: import("../../../../../base/common/observable.js").IObservable<SuggestItemInfo | undefined>;
-    constructor(_editorObs: ObservableCodeEditor, _handleSuggestAccepted: (item: SuggestItemInfo) => void, _suggestControllerPreselector: () => SingleTextEdit | undefined);
+    constructor(_editorObs: ObservableCodeEditor, _handleSuggestAccepted: (item: SuggestItemInfo) => void, _suggestControllerPreselector: () => TextReplacement | undefined);
     stopForceRenderingAbove(): void;
     forceRenderingAbove(): void;
 }

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

@@ -5,14 +5,14 @@ import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
-import { SingleTextEdit } from '../../../../common/core/textEdit.js';
+import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { CompletionItemInsertTextRule, SelectedSuggestionInfo } from '../../../../common/languages.js';
 import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEditHelpers.js';
 import { SnippetParser } from '../../../snippet/browser/snippetParser.js';
 import { SnippetSession } from '../../../snippet/browser/snippetSession.js';
 import { SuggestController } from '../../../suggest/browser/suggestController.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 class SuggestWidgetAdaptor extends Disposable {
     get selectedItem() {
@@ -168,7 +168,7 @@ class SuggestItemInfo {
         return ( new SelectedSuggestionInfo(this.range, this.insertText, this.completionItemKind, this.isSnippetText));
     }
     getSingleTextEdit() {
-        return ( new SingleTextEdit(this.range, this.insertText));
+        return ( new TextReplacement(this.range, this.insertText));
     }
 }
 function suggestItemInfoEquals(a, b) {

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

@@ -1,5 +1,6 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
+import { URI } from "../../../../base/common/uri.js";
 import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 export interface IRecordableLogEntry {
@@ -7,7 +8,7 @@ export interface IRecordableLogEntry {
     time: number;
 }
 export interface IRecordableEditorLogEntry extends IRecordableLogEntry {
-    modelUri: string;
+    modelUri: URI;
     modelVersion: number;
 }
 export type EditorLogEntryData = IDocumentEventDataSetChangeReason | IDocumentEventFetchStart;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/structuredLogger.js

@@ -4,7 +4,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 function formatRecordableLogEntry(entry) {
     return entry.sourceId + ' @@ ' + JSON.stringify({ ...entry, sourceId: undefined });
@@ -26,7 +26,11 @@ let StructuredLogger = class StructuredLogger extends Disposable {
         if (!commandId) {
             return false;
         }
-        this._commandService.executeCommand(commandId, data);
+        try {
+            this._commandService.executeCommand(commandId, data).catch(() => { });
+        }
+        catch (e) {
+        }
         return true;
     }
 };

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

@@ -5,13 +5,15 @@ import { ContextKeyValue, RawContextKey } from "../../../../platform/contextkey/
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { Position } from "../../../common/core/position.js";
 import { Range } from "../../../common/core/range.js";
-import { SingleTextEdit } from "../../../common/core/textEdit.js";
+import { TextReplacement } from "../../../common/core/edits/textEdit.js";
+import { ITextModel } from "../../../common/model.js";
 export declare function getReadonlyEmptyArray<T>(): readonly T[];
 export declare function addPositions(pos1: Position, pos2: Position): Position;
 export declare function subtractPositions(pos1: Position, pos2: Position): Position;
 export declare function substringPos(text: string, pos: Position): string;
-export declare function getEndPositionsAfterApplying(edits: readonly SingleTextEdit[]): Position[];
-export declare function getModifiedRangesAfterApplying(edits: readonly SingleTextEdit[]): Range[];
+export declare function getEndPositionsAfterApplying(edits: readonly TextReplacement[]): Position[];
+export declare function getModifiedRangesAfterApplying(edits: readonly TextReplacement[]): Range[];
+export declare function removeTextReplacementCommonSuffixPrefix(edits: readonly TextReplacement[], textModel: ITextModel): TextReplacement[];
 export declare function convertItemsToStableObservables<T>(items: IObservable<readonly T[]>, store: DisposableStore): IObservable<IObservable<T>[]>;
 export declare class ObservableContextKeyService {
     private readonly _contextKeyService;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js

@@ -3,11 +3,13 @@ import { Permutation, compareBy } from '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/index.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Position } from '../../../common/core/position.js';
-import { PositionOffsetTransformer } from '../../../common/core/positionToOffset.js';
+import { PositionOffsetTransformer } from '../../../common/core/text/positionToOffset.js';
 import { Range } from '../../../common/core/range.js';
-import { TextEdit } from '../../../common/core/textEdit.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { TextEdit } from '../../../common/core/edits/textEdit.js';
+import { getPositionOffsetTransformerFromTextModel } from '../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
+import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
+import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
+import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
 const array = [];
 function getReadonlyEmptyArray() {
@@ -40,6 +42,13 @@ function getModifiedRangesAfterApplying(edits) {
     const sortedNewRanges = edit.getNewRanges();
     return sortPerm.inverse().apply(sortedNewRanges);
 }
+function removeTextReplacementCommonSuffixPrefix(edits, textModel) {
+    const transformer = getPositionOffsetTransformerFromTextModel(textModel);
+    const text = textModel.getValue();
+    const stringReplacements = ( edits.map(edit => transformer.getStringReplacement(edit)));
+    const minimalStringReplacements = ( stringReplacements.map(replacement => replacement.removeCommonSuffixPrefix(text)));
+    return ( minimalStringReplacements.map(replacement => transformer.getSingleTextEdit(replacement)));
+}
 function convertItemsToStableObservables(items, store) {
     const result = observableValue('result', []);
     const innerObservables = [];
@@ -89,4 +98,4 @@ function wait(ms, cancellationToken) {
     }));
 }
 
-export { ObservableContextKeyService, addPositions, convertItemsToStableObservables, getEndPositionsAfterApplying, getModifiedRangesAfterApplying, getReadonlyEmptyArray, substringPos, subtractPositions, wait };
+export { ObservableContextKeyService, addPositions, convertItemsToStableObservables, getEndPositionsAfterApplying, getModifiedRangesAfterApplying, getReadonlyEmptyArray, removeTextReplacementCommonSuffixPrefix, substringPos, subtractPositions, wait };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.d.ts

@@ -44,8 +44,8 @@ export declare class GhostTextView extends Disposable {
     private readonly decorations;
     private readonly _additionalLinesWidget;
     private readonly _isInlineTextHovered;
-    readonly isHovered: IObservable<boolean>;
-    readonly height: IObservable<number>;
+    readonly isHovered: import("../../../../../../base/common/observable.js").IObservableWithChange<boolean, void>;
+    readonly height: import("../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
     ownsViewZone(viewZoneId: string): boolean;
 }
 export declare class AdditionalLinesWidget extends Disposable {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js

@@ -14,7 +14,7 @@ import { applyFontInfo } from '../../../../../browser/config/domFontInfo.js';
 import { MouseTargetType } from '../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorOption, EditorFontLigatures } from '../../../../../common/config/editorOptions.js';
-import { OffsetEdit, SingleOffsetEdit } from '../../../../../common/core/offsetEdit.js';
+import { StringEdit, StringReplacement } from '../../../../../common/core/edits/stringEdit.js';
 import { Position } from '../../../../../common/core/position.js';
 import { Range } from '../../../../../common/core/range.js';
 import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
@@ -25,16 +25,16 @@ import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations
 import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
 import { InlineDecorationType } from '../../../../../common/viewModel.js';
 import { GhostTextReplacement } from '../../model/ghostText.js';
-import { RangeSingleLine } from '../../../../../common/core/rangeSingleLine.js';
-import { ColumnRange } from '../../../../../common/core/columnRange.js';
+import { RangeSingleLine } from '../../../../../common/core/ranges/rangeSingleLine.js';
+import { ColumnRange } from '../../../../../common/core/ranges/columnRange.js';
 import * as ghostTextView from './ghostTextView.css';
 import { StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { CodeEditorWidget } from '../../../../../browser/widget/codeEditor/codeEditorWidget.js';
 import { TokenWithTextArray } from '../../../../../common/tokens/tokenWithTextArray.js';
-import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import { observableSignalFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
+import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableSignalFromEvent } from '../../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 
 var GhostTextView_1;
 registerCss(ghostTextView);
@@ -94,9 +94,9 @@ let GhostTextView = class GhostTextView extends Disposable {
             const extraClassNames = this._extraClassNames.read(reader);
             const { inlineTexts, additionalLines, hiddenRange, additionalLinesOriginalSuffix } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
             const currentLine = textModel.getLineContent(ghostText.lineNumber);
-            const edit = ( new OffsetEdit(( inlineTexts.map(t => SingleOffsetEdit.insert(t.column - 1, t.text)))));
+            const edit = ( new StringEdit(( inlineTexts.map(t => StringReplacement.insert(t.column - 1, t.text)))));
             const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLinesAt(ghostText.lineNumber, [edit.apply(currentLine), ...( additionalLines.map(l => l.content))]) : undefined;
-            const newRanges = edit.getNewTextRanges();
+            const newRanges = edit.getNewRanges();
             const inlineTextsWithTokens = ( inlineTexts.map(
                 (t, idx) => ({ ...t, tokens: tokens?.[0]?.getTokensInRange(newRanges[idx]) })
             ));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.js

@@ -11,8 +11,9 @@ import { convertItemsToStableObservables } from '../utils.js';
 import { GhostTextView } from './ghostText/ghostTextView.js';
 import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewProducer.js';
 import { createStyleSheetFromObservable } from '../../../../../base/browser/domImpl/domObservable.js';
-import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/derived.js';
-import { mapObservableArrayCached, constObservable, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils.js';
+import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { mapObservableArrayCached, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
 
 let InlineCompletionsView = class InlineCompletionsView extends Disposable {
     constructor(_editor, _model, _focusIsInMenu, _instantiationService) {