@codingame/monaco-vscode-api 18.4.0 → 19.0.1

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

@@ -1,10 +1,10 @@
 
-import { SingleLineEdit } from '../../../../../common/core/edits/lineEdit.js';
+import { LineReplacement } from '../../../../../common/core/edits/lineEdit.js';
 import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 
 class InlineEditWithChanges {
     get lineEdit() {
-        return SingleLineEdit.fromSingleTextEdit(this.edit.toReplacement(this.originalText), this.originalText);
+        return LineReplacement.fromSingleTextEdit(this.edit.toReplacement(this.originalText), this.originalText);
     }
     get originalLineRange() { return this.lineEdit.lineRange; }
     get modifiedLineRange() { return this.lineEdit.toLineEdit().getNewLineRanges()[0]; }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.d.ts

@@ -2,10 +2,10 @@ import { Event } from "../../../../../../base/common/event.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
 import { ICodeEditor } from "../../../../../browser/editorBrowser.js";
 import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
-import { Command, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
+import { Command, InlineCompletionCommand, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
 import { InlineCompletionsModel } from "../../model/inlineCompletionsModel.js";
 import { InlineCompletionItem } from "../../model/inlineSuggestionItem.js";
-import { IInlineEditHost, IInlineEditModel, InlineEditTabAction } from "./inlineEditsViewInterface.js";
+import { IInlineEditHost, IInlineEditModel, InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from "./inlineEditsViewInterface.js";
 import { InlineEditWithChanges } from "./inlineEditWithChanges.js";
 export declare class InlineEditModel implements IInlineEditModel {
     private readonly _model;
@@ -13,14 +13,15 @@ export declare class InlineEditModel implements IInlineEditModel {
     readonly tabAction: IObservable<InlineEditTabAction>;
     readonly action: Command | undefined;
     readonly displayName: string;
-    readonly extensionCommands: Command[];
+    readonly extensionCommands: InlineCompletionCommand[];
+    readonly isInDiffEditor: boolean;
     readonly displayLocation: InlineCompletionDisplayLocation | undefined;
     readonly showCollapsed: IObservable<boolean>;
     constructor(_model: InlineCompletionsModel, inlineEdit: InlineEditWithChanges, tabAction: IObservable<InlineEditTabAction>);
     accept(): void;
     jump(): void;
     abort(reason: string): void;
-    handleInlineEditShown(): void;
+    handleInlineEditShown(viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): void;
 }
 export declare class InlineEditHost implements IInlineEditHost {
     private readonly _model;

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

@@ -14,8 +14,9 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1280, "Inline Edit"));
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1291, "Inline Edit"));
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
+        this.isInDiffEditor = this._model.isInDiffEditor;
         this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;
         this.showCollapsed = this._model.showCollapsed;
     }
@@ -27,10 +28,11 @@ class InlineEditModel {
     }
     abort(reason) {
         console.error(reason);
+        this.inlineEdit.inlineCompletion.reportInlineEditError(reason);
         this._model.stop();
     }
-    handleInlineEditShown() {
-        this._model.handleInlineSuggestionShown(this.inlineEdit.inlineCompletion);
+    handleInlineEditShown(viewKind, viewData) {
+        this._model.handleInlineSuggestionShown(this.inlineEdit.inlineCompletion, viewKind, viewData);
     }
 }
 class InlineEditHost {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.d.ts

@@ -21,7 +21,6 @@ export declare class InlineEditsView extends Disposable {
     private readonly _editorObs;
     private readonly _useCodeShifting;
     private readonly _renderSideBySide;
-    private readonly _useMultiLineGhostText;
     private readonly _tabAction;
     private _previousView;
     constructor(_editor: ICodeEditor, _host: IObservable<InlineEditHost | undefined>, _model: IObservable<InlineEditModel | undefined>, _ghostTextIndicator: IObservable<GhostTextIndicator | undefined>, _focusIsInMenu: ISettableObservable<boolean>, _instantiationService: IInstantiationService);

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

@@ -18,7 +18,7 @@ import { RangeMapping, lineRangeMappingFromRangeMappings } from '../../../../../
 import { TextModel } from '../../../../../common/model/textModel.js';
 import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
 import { InlineEditsOnboardingExperience } from './inlineEditsNewUsers.js';
-import { InlineEditTabAction } from './inlineEditsViewInterface.js';
+import { InlineEditTabAction, InlineCompletionViewKind } from './inlineEditsViewInterface.js';
 import { InlineEditsCollapsedView } from './inlineEditsViews/inlineEditsCollapsedView.js';
 import { InlineEditsCustomView } from './inlineEditsViews/inlineEditsCustomView.js';
 import { InlineEditsDeletionView } from './inlineEditsViews/inlineEditsDeletionView.js';
@@ -52,7 +52,6 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             if (!model || !this._constructorDone.read(reader)) {
                 return undefined;
             }
-            model.handleInlineEditShown();
             const inlineEdit = model.inlineEdit;
             let mappings = RangeMapping.fromEdit(inlineEdit.edit);
             let newText = inlineEdit.edit.apply(inlineEdit.originalText);
@@ -62,7 +61,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 model.abort(`unable to determine view: tried to render ${this._previousView?.view}`);
                 return undefined;
             }
-            if (state.kind === 'sideBySide') {
+            if (state.kind === InlineCompletionViewKind.SideBySide) {
                 const indentationAdjustmentEdit = createReindentEdit(newText, inlineEdit.modifiedLineRange);
                 newText = indentationAdjustmentEdit.applyToString(newText);
                 mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
@@ -74,14 +73,16 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 this._previewTextModel.setValue(newText);
             }
             if (model.showCollapsed.read(reader) && !this._indicator.read(reader)?.isHoverVisible.read(reader)) {
-                state = { kind: 'collapsed' };
+                state = { kind: InlineCompletionViewKind.Collapsed, viewData: state.viewData };
             }
+            model.handleInlineEditShown(state.kind, state.viewData);
             return {
                 state,
                 diff,
                 edit: inlineEdit,
                 newText,
                 newTextLineCount: inlineEdit.modifiedLineRange.length,
+                isInDiffEditor: model.isInDiffEditor,
             };
         });
         this._previewTextModel = this._register(this._instantiationService.createInstance(TextModel, '', this._editor.getModel().getLanguageId(), { ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } }, null));
