@codingame/monaco-vscode-api 26.2.2 → 28.0.0

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

@@ -0,0 +1,65 @@
+
+import { onUnexpectedError } from '../../../../../base/common/errors.js';
+import { AbstractText } from '../../../../common/core/text/abstractText.js';
+import { TextLength } from '../../../../common/core/text/textLength.js';
+
+class TextModelValueReference extends AbstractText {
+    static snapshot(textModel) {
+        return ( new TextModelValueReference(textModel));
+    }
+    constructor(_textModel) {
+        super();
+        this._textModel = _textModel;
+        this._version = _textModel.getVersionId();
+    }
+    get uri() {
+        return this._textModel.uri;
+    }
+    get version() {
+        return this._version;
+    }
+    _assertValid() {
+        if (this._textModel.getVersionId() !== this._version) {
+            onUnexpectedError(( new Error(
+                `TextModel has changed: expected version ${this._version}, got ${this._textModel.getVersionId()}`
+            )));
+        }
+    }
+    targets(textModel) {
+        return ( this._textModel.uri.toString()) === ( textModel.uri.toString());
+    }
+    getValueOfRange(range) {
+        this._assertValid();
+        return this._textModel.getValueInRange(range);
+    }
+    getLineLength(lineNumber) {
+        this._assertValid();
+        return this._textModel.getLineLength(lineNumber);
+    }
+    get length() {
+        this._assertValid();
+        const lastLineNumber = this._textModel.getLineCount();
+        const lastLineLen = this._textModel.getLineLength(lastLineNumber);
+        return ( new TextLength(lastLineNumber - 1, lastLineLen));
+    }
+    getEOL() {
+        this._assertValid();
+        return this._textModel.getEOL();
+    }
+    getPositionAt(offset) {
+        this._assertValid();
+        return this._textModel.getPositionAt(offset);
+    }
+    getValueInRange(range) {
+        this._assertValid();
+        return this._textModel.getValueInRange(range);
+    }
+    getVersionId() {
+        return this._version;
+    }
+    dangerouslyGetUnderlyingModel() {
+        return this._textModel;
+    }
+}
+
+export { TextModelValueReference };

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

@@ -12,7 +12,7 @@ export declare class GutterIndicatorMenuContent {
     private readonly _keybindingService;
     private readonly _commandService;
     private readonly _inlineEditsShowCollapsed;
-    constructor(_editorObs: ObservableCodeEditor, _data: InlineSuggestionGutterMenuData, _close: (focusEditor: boolean) => void, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService);
+    constructor(_editorObs: ObservableCodeEditor, _data: InlineSuggestionGutterMenuData, _close: (focusEditor: boolean, commandId?: string) => void, _contextKeyService: IContextKeyService, _keybindingService: IKeybindingService, _commandService: ICommandService);
     toDisposableLiveElement(): LiveElement;
     private _createHoverContent;
     private _getKeybinding;

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

@@ -66,24 +66,39 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
                 isActive: ( activeElement.map(v => v === options.id)),
                 onHoverChange: v => activeElement.set(v ? options.id : undefined, undefined),
                 onAction: () => {
-                    this._close(true);
-                    return this._commandService.executeCommand(
-                        typeof options.commandId === "string" ? options.commandId : options.commandId.get(),
-                        ...(options.commandArgs ?? [])
-                    );
+                    const commandId = typeof options.commandId === "string" ? options.commandId : options.commandId.get();
+                    this._close(true, commandId);
+                    return this._commandService.executeCommand(commandId, ...(options.commandArgs ?? []));
                 }
             };
         };
