@codingame/monaco-vscode-api 17.2.1 → 18.0.1

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

@@ -26,13 +26,13 @@ import '../../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
-import { inlineSuggestCommitId, jumpToNextInlineEditId, hideInlineCompletionId, toggleShowCollapsedId } from '../../../controller/commandIds.js';
-import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
-import { constObservable, observableFromEvent } from '../../../../../../../base/common/observableInternal/utils.js';
-import { derived, derivedWithStore } from '../../../../../../../base/common/observableInternal/derived.js';
+import { inlineSuggestCommitId, hideInlineCompletionId, toggleShowCollapsedId } from '../../../controller/commandIds.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
+import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
     constructor(_model, _close, _editorObs, _contextKeyService, _keybindingService, _commandService) {
@@ -65,17 +65,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1271, "Go To"))} / ${( localize(1272, "Accept"))}`,
-            icon: ( this._model.tabAction.map(
-                action => action === InlineEditTabAction.Accept ? Codicon.check : Codicon.arrowRight
-            )),
-            commandId: ( this._model.tabAction.map(
-                action => action === InlineEditTabAction.Accept ? inlineSuggestCommitId : jumpToNextInlineEditId
-            ))
+            title: `${( localize(1274, "Go To"))} / ${( localize(1275, "Accept"))}`,
+            icon: Codicon.check,
+            commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1273, "Reject")),
+            title: ( localize(1276, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -85,19 +81,19 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1274, "Show Expanded")),
+                title: ( localize(1277, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1275, "Show Collapsed")),
+                title: ( localize(1278, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1276, "Settings")),
+            title: ( localize(1279, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']
@@ -157,7 +153,7 @@ function header(title) {
     }, [title]);
 }
 function option(props) {
-    return derivedWithStore((_reader, store) => n.div({
+    return derived((_reader) => n.div({
         class: ['monaco-menu-option', props.isActive?.map(v => v && 'active')],
         onmouseenter: () => props.onHoverChange?.(true),
         onmouseleave: () => props.onHoverChange?.(false),
@@ -182,7 +178,7 @@ function option(props) {
         n.div({
             style: { marginLeft: 'auto' },
             ref: elem => {
-                const keybindingLabel = store.add(( new KeybindingLabel(elem, OS, {
+                const keybindingLabel = _reader.store.add(( new KeybindingLabel(elem, OS, {
                     disableTitle: true,
                     ...defaultKeybindingLabelStyles,
                     keybindingLabelShadow: undefined,
@@ -190,7 +186,7 @@ function option(props) {
                     keybindingLabelBorder: 'transparent',
                     keybindingLabelBottomBorder: undefined,
                 })));
-                store.add(autorun(reader => {
+                _reader.store.add(autorun(reader => {
                     keybindingLabel.set(props.keybinding.read(reader));
                 }));
             }
@@ -198,7 +194,7 @@ function option(props) {
     ]));
 }
 function actionBar(actions, options) {
-    return derivedWithStore((_reader, store) => n.div({
+    return derived((_reader) => n.div({
         class: ['action-widget-action-bar'],
         style: {
             padding: '0 10px',
@@ -206,7 +202,7 @@ function actionBar(actions, options) {
     }, [
         n.div({
             ref: elem => {
-                const actionBar = store.add(( new ActionBar(elem, options)));
+                const actionBar = _reader.store.add(( new ActionBar(elem, options)));
                 actionBar.push(actions, { icon: false, label: true });
             }
         })

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

@@ -5,7 +5,7 @@ import { IInstantiationService } from "../../../../../../../platform/instantiati
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
 import { HoverService } from "../../../../../../browser/services/hoverService/hoverService.js";
-import { LineRange } from "../../../../../../common/core/lineRange.js";
+import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { IInlineEditModel } from "../inlineEditsViewInterface.js";
 export declare class InlineEditsGutterIndicator extends Disposable {
     private readonly _editorObs;

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

@@ -11,20 +11,23 @@ import { IHoverService } from '../../../../../../../platform/hover/browser/hover
 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 { Point } from '../../../../../../browser/point.js';
-import { Rect } from '../../../../../../browser/rect.js';
+import { Point } from '../../../../../../common/core/2d/point.js';
+import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { EditorOption, RenderLineNumbersType } from '../../../../../../common/config/editorOptions.js';
-import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
+import { OffsetRange } from '../../../../../../common/core/ranges/offsetRange.js';
 import { StickyScrollController } from '../../../../../stickyScroll/browser/stickyScrollController.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
-import { inlineEditIndicatorBackground, getEditorBlendedColor, inlineEditIndicatorsuccessfulBorder, inlineEditIndicatorsuccessfulForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSecondaryBackground } from '../theme.js';
+import { getEditorBlendedColor, inlineEditIndicatorsuccessfulBorder, inlineEditIndicatorsuccessfulForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorBackground } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
-import { observableFromEvent, constObservable, debouncedObservable, runOnChange } from '../../../../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { debouncedObservable } from '../../../../../../../base/common/observableInternal/utils/utils.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
-import { autorun } from '../../../../../../../base/common/observableInternal/autorun.js';
+import { runOnChange } from '../../../../../../../base/common/observableInternal/utils/runOnChange.js';
+import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Disposable {
     get model() {
@@ -45,6 +48,38 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         this._hoverService = _hoverService;
         this._instantiationService = _instantiationService;
         this._accessibilityService = _accessibilityService;
+        this._tabAction = derived(this, reader => {
+            const model = this._model.read(reader);
+            if (!model) {
+                return InlineEditTabAction.Inactive;
+            }
+            return model.tabAction.read(reader);
+        });
+        this._hoverVisible = observableValue(this, false);
+        this.isHoverVisible = this._hoverVisible;
+        this._isHoveredOverIcon = observableValue(this, false);
+        this._isHoveredOverIconDebounced = debouncedObservable(this._isHoveredOverIcon, 100);
+        this.isHoveredOverIcon = this._isHoveredOverIconDebounced;
+        this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
+        this._gutterIndicatorStyles = ( this._tabAction.map((v, reader) => {
+            switch (v) {
+                case InlineEditTabAction.Inactive: return {
+                    background: ( getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, themeService).read(reader).toString()),
+                    foreground: ( getEditorBlendedColor(inlineEditIndicatorSecondaryForeground, themeService).read(reader).toString()),
+                    border: ( getEditorBlendedColor(inlineEditIndicatorSecondaryBorder, themeService).read(reader).toString()),
+                };
+                case InlineEditTabAction.Jump: return {
+                    background: ( getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, themeService).read(reader).toString()),
+                    foreground: ( getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, themeService).read(reader).toString()),
+                    border: ( getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, themeService).read(reader).toString())
+                };
+                case InlineEditTabAction.Accept: return {
+                    background: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulBackground, themeService).read(reader).toString()),
+                    foreground: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulForeground, themeService).read(reader).toString()),
+                    border: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulBorder, themeService).read(reader).toString())
+                };
+            }
+        }));
         this._originalRangeObs = mapOutFalsy(this._originalRange);
         this._state = derived(reader => {
             const range = this._originalRangeObs.read(reader);
@@ -143,13 +178,14 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             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 gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader) + gutterViewPortPadding);
+            const gutterViewPortWithoutStickyScrollWithoutPaddingTop = gutterViewPortWithStickyScroll.withTop(this._stickyScrollHeight.read(reader));
+            const gutterViewPortWithoutStickyScroll = gutterViewPortWithStickyScroll.withTop(gutterViewPortWithoutStickyScrollWithoutPaddingTop.top + gutterViewPortPadding);
             const verticalEditRange = s.lineOffsetRange.read(reader);
             const gutterEditArea = Rect.fromRanges(OffsetRange.fromTo(gutterViewPortWithoutStickyScroll.left, gutterViewPortWithoutStickyScroll.right), verticalEditRange);
             const pillHeight = lineHeight;
             const pillOffset = this._verticalOffset.read(reader);
             const pillFullyDockedRect = gutterEditArea.withHeight(pillHeight).translateY(pillOffset);
-            const pillIsFullyDocked = gutterViewPortWithoutStickyScroll.containsRect(pillFullyDockedRect);
+            const pillIsFullyDocked = gutterViewPortWithoutStickyScrollWithoutPaddingTop.containsRect(pillFullyDockedRect);
             const iconNoneDocked = ( this._tabAction.map(
                 action => action === InlineEditTabAction.Accept ? Codicon.keyboardTab : Codicon.arrowRight
             ));
@@ -172,7 +208,13 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             };
             if (pillIsFullyDocked) {
                 const pillRect = pillFullyDockedRect;
-                const lineNumberWidth = Math.max(layout.lineNumbersLeft + layout.lineNumbersWidth - gutterViewPortWithStickyScroll.left, 0);
+                let lineNumberWidth;
+                if (layout.lineNumbersWidth === 0) {
+                    lineNumberWidth = Math.min(Math.max(layout.lineNumbersLeft - gutterViewPortWithStickyScroll.left, 0), pillRect.width - idealIconWidth);
+                }
+                else {
+                    lineNumberWidth = 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);
@@ -215,18 +257,6 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         });
         this._iconRef = n.ref();
         this.isVisible = ( this._layout.map(l => !!l));
-        this._hoverVisible = observableValue(this, false);
-        this.isHoverVisible = this._hoverVisible;
-        this._isHoveredOverIcon = observableValue(this, false);
-        this._isHoveredOverIconDebounced = debouncedObservable(this._isHoveredOverIcon, 100);
-        this.isHoveredOverIcon = this._isHoveredOverIconDebounced;
-        this._tabAction = derived(this, reader => {
-            const model = this._model.read(reader);
-            if (!model) {
-                return InlineEditTabAction.Inactive;
-            }
-            return model.tabAction.read(reader);
-        });
         this._indicator = n.div({
             class: 'inline-edits-view-gutter-indicator',
             onclick: () => {
@@ -303,25 +333,6 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 ])
             ]),
         ]))).keepUpdated(this._store);
-        this._gutterIndicatorStyles = ( this._tabAction.map((v, reader) => {
-            switch (v) {
-                case InlineEditTabAction.Inactive: return {
-                    background: ( getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, themeService).read(reader).toString()),
-                    foreground: ( getEditorBlendedColor(inlineEditIndicatorSecondaryForeground, themeService).read(reader).toString()),
-                    border: ( getEditorBlendedColor(inlineEditIndicatorSecondaryBorder, themeService).read(reader).toString()),
-                };
-                case InlineEditTabAction.Jump: return {
-                    background: ( getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, themeService).read(reader).toString()),
-                    foreground: ( getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, themeService).read(reader).toString()),
-                    border: ( getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, themeService).read(reader).toString())
-                };
-                case InlineEditTabAction.Accept: return {
-                    background: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulBackground, themeService).read(reader).toString()),
-                    foreground: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulForeground, themeService).read(reader).toString()),
-                    border: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulBorder, themeService).read(reader).toString())
-                };
-            }
-        }));
         this._register(this._editorObs.createOverlayWidget({
             domNode: this._indicator.element,
             position: constObservable(null),
@@ -342,7 +353,6 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         this._register(this._editorObs.editor.onDidScrollChange(() => {
             this._isHoveredOverIcon.set(false, undefined);
         }));
-        this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
         this._register(runOnChange(this._isHoveredOverInlineEditDebounced, (isHovering) => {
             if (isHovering) {
                 this.triggerAnimation();

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

@@ -1,7 +1,8 @@
-import { SingleLineEdit } from "../../../../../common/core/lineEdit.js";
-import { LineRange } from "../../../../../common/core/lineRange.js";
+import { SingleLineEdit } from "../../../../../common/core/edits/lineEdit.js";
+import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
 import { Position } from "../../../../../common/core/position.js";
-import { AbstractText, TextEdit } from "../../../../../common/core/textEdit.js";
+import { TextEdit } from "../../../../../common/core/edits/textEdit.js";
+import { AbstractText } from "../../../../../common/core/text/abstractText.js";
 import { Command } from "../../../../../common/languages.js";
 import { InlineSuggestionItem } from "../../model/inlineSuggestionItem.js";
 export declare class InlineEditWithChanges {

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

@@ -1,10 +1,10 @@
 
-import { SingleLineEdit } from '../../../../../common/core/lineEdit.js';
-import { LineRange } from '../../../../../common/core/lineRange.js';
+import { SingleLineEdit } from '../../../../../common/core/edits/lineEdit.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 
 class InlineEditWithChanges {
     get lineEdit() {
-        return SingleLineEdit.fromSingleTextEdit(this.edit.toSingle(this.originalText), this.originalText);
+        return SingleLineEdit.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

@@ -1,7 +1,7 @@
 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/lineRange.js";
+import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
 import { Command, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
 import { InlineCompletionsModel } from "../../model/inlineCompletionsModel.js";
 import { InlineCompletionItem } from "../../model/inlineSuggestionItem.js";

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

@@ -2,10 +2,11 @@
 import '../../../../../../base/common/observableInternal/index.js';
 import { localize } from '../../../../../../nls.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { StringText, TextEdit } from '../../../../../common/core/textEdit.js';
+import { TextEdit } from '../../../../../common/core/edits/textEdit.js';
+import { StringText } from '../../../../../common/core/text/abstractText.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
 
 class InlineEditModel {
     constructor(_model, inlineEdit, tabAction) {
@@ -13,7 +14,7 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1277, "Inline Edit"));
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1280, "Inline Edit"));
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
         this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;
         this.showCollapsed = this._model.showCollapsed;

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

@@ -7,10 +7,10 @@ import '../../../../../../base/common/observableInternal/index.js';
 import { IConfigurationService } from '../../../../../../platform/configuration/common/configuration.service.js';
 import { StorageScope, StorageTarget } from '../../../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../../../platform/storage/common/storage.service.js';
-import { runOnChangeWithCancellationToken, runOnChange } from '../../../../../../base/common/observableInternal/utils.js';
-import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunWithStore } from '../../../../../../base/common/observableInternal/autorun.js';
+import { runOnChangeWithCancellationToken, runOnChange } from '../../../../../../base/common/observableInternal/utils/runOnChange.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
+import { autorun, autorunWithStore } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 var UserKind;
 (function (UserKind) {

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

@@ -29,7 +29,7 @@ export declare class InlineEditsView extends Disposable {
     private readonly _uiState;
     private readonly _previewTextModel;
     private readonly _indicatorCyclicDependencyCircuitBreaker;
-    protected readonly _indicator: IObservable<InlineEditsGutterIndicator | undefined>;
+    protected readonly _indicator: import("../../../../../../base/common/observable.js").IObservableWithChange<InlineEditsGutterIndicator | undefined, void>;
     private readonly _inlineEditsIsHovered;
     private readonly _gutterIndicatorOffset;
     private readonly _sideBySide;

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

@@ -9,10 +9,11 @@ import '../../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../common/core/lineRange.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { Range } from '../../../../../common/core/range.js';
-import { StringText, SingleTextEdit } from '../../../../../common/core/textEdit.js';
-import { TextLength } from '../../../../../common/core/textLength.js';
+import { TextReplacement } from '../../../../../common/core/edits/textEdit.js';
+import { StringText } from '../../../../../common/core/text/abstractText.js';
+import { TextLength } from '../../../../../common/core/text/textLength.js';
 import { RangeMapping, lineRangeMappingFromRangeMappings } from '../../../../../common/diff/rangeMapping.js';
 import { TextModel } from '../../../../../common/model/textModel.js';
 import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
@@ -28,10 +29,10 @@ import { InlineEditsWordReplacementView } from './inlineEditsViews/inlineEditsWo
 import { OriginalEditorInlineDiffView } from './inlineEditsViews/originalEditorInlineDiffView.js';
 import { createReindentEdit, applyEditToModifiedRangeMappings } from './utils/utils.js';
 import * as view from './view.css';
-import { derived, derivedWithStore, derivedOpts } from '../../../../../../base/common/observableInternal/derived.js';
-import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import { mapObservableArrayCached } from '../../../../../../base/common/observableInternal/utils.js';
-import { autorunWithStore } from '../../../../../../base/common/observableInternal/autorun.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';
+import { autorunWithStore } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(view);
 let InlineEditsView = class InlineEditsView extends Disposable {
@@ -85,7 +86,7 @@ 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._indicatorCyclicDependencyCircuitBreaker = observableValue(this, false);
-        this._indicator = derivedWithStore(this, (reader, store) => {
+        this._indicator = derived(this, (reader) => {
             if (!this._indicatorCyclicDependencyCircuitBreaker.read(reader)) {
                 return undefined;
             }
@@ -121,7 +122,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 }
                 return model;
             });
-            return store.add(this._instantiationService.createInstance(InlineEditsGutterIndicator, this._editorObs, indicatorDisplayRange, this._gutterIndicatorOffset, modelWithGhostTextSupport, this._inlineEditsIsHovered, this._focusIsInMenu));
+            return reader.store.add(this._instantiationService.createInstance(InlineEditsGutterIndicator, this._editorObs, indicatorDisplayRange, this._gutterIndicatorOffset, modelWithGhostTextSupport, this._inlineEditsIsHovered, this._focusIsInMenu));
         });
         this._inlineEditsIsHovered = derived(this, reader => {
             return this._sideBySide.isHovered.read(reader)
@@ -136,6 +137,10 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             if (this._uiState.read(reader)?.state?.kind === 'insertionMultiLine') {
                 return this._insertion.startLineOffset.read(reader);
             }
+            const ghostTextIndicator = this._ghostTextIndicator.read(reader);
+            if (ghostTextIndicator) {
+                return getGhostTextTopOffset(ghostTextIndicator, this._editor);
+            }
             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' ? ({
@@ -221,8 +226,11 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         const isSingleInnerEdit = inner.length === 1;
         if (isSingleInnerEdit
             && this._useCodeShifting.read(reader) !== 'never'
-            && isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)) {
-            return 'insertionInline';
+            && isSingleLineInsertion(diff)) {
+            if (isSingleLineInsertionAfterPosition(diff, inlineEdit.cursorPosition)) {
+                return 'insertionInline';
+            }
+            return 'lineReplacement';
         }
         const innerValues = ( inner.map(
             m => ({ original: inlineEdit.originalText.getValueOfRange(m.originalRange), modified: newText.getValueOfRange(m.modifiedRange) })
@@ -238,7 +246,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         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 SingleTextEdit(m.originalRange, '')))), inlineEdit.originalText).some(
+                !( 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';
@@ -282,7 +290,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
                 text: newText.getValueOfRange(change.modifiedRange),
             };
         }
-        const replacements = ( inner.map(m => ( new SingleTextEdit(m.originalRange, newText.getValueOfRange(m.modifiedRange)))));
+        const replacements = ( inner.map(m => ( new TextReplacement(m.originalRange, newText.getValueOfRange(m.modifiedRange)))));
         if (replacements.length === 0) {
             return undefined;
         }
@@ -319,13 +327,9 @@ let InlineEditsView = class InlineEditsView extends Disposable {
 InlineEditsView = ( __decorate([
     ( __param(5, IInstantiationService))
 ], InlineEditsView));
-function isSingleLineInsertionAfterPosition(diff, position) {
-    if (!position) {
-        return false;
-    }
-    const pos = position;
-    return diff.every(m => m.innerChanges.every(r => isStableWordInsertion(r)));
-    function isStableWordInsertion(r) {
+function isSingleLineInsertion(diff) {
+    return diff.every(m => m.innerChanges.every(r => isWordInsertion(r)));
+    function isWordInsertion(r) {
         if (!r.originalRange.isEmpty()) {
             return false;
         }
@@ -333,6 +337,19 @@ function isSingleLineInsertionAfterPosition(diff, position) {
         if (!isInsertionWithinLine) {
             return false;
         }
+        return true;
+    }
+}
+function isSingleLineInsertionAfterPosition(diff, position) {
+    if (!position) {
+        return false;
+    }
+    if (!isSingleLineInsertion(diff)) {
+        return false;
+    }
+    const pos = position;
+    return diff.every(m => m.innerChanges.every(r => isStableWordInsertion(r)));
+    function isStableWordInsertion(r) {
         const insertPosition = r.originalRange.getStartPosition();
         if (pos.isBeforeOrEqual(insertPosition)) {
             return true;
@@ -385,14 +402,14 @@ function _growEdits(replacements, originalText, fn) {
                 endIndex++;
             }
         }
-        let newEdit = ( new SingleTextEdit(( new Range(
+        let newEdit = ( new TextReplacement(( new Range(
             edit.range.startLineNumber,
             startIndex + 1,
             edit.range.endLineNumber,
             endIndex + 2
         )), prefix + edit.text + suffix));
         if (result.length > 0 && Range.areIntersectingOrTouching(result[result.length - 1].range, newEdit.range)) {
-            newEdit = SingleTextEdit.joinEdits([result.pop(), newEdit], originalText);
+            newEdit = TextReplacement.joinReplacements([result.pop(), newEdit], originalText);
         }
         result.push(newEdit);
     }
@@ -404,5 +421,34 @@ function _growEdits(replacements, originalText, fn) {
     }
     return result;
 }
+function getGhostTextTopOffset(ghostTextIndicator, editor) {
+    const replacements = ghostTextIndicator.model.inlineEdit.edit.replacements;
+    if (replacements.length !== 1) {
+        return 0;
+    }
+    const textModel = editor.getModel();
+    if (!textModel) {
+        return 0;
+    }
+    const EOL = textModel.getEOL();
+    const replacement = replacements[0];
+    if (replacement.range.isEmpty() && replacement.text.startsWith(EOL)) {
+        const lineHeight = editor.getLineHeightForPosition(replacement.range.getStartPosition());
+        return countPrefixRepeats(replacement.text, EOL) * lineHeight;
+    }
+    return 0;
+}
+function countPrefixRepeats(str, prefix) {
+    if (!prefix.length) {
+        return 0;
+    }
+    let count = 0;
+    let i = 0;
+    while (str.startsWith(prefix, i)) {
+        count++;
+        i += prefix.length;
+    }
+    return count;
+}
 
 export { InlineEditsView };

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

@@ -5,15 +5,15 @@ import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import '../../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { observableCodeEditor } from '../../../../../browser/observableCodeEditor.js';
-import { LineRange } from '../../../../../common/core/lineRange.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { Range } from '../../../../../common/core/range.js';
-import { SingleTextEdit, TextEdit } from '../../../../../common/core/textEdit.js';
+import { TextReplacement, TextEdit } from '../../../../../common/core/edits/textEdit.js';
 import { TextModelText } from '../../../../../common/model/textModelText.js';
 import { InlineEditWithChanges } from './inlineEditWithChanges.js';
 import { InlineEditModel, InlineEditHost, GhostTextIndicator } from './inlineEditsModel.js';
 import { InlineEditsView } from './inlineEditsView.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
-import { derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
 
 var InlineEditsViewAndDiffProducer_1;
 let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extends Disposable {
@@ -42,9 +42,9 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
             if (!editOffset) {
                 return undefined;
             }
-            const edits = ( editOffset.edits.map(e => {
+            const edits = ( editOffset.replacements.map(e => {
                 const innerEditRange = Range.fromPositions(textModel.getPositionAt(e.replaceRange.start), textModel.getPositionAt(e.replaceRange.endExclusive));
-                return ( new SingleTextEdit(innerEditRange, e.newText));
+                return ( new TextReplacement(innerEditRange, e.newText));
             }));
             const diffEdits = ( new TextEdit(edits));
             const text = ( new TextModelText(textModel));

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

@@ -7,13 +7,13 @@ import '../../../../../../../base/common/observableInternal/index.js';
 import { IAccessibilityService } from '../../../../../../../platform/accessibility/common/accessibility.service.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
-import { Point } from '../../../../../../browser/point.js';
+import { Point } from '../../../../../../common/core/2d/point.js';
 import { singleTextRemoveCommonPrefix } from '../../../model/singleTextEditHelpers.js';
 import { inlineEditIndicatorPrimaryBorder } from '../theme.js';
-import { PathBuilder } from '../utils/utils.js';
+import { rectToProps, getEditorValidOverlayRect, PathBuilder } from '../utils/utils.js';
 import { n } from '../../../../../../../base/browser/domImpl/n.js';
-import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
+import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
+import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 
 let InlineEditsCollapsedView = class InlineEditsCollapsedView extends Disposable {
     constructor(_editor, _edit, _accessibilityService) {
@@ -26,7 +26,7 @@ let InlineEditsCollapsedView = class InlineEditsCollapsedView extends Disposable
         this._iconRef = n.ref();
         this.isHovered = constObservable(false);
         this._editorObs = observableCodeEditor(this._editor);
-        const firstEdit = ( this._edit.map(inlineEdit => inlineEdit?.edit.edits[0] ?? null));
+        const firstEdit = ( this._edit.map(inlineEdit => inlineEdit?.edit.replacements[0] ?? null));
         const startPosition = ( firstEdit.map(
             edit => edit ? singleTextRemoveCommonPrefix(edit, this._editor.getModel()).range.getStartPosition() : null
         ));
@@ -84,10 +84,7 @@ let InlineEditsCollapsedView = class InlineEditsCollapsedView extends Disposable
             ref: this._iconRef,
             style: {
                 position: 'absolute',
-                top: 0,
-                left: contentLeft,
-                width: this._editorObs.contentWidth,
-                height: this._editorObs.editor.getContentHeight(),
+                ...rectToProps((r) => getEditorValidOverlayRect(this._editorObs).read(r)),
                 overflow: 'hidden',
                 pointerEvents: 'none',
             }