@codingame/monaco-vscode-api 36.2.7 → 37.1.0

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

@@ -12,11 +12,10 @@ import { observableReducerSettable } from '../../../../../base/common/observable
 import { isDefined, isObject } from '../../../../../base/common/types.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
-import { isCopilotLikeExtension, forwardToChannelIf, DataChannelForwardingTelemetryService } from '../../../../../platform/dataChannel/browser/forwardingTelemetryService.js';
+import { DataChannelForwardingTelemetryService, isCopilotLikeExtension, forwardToChannelIf } from '../../../../../platform/dataChannel/browser/forwardingTelemetryService.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
-import product from '../../../../../platform/product/common/product.js';
 import { StringEdit } from '../../../../common/core/edits/stringEdit.js';
 import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
@@ -51,6 +50,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         _versionId,
         _debounceValue,
         _cursorPosition,
+        completionsEnablementSetting,
         _languageConfigurationService,
         _logService,
         _configurationService,
@@ -110,6 +110,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         });
         this._loadingCount = observableValue(this, 0);
         this.loading = ( this._loadingCount.map(this, v => v > 0));
+        this._dataChannelTelemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
         this._loggingEnabled = observableConfigValue("editor.inlineSuggest.logFetch", false, this._configurationService).recomputeInitiallyAndOnChange(this._store);
         this._sendRequestData = observableConfigValue(
             "editor.inlineSuggest.emptyResponseInformation",
@@ -121,12 +122,11 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         );
         this._renameProcessor = this._store.add(this._instantiationService.createInstance(RenameSymbolProcessor));
         this.clearOperationOnTextModelChange.recomputeInitiallyAndOnChange(this._store);
-        const enablementSetting = product.defaultChatAgent?.completionsEnablementSetting ?? undefined;
-        if (enablementSetting) {
-            this._updateCompletionsEnablement(enablementSetting);
+        if (completionsEnablementSetting) {
+            this._updateCompletionsEnablement(completionsEnablementSetting);
             this._register(this._configurationService.onDidChangeConfiguration(e => {
-                if (e.affectsConfiguration(enablementSetting)) {
-                    this._updateCompletionsEnablement(enablementSetting);
+                if (e.affectsConfiguration(completionsEnablementSetting)) {
+                    this._updateCompletionsEnablement(completionsEnablementSetting);
                 }
             }));
         }
@@ -506,6 +506,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             sameShapeReplacements: undefined,
             longDistanceHintVisible: undefined,
             longDistanceHintDistance: undefined,
+            isForAnotherDocument: undefined,
             notShownReason: undefined,
             renameCreated: false,
             renameDuration: undefined,
@@ -515,8 +516,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             performanceMarkers: undefined,
             editKind: undefined
         };
-        const dataChannel = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
-        sendInlineCompletionsEndOfLifeTelemetry(dataChannel, emptyEndOfLifeEvent);
+        sendInlineCompletionsEndOfLifeTelemetry(this._dataChannelTelemetryService, emptyEndOfLifeEvent);
     }
     clearSuggestWidgetInlineCompletions(tx) {
         if (this._updateOperation.value?.request.context.selectedSuggestionInfo) {
@@ -527,7 +527,7 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
         this._updateOperation.clear();
     }
 };