@@ -143,24 +144,29 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             }
             return 0;
         });
-        this._sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideView, this._editor, ( this._model.map(m => m?.inlineEdit)), this._previewTextModel, ( this._uiState.map(s => s && s.state?.kind === 'sideBySide' ? ({
+        this._sideBySide = this._register(this._instantiationService.createInstance(InlineEditsSideBySideView, this._editor, ( this._model.map(m => m?.inlineEdit)), this._previewTextModel, ( this._uiState.map(s => s && s.state?.kind === InlineCompletionViewKind.SideBySide ? ({
             newTextLineCount: s.newTextLineCount,
+            isInDiffEditor: s.isInDiffEditor,
         }) : undefined)), this._tabAction));
-        this._deletion = this._register(this._instantiationService.createInstance(InlineEditsDeletionView, this._editor, ( this._model.map(m => m?.inlineEdit)), ( this._uiState.map(s => s && s.state?.kind === 'deletion' ? ({
+        this._deletion = this._register(this._instantiationService.createInstance(InlineEditsDeletionView, this._editor, ( this._model.map(m => m?.inlineEdit)), ( this._uiState.map(s => s && s.state?.kind === InlineCompletionViewKind.Deletion ? ({
             originalRange: s.state.originalRange,
             deletions: s.state.deletions,
+            inDiffEditor: s.isInDiffEditor,
         }) : undefined)), this._tabAction));
-        this._insertion = this._register(this._instantiationService.createInstance(InlineEditsInsertionView, this._editor, ( this._uiState.map(s => s && s.state?.kind === 'insertionMultiLine' ? ({
-            lineNumber: s.state.lineNumber,
-            startColumn: s.state.column,
-            text: s.state.text,
-        }) : undefined)), this._tabAction));
+        this._insertion = this._register(this._instantiationService.createInstance(InlineEditsInsertionView, this._editor, ( this._uiState.map(
+            s => s && s.state?.kind === InlineCompletionViewKind.InsertionMultiLine ? ({
+                lineNumber: s.state.lineNumber,
+                startColumn: s.state.column,
+                text: s.state.text,
+                inDiffEditor: s.isInDiffEditor,
+            }) : undefined
+        )), this._tabAction));
         this._inlineDiffViewState = derived(this, reader => {
             const e = this._uiState.read(reader);
             if (!e || !e.state) {
                 return undefined;
             }
-            if (e.state.kind === 'wordReplacements' || e.state.kind === 'lineReplacement' || e.state.kind === 'insertionMultiLine' || e.state.kind === 'collapsed' || e.state.kind === 'custom') {
+            if (e.state.kind === 'wordReplacements' || e.state.kind === 'insertionMultiLine' || e.state.kind === 'collapsed' || e.state.kind === 'custom') {
                 return undefined;
             }
             return {
@@ -168,6 +174,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 diff: e.diff,
                 mode: e.state.kind,
                 modifiedCodeEditor: this._sideBySide.previewEditor,
+                isInDiffEditor: e.isInDiffEditor,
             };
         });
         this._inlineCollapsedView = this._register(this._instantiationService.createInstance(InlineEditsCollapsedView, this._editor, ( this._model.map(
@@ -180,15 +187,14 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         this._wordReplacementViews = mapObservableArrayCached(this, ( this._uiState.map(s => s?.state?.kind === 'wordReplacements' ? s.state.replacements : [])), (e, store) => {
             return store.add(this._instantiationService.createInstance(InlineEditsWordReplacementView, this._editorObs, e, this._tabAction));
         });
-        this._lineReplacementView = this._register(this._instantiationService.createInstance(InlineEditsLineReplacementView, this._editorObs, ( this._uiState.map(s => s?.state?.kind === 'lineReplacement' ? ({
+        this._lineReplacementView = this._register(this._instantiationService.createInstance(InlineEditsLineReplacementView, this._editorObs, ( this._uiState.map(s => s?.state?.kind === InlineCompletionViewKind.LineReplacement ? ({
             originalRange: s.state.originalRange,
             modifiedRange: s.state.modifiedRange,
             modifiedLines: s.state.modifiedLines,
             replacements: s.state.replacements,
-        }) : undefined)), this._tabAction));
+        }) : undefined)), ( this._uiState.map(s => s?.isInDiffEditor ?? false)), this._tabAction));
         this._useCodeShifting = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.allowCodeShifting));
         this._renderSideBySide = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.renderSideBySide));
-        this._useMultiLineGhostText = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(s => s.edits.useMultiLineGhostText));
         this._register(autorunWithStore((reader, store) => {
             const model = this._model.read(reader);
             if (!model) {
@@ -214,103 +220,132 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         const inlineEdit = model.inlineEdit;
         const canUseCache = this._previousView?.id === this.getCacheId(model);
         const reconsiderViewEditorWidthChange = this._previousView?.editorWidth !== this._editorObs.layoutInfoWidth.read(reader) &&
-            (this._previousView?.view === 'sideBySide' ||
-                this._previousView?.view === 'lineReplacement');
+            (this._previousView?.view === InlineCompletionViewKind.SideBySide ||
+                this._previousView?.view === InlineCompletionViewKind.LineReplacement);
         if (canUseCache && !reconsiderViewEditorWidthChange) {
             return this._previousView.view;
         }
         if (model.displayLocation) {
-            return 'custom';
+            return InlineCompletionViewKind.Custom;
         }
+        const numOriginalLines = inlineEdit.originalLineRange.length;
+        const numModifiedLines = inlineEdit.modifiedLineRange.length;
         const inner = diff.flatMap(d => d.innerChanges ?? []);
         const isSingleInnerEdit = inner.length === 1;
-        if (isSingleInnerEdit
-            && this._useCodeShifting.read(reader) !== 'never'
-            && isSingleLineInsertion(diff)) {
-            if (isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)) {
-                return 'insertionInline';
+        if (!model.isInDiffEditor) {
+            if (isSingleInnerEdit
+                && this._useCodeShifting.read(reader) !== 'never'
+                && isSingleLineInsertion(diff)) {
+                if (isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)) {
+                    return InlineCompletionViewKind.InsertionInline;
+                }
+                return InlineCompletionViewKind.LineReplacement;
             }
-            return 'lineReplacement';
-        }
-        const innerValues = ( inner.map(
-            m => ({ original: inlineEdit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) })
-        ));
-        if (innerValues.every(({ original, modified }) => modified.trim() === '' && original.length > 0 && (original.length > modified.length || original.trim() !== ''))) {
-            return 'deletion';
-        }
-        if (isSingleMultiLineInsertion(diff) && this._useMultiLineGhostText.read(reader) && this._useCodeShifting.read(reader) === 'always') {
-            return 'insertionMultiLine';
-        }
-        const numOriginalLines = inlineEdit.originalLineRange.length;
-        const numModifiedLines = inlineEdit.modifiedLineRange.length;
-        const allInnerChangesNotTooLong = inner.every(m => TextLength.ofRange(m.originalRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH && TextLength.ofRange(m.modifiedRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH);
-        if (allInnerChangesNotTooLong && isSingleInnerEdit && numOriginalLines === 1 && numModifiedLines === 1) {
-            if (!( inner.some(m => m.originalRange.isEmpty())) ||
-                !( growEditsUntilWhitespace(( inner.map(m => ( new TextReplacement(m.originalRange, '')))), inlineEdit.originalText).some(
-                    e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH
-                ))) {
-                return 'wordReplacements';
+            if (isDeletion(inner, inlineEdit, newText)) {
+                return InlineCompletionViewKind.Deletion;
+            }
+            if (isSingleMultiLineInsertion(diff) && this._useCodeShifting.read(reader) === 'always') {
+                return InlineCompletionViewKind.InsertionMultiLine;
+            }
+            const allInnerChangesNotTooLong = inner.every(m => TextLength.ofRange(m.originalRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH && TextLength.ofRange(m.modifiedRange).columnCount < InlineEditsWordReplacementView.MAX_LENGTH);
+            if (allInnerChangesNotTooLong && isSingleInnerEdit && numOriginalLines === 1 && numModifiedLines === 1) {
+                if (!( inner.some(m => m.originalRange.isEmpty())) ||
+                    !( growEditsUntilWhitespace(( inner.map(m => ( new TextReplacement(m.originalRange, '')))), inlineEdit.originalText).some(
+                        e => e.range.isEmpty() && TextLength.ofRange(e.range).columnCount < InlineEditsWordReplacementView.MAX_LENGTH
+                    ))) {
+                    return InlineCompletionViewKind.WordReplacements;
+                }
             }
         }
         if (numOriginalLines > 0 && numModifiedLines > 0) {
-            if (numOriginalLines === 1 && numModifiedLines === 1) {
-                return 'lineReplacement';
+            if (numOriginalLines === 1 && numModifiedLines === 1 && !model.isInDiffEditor ) {
+                return InlineCompletionViewKind.LineReplacement;
             }
             if (this._renderSideBySide.read(reader) !== 'never' && InlineEditsSideBySideView.fitsInsideViewport(this._editor, this._previewTextModel, inlineEdit, reader)) {
-                return 'sideBySide';
+                return InlineCompletionViewKind.SideBySide;
+            }
+            return InlineCompletionViewKind.LineReplacement;
+        }
+        if (model.isInDiffEditor) {
+            if (isDeletion(inner, inlineEdit, newText)) {
+                return InlineCompletionViewKind.Deletion;
+            }
+            if (isSingleMultiLineInsertion(diff) && this._useCodeShifting.read(reader) === 'always') {
+                return InlineCompletionViewKind.InsertionMultiLine;
             }
-            return 'lineReplacement';
         }
-        return 'sideBySide';
+        return InlineCompletionViewKind.SideBySide;
     }
     determineRenderState(model, reader, diff, newText) {
         const inlineEdit = model.inlineEdit;
         const view = this.determineView(model, reader, diff, newText);
         this._previousView = { id: this.getCacheId(model), view, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
+        const inner = diff.flatMap(d => d.innerChanges ?? []);
+        const textModel = this._editor.getModel();
+        const stringChanges = ( inner.map(m => ({
+            originalRange: m.originalRange,
+            modifiedRange: m.modifiedRange,
+            original: textModel.getValueInRange(m.originalRange),
+            modified: newText.getValueOfRange(m.modifiedRange)
+        })));
+        const cursorPosition = inlineEdit.cursorPosition;
+        const viewData = {
+            cursorColumnDistance: inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
+            cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber,
+            lineCountOriginal: inlineEdit.lineEdit.lineRange.length,
+            lineCountModified: inlineEdit.lineEdit.newLines.length,
+            characterCountOriginal: stringChanges.reduce((acc, r) => acc + r.original.length, 0),
+            characterCountModified: stringChanges.reduce((acc, r) => acc + r.modified.length, 0),
+            disjointReplacements: stringChanges.length,
+            sameShapeReplacements: stringChanges.length > 1 ? stringChanges.every(r => r.original === stringChanges[0].original && r.modified === stringChanges[0].modified) : undefined,
+        };
         switch (view) {
-            case 'custom': return { kind: 'custom', displayLocation: model.displayLocation };
-            case 'insertionInline': return { kind: 'insertionInline' };
-            case 'sideBySide': return { kind: 'sideBySide' };
-            case 'collapsed': return { kind: 'collapsed' };
+            case InlineCompletionViewKind.InsertionInline: return { kind: InlineCompletionViewKind.InsertionInline, viewData };
+            case InlineCompletionViewKind.SideBySide: return { kind: InlineCompletionViewKind.SideBySide, viewData };
+            case InlineCompletionViewKind.Collapsed: return { kind: InlineCompletionViewKind.Collapsed, viewData };
+            case InlineCompletionViewKind.Custom: return { kind: InlineCompletionViewKind.Custom, displayLocation: model.displayLocation, viewData };
         }
-        const inner = diff.flatMap(d => d.innerChanges ?? []);
-        if (view === 'deletion') {
+        if (view === InlineCompletionViewKind.Deletion) {
             return {
-                kind: 'deletion',
+                kind: InlineCompletionViewKind.Deletion,
                 originalRange: inlineEdit.originalLineRange,
                 deletions: ( inner.map(m => m.originalRange)),
+                viewData,
             };
         }
-        if (view === 'insertionMultiLine') {
+        if (view === InlineCompletionViewKind.InsertionMultiLine) {
             const change = inner[0];
             return {
-                kind: 'insertionMultiLine',
+                kind: InlineCompletionViewKind.InsertionMultiLine,
                 lineNumber: change.originalRange.startLineNumber,
                 column: change.originalRange.startColumn,
                 text: newText.getValueOfRange(change.modifiedRange),
+                viewData,
             };
         }
-        const replacements = ( inner.map(m => ( new TextReplacement(m.originalRange, newText.getValueOfRange(m.modifiedRange)))));
+        const replacements = ( stringChanges.map(m => ( new TextReplacement(m.originalRange, m.modified))));
         if (replacements.length === 0) {
             return undefined;
         }
-        if (view === 'wordReplacements') {
+        if (view === InlineCompletionViewKind.WordReplacements) {
             let grownEdits = growEditsToEntireWord(replacements, inlineEdit.originalText);
             if (( grownEdits.some(e => e.range.isEmpty()))) {
                 grownEdits = growEditsUntilWhitespace(replacements, inlineEdit.originalText);
             }
             return {
-                kind: 'wordReplacements',
+                kind: InlineCompletionViewKind.WordReplacements,
                 replacements: grownEdits,
+                viewData,
             };
         }
-        if (view === 'lineReplacement') {
+        if (view === InlineCompletionViewKind.LineReplacement) {
             return {
-                kind: 'lineReplacement',
+                kind: InlineCompletionViewKind.LineReplacement,
                 originalRange: inlineEdit.originalLineRange,
                 modifiedRange: inlineEdit.modifiedLineRange,
                 modifiedLines: inlineEdit.modifiedLineRange.mapToLineArray(line => newText.getLineAt(line)),
                 replacements: ( inner.map(m => ({ originalRange: m.originalRange, modifiedRange: m.modifiedRange }))),
+                viewData,
             };
         }
         return undefined;
@@ -374,6 +409,12 @@ function isSingleMultiLineInsertion(diff) {
     }
     return true;
 }
+function isDeletion(inner, inlineEdit, newText) {
+    const innerValues = ( inner.map(
+        m => ({ original: inlineEdit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) })
+    ));
+    return innerValues.every(({ original, modified }) => modified.trim() === '' && original.length > 0 && (original.length > modified.length || original.trim() !== ''));
+}
 function growEditsToEntireWord(replacements, originalText) {
     return _growEdits(replacements, originalText, (char) => /^[a-zA-Z]$/.test(char));
 }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.d.ts

@@ -1,7 +1,7 @@
 import { IMouseEvent } from "../../../../../../base/browser/mouseEvent.js";
 import { Event } from "../../../../../../base/common/event.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
-import { Command, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
+import { Command, InlineCompletionCommand, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
 import { InlineEditWithChanges } from "./inlineEditWithChanges.js";
 export declare enum InlineEditTabAction {
     Jump = "jump",
@@ -19,13 +19,35 @@ export interface IInlineEditHost {
 export interface IInlineEditModel {
     displayName: string;
     action: Command | undefined;
-    extensionCommands: Command[];
+    extensionCommands: InlineCompletionCommand[];
+    isInDiffEditor: boolean;
     inlineEdit: InlineEditWithChanges;
     tabAction: IObservable<InlineEditTabAction>;
     showCollapsed: IObservable<boolean>;
     displayLocation: InlineCompletionDisplayLocation | undefined;
-    handleInlineEditShown(): void;
+    handleInlineEditShown(viewKind: string, viewData?: InlineCompletionViewData): void;
     accept(): void;
     jump(): void;
     abort(reason: string): void;
 }
+export declare enum InlineCompletionViewKind {
+    GhostText = "ghostText",
+    Custom = "custom",
+    SideBySide = "sideBySide",
+    Deletion = "deletion",
+    InsertionInline = "insertionInline",
+    InsertionMultiLine = "insertionMultiLine",
+    WordReplacements = "wordReplacements",
+    LineReplacement = "lineReplacement",
+    Collapsed = "collapsed"
+}
+export type InlineCompletionViewData = {
+    cursorColumnDistance: number;
+    cursorLineDistance: number;
+    lineCountOriginal: number;
+    lineCountModified: number;
+    characterCountOriginal: number;
+    characterCountModified: number;
+    disjointReplacements: number;
+    sameShapeReplacements?: boolean;
+};

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

@@ -6,5 +6,17 @@ var InlineEditTabAction;
     InlineEditTabAction["Accept"] = "accept";
     InlineEditTabAction["Inactive"] = "inactive";
 })(InlineEditTabAction || (InlineEditTabAction = {}));
+var InlineCompletionViewKind;
+(function (InlineCompletionViewKind) {
+    InlineCompletionViewKind["GhostText"] = "ghostText";
+    InlineCompletionViewKind["Custom"] = "custom";
+    InlineCompletionViewKind["SideBySide"] = "sideBySide";
+    InlineCompletionViewKind["Deletion"] = "deletion";
+    InlineCompletionViewKind["InsertionInline"] = "insertionInline";
+    InlineCompletionViewKind["InsertionMultiLine"] = "insertionMultiLine";
+    InlineCompletionViewKind["WordReplacements"] = "wordReplacements";
+    InlineCompletionViewKind["LineReplacement"] = "lineReplacement";
+    InlineCompletionViewKind["Collapsed"] = "collapsed";
+})(InlineCompletionViewKind || (InlineCompletionViewKind = {}));
 
-export { InlineEditTabAction };
+export { InlineCompletionViewKind, InlineEditTabAction };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import '../../../../../../../base/browser/dom.js';
+import { n } from '../../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/observableInternal/index.js';
@@ -11,7 +11,6 @@ import { Point } from '../../../../../../common/core/2d/point.js';
 import { singleTextRemoveCommonPrefix } from '../../../model/singleTextEditHelpers.js';
 import { inlineEditIndicatorPrimaryBorder } from '../theme.js';
 import { rectToProps, getEditorValidOverlayRect, PathBuilder } from '../utils/utils.js';
-import { n } from '../../../../../../../base/browser/domImpl/n.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import { getWindow } from '../../../../../../../base/browser/dom.js';
+import { n, getWindow } from '../../../../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../../../../base/browser/mouseEvent.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
@@ -18,18 +18,16 @@ import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { renderLines, LineSource, RenderOptions } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
-import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
-import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
+import { TokenArray, LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, getEditorBlendedColor } from '../theme.js';
 import { maxContentWidthInRange, rectToProps } from '../utils/utils.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
-import { n } from '../../../../../../../base/browser/domImpl/n.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
@@ -121,7 +119,7 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
             const endLineNumber = displayLocation.range.endLineNumber;
             const { lineWidth, lineWidthBelow, lineWidthAbove, startContentLeftOffset, endContentLeftOffset } = contentState.read(reader);
             const contentLeft = this._editorObs.layoutInfoContentLeft.read(reader);
-            const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
+            const lineHeight = this._editorObs.observeLineHeightForLine(startLineNumber).read(reader);
             const scrollTop = this._editorObs.scrollTop.read(reader);
             const scrollLeft = this._editorObs.scrollLeft.read(reader);
             let position;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.d.ts

@@ -20,6 +20,7 @@ export declare class InlineEditsDeletionView extends Disposable implements IInli
     constructor(_editor: ICodeEditor, _edit: IObservable<InlineEditWithChanges | undefined>, _uiState: IObservable<{
         originalRange: LineRange;
         deletions: Range[];
+        inDiffEditor: boolean;
     } | undefined>, _tabAction: IObservable<InlineEditTabAction>);
     private readonly _display;
     private readonly _editorMaxContentWidthInRange;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.js

@@ -1,5 +1,5 @@
 
-import '../../../../../../../base/browser/dom.js';
+import { n } from '../../../../../../../base/browser/dom.js';
 import { Emitter } from '../../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/observableInternal/index.js';
@@ -24,12 +24,12 @@ import { maxContentWidthInRange, getPrefixTrim, mapOutFalsy } from '../utils/uti
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
-import { n } from '../../../../../../../base/browser/domImpl/n.js';
 
 const HORIZONTAL_PADDING = 0;
 const VERTICAL_PADDING = 0;
 const BORDER_WIDTH = 1;
 const WIDGET_SEPARATOR_WIDTH = 1;
+const WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH = 3;
 const BORDER_RADIUS = 4;
 class InlineEditsDeletionView extends Disposable {
     constructor(_editor, _edit, _uiState, _tabAction) {
@@ -100,14 +100,17 @@ class InlineEditsDeletionView extends Disposable {
                 const overlayHider = overlayhider.read(reader);
                 return rect.intersectHorizontal(( new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER)));
             });
-            const separatorRect = ( overlayRect.map(rect => rect.withMargin(WIDGET_SEPARATOR_WIDTH, WIDGET_SEPARATOR_WIDTH)));
+            const separatorWidth = ( this._uiState.map(
+                s => s?.inDiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH
+            )).read(reader);
+            const separatorRect = ( overlayRect.map(rect => rect.withMargin(separatorWidth, separatorWidth)));
             return [
                 n.div({
                     class: 'originalSeparatorDeletion',
                     style: {
                         ...separatorRect.read(reader).toStyles(),
                         borderRadius: `${BORDER_RADIUS}px`,
-                        border: `${BORDER_WIDTH + WIDGET_SEPARATOR_WIDTH}px solid ${asCssVariable(editorBackground)}`,
+                        border: `${BORDER_WIDTH + separatorWidth}px solid ${asCssVariable(editorBackground)}`,
                         boxSizing: 'border-box',
                     }
                 }),

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.d.ts

@@ -25,6 +25,7 @@ export declare class InlineEditsInsertionView extends Disposable implements IInl
         lineNumber: number;
         startColumn: number;
         text: string;
+        inDiffEditor: boolean;
     } | undefined>, _tabAction: IObservable<InlineEditTabAction>, instantiationService: IInstantiationService, _languageService: ILanguageService);
     private readonly _display;
     private readonly _editorMaxContentWidthInRange;