+        const extensionCommandGroups = ( this._data.extensionCommands.map(group => ( group.map((c, idx) => option(createOptionArgs({
+            id: c.command.id + "_" + idx,
+            title: c.command.title,
+            icon: c.icon ?? Codicon.symbolEvent,
+            commandId: c.command.id,
+            commandArgs: c.command.arguments
+        }))))));
+        const extensionCommandNodes = [];
+        for (const group of extensionCommandGroups) {
+            if (group.length > 0) {
+                extensionCommandNodes.push(separator());
+                extensionCommandNodes.push(...group);
+            }
+        }
+        if (this._data.extensionCommandsOnly) {
+            return hoverContent(extensionCommandNodes.slice(1));
+        }
         const title = header(this._data.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: "gotoAndAccept",
-            title: ( localize(1318, "Go To / Accept")),
+            title: ( localize(1341, "Go To / Accept")),
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: "reject",
-            title: ( localize(1319, "Reject")),
+            title: ( localize(1342, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -93,34 +108,27 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             icon: this._data.alternativeAction.icon,
             commandId: inlineSuggestCommitAlternativeActionId
         })) : undefined;
-        const extensionCommands = ( this._data.extensionCommands.map((c, idx) => option(createOptionArgs({
-            id: c.command.id + "_" + idx,
-            title: c.command.title,
-            icon: c.icon ?? Codicon.symbolEvent,
-            commandId: c.command.id,
-            commandArgs: c.command.arguments
-        }))));
         const modelOptions = [];
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ? option(createOptionArgs({
             id: "showExpanded",
-            title: ( localize(1320, "Show Expanded")),
+            title: ( localize(1343, "Show Expanded")),
             icon: Codicon.expandAll,
             commandId: toggleShowCollapsedId
         })) : option(createOptionArgs({
             id: "showCollapsed",
-            title: ( localize(1321, "Show Collapsed")),
+            title: ( localize(1344, "Show Collapsed")),
             icon: Codicon.collapseAll,
             commandId: toggleShowCollapsedId
         }))));
         const snooze = option(createOptionArgs({
             id: "snooze",
-            title: ( localize(1322, "Snooze")),
+            title: ( localize(1345, "Snooze")),
             icon: Codicon.bellSlash,
             commandId: "editor.action.inlineSuggest.snooze"
         }));
         const settings = option(createOptionArgs({
             id: "settings",
-            title: ( localize(1323, "Settings")),
+            title: ( localize(1346, "Settings")),
             icon: Codicon.gear,
             commandId: "workbench.action.openSettings",
             commandArgs: ["@tag:nextEditSuggestions"]
@@ -144,10 +152,9 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             toggleCollapsedMode,
             modelOptions.length ? separator() : undefined,
             ...modelOptions,
-            extensionCommands.length ? separator() : undefined,
             snooze,
             settings,
-            ...extensionCommands,
+            ...extensionCommandNodes,
             actionBarFooter ? separator() : undefined,
             actionBarFooter
         ]);

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

@@ -12,6 +12,8 @@ import { InlineSuggestionItem } from "../../../model/inlineSuggestionItem.js";
 import { InlineCompletionsModel } from "../../../model/inlineCompletionsModel.js";
 import { InlineSuggestAlternativeAction } from "../../../model/InlineSuggestAlternativeAction.js";
 import { ThemeIcon } from "../../../../../../../base/common/themables.js";
+import { IUserInteractionService } from "../../../../../../../platform/userInteraction/browser/userInteractionService.service.js";
+import { Event } from "../../../../../../../base/common/event.js";
 /**
  * Customization options for the gutter indicator appearance and behavior.
  */
@@ -30,12 +32,13 @@ export declare class InlineEditsGutterIndicatorData {
 export declare class InlineSuggestionGutterMenuData {
     readonly action: Command | undefined;
     readonly displayName: string;
-    readonly extensionCommands: InlineCompletionCommand[];
+    readonly extensionCommands: InlineCompletionCommand[][];
     readonly alternativeAction: InlineSuggestAlternativeAction | undefined;
     readonly modelInfo: IInlineCompletionModelInfo | undefined;
     readonly setModelId: ((modelId: string) => Promise<void>) | undefined;
+    readonly extensionCommandsOnly: boolean;
     static fromInlineSuggestion(suggestion: InlineSuggestionItem): InlineSuggestionGutterMenuData;
-    constructor(action: Command | undefined, displayName: string, extensionCommands: InlineCompletionCommand[], alternativeAction: InlineSuggestAlternativeAction | undefined, modelInfo: IInlineCompletionModelInfo | undefined, setModelId: ((modelId: string) => Promise<void>) | undefined);
+    constructor(action: Command | undefined, displayName: string, extensionCommands: InlineCompletionCommand[][], alternativeAction: InlineSuggestAlternativeAction | undefined, modelInfo: IInlineCompletionModelInfo | undefined, setModelId: ((modelId: string) => Promise<void>) | undefined, extensionCommandsOnly?: boolean);
 }
 export declare class SimpleInlineSuggestModel {
     readonly accept: () => void;
@@ -54,7 +57,10 @@ export declare class InlineEditsGutterIndicator extends Disposable {
     private readonly _instantiationService;
     private readonly _accessibilityService;
     private readonly _themeService;
-    constructor(_editorObs: ObservableCodeEditor, _data: IObservable<InlineEditsGutterIndicatorData | undefined>, _tabAction: IObservable<InlineEditTabAction>, _verticalOffset: IObservable<number>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, _themeService: IThemeService);
+    private readonly _userInteractionService;
+    private readonly _onDidCloseWithCommand;
+    readonly onDidCloseWithCommand: Event<string>;
+    constructor(_editorObs: ObservableCodeEditor, _data: IObservable<InlineEditsGutterIndicatorData | undefined>, _tabAction: IObservable<InlineEditTabAction>, _verticalOffset: IObservable<number>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, _themeService: IThemeService, _userInteractionService: IUserInteractionService);
     private readonly _isHoveredOverInlineEditDebounced;
     private readonly _modifierPressed;
     private readonly _gutterIndicatorStyles;

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import { ModifierKeyEmitter, n, trackFocus } from '../../../../../../../base/browser/dom.js';
+import { n } from '../../../../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
@@ -22,11 +22,13 @@ import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
 import { assertNever } from '../../../../../../../base/common/assert.js';
 import { localize } from '../../../../../../../nls.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
+import { IUserInteractionService } from '../../../../../../../platform/userInteraction/browser/userInteractionService.service.js';
+import { Emitter } from '../../../../../../../base/common/event.js';
 import { debouncedObservable } from '../../../../../../../base/common/observableInternal/utils/utils.js';
-import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { runOnChange } from '../../../../../../../base/common/observableInternal/utils/runOnChange.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
@@ -42,10 +44,11 @@ class InlineEditsGutterIndicatorData {
 class InlineSuggestionGutterMenuData {
     static fromInlineSuggestion(suggestion) {
         const alternativeAction = suggestion.action?.kind === "edit" ? suggestion.action.alternativeAction : undefined;
+        const commands = suggestion.source.inlineSuggestions.commands ?? [];
         return (new InlineSuggestionGutterMenuData(
             suggestion.gutterMenuLinkAction,
-            suggestion.source.provider.displayName ?? ( localize(1324, "Inline Suggestion")),
-            suggestion.source.inlineSuggestions.commands ?? [],
+            suggestion.source.provider.displayName ?? ( localize(1347, "Inline Suggestion")),
+            commands.length > 0 ? [commands] : [],
             alternativeAction,
             suggestion.source.provider.modelInfo,
             suggestion.source.provider.setModelId?.bind(suggestion.source.provider)
@@ -57,7 +60,8 @@ class InlineSuggestionGutterMenuData {
         extensionCommands,
         alternativeAction,
         modelInfo,
-        setModelId
+        setModelId,
+        extensionCommandsOnly = false
     ) {
         this.action = action;
         this.displayName = displayName;
@@ -65,6 +69,7 @@ class InlineSuggestionGutterMenuData {
         this.alternativeAction = alternativeAction;
         this.modelInfo = modelInfo;
         this.setModelId = setModelId;
+        this.extensionCommandsOnly = extensionCommandsOnly;
     }
 }
 class SimpleInlineSuggestModel {
@@ -89,7 +94,8 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         _hoverService,
         _instantiationService,
         _accessibilityService,
-        _themeService
+        _themeService,
+        _userInteractionService
     ) {
         super();
         this._editorObs = _editorObs;
@@ -102,10 +108,12 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         this._instantiationService = _instantiationService;
         this._accessibilityService = _accessibilityService;
         this._themeService = _themeService;
-        this._modifierPressed = observableFromEvent(
+        this._userInteractionService = _userInteractionService;
+        this._onDidCloseWithCommand = this._register(( new Emitter()));
+        this.onDidCloseWithCommand = this._onDidCloseWithCommand.event;
+        this._modifierPressed = derived(
             this,
-            ModifierKeyEmitter.getInstance().event,
-            () => ModifierKeyEmitter.getInstance().keyStatus.shiftKey
+            reader => this._userInteractionService.readModifierKeyStatus(this._editorObs.editor.getDomNode(), reader).shiftKey
         );
         this._gutterIndicatorStyles = derived(this, reader => {
             let v = this._tabAction.read(reader);
@@ -411,7 +419,10 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 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"))
+                right: ( layout.map(l => l.iconDirection === "top" ? "1px" : "0")),
+                color: ( this._data.map(
+                    d => d?.customization?.icon?.color ? asCssVariable(d.customization.icon.color.id) : undefined
+                ))
             }
         }, [( layout.map((l, reader) => withStyles(renderIcon(l.icon.read(reader)), {
             fontSize: toPx(Math.min(l.iconRect.width - CODICON_PADDING_PX, CODICON_SIZE_PX))
@@ -486,16 +497,20 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             GutterIndicatorMenuContent,
             this._editorObs,
             data.gutterMenuData,
-            focusEditor => {
+            (focusEditor, commandId) => {
                 if (focusEditor) {
                     this._editorObs.editor.focus();
                 }
+                if (commandId) {
+                    this._onDidCloseWithCommand.fire(commandId);
+                }
                 h?.dispose();
             }
         ).toDisposableLiveElement());
-        const focusTracker = disposableStore.add(trackFocus(content.element));
-        disposableStore.add(focusTracker.onDidBlur(() => this._focusIsInMenu.set(false, undefined)));
-        disposableStore.add(focusTracker.onDidFocus(() => this._focusIsInMenu.set(true, undefined)));
+        const isFocused = this._userInteractionService.createFocusTracker(content.element, disposableStore);
+        disposableStore.add(autorun(reader => {
+            this._focusIsInMenu.set(isFocused.read(reader), undefined);
+        }));
         disposableStore.add(toDisposable(() => this._focusIsInMenu.set(false, undefined)));
         const h = this._hoverService.showInstantHover({
             target: this._iconRef.element,
@@ -513,7 +528,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         }
     }
 };
-InlineEditsGutterIndicator = ( __decorate([( __param(6, IHoverService)), ( __param(7, IInstantiationService)), ( __param(8, IAccessibilityService)), ( __param(9, IThemeService))], InlineEditsGutterIndicator));
+InlineEditsGutterIndicator = ( __decorate([( __param(6, IHoverService)), ( __param(7, IInstantiationService)), ( __param(8, IAccessibilityService)), ( __param(9, IThemeService)), ( __param(10, IUserInteractionService))], InlineEditsGutterIndicator));
 function getRotationFromDirection(direction) {
     switch (direction) {
     case "top":

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

@@ -2,11 +2,11 @@ import { LineReplacement } from "../../../../../common/core/edits/lineEdit.js";
 import { TextEdit } from "../../../../../common/core/edits/textEdit.js";
 import { Position } from "../../../../../common/core/position.js";
 import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
-import { AbstractText } from "../../../../../common/core/text/abstractText.js";
 import { InlineCompletionCommand } from "../../../../../common/languages.js";
 import { InlineSuggestionAction, InlineSuggestionItem } from "../../model/inlineSuggestionItem.js";
+import { TextModelValueReference } from "../../model/textModelValueReference.js";
 export declare class InlineEditWithChanges {
-    readonly originalText: AbstractText;
+    readonly originalText: TextModelValueReference;
     readonly action: InlineSuggestionAction | undefined;
     readonly edit: TextEdit | undefined;
     readonly cursorPosition: Position;
@@ -17,5 +17,5 @@ export declare class InlineEditWithChanges {
     get originalLineRange(): LineRange;
     get modifiedLineRange(): LineRange;
     get displayRange(): LineRange;
-    constructor(originalText: AbstractText, action: InlineSuggestionAction | undefined, edit: TextEdit | undefined, cursorPosition: Position, multiCursorPositions: readonly Position[], commands: readonly InlineCompletionCommand[], inlineCompletion: InlineSuggestionItem);
+    constructor(originalText: TextModelValueReference, action: InlineSuggestionAction | undefined, edit: TextEdit | undefined, cursorPosition: Position, multiCursorPositions: readonly Position[], commands: readonly InlineCompletionCommand[], inlineCompletion: InlineSuggestionItem);
 }

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

@@ -64,6 +64,9 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             if (!state) {
                 return undefined;
             }
+            if (( state.target.uri.toString()) !== this._editorObs.model.read(reader)?.uri.toString()) {
+                return undefined;
+            }
             if (state.state?.kind === "custom") {
                 const range = state.state.displayLocation?.range;
                 if (!range) {
@@ -140,7 +143,8 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 newTextLineCount: inlineEdit.modifiedLineRange.length,
                 editorType: model.editorType,
                 longDistanceHint,
-                nextCursorPosition: nextCursorPosition
+                nextCursorPosition: nextCursorPosition,
+                target: inlineEdit.inlineCompletion.originalTextRef
             };
         });
         this.inlineEditsIsHovered = derived(this, reader => {
@@ -210,7 +214,8 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                     editorType: s.editorType,
                     model: this._simpleModel.read(reader),
                     inlineSuggestInfo: this._inlineSuggestInfo.read(reader),
-                    nextCursorPosition: s.nextCursorPosition
+                    nextCursorPosition: s.nextCursorPosition,
+                    target: s.target
                 }) : undefined)), this._previewTextModel, this._tabAction)
             );
         }).recomputeInitiallyAndOnChange(this._store);
@@ -319,6 +324,12 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         if (model.inlineEdit.action === undefined) {
             return undefined;
         }
+        if (( model.inlineEdit.originalText.uri.toString()) !== this._editorObs.model.read(reader)?.uri.toString()) {
+            return {
+                isVisible: true,
+                lineNumber: model.inlineEdit.cursorPosition.lineNumber
+            };
+        }
         if (this._currentInlineEditCache?.inlineSuggestionIdentity !== model.inlineEdit.inlineCompletion.identity) {
             this._currentInlineEditCache = {
                 inlineSuggestionIdentity: model.inlineEdit.inlineCompletion.identity,
@@ -335,7 +346,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
     }
     _determineView(model, reader, diff, newText) {
         const inlineEdit = model.inlineEdit;
-        const canUseCache = this._previousView?.id === this._getCacheId(model);
+        const canUseCache = this._previousView?.id === this._getCacheId(model) && this._previousView?.uri.toString() === ( this._editorObs.model.get().uri.toString());
         const reconsiderViewEditorWidthChange = this._previousView?.editorWidth !== this._editorObs.layoutInfoWidth.read(reader) && (this._previousView?.view === InlineCompletionViewKind.SideBySide || this._previousView?.view === InlineCompletionViewKind.LineReplacement);
         if (canUseCache && !reconsiderViewEditorWidthChange) {
             return this._previousView.view;
@@ -344,8 +355,9 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         if (action?.kind === "edit" && action.alternativeAction) {
             return InlineCompletionViewKind.WordReplacements;
         }
-        const uri = action?.kind === "edit" ? action.uri : undefined;
-        if (uri !== undefined) {
+        const targetUri = model.inlineEdit.inlineCompletion.originalTextRef.uri;
+        const currentUri = this._editorObs.model.read(reader)?.uri;
+        if (currentUri && ( targetUri.toString()) !== ( currentUri.toString())) {
             return InlineCompletionViewKind.Custom;
         }
         if (model.displayLocation && !model.inlineEdit.inlineCompletion.identity.jumpedTo.read(reader)) {
@@ -424,14 +436,15 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             id: this._getCacheId(model),
             view,
             editorWidth: this._editor.getLayoutInfo().width,
-            timestamp: Date.now()
+            timestamp: Date.now(),
+            uri: this._editorObs.model.get().uri
         };
         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),
+            original: inlineEdit.originalText.getValueOfRange(m.originalRange),
             modified: newText.getValueOfRange(m.modifiedRange)
         })));
         const viewData = getViewData(inlineEdit, stringChanges, textModel);

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

@@ -6,7 +6,6 @@ import { IInstantiationService } from '../../../../../../platform/instantiation/
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { Range } from '../../../../../common/core/range.js';
 import { TextReplacement, TextEdit } from '../../../../../common/core/edits/textEdit.js';
-import { TextModelText } from '../../../../../common/model/textModelText.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 import { ModelPerInlineEdit } from './inlineEditsModel.js';
 import { InlineEditsView } from './inlineEditsView.js';
@@ -34,14 +33,14 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
                 return undefined;
             }
             const action = state.inlineSuggestion.action;
-            const text = ( new TextModelText(textModel));
             let diffEdits;
             if (action?.kind === "edit") {
                 const editOffset = action.stringEdit;
+                const t = state.inlineSuggestion.originalTextRef.getTransformer();
                 const edits = ( editOffset.replacements.map(e => {
                     const innerEditRange = Range.fromPositions(
-                        textModel.getPositionAt(e.replaceRange.start),
-                        textModel.getPositionAt(e.replaceRange.endExclusive)
+                        t.getPosition(e.replaceRange.start),
+                        t.getPosition(e.replaceRange.endExclusive)
                     );
                     return ( new TextReplacement(innerEditRange, e.newText));
                 }));
@@ -50,7 +49,7 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
                 diffEdits = undefined;
             }
             return ( new InlineEditWithChanges(
-                text,
+                state.inlineSuggestion.originalTextRef,
                 action,
                 diffEdits,
                 model.primaryPosition.read(undefined),

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

@@ -2,6 +2,7 @@ import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable, IReader } from "../../../../../../../base/common/observable.js";
 import { IInstantiationService } from "../../../../../../../platform/instantiation/common/instantiation.js";
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
+import { IUserInteractionService } from "../../../../../../../platform/userInteraction/browser/userInteractionService.service.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
 import { EmbeddedCodeEditorWidget } from "../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js";
 import { ITextModel } from "../../../../../../common/model.js";
@@ -16,6 +17,7 @@ export declare class InlineEditsSideBySideView extends Disposable implements IIn
     private readonly _tabAction;
     private readonly _instantiationService;
     private readonly _themeService;
+    private readonly _userInteractionService;
     static fitsInsideViewport(editor: ICodeEditor, textModel: ITextModel, edit: InlineEditWithChanges, reader: IReader): boolean;
     private readonly _editorObs;
     private readonly _onDidClick;
@@ -23,7 +25,7 @@ export declare class InlineEditsSideBySideView extends Disposable implements IIn
     constructor(_editor: ICodeEditor, _edit: IObservable<InlineEditWithChanges | undefined>, _previewTextModel: ITextModel, _uiState: IObservable<{
         newTextLineCount: number;
         editorType: InlineCompletionEditorType;
-    } | undefined>, _tabAction: IObservable<InlineEditTabAction>, _instantiationService: IInstantiationService, _themeService: IThemeService);
+    } | undefined>, _tabAction: IObservable<InlineEditTabAction>, _instantiationService: IInstantiationService, _themeService: IThemeService, _userInteractionService: IUserInteractionService);
     private readonly _display;
     private readonly previewRef;
     private readonly _editorContainer;

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

@@ -8,6 +8,7 @@ import '../../../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.js';
+import { IUserInteractionService } from '../../../../../../../platform/userInteraction/browser/userInteractionService.service.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { EmbeddedCodeEditorWidget } from '../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
@@ -61,7 +62,8 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         _uiState,
         _tabAction,
         _instantiationService,
-        _themeService
+        _themeService,
+        _userInteractionService
     ) {
         super();
         this._editor = _editor;
@@ -71,6 +73,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         this._tabAction = _tabAction;
         this._instantiationService = _instantiationService;
         this._themeService = _themeService;
+        this._userInteractionService = _userInteractionService;
         this._onDidClick = this._register(( new Emitter()));
         this.onDidClick = this._onDidClick.event;
         this._editorObs = observableCodeEditor(this._editor);
@@ -99,7 +102,7 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
             },
             ref: this.previewRef
         })]).keepUpdated(this._store);
-        this.isHovered = this._editorContainer.didMouseMoveDuringHover;
+        this.isHovered = this._userInteractionService.createHoverTracker(this._editorContainer.element, this._store);
         this.previewEditor = this._register(
             this._instantiationService.createInstance(EmbeddedCodeEditorWidget, this.previewRef.element, {
                 glyphMargin: false,
@@ -559,6 +562,6 @@ let InlineEditsSideBySideView = class InlineEditsSideBySideView extends Disposab
         this._updatePreviewEditor.recomputeInitiallyAndOnChange(this._store);
     }
 };
-InlineEditsSideBySideView = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, IThemeService))], InlineEditsSideBySideView));
+InlineEditsSideBySideView = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, IThemeService)), ( __param(7, IUserInteractionService))], InlineEditsSideBySideView));
 
 export { InlineEditsSideBySideView };

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

