@codingame/monaco-vscode-api 24.3.0 → 25.0.1

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

@@ -237,17 +237,24 @@ class RenameInferenceEngine {
     }
 }
 class RenameSymbolRunnable {
-    constructor(languageFeaturesService, textModel, position, newName) {
+    constructor(languageFeaturesService, textModel, position, newName, requestUuid) {
         this._result = undefined;
+        this._requestUuid = requestUuid;
         this._cancellationTokenSource = ( new CancellationTokenSource());
         this._promise = rawRename(languageFeaturesService.renameProvider, textModel, position, newName, this._cancellationTokenSource.token);
     }
+    get requestUuid() {
+        return this._requestUuid;
+    }
     cancel() {
         this._cancellationTokenSource.cancel();
     }
     async getCount() {
+        if (this._cancellationTokenSource.token.isCancellationRequested) {
+            return 0;
+        }
         const result = await this.getResult();
-        if (result === undefined) {
+        if (result === undefined || this._cancellationTokenSource.token.isCancellationRequested) {
             return 0;
         }
         return result.edits.length;
@@ -256,10 +263,13 @@ class RenameSymbolRunnable {
         return this.getResult();
     }
     async getResult() {
+        if (this._cancellationTokenSource.token.isCancellationRequested) {
+            return undefined;
+        }
         if (this._result === undefined) {
             this._result = await this._promise;
         }
-        if (this._result.rejectReason) {
+        if (this._result.rejectReason || this._cancellationTokenSource.token.isCancellationRequested) {
             return undefined;
         }
         return this._result;
@@ -272,30 +282,27 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         this._languageFeaturesService = _languageFeaturesService;
         this._languageConfigurationService = _languageConfigurationService;
         this._renameInferenceEngine = ( new RenameInferenceEngine());
-        const self = this;
-        this._register(CommandsRegistry.registerCommand(renameSymbolCommandId, async (_, textModel, position, newName, source, id) => {
-            if (self._renameRunnable === undefined) {
+        this._renameRunnable = undefined;
+        this._register(CommandsRegistry.registerCommand(renameSymbolCommandId, async (_, source, renameRunnable) => {
+            if (renameRunnable === undefined) {
                 return;
             }
-            let workspaceEdit;
-            if (self._renameRunnable.id !== id) {
-                self._renameRunnable.runnable.cancel();
-                self._renameRunnable = undefined;
-                const runnable = ( new RenameSymbolRunnable(self._languageFeaturesService, textModel, position, newName));
-                workspaceEdit = await runnable.getWorkspaceEdit();
-            }
-            else {
-                workspaceEdit = await self._renameRunnable.runnable.getWorkspaceEdit();
-                self._renameRunnable = undefined;
+            try {
+                const workspaceEdit = await renameRunnable.getWorkspaceEdit();
+                if (workspaceEdit === undefined) {
+                    return;
+                }
+                bulkEditService.apply(workspaceEdit, { reason: source });
             }
-            if (workspaceEdit === undefined) {
-                return;
+            finally {
+                if (this._renameRunnable === renameRunnable) {
+                    this._renameRunnable = undefined;
+                }
             }
-            bulkEditService.apply(workspaceEdit, { reason: source });
         }));
     }
-    async proposeRenameRefactoring(textModel, suggestItem) {
-        if (!suggestItem.supportsRename || suggestItem.action?.kind !== 'edit') {
+    async proposeRenameRefactoring(textModel, suggestItem, context) {
+        if (!suggestItem.supportsRename || suggestItem.action?.kind !== 'edit' || context.selectedSuggestionInfo) {
             return suggestItem;
         }
         if (!hasProvider(this._languageFeaturesService.renameProvider, textModel)) {
@@ -311,7 +318,7 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         const { oldName, newName, position, edits: renameEdits } = edits.renames;
         let timedOut = false;
         const check = await raceTimeout(this.checkRenamePrecondition(suggestItem, textModel, position, oldName, newName), 100, () => { timedOut = true; });
-        const renamePossible = check === RenameKind.yes || check === RenameKind.maybe;
+        const renamePossible = this.isRenamePossible(suggestItem, check);
         suggestItem.setRenameProcessingInfo({
             createdRename: renamePossible,
             duration: Date.now() - start,
@@ -322,13 +329,15 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         if (!renamePossible) {
             return suggestItem;
         }
-        const id = suggestItem.identity.id;
-        if (this._renameRunnable !== undefined) {
-            this._renameRunnable.runnable.cancel();
-            this._renameRunnable = undefined;
+        if (this._renameRunnable === undefined) {
+            this._renameRunnable = ( new RenameSymbolRunnable(
+                this._languageFeaturesService,
+                textModel,
+                position,
+                newName,
+                suggestItem.requestUuid
+            ));
         }
-        const runnable = ( new RenameSymbolRunnable(this._languageFeaturesService, textModel, position, newName));
-        this._renameRunnable = { id, runnable };
         const source = EditSources.inlineCompletionAccept({
             nes: suggestItem.isInlineEdit,
             requestUuid: suggestItem.requestUuid,
@@ -338,14 +347,14 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         });
         const command = {
             id: renameSymbolCommandId,
-            title: ( localize(1311, "Rename")),
-            arguments: [textModel, position, newName, source, id],
+            title: ( localize(1315, "Rename")),
+            arguments: [source, this._renameRunnable],
         };
         const alternativeAction = {
-            label: ( localize(1311, "Rename")),
+            label: ( localize(1315, "Rename")),
             icon: Codicon.replaceAll,
             command,
-            count: runnable.getCount(),
+            count: this._renameRunnable.getCount(),
         };
         const renameAction = {
             kind: 'edit',
@@ -371,6 +380,22 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
             return RenameKind.no;
         }
     }
+    isRenamePossible(suggestItem, check) {
+        if (check === undefined || check === RenameKind.no) {
+            return false;
+        }
+        if (this._renameRunnable === undefined) {
+            return true;
+        }
+        if (this._renameRunnable.requestUuid === suggestItem.requestUuid) {
+            return false;
+        }
+        else {
+            this._renameRunnable.cancel();
+            this._renameRunnable = undefined;
+            return true;
+        }
+    }
 };
 RenameSymbolProcessor = ( __decorate([
     ( __param(0, ICommandService)),

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

@@ -22,6 +22,7 @@ export type InlineCompletionEndOfLifeEvent = {
     timeUntilProviderRequest: number | undefined;
     timeUntilProviderResponse: number | undefined;
     reason: "accepted" | "rejected" | "ignored" | undefined;
+    acceptedAlternativeAction: boolean | undefined;
     partiallyAccepted: number | undefined;
     partiallyAcceptedCountSinceOriginal: number | undefined;
     partiallyAcceptedRatioSinceOriginal: number | undefined;
@@ -29,9 +30,9 @@ export type InlineCompletionEndOfLifeEvent = {
     preceeded: boolean | undefined;
     superseded: boolean | undefined;
     notShownReason: string | undefined;
-    renameCreated: boolean;
+    renameCreated: boolean | undefined;
     renameDuration: number | undefined;
-    renameTimedOut: boolean;
+    renameTimedOut: boolean | undefined;
     renameDroppedOtherEdits: number | undefined;
     renameDroppedRenameEdits: number | undefined;
     performanceMarkers: string | undefined;

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

@@ -32,7 +32,7 @@ import { TokenWithTextArray } from '../../../../../common/tokens/tokenWithTextAr
 import { InlineCompletionViewData } from '../inlineEdits/inlineEditsViewInterface.js';
 import { InlineDecorationType } from '../../../../../common/viewModel/inlineDecorations.js';
 import { sum, equals } from '../../../../../../base/common/arrays.js';
-import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
+import { equalsIfDefinedC, thisEqualsC } from '../../../../../../base/common/equals.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { derived, derivedOpts } from '../../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../../base/common/observableInternal/observables/constObservable.js';
@@ -198,7 +198,7 @@ let GhostTextView = class GhostTextView extends Disposable {
         this._editorObs = observableCodeEditor(this._editor);
         this._additionalLinesWidget = this._register(( new AdditionalLinesWidget(
             this._editor,
-            derivedOpts({ owner: this, equalsFn: equalsIfDefined(itemEquals()) }, reader => {
+            derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(thisEqualsC()) }, reader => {
                 const uiState = this._state.read(reader);
                 return uiState ? ( new AdditionalLinesData(
                     uiState.lineNumber,
@@ -327,7 +327,7 @@ class AdditionalLinesData {
         if (this.minReservedLineCount !== other.minReservedLineCount) {
             return false;
         }
-        return equals(this.additionalLines, other.additionalLines, itemEquals());
+        return equals(this.additionalLines, other.additionalLines, thisEqualsC());
     }
 }
 class AdditionalLinesWidget extends Disposable {
@@ -383,26 +383,28 @@ class AdditionalLinesWidget extends Disposable {
             return;
         }
         const { tabSize } = textModel.getOptions();
-        this._editor.changeViewZones((changeAccessor) => {
-            const store = ( new DisposableStore());
-            this.removeActiveViewZone(changeAccessor);
-            const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
-            if (heightInLines > 0) {
-                const domNode = createElement('div');
-                renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
-                if (this._isClickable) {
-                    store.add(addDisposableListener(domNode, 'mousedown', (e) => {
-                        e.preventDefault();
-                    }));
-                    store.add(addDisposableListener(domNode, 'click', (e) => {
-                        if (isTargetGhostText(e.target)) {
-                            this._onDidClick.fire(( new StandardMouseEvent(getWindow(e), e)));
-                        }
-                    }));
+        observableCodeEditor(this._editor).transaction(_ => {
+            this._editor.changeViewZones((changeAccessor) => {
+                const store = ( new DisposableStore());
+                this.removeActiveViewZone(changeAccessor);
+                const heightInLines = Math.max(additionalLines.length, minReservedLineCount);
+                if (heightInLines > 0) {
+                    const domNode = createElement('div');
+                    renderLines(domNode, tabSize, additionalLines, this._editor.getOptions(), this._isClickable);
+                    if (this._isClickable) {
+                        store.add(addDisposableListener(domNode, 'mousedown', (e) => {
+                            e.preventDefault();
+                        }));
+                        store.add(addDisposableListener(domNode, 'click', (e) => {
+                            if (isTargetGhostText(e.target)) {
+                                this._onDidClick.fire(( new StandardMouseEvent(getWindow(e), e)));
+                            }
+                        }));
+                    }
+                    this.addViewZone(changeAccessor, lineNumber, heightInLines, domNode);
                 }
-                this.addViewZone(changeAccessor, lineNumber, heightInLines, domNode);
-            }
-            this._viewZoneListener.value = store;
+                this._viewZoneListener.value = store;
+            });
         });
     }
     addViewZone(changeAccessor, afterLineNumber, heightInLines, domNode) {

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

@@ -64,13 +64,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._data.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1312, "Go To"))} / ${( localize(1313, "Accept"))}`,
+            title: `${( localize(1316, "Go To"))} / ${( localize(1317, "Accept"))}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId,
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1314, "Reject")),
+            title: ( localize(1318, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -91,25 +91,25 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1315, "Show Expanded")),
+                title: ( localize(1319, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1316, "Show Collapsed")),
+                title: ( localize(1320, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const snooze = option(createOptionArgs({
             id: 'snooze',
-            title: ( localize(1317, "Snooze")),
+            title: ( localize(1321, "Snooze")),
             icon: Codicon.bellSlash,
             commandId: 'editor.action.inlineSuggest.snooze'
         }));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1318, "Settings")),
+            title: ( localize(1322, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']

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

@@ -16,7 +16,7 @@ import { EditorOption, RenderLineNumbersType } from '../../../../../../common/co
 import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { getEditorBlendedColor, inlineEditIndicatorSuccessfulBorder, inlineEditIndicatorSuccessfulForeground, inlineEditIndicatorSuccessfulBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorBackground } from '../theme.js';
+import { getEditorBlendedColor, inlineEditIndicatorSuccessfulBorder, inlineEditIndicatorSuccessfulForeground, inlineEditIndicatorSuccessfulBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSecondaryBackground, INLINE_EDITS_BORDER_RADIUS, inlineEditIndicatorBackground } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
 import { assertNever } from '../../../../../../../base/common/assert.js';
@@ -43,7 +43,7 @@ class InlineSuggestionGutterMenuData {
         const alternativeAction = suggestion.action?.kind === 'edit' ? suggestion.action.alternativeAction : undefined;
         return (new InlineSuggestionGutterMenuData(
             suggestion.gutterMenuLinkAction,
-            suggestion.source.provider.displayName ?? ( localize(1319, "Inline Suggestion")),
+            suggestion.source.provider.displayName ?? ( localize(1323, "Inline Suggestion")),
             suggestion.source.inlineSuggestions.commands ?? [],
             alternativeAction,
             suggestion.source.provider.modelInfo,
@@ -68,6 +68,8 @@ class SimpleInlineSuggestModel {
         this.jump = jump;
     }
 }
+const CODICON_SIZE_PX = 16;
+const CODICON_PADDING_PX = 2;
 let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Disposable {
     constructor(_editorObs, _data, _tabAction, _verticalOffset, _isHoveringOverInlineEdit, _focusIsInMenu, _hoverService, _instantiationService, _accessibilityService, _themeService) {
         super();
@@ -198,12 +200,13 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             }
             const layout = this._editorObs.layoutInfo.read(reader);
             const lineHeight = this._editorObs.observeLineHeightForLine(( s.range.map(r => r.startLineNumber))).read(reader);
-            const gutterViewPortPadding = 2;
-            const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPadding;
-            const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPadding;
-            const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPadding, gutterViewPortPadding, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
+            const gutterViewPortPaddingLeft = 1;
+            const gutterViewPortPaddingTop = 2;
+            const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPaddingLeft;
+            const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPaddingTop;
+            const gutterViewPortWithStickyScroll = Rect.fromLeftTopWidthHeight(gutterViewPortPaddingLeft, gutterViewPortPaddingTop, gutterWidthWithoutPadding, gutterHeightWithoutPadding);
             const gutterViewPortWithoutStickyScrollWithoutPaddingTop = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader));
-            const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPadding);
+            const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPaddingTop);
             const verticalEditRange = s.lineOffsetRange.read(reader);
             const gutterEditArea = Rect.fromRanges(OffsetRange.fromTo(gutterViewPortWithoutStickyScroll.left, gutterViewPortWithoutStickyScroll.right), verticalEditRange);
             const pillHeight = lineHeight;
@@ -224,29 +227,31 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 const editStartLineNumber = s.range.read(reader).startLineNumber;
                 return cursorLineNumber <= editStartLineNumber ? Codicon.keyboardTabAbove : Codicon.keyboardTabBelow;
             });
-            const idealIconWidth = 22;
-            const minimalIconWidth = 16;
+            const idealIconAreaWidth = 22;
             const iconWidth = (pillRect) => {
-                const availableWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPadding;
-                return Math.max(Math.min(availableWidth, idealIconWidth), minimalIconWidth);
+                const availableIconAreaWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPaddingLeft;
+                return Math.max(Math.min(availableIconAreaWidth, idealIconAreaWidth), CODICON_SIZE_PX);
             };
             if (pillIsFullyDocked) {
                 const pillRect = pillFullyDockedRect;
-                let lineNumberWidth;
+                let widthUntilLineNumberEnd;
                 if (layout.lineNumbersWidth === 0) {
-                    lineNumberWidth = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconWidth);
+                    widthUntilLineNumberEnd = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconAreaWidth);
                 }
                 else {
-                    lineNumberWidth = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
+                    widthUntilLineNumberEnd = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
                 }
-                const lineNumberRect = pillRect.withWidth(lineNumberWidth);
-                const iconWidth = Math.max(Math.min(layout.decorationsWidth, idealIconWidth), minimalIconWidth);
-                const iconRect = pillRect.withWidth(iconWidth).translateX(lineNumberWidth);
+                const lineNumberRect = pillRect.withWidth(widthUntilLineNumberEnd);
+                const minimalIconWidthWithPadding = CODICON_SIZE_PX + CODICON_PADDING_PX;
+                const iconWidth = Math.min(pillRect.width - widthUntilLineNumberEnd, idealIconAreaWidth);
+                const iconRect = pillRect.withWidth(Math.max(iconWidth, minimalIconWidthWithPadding)).translateX(widthUntilLineNumberEnd);
+                const iconVisible = iconWidth >= minimalIconWidthWithPadding;
                 return {
                     gutterEditArea,
                     icon: iconDocked,
                     iconDirection: 'right',
                     iconRect,
+                    iconVisible,
                     pillRect,
                     lineNumberRect,
                 };
@@ -263,6 +268,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                     iconDirection: 'right',
                     iconRect,
                     pillRect,
+                    iconVisible: true,
                 };
             }
             const pillRectMoved = pillFullyDockedRect.moveToBeContainedIn(gutterViewPortWithStickyScroll);
@@ -277,6 +283,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 iconDirection,
                 iconRect,
                 pillRect,
+                iconVisible: true,
             };
         });
         this._iconRef = n.ref();
@@ -297,7 +304,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 style: {
                     position: 'absolute',
                     background: asCssVariable(inlineEditIndicatorBackground),
-                    borderRadius: '4px',
+                    borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
                     ...rectToProps(reader => layout.read(reader).gutterEditArea),
                 }
             }),
@@ -331,9 +338,9 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                     ['--vscodeIconForeground']: ( this._gutterIndicatorStyles.map(v => v.foreground)),
                     border: ( this._gutterIndicatorStyles.map(v => `1px solid ${v.border}`)),
                     boxSizing: 'border-box',
-                    borderRadius: '4px',
+                    borderRadius: `${INLINE_EDITS_BORDER_RADIUS}px`,
                     display: 'flex',
-                    justifyContent: 'flex-end',
+                    justifyContent: ( layout.map(l => l.iconDirection === 'bottom' ? 'flex-start' : 'flex-end')),
                     transition: ( this._modifierPressed.map(m => m ? '' : 'background-color 0.2s ease-in-out, width 0.2s ease-in-out')),
                     ...rectToProps(reader => layout.read(reader).pillRect),
                 }
@@ -352,17 +359,22 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 }, this._lineNumberToRender),
                 n.div({
                     style: {
-                        rotate: ( layout.map(l => `${getRotationFromDirection(l.iconDirection)}deg`)),
-                        transition: 'rotate 0.2s ease-in-out',
+                        transform: ( layout.map(l => `rotate(${getRotationFromDirection(l.iconDirection)}deg)`)),
+                        transition: 'rotate 0.2s ease-in-out, opacity 0.2s ease-in-out',
                         display: 'flex',
                         alignItems: 'center',
                         justifyContent: 'center',
                         height: '100%',
+                        opacity: ( layout.map(l => l.iconVisible ? '1' : '0')),
                         marginRight: ( layout.map(l => l.pillRect.width - l.iconRect.width - (l.lineNumberRect?.width ?? 0))),
                         width: ( layout.map(l => l.iconRect.width)),
+                        position: 'relative',
+                        right: ( layout.map(l => l.iconDirection === 'top' ? '1px' : '0')),
                     }
                 }, [
-                    ( layout.map((l, reader) => renderIcon(l.icon.read(reader)))),
+                    ( layout.map(
+                        (l, reader) => withStyles(renderIcon(l.icon.read(reader)), { fontSize: toPx(Math.min(l.iconRect.width - CODICON_PADDING_PX, CODICON_SIZE_PX)) })
+                    )),
                 ])
             ]),
         ])));
@@ -472,5 +484,14 @@ function getRotationFromDirection(direction) {
         case 'right': return 0;
     }
 }
+function withStyles(element, styles) {
+    for (const key in styles) {
+        element.style[key] = styles[key];
+    }
+    return element;
+}
+function toPx(n) {
+    return `${n}px`;
+}
 
 export { InlineEditsGutterIndicator, InlineEditsGutterIndicatorData, InlineSuggestionGutterMenuData, SimpleInlineSuggestModel };

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

@@ -2,6 +2,7 @@ import { Event } from "../../../../../../base/common/event.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
 import { InlineCompletionsModel } from "../../model/inlineCompletionsModel.js";
 import { InlineSuggestHint } from "../../model/inlineSuggestionItem.js";
+import { InlineCompletionEditorType } from "../../model/provideInlineCompletions.js";
 import { InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from "./inlineEditsViewInterface.js";
 import { InlineEditWithChanges } from "./inlineEditWithChanges.js";
 /**
@@ -12,7 +13,7 @@ export declare class ModelPerInlineEdit {
     private readonly _model;
     readonly inlineEdit: InlineEditWithChanges;
     readonly tabAction: IObservable<InlineEditTabAction>;
-    readonly isInDiffEditor: boolean;
+    readonly editorType: InlineCompletionEditorType;
     readonly displayLocation: InlineSuggestHint | undefined;
     /** Determines if the inline suggestion is fully in the view port */
     readonly inViewPort: IObservable<boolean>;

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

@@ -9,7 +9,7 @@ class ModelPerInlineEdit {
         this._model = _model;
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
-        this.isInDiffEditor = this._model.isInDiffEditor;
+        this.editorType = this._model.editorType;
         this.displayLocation = this.inlineEdit.inlineCompletion.hint;
         this.inViewPort = derived(this, reader => isSuggestionInViewport(this._model.editor, this.inlineEdit.inlineCompletion, reader));
         this.onDidAccept = this._model.onDidAccept;

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

@@ -2,7 +2,7 @@
 import { registerCss } from '../../../../../../../../../css.js';
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
 import { $ } from '../../../../../../base/browser/dom.js';
-import { itemsEquals } from '../../../../../../base/common/equals.js';
+import { equals } from '../../../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
@@ -33,6 +33,7 @@ import { JumpToView } from './inlineEditsViews/jumpToView.js';
 import { StringEdit } from '../../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../../common/core/ranges/offsetRange.js';
 import { getPositionOffsetTransformerFromTextModel } from '../../../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
+import { InlineCompletionEditorType } from '../../model/provideInlineCompletions.js';
 import { derived, derivedOpts } from '../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { mapObservableArrayCached } from '../../../../../../base/common/observableInternal/utils/utils.js';
@@ -102,14 +103,10 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 mappings = applyEditToModifiedRangeMappings(mappings, indentationAdjustmentEdit);
                 diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, newText);
             }
-            const tm = this._editorObs.model.read(reader);
-            if (!tm) {
-                return undefined;
-            }
-            this._previewTextModel.setLanguage(tm.getLanguageId());
+            this._previewTextModel.setLanguage(textModel.getLanguageId());
             const previousNewText = this._previewTextModel.getValue();
             if (previousNewText !== newText.getValue()) {
-                this._previewTextModel.setEOL(tm.getEndOfLineSequence());
+                this._previewTextModel.setEOL(textModel.getEndOfLineSequence());
                 const updateOldValueEdit = StringEdit.replace(( new OffsetRange(0, previousNewText.length)), newText.getValue());
                 const updateOldValueEditSmall = updateOldValueEdit.removeCommonSuffixPrefix(previousNewText);
                 const textEdit = getPositionOffsetTransformerFromTextModel(this._previewTextModel).getTextEdit(updateOldValueEditSmall);
@@ -126,7 +123,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 edit: inlineEdit,
                 newText: newText.getValue(),
                 newTextLineCount: inlineEdit.modifiedLineRange.length,
-                isInDiffEditor: model.isInDiffEditor,
+                editorType: model.editorType,
                 longDistanceHint,
                 nextCursorPosition: nextCursorPosition,
             };
@@ -152,19 +149,19 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         this._previewTextModel = this._register(this._instantiationService.createInstance(TextModel, '', this._editor.getModel().getLanguageId(), { ...TextModel.DEFAULT_CREATION_OPTIONS, bracketPairColorizationOptions: { enabled: true, independentColorPoolPerBracketType: false } }, null));
         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,
+            editorType: s.editorType,
         }) : 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 === InlineCompletionViewKind.Deletion ? ({
             originalRange: s.state.originalRange,
             deletions: s.state.deletions,
-            inDiffEditor: s.isInDiffEditor,
+            editorType: s.editorType,
         }) : 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,
+                editorType: s.editorType,
             }) : undefined
         )), this._tabAction));
         this._inlineCollapsedView = this._register(this._instantiationService.createInstance(InlineEditsCollapsedView, this._editor, ( this._model.map(
@@ -172,7 +169,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         ))));
         this._customView = this._register(this._instantiationService.createInstance(InlineEditsCustomView, this._editor, ( this._model.map(
             (m, reader) => this._uiState.read(reader)?.state?.kind === InlineCompletionViewKind.Custom ? m?.displayLocation : undefined
-        )), this._tabAction));
+        )), this._tabAction, ( this._uiState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor))));
         this._showLongDistanceHint = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(this, s => s.edits.showLongDistanceHint));
         this._longDistanceHint = derived(this, reader => {
             if (!this._showLongDistanceHint.read(reader)) {
@@ -183,6 +180,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 newTextLineCount: s.newTextLineCount,
                 edit: s.edit,
                 diff: s.diff,
+                editorType: s.editorType,
                 model: this._simpleModel.read(reader),
                 inlineSuggestInfo: this._inlineSuggestInfo.read(reader),
                 nextCursorPosition: s.nextCursorPosition,
@@ -201,7 +199,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 diff: e.diff,
                 mode: e.state.kind,
                 modifiedCodeEditor: this._sideBySide.previewEditor,
-                isInDiffEditor: e.isInDiffEditor,
+                editorType: e.editorType,
             };
         });
         this._inlineDiffView = this._register(( new OriginalEditorInlineDiffView(this._editor, this._inlineDiffViewState, this._previewTextModel)));