-InlineCompletionsSource = InlineCompletionsSource_1 = ( __decorate([( __param(4, ILanguageConfigurationService)), ( __param(5, ILogService)), ( __param(6, IConfigurationService)), ( __param(7, IInstantiationService)), ( __param(8, IContextKeyService)), ( __param(9, ITextModelService))], InlineCompletionsSource));
+InlineCompletionsSource = InlineCompletionsSource_1 = ( __decorate([( __param(5, ILanguageConfigurationService)), ( __param(6, ILogService)), ( __param(7, IConfigurationService)), ( __param(8, IInstantiationService)), ( __param(9, IContextKeyService)), ( __param(10, ITextModelService))], InlineCompletionsSource));
 class UpdateRequest {
     constructor(position, context, versionId, providers) {
         this.position = position;

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

@@ -480,11 +480,11 @@ let RenameSymbolProcessor = class RenameSymbolProcessor extends Disposable {
         });
         const command = {
             id: renameSymbolCommandId,
-            title: ( localize(1359, "Rename")),
+            title: ( localize(1373, "Rename")),
             arguments: [source, this._renameRunnable]
         };
         const alternativeAction = {
-            label: ( localize(1359, "Rename")),
+            label: ( localize(1373, "Rename")),
             icon: Codicon.replaceAll,
             command,
             count: this._renameRunnable.getCount()

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

@@ -47,6 +47,7 @@ export type InlineCompletionEndOfLifeEvent = {
     sameShapeReplacements: boolean | undefined;
     longDistanceHintVisible: boolean | undefined;
     longDistanceHintDistance: number | undefined;
+    isForAnotherDocument: boolean | undefined;
     noSuggestionReason: string | undefined;
     editKind: string | undefined;
 };

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

@@ -94,5 +94,5 @@ export declare class LineData implements IEquatable<LineData> {
     decorations: readonly LineDecoration[]);
     equals(other: LineData): boolean;
 }
-export declare const ttPolicy: Pick<TrustedTypePolicy, "name" | "createHTML"> | undefined;
+export declare const ttPolicy: Pick<TrustedTypePolicy, "createHTML" | "name"> | undefined;
 export {};

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

@@ -383,7 +383,7 @@ class AdditionalLinesWidget extends Disposable {
         this._viewZoneHeight = observableValue("viewZoneHeight", undefined);
         this.editorOptionsChanged = observableSignalFromEvent("editorOptionChanged", Event.filter(
             this._editor.onDidChangeConfiguration,
-            e => e.hasChanged(EditorOption.disableMonospaceOptimizations) || e.hasChanged(EditorOption.stopRenderingLineAfter) || e.hasChanged(EditorOption.renderWhitespace) || e.hasChanged(EditorOption.renderControlCharacters) || e.hasChanged(EditorOption.fontLigatures) || e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.lineHeight)
+            e => e.hasChanged(EditorOption.disableMonospaceOptimizations) || e.hasChanged(EditorOption.stopRenderingLineAfter) || e.hasChanged(EditorOption.renderWhitespace) || e.hasChanged(EditorOption.renderControlCharacters) || e.hasChanged(EditorOption.fontLigatures) || e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.lineHeight) || e.hasChanged(EditorOption.effectiveFullwidthCharacterWidth)
         ));
         this._onDidClick = this._register(( new Emitter()));
         this.onDidClick = this._onDidClick.event;