@@ -10,6 +10,7 @@ import { ILanguageService } from "../../../../../../common/languages/language.se
 import { InlineSuggestAlternativeAction } from "../../../model/InlineSuggestAlternativeAction.js";
 import { InlineCompletionEditorType } from "../../../model/provideInlineCompletions.js";
 import { IInlineEditsView, InlineEditClickEvent, InlineEditTabAction } from "../inlineEditsViewInterface.js";
+import { IUserInteractionService } from "../../../../../../../platform/userInteraction/browser/userInteractionService.service.js";
 export declare class WordReplacementsViewData implements IEquatable<WordReplacementsViewData> {
     readonly edit: TextReplacement;
     readonly editorType: InlineCompletionEditorType;
@@ -25,6 +26,7 @@ export declare class InlineEditsWordReplacementView extends Disposable implement
     private readonly _themeService;
     private readonly _keybindingService;
     private readonly _hoverService;
+    private readonly _userInteractionService;
     static MAX_LENGTH: number;
     private readonly _onDidClick;
     readonly onDidClick: import("../../../../../../../base/common/event.js").Event<InlineEditClickEvent>;
@@ -33,9 +35,9 @@ export declare class InlineEditsWordReplacementView extends Disposable implement
     private readonly _line;
     private readonly _primaryElement;
     private readonly _secondaryElement;
-    readonly isHovered: IObservable<boolean>;
+    readonly isHovered: import("../../../../../../../base/common/observable.js").IObservableWithChange<boolean, void>;
     readonly minEditorScrollHeight: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
-    constructor(_editor: ObservableCodeEditor, _viewData: WordReplacementsViewData, _tabAction: IObservable<InlineEditTabAction>, _languageService: ILanguageService, _themeService: IThemeService, _keybindingService: IKeybindingService, _hoverService: IHoverService);
+    constructor(_editor: ObservableCodeEditor, _viewData: WordReplacementsViewData, _tabAction: IObservable<InlineEditTabAction>, _languageService: ILanguageService, _themeService: IThemeService, _keybindingService: IKeybindingService, _hoverService: IHoverService, _userInteractionService: IUserInteractionService);
     private readonly _renderTextEffect;
     private readonly _layout;
     private readonly _root;