@@ -213,10 +211,10 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             return undefined;
         })));
         const wordReplacements = derivedOpts({
-            equalsFn: itemsEquals((a, b) => a.equals(b))
+            equalsFn: equals.arrayC(equals.thisC())
         }, reader => {
             const s = this._uiState.read(reader);
-            return s?.state?.kind === InlineCompletionViewKind.WordReplacements ? ( s.state.replacements.map(replacement => ( new WordReplacementsViewData(replacement, s.state?.alternativeAction)))) : [];
+            return s?.state?.kind === InlineCompletionViewKind.WordReplacements ? ( s.state.replacements.map(replacement => ( new WordReplacementsViewData(replacement, s.editorType, s.state?.alternativeAction)))) : [];
         });
         this._wordReplacementViews = mapObservableArrayCached(this, wordReplacements, (viewData, store) => {
             return store.add(this._instantiationService.createInstance(InlineEditsWordReplacementView, this._editorObs, viewData, this._tabAction));
@@ -226,7 +224,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             modifiedRange: s.state.modifiedRange,
             modifiedLines: s.state.modifiedLines,
             replacements: s.state.replacements,
-        }) : undefined)), ( this._uiState.map(s => s?.isInDiffEditor ?? false)), this._tabAction));
+        }) : undefined)), ( this._uiState.map(s => s?.editorType ?? InlineCompletionEditorType.TextEditor)), 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._register(autorun((reader) => {
@@ -316,7 +314,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         const numModifiedLines = inlineEdit.modifiedLineRange.length;
         const inner = diff.flatMap(d => d.innerChanges ?? []);
         const isSingleInnerEdit = inner.length === 1;
-        if (!model.isInDiffEditor) {
+        if (model.editorType !== InlineCompletionEditorType.DiffEditor) {
             if (isSingleInnerEdit
                 && this._useCodeShifting.read(reader) !== 'never'
                 && isSingleLineInsertion(diff)) {
@@ -346,7 +344,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             }
         }
         if (numOriginalLines > 0 && numModifiedLines > 0) {
-            if (numOriginalLines === 1 && numModifiedLines === 1 && !model.isInDiffEditor ) {
+            if (numOriginalLines === 1 && numModifiedLines === 1 && model.editorType !== InlineCompletionEditorType.DiffEditor ) {
                 return InlineCompletionViewKind.LineReplacement;
             }
             if (this._renderSideBySide.read(reader) !== 'never' && InlineEditsSideBySideView.fitsInsideViewport(this._editor, this._previewTextModel, inlineEdit, reader)) {
@@ -354,7 +352,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             }
             return InlineCompletionViewKind.LineReplacement;
         }
-        if (model.isInDiffEditor) {
+        if (model.editorType === InlineCompletionEditorType.DiffEditor) {
             if (isDeletion(inner, inlineEdit, newText)) {
                 return InlineCompletionViewKind.Deletion;
             }