@@ -392,7 +392,7 @@ class AdditionalLinesWidget extends Disposable {
         this.hasBeenAccepted = false;
         if (this._editor instanceof CodeEditorWidget && this._shouldKeepCursorStable) {
             this._register(
-                this._editor.onBeforeExecuteEdit(e => this.hasBeenAccepted = e.source === "inlineSuggestion.accept")
+                this._editor.onBeforeExecuteEdit(e => this.hasBeenAccepted = e.source === "inlineCompletionAccept")
             );
         }
         this._register(autorun(reader => {
@@ -519,6 +519,7 @@ function renderLines(domNode, tabSize, lines, opts, isClickable) {
     const fontLigatures = opts.get(EditorOption.fontLigatures);
     const fontInfo = opts.get(EditorOption.fontInfo);
     const lineHeight = opts.get(EditorOption.lineHeight);
+    const useTwoCellFullwidthCharacters = opts.get(EditorOption.effectiveFullwidthCharacterWidth) === "twoCells";
     let classNames = "suggest-preview-text";
     if (isClickable) {
         classNames += " clickable";
@@ -556,7 +557,9 @@ function renderLines(domNode, tabSize, lines, opts, isClickable) {
             fontLigatures !== EditorFontLigatures.OFF,
             null,
             null,
-            0
+            0,
+            false,
+            useTwoCellFullwidthCharacters
         )), sb);
         sb.appendString("</div>");
     }

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

@@ -92,13 +92,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._data.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: "gotoAndAccept",
-            title: ( localize(1360, "Go To / Accept")),
+            title: ( localize(1374, "Go To / Accept")),
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: "reject",
-            title: ( localize(1361, "Reject")),
+            title: ( localize(1375, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -111,24 +111,24 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const modelOptions = [];
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ? option(createOptionArgs({
             id: "showExpanded",
-            title: ( localize(1362, "Show Expanded")),
+            title: ( localize(1376, "Show Expanded")),
             icon: Codicon.expandAll,
             commandId: toggleShowCollapsedId
         })) : option(createOptionArgs({
             id: "showCollapsed",
-            title: ( localize(1363, "Show Collapsed")),
+            title: ( localize(1377, "Show Collapsed")),
             icon: Codicon.collapseAll,
             commandId: toggleShowCollapsedId
         }))));
         const snooze = option(createOptionArgs({
             id: "snooze",
-            title: ( localize(1364, "Snooze")),
+            title: ( localize(1378, "Snooze")),
             icon: Codicon.bellSlash,
             commandId: "editor.action.inlineSuggest.snooze"
         }));
         const settings = option(createOptionArgs({
             id: "settings",
-            title: ( localize(1365, "Settings")),
+            title: ( localize(1379, "Settings")),
             icon: Codicon.gear,
             commandId: "workbench.action.openSettings",
             commandArgs: ["@tag:nextEditSuggestions"]

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

@@ -10,7 +10,6 @@ import { IAccessibilityService } from '../../../../../../../platform/accessibili
 import { IHoverService } from '../../../../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../../../../platform/instantiation/common/instantiation.js';
 import { IThemeService } from '../../../../../../../platform/theme/common/themeService.service.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/ranges/offsetRange.js';
@@ -47,7 +46,7 @@ class InlineSuggestionGutterMenuData {
         const commands = suggestion.source.inlineSuggestions.commands ?? [];
         return (new InlineSuggestionGutterMenuData(
             suggestion.gutterMenuLinkAction,
-            suggestion.source.provider.displayName ?? ( localize(1366, "Inline Suggestion")),
+            suggestion.source.provider.displayName ?? ( localize(1380, "Inline Suggestion")),
             commands.length > 0 ? [commands] : [],
             alternativeAction,
             suggestion.source.provider.modelInfo,
@@ -380,8 +379,10 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 }
             },
             onmouseenter: () => {
+                this._isHoveredOverIcon.set(true, undefined);
                 this._showHover();
             },
+            onmouseleave: () => this._isHoveredOverIcon.set(false, undefined),
             style: {
                 cursor: "pointer",
                 zIndex: "20",
@@ -441,17 +442,6 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             allowEditorOverflow: false,
             minContentWidthInPx: constObservable(0)
         }));
-        this._register(this._editorObs.editor.onMouseMove(e => {
-            const state = this._state.get();
-            if (state === undefined) {
-                return;
-            }
-            const el = this._iconRef.element;
-            const rect = el.getBoundingClientRect();
-            const rectangularArea = Rect.fromLeftTopWidthHeight(rect.left, rect.top, rect.width, rect.height);
-            const point = ( new Point(e.event.posx, e.event.posy));
-            this._isHoveredOverIcon.set(rectangularArea.containsPoint(point), undefined);
-        }));
         this._register(this._editorObs.editor.onDidScrollChange(() => {
             this._isHoveredOverIcon.set(false, undefined);
         }));

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

@@ -108,6 +108,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             if (longDistanceHint && longDistanceHint.isVisible) {
                 state.viewData.setLongDistanceViewData(longDistanceHint.lineNumber, inlineEdit.lineEdit.lineRange.startLineNumber);
             }
+            state.viewData.isForAnotherDocument = !inlineEdit.originalText.targets(textModel);
             if (state.kind === InlineCompletionViewKind.SideBySide) {
                 const indentationAdjustmentEdit = createReindentEdit(
                     newText.getValue(),
@@ -324,7 +325,8 @@ 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()) {
+        const editorModel = this._editorObs.model.read(reader);
+        if (!editorModel || !model.inlineEdit.originalText.targets(editorModel)) {
             return {
                 isVisible: true,
                 lineNumber: model.inlineEdit.cursorPosition.lineNumber
@@ -419,7 +421,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             return {
                 kind: InlineCompletionViewKind.JumpTo,
                 position: model.inlineEdit.action.position,
-                viewData: emptyViewData
+                viewData: createEmptyViewData()
             };
         }
         const inlineEdit = model.inlineEdit;
@@ -545,10 +547,10 @@ let InlineEditsView = class InlineEditsView extends Disposable {
     }
 };
 InlineEditsView = ( __decorate([( __param(5, IInstantiationService))], InlineEditsView));
-const emptyViewData = ( new InlineCompletionViewData(-1, -1, -1, -1, -1, -1, -1, true));
+const createEmptyViewData = () => ( new InlineCompletionViewData(-1, -1, -1, -1, -1, -1, -1, true));
 function getViewData(inlineEdit, stringChanges, textModel) {
     if (!inlineEdit.edit) {
-        return emptyViewData;
+        return createEmptyViewData();
     }
     const cursorPosition = inlineEdit.cursorPosition;
     const startsWithEOL = stringChanges.length === 0 ? false : stringChanges[0].modified.startsWith(textModel.getEOL());

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

@@ -40,6 +40,11 @@ export declare class InlineCompletionViewData {
     readonly sameShapeReplacements?: boolean | undefined;
     longDistanceHintVisible: boolean | undefined;
     longDistanceHintDistance: number | undefined;
+    /**
+     * Whether the suggestion targets a different text model (URI) than the active editor's,
+     * i.e. a cross-document Next Edit Suggestion. `undefined` for inline completions / ghost text.
+     */
+    isForAnotherDocument: boolean | undefined;
     constructor(cursorColumnDistance: number, cursorLineDistance: number, lineCountOriginal: number, lineCountModified: number, characterCountOriginal: number, characterCountModified: number, disjointReplacements: number, sameShapeReplacements?: boolean | undefined);
     setLongDistanceViewData(lineNumber: number, inlineEditLineNumber: number): void;
     getData(): {
@@ -53,5 +58,6 @@ export declare class InlineCompletionViewData {
         sameShapeReplacements: boolean | undefined;
         longDistanceHintVisible: boolean | undefined;
         longDistanceHintDistance: number | undefined;
+        isForAnotherDocument: boolean | undefined;
     };
 }

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

@@ -51,6 +51,7 @@ class InlineCompletionViewData {
         this.sameShapeReplacements = sameShapeReplacements;
         this.longDistanceHintVisible = undefined;
         this.longDistanceHintDistance = undefined;
+        this.isForAnotherDocument = undefined;
     }
     setLongDistanceViewData(lineNumber, inlineEditLineNumber) {
         this.longDistanceHintVisible = true;
@@ -67,7 +68,8 @@ class InlineCompletionViewData {
             disjointReplacements: this.disjointReplacements,
             sameShapeReplacements: this.sameShapeReplacements,
             longDistanceHintVisible: this.longDistanceHintVisible,
-            longDistanceHintDistance: this.longDistanceHintDistance
+            longDistanceHintDistance: this.longDistanceHintDistance,
+            isForAnotherDocument: this.isForAnotherDocument
         };
     }
 }

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

@@ -62,29 +62,32 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
         });
         this._trimVertically = derived(this, reader => {
             const state = this._state.read(reader);
-            const text = state?.text;
-            if (!text || text.trim() === "") {
+            if (!state) {
                 return {
                     topOffset: 0,
-                    bottomOffset: 0,
+                    contentHeight: 0,
                     linesTop: 0,
                     linesBottom: 0
                 };
             }
+            const text = state.text;
             const lineHeight = this._editor.getLineHeightForPosition(( new Position(state.lineNumber, 1)));
             const eol = this._editor.getModel().getEOL();
+            const lineCount = text.split(eol).length;
             let linesTop = 0;
             let linesBottom = 0;
-            let i = 0;
-            for (; i < text.length && text.startsWith(eol, i); i += eol.length) {
-                linesTop += 1;
-            }
-            for (let j = text.length; j > i && text.endsWith(eol, j); j -= eol.length) {
-                linesBottom += 1;
+            if (text.trim() !== "") {
+                let i = 0;
+                for (; i < text.length && text.startsWith(eol, i); i += eol.length) {
+                    linesTop += 1;
+                }
+                for (let j = text.length; j > i && text.endsWith(eol, j); j -= eol.length) {
+                    linesBottom += 1;
+                }
             }
             return {
                 topOffset: linesTop * lineHeight,
-                bottomOffset: linesBottom * lineHeight,
+                contentHeight: (lineCount - linesTop - linesBottom) * lineHeight,
                 linesTop,
                 linesBottom
             };
@@ -174,10 +177,9 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
             }
             const {
                 topOffset: topTrim,
-                bottomOffset: bottomTrim
+                contentHeight: height
             } = this._trimVertically.read(reader);
             const scrollTop = this._editorObs.scrollTop.read(reader);
-            const height = this._ghostTextView.height.read(reader) - topTrim - bottomTrim;
             const top = this._editor.getTopForLineNumber(state.lineNumber) - scrollTop + topTrim;
             const bottom = top + height;
             const overlay = ( new Rect(left, top, right, bottom));
@@ -207,7 +209,7 @@ let InlineEditsInsertionView = class InlineEditsInsertionView extends Disposable
                 i => i?.editorType === InlineCompletionEditorType.DiffEditor ? WIDGET_SEPARATOR_DIFF_EDITOR_WIDTH : WIDGET_SEPARATOR_WIDTH
             )).read(reader);
             const overlayRect = ( overlayLayoutObs.map(
-                l => l.overlay.withMargin(0, BORDER_WIDTH, 0, l.startsAtContentLeft ? 0 : BORDER_WIDTH).intersectHorizontal(( new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER)))
+                l => l.overlay.withMargin(0, BORDER_WIDTH, BORDER_WIDTH, l.startsAtContentLeft ? 0 : BORDER_WIDTH).intersectHorizontal(( new OffsetRange(overlayHider.left, Number.MAX_SAFE_INTEGER)))
             ));
             const underlayRect = ( overlayRect.map(rect => rect.withMargin(separatorWidth, separatorWidth)));
             const editorBackground = getEditorBackgroundColor(

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

@@ -141,8 +141,8 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                 const label = this._viewData.alternativeAction.label;
                 const count = altCount.read(reader);
                 const active = altModifierActive.read(reader);
-                const occurrencesLabel = count !== undefined ? count === 1 ? ( localize(1367, "{0} 1 occurrence", label)) : ( localize(1368, "{0} {1} occurrences", label, count)) : label;
-                const keybindingTooltip = ( localize(1369, "{0} show occurrences", "[shift]"));
+                const occurrencesLabel = count !== undefined ? count === 1 ? ( localize(1381, "{0} 1 occurrence", label)) : ( localize(1382, "{0} {1} occurrences", label, count)) : label;
+                const keybindingTooltip = ( localize(1383, "{0} show occurrences", "[shift]"));
                 alternativeAction = {
                     label: count !== undefined ? (active ? occurrencesLabel : label) : label,
                     tooltip: occurrencesLabel ? `${occurrencesLabel}\n${keybindingTooltip}` : undefined,

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

@@ -174,9 +174,11 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
                 widgetBorder,
                 lowerBarHeight
             } = layoutConstants;
+            const maxWidgetWidthUpperBound = position === "overlay" ? MAX_WIDGET_WIDTH.OVERLAY : MAX_WIDGET_WIDTH.EMPTY_SPACE;
+            const contentBasedWidgetWidth = previewEditorContentLayout.maxEditorWidth + previewEditorMargin + widgetPadding;
             const maxWidgetWidth = Math.min(
-                position === "overlay" ? MAX_WIDGET_WIDTH.OVERLAY : MAX_WIDGET_WIDTH.EMPTY_SPACE,
-                previewEditorContentLayout.maxEditorWidth + previewEditorMargin + widgetPadding
+                maxWidgetWidthUpperBound,
+                Math.max(contentBasedWidgetWidth, layoutConstants.minWidgetWidth)
             );
             const layout = distributeFlexBoxLayout(rectAvailableSpace.width, {
                 spaceBefore: {
@@ -298,9 +300,9 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
                 if (!viewState) {
                     return children;
                 }
-                const currentUri = this._editorObs.model.read(reader)?.uri;
+                const currentModel = this._editorObs.model.read(reader);
                 const targetUri = viewState.target.uri;
-                const isCrossFileEdit = targetUri && (!currentUri || ( targetUri.toString()) !== ( currentUri.toString()));
+                const isCrossFileEdit = !currentModel || !viewState.target.targets(currentModel);
                 if (isCrossFileEdit) {
                     const fileName = basename(targetUri);
                     const iconClasses = getIconClasses(this._modelService, this._languageService, targetUri, FileKind.FILE);

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

@@ -5,6 +5,7 @@ import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
 import { clamp } from '../../../../../../../../base/common/numbers.js';
 import '../../../../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
+import { EditorOption } from '../../../../../../../common/config/editorOptions.js';
 import { observableCodeEditor } from '../../../../../../../browser/observableCodeEditor.js';
 import { EmbeddedCodeEditorWidget } from '../../../../../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { Position } from '../../../../../../../common/core/position.js';
@@ -22,6 +23,12 @@ import { constObservable } from '../../../../../../../../base/common/observableI
 import { autorun } from '../../../../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableValue } from '../../../../../../../../base/common/observableInternal/observables/observableValue.js';
 
+function expandLineRangeWithContext(targetLineNumber, contextLineCount, lineCount) {
+    const clampedTarget = Math.max(1, Math.min(lineCount, targetLineNumber));
+    const startLineNumber = Math.max(1, clampedTarget - contextLineCount);
+    const endLineNumberExclusive = Math.min(lineCount + 1, clampedTarget + contextLineCount + 1);
+    return ( new LineRange(startLineNumber, endLineNumberExclusive));
+}
 let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposable {
     constructor(
         _previewTextModel,
@@ -48,23 +55,27 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
                 return undefined;
             }
             let mode;
-            let visibleRange;
+            let targetLineNumber;
             if (props.nextCursorPosition !== null) {
                 mode = "original";
-                visibleRange = LineRange.ofLength(props.nextCursorPosition.lineNumber, 1);
+                targetLineNumber = props.nextCursorPosition.lineNumber;
             } else {
                 if (props.diff[0].innerChanges?.every(c => c.modifiedRange.isEmpty())) {
                     mode = "original";
-                    visibleRange = LineRange.ofLength(props.diff[0].original.startLineNumber, 1);
+                    targetLineNumber = props.diff[0].original.startLineNumber;
                 } else {
                     mode = "modified";
-                    visibleRange = LineRange.ofLength(props.diff[0].modified.startLineNumber, 1);
+                    targetLineNumber = props.diff[0].modified.startLineNumber;
                 }
             }
             const textModel = mode === "modified" ? TextModelValueReference.snapshot(this._previewTextModel) : props.target;
+            const contextLineCount = this._parentEditorObs.getOption(EditorOption.inlineSuggest).read(reader).edits.longDistanceHintContextLineCount;
+            const displayModel = mode === "modified" ? this._previewTextModel : props.target.dangerouslyGetUnderlyingModel();
+            const visibleLineRange = expandLineRangeWithContext(targetLineNumber, contextLineCount, displayModel.getLineCount());
             return {
                 mode,
-                visibleLineRange: visibleRange,
+                targetLineNumber,
+                visibleLineRange,
                 textModel,
                 diff: props.diff
             };
@@ -97,8 +108,7 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
             if (!viewState) {
                 return constObservable(null);
             }
-            const previewEditorHeight = this._previewEditorObs.observeLineHeightForLine(viewState.visibleLineRange.startLineNumber);
-            return previewEditorHeight;
+            return ( this._previewEditorObs.observeLineHeightsForLineRange(viewState.visibleLineRange).map(heights => heights.reduce((sum, height) => sum + height, 0)));
         }).flatten();
         this._editorDecorations = derived(this, reader => {
             const state = this._state.read(reader);
@@ -201,7 +211,7 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
             if (!state) {
                 return;
             }
-            const lineNumberDigets = ( state.visibleLineRange.startLineNumber.toString()).length;
+            const lineNumberDigets = ( (state.visibleLineRange.endLineNumberExclusive - 1).toString()).length;
             this.previewEditor.updateOptions({
                 lineNumbersMinChars: lineNumberDigets + 1
             });
@@ -218,7 +228,7 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
                 }
                 return ( new InlineEditsGutterIndicatorData(
                     props.inlineSuggestInfo,
-                    LineRange.ofLength(state.visibleLineRange.startLineNumber, 1),
+                    LineRange.ofLength(state.targetLineNumber, 1),
                     props.model,
                     undefined
                 ));
@@ -334,7 +344,7 @@ function growUntilVariableBoundaries(textModel, range, maxGrow) {
     }
     return ( new Range(
         startPosition.lineNumber,
-        startPosition.column,
+        startColumn,
         endPosition.lineNumber,
         endColumn + 1
     ));

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

@@ -18,14 +18,14 @@ import { InlineCompletionEditorType } from '../../model/provideInlineCompletions
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-const originalBackgroundColor = registerColor("inlineEdit.originalBackground", ( transparent(diffRemoved, 0.2)), ( localize(1370, "Background color for the original text in inline edits.")), true);
-const modifiedBackgroundColor = registerColor("inlineEdit.modifiedBackground", ( transparent(diffInserted, 0.3)), ( localize(1371, "Background color for the modified text in inline edits.")), true);
+const originalBackgroundColor = registerColor("inlineEdit.originalBackground", ( transparent(diffRemoved, 0.2)), ( localize(1384, "Background color for the original text in inline edits.")), true);
+const modifiedBackgroundColor = registerColor("inlineEdit.modifiedBackground", ( transparent(diffInserted, 0.3)), ( localize(1385, "Background color for the modified text in inline edits.")), true);
 registerColor("inlineEdit.originalChangedLineBackground", ( transparent(diffRemoved, 0.8)), ( localize(
-    1372,
+    1386,
     "Background color for the changed lines in the original text of inline edits."
 )), true);
 const originalChangedTextOverlayColor = registerColor("inlineEdit.originalChangedTextBackground", ( transparent(diffRemoved, 0.8)), ( localize(
-    1373,
+    1387,
     "Overlay color for the changed text in the original text of inline edits."
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor("inlineEdit.modifiedChangedLineBackground", {
@@ -34,84 +34,84 @@ const modifiedChangedLineBackgroundColor = registerColor("inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1374,
+    1388,
     "Background color for the changed lines in the modified text of inline edits."
 )), true);
 const modifiedChangedTextOverlayColor = registerColor("inlineEdit.modifiedChangedTextBackground", ( transparent(diffInserted, 0.7)), ( localize(
-    1375,
+    1389,
     "Overlay color for the changed text in the modified text of inline edits."
 )), true);
 const inlineEditIndicatorPrimaryForeground = registerColor(
     "inlineEdit.gutterIndicator.primaryForeground",
     buttonForeground,
-    ( localize(1376, "Foreground color for the primary inline edit gutter indicator."))
+    ( localize(1390, "Foreground color for the primary inline edit gutter indicator."))
 );
 const inlineEditIndicatorPrimaryBorder = registerColor(
     "inlineEdit.gutterIndicator.primaryBorder",
     buttonBackground,
-    ( localize(1377, "Border color for the primary inline edit gutter indicator."))
+    ( localize(1391, "Border color for the primary inline edit gutter indicator."))
 );
 const inlineEditIndicatorPrimaryBackground = registerColor("inlineEdit.gutterIndicator.primaryBackground", {
     light: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
     dark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcDark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcLight: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5))
-}, ( localize(1378, "Background color for the primary inline edit gutter indicator.")));
+}, ( localize(1392, "Background color for the primary inline edit gutter indicator.")));
 const inlineEditIndicatorSecondaryForeground = registerColor(
     "inlineEdit.gutterIndicator.secondaryForeground",
     editorHoverForeground,
-    ( localize(1379, "Foreground color for the secondary inline edit gutter indicator."))
+    ( localize(1393, "Foreground color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSecondaryBorder = registerColor(
     "inlineEdit.gutterIndicator.secondaryBorder",
     editorHoverBorder,
-    ( localize(1380, "Border color for the secondary inline edit gutter indicator."))
+    ( localize(1394, "Border color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSecondaryBackground = registerColor(
     "inlineEdit.gutterIndicator.secondaryBackground",
     editorHoverBackground,
-    ( localize(1381, "Background color for the secondary inline edit gutter indicator."))
+    ( localize(1395, "Background color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulForeground = registerColor(
     "inlineEdit.gutterIndicator.successfulForeground",
     buttonForeground,
-    ( localize(1382, "Foreground color for the successful inline edit gutter indicator."))
+    ( localize(1396, "Foreground color for the successful inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulBorder = registerColor(
     "inlineEdit.gutterIndicator.successfulBorder",
     buttonBackground,
-    ( localize(1383, "Border color for the successful inline edit gutter indicator."))
+    ( localize(1397, "Border color for the successful inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulBackground = registerColor(
     "inlineEdit.gutterIndicator.successfulBackground",
     inlineEditIndicatorSuccessfulBorder,
-    ( localize(1384, "Background color for the successful inline edit gutter indicator."))
+    ( localize(1398, "Background color for the successful inline edit gutter indicator."))
 );
 const inlineEditIndicatorBackground = registerColor("inlineEdit.gutterIndicator.background", {
     hcDark: ( transparent("tab.inactiveBackground", 0.5)),
     hcLight: ( transparent("tab.inactiveBackground", 0.5)),
     dark: ( transparent("tab.inactiveBackground", 0.5)),
     light: "#5f5f5f18"
-}, ( localize(1385, "Background color for the inline edit gutter indicator.")));
+}, ( localize(1399, "Background color for the inline edit gutter indicator.")));
 const originalBorder = registerColor("inlineEdit.originalBorder", {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1386, "Border color for the original text in inline edits.")));
+}, ( localize(1400, "Border color for the original text in inline edits.")));
 const modifiedBorder = registerColor("inlineEdit.modifiedBorder", {
     light: ( darken(diffInserted, 0.6)),
     dark: diffInserted,
     hcDark: diffInserted,
     hcLight: diffInserted
-}, ( localize(1387, "Border color for the modified text in inline edits.")));
+}, ( localize(1401, "Border color for the modified text in inline edits.")));
 const tabWillAcceptModifiedBorder = registerColor("inlineEdit.tabWillAcceptModifiedBorder", {
     light: ( darken(modifiedBorder, 0)),
     dark: ( darken(modifiedBorder, 0)),
     hcDark: ( darken(modifiedBorder, 0)),
     hcLight: ( darken(modifiedBorder, 0))
 }, ( localize(
-    1388,
+    1402,
     "Modified border color for the inline edits widget when tab will accept it."
 )));
 const tabWillAcceptOriginalBorder = registerColor("inlineEdit.tabWillAcceptOriginalBorder", {
@@ -120,7 +120,7 @@ const tabWillAcceptOriginalBorder = registerColor("inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1389,
+    1403,
     "Original border color for the inline edits widget over the original text when tab will accept it."
 )));
 function getModifiedBorderColor(tabAction) {