@codingame/monaco-vscode-api 26.2.1 → 27.0.0

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

@@ -35,6 +35,11 @@ import { LongDistancePreviewEditor } from './longDistancePreviewEditor.js';
 import { jumpToNextInlineEditId } from '../../../../controller/commandIds.js';
 import { splitIntoContinuousLineRanges, WidgetPlacementContext } from './longDistnaceWidgetPlacement.js';
 import { InlineCompletionEditorType } from '../../../../model/provideInlineCompletions.js';
+import { basename } from '../../../../../../../../base/common/resources.js';
+import { IModelService } from '../../../../../../../common/services/model.service.js';
+import { ILanguageService } from '../../../../../../../common/languages/language.service.js';
+import { getIconClasses } from '../../../../../../../common/services/getIconClasses.js';
+import { FileKind } from '../../../../../../../../platform/files/common/files.js';
 import { debouncedObservable2 } from '../../../../../../../../base/common/observableInternal/utils/utils.js';
 import { derived, derivedDisposable } from '../../../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableFromEvent } from '../../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
@@ -62,7 +67,9 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
         _tabAction,
         _instantiationService,
         _themeService,
-        _keybindingService
+        _keybindingService,
+        _modelService,
+        _languageService
     ) {
         super();
         this._editor = _editor;
@@ -72,6 +79,8 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
         this._instantiationService = _instantiationService;
         this._themeService = _themeService;
         this._keybindingService = _keybindingService;
+        this._modelService = _modelService;
+        this._languageService = _languageService;
         this.onDidClick = Event.None;
         this._viewWithElement = undefined;
         this._hintTextPosition = derived(this, reader => {
@@ -239,7 +248,7 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
         this._widgetContent = derived(
             this,
             reader => n.div({
-                class: "inline-edits-long-distance-hint-widget",
+                class: ["inline-edits-long-distance-hint-widget", "show-file-icons"],
                 style: {
                     position: "absolute",
                     overflow: "hidden",
@@ -289,45 +298,70 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
                 if (!viewState) {
                     return children;
                 }
-                const source = this._originalOutlineSource.read(reader);
-                const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
-                const outlineItems = source?.getAt(originalTargetLineNumber, reader).slice(0, 1) ?? [];
-                const outlineElements = [];
-                if (outlineItems.length > 0) {
-                    for (let i = 0; i < outlineItems.length; i++) {
-                        const item = outlineItems[i];
-                        const icon = SymbolKinds.toIcon(item.kind);
-                        outlineElements.push(n.div({
-                            class: "breadcrumb-item",
-                            style: {
-                                display: "flex",
-                                alignItems: "center",
-                                flex: "1 1 auto",
-                                whiteSpace: "nowrap",
-                                overflow: "hidden",
-                                textOverflow: "ellipsis"
-                            }
-                        }, [
-                            renderIcon(icon),
-                            " ",
-                            item.name,
-                            ...(i === outlineItems.length - 1 ? [] : [renderIcon(Codicon.chevronRight)])
-                        ]));
+                const currentUri = this._editorObs.model.read(reader)?.uri;
+                const targetUri = viewState.target.uri;
+                const isCrossFileEdit = targetUri && (!currentUri || ( targetUri.toString()) !== ( currentUri.toString()));
+                if (isCrossFileEdit) {
+                    const fileName = basename(targetUri);
+                    const iconClasses = getIconClasses(this._modelService, this._languageService, targetUri, FileKind.FILE);
+                    children.push(n.div({
+                        class: "target-file",
+                        style: {
+                            display: "flex",
+                            alignItems: "center",
+                            overflow: "hidden",
+                            textOverflow: "ellipsis",
+                            whiteSpace: "nowrap"
+                        }
+                    }, [n.elem("span", {
+                        class: iconClasses,
+                        style: {
+                            flexShrink: "0",
+                            marginRight: "4px"
+                        }
+                    }), fileName]));
+                } else {
+                    const source = this._originalOutlineSource.read(reader);
+                    const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
+                    const outlineItems = source?.getAt(originalTargetLineNumber, reader).slice(0, 1) ?? [];
+                    const outlineElements = [];
+                    if (outlineItems.length > 0) {
+                        for (let i = 0; i < outlineItems.length; i++) {
+                            const item = outlineItems[i];
+                            const icon = SymbolKinds.toIcon(item.kind);
+                            outlineElements.push(n.div({
+                                class: "breadcrumb-item",
+                                style: {
+                                    display: "flex",
+                                    alignItems: "center",
+                                    flex: "1 1 auto",
+                                    whiteSpace: "nowrap",
+                                    overflow: "hidden",
+                                    textOverflow: "ellipsis"
+                                }
+                            }, [
+                                renderIcon(icon),
+                                " ",
+                                item.name,
+                                ...(i === outlineItems.length - 1 ? [] : [renderIcon(Codicon.chevronRight)])
+                            ]));
+                        }
                     }
+                    children.push(n.div({
+                        class: "outline-elements",
+                        style: {
+                            overflow: "hidden",
+                            textOverflow: "ellipsis",
+                            whiteSpace: "nowrap"
+                        }
+                    }, outlineElements));
                 }
-                children.push(n.div({
-                    class: "outline-elements",
-                    style: {
-                        overflow: "hidden",
-                        textOverflow: "ellipsis",
-                        whiteSpace: "nowrap"
-                    }
-                }, outlineElements));
-                const arrowIcon = viewState.hint.lineNumber < originalTargetLineNumber ? Codicon.arrowDown : Codicon.arrowUp;
+                const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
+                const arrowIcon = isCrossFileEdit ? Codicon.arrowRight : (viewState.hint.lineNumber < originalTargetLineNumber ? Codicon.arrowDown : Codicon.arrowUp);
                 const keybinding = this._keybindingService.lookupKeybinding(jumpToNextInlineEditId);
-                let label = "Go to suggestion";
+                let label = isCrossFileEdit ? "Go to file" : "Go to suggestion";
                 if (keybinding && keybinding.getLabel() === "Tab") {
-                    label = "Tab to jump";
+                    label = isCrossFileEdit ? "Tab to open" : "Tab to jump";
                 }
                 children.push(n.div({
                     class: "go-to-label",
@@ -398,7 +432,8 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
                     diff: viewState.diff,
                     model: viewState.model,
                     inlineSuggestInfo: viewState.inlineSuggestInfo,
-                    nextCursorPosition: viewState.nextCursorPosition
+                    nextCursorPosition: viewState.nextCursorPosition,
+                    target: viewState.target
                 };
             }), this._editor, this._tabAction)
         );
@@ -426,7 +461,7 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
         return this._widgetContent.get().didMouseMoveDuringHover;
     }
 };
-InlineEditsLongDistanceHint = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IThemeService)), ( __param(6, IKeybindingService))], InlineEditsLongDistanceHint));
+InlineEditsLongDistanceHint = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, IThemeService)), ( __param(6, IKeybindingService)), ( __param(7, IModelService)), ( __param(8, ILanguageService))], InlineEditsLongDistanceHint));
 function lengthsToOffsetRanges(lengths, initialOffset = 0) {
     const result = [];
     let offset = initialOffset;

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

@@ -10,11 +10,17 @@ import { DetailedLineRangeMapping } from "../../../../../../../common/diff/range
 import { ITextModel } from "../../../../../../../common/model.js";
 import { InlineSuggestionGutterMenuData, SimpleInlineSuggestModel } from "../../components/gutterIndicatorView.js";
 import { InlineEditTabAction } from "../../inlineEditsViewInterface.js";
+import { TextModelValueReference } from "../../../../model/textModelValueReference.js";
 export interface ILongDistancePreviewProps {
     nextCursorPosition: Position | null;
     diff: DetailedLineRangeMapping[];
     model: SimpleInlineSuggestModel;
     inlineSuggestInfo: InlineSuggestionGutterMenuData;
+    /**
+     * The URI of the file the edit targets.
+     * When undefined (or same as the editor's model URI), the edit targets the current file.
+     */
+    target: TextModelValueReference;
 }
 export declare class LongDistancePreviewEditor extends Disposable {
     private readonly _previewTextModel;

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

@@ -16,6 +16,7 @@ import { InlineCompletionContextKeys } from '../../../../controller/inlineComple
 import { InlineEditsGutterIndicator, InlineEditsGutterIndicatorData } from '../../components/gutterIndicatorView.js';
 import { classNames, maxContentWidthInRange } from '../../utils/utils.js';
 import '../jumpToView.js';
+import { TextModelValueReference } from '../../../../model/textModelValueReference.js';
 import { derived } from '../../../../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { autorun } from '../../../../../../../../base/common/observableInternal/reactions/autorun.js';
@@ -60,7 +61,7 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
                     visibleRange = LineRange.ofLength(props.diff[0].modified.startLineNumber, 1);
                 }
             }
-            const textModel = mode === "original" ? this._parentEditorObs.model.read(reader) : this._previewTextModel;
+            const textModel = mode === "modified" ? TextModelValueReference.snapshot(this._previewTextModel) : props.target;
             return {
                 mode,
                 visibleLineRange: visibleRange,
@@ -174,7 +175,7 @@ let LongDistancePreviewEditor = class LongDistancePreviewEditor extends Disposab
         this._register(autorun(reader => {
             const tm = this._state.read(reader)?.textModel || null;
             if (tm) {
-                this.previewEditor.setModel(tm);
+                this.previewEditor.setModel(tm.dangerouslyGetUnderlyingModel());
             }
         }));
         this._previewEditorObs = observableCodeEditor(this.previewEditor);

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(1328, "Background color for the original text in inline edits.")), true);
-const modifiedBackgroundColor = registerColor("inlineEdit.modifiedBackground", ( transparent(diffInserted, 0.3)), ( localize(1329, "Background color for the modified text in inline edits.")), true);
+const originalBackgroundColor = registerColor("inlineEdit.originalBackground", ( transparent(diffRemoved, 0.2)), ( localize(1349, "Background color for the original text in inline edits.")), true);
+const modifiedBackgroundColor = registerColor("inlineEdit.modifiedBackground", ( transparent(diffInserted, 0.3)), ( localize(1350, "Background color for the modified text in inline edits.")), true);
 registerColor("inlineEdit.originalChangedLineBackground", ( transparent(diffRemoved, 0.8)), ( localize(
-    1330,
+    1351,
     "Background color for the changed lines in the original text of inline edits."
 )), true);
 const originalChangedTextOverlayColor = registerColor("inlineEdit.originalChangedTextBackground", ( transparent(diffRemoved, 0.8)), ( localize(
-    1331,
+    1352,
     "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(
-    1332,
+    1353,
     "Background color for the changed lines in the modified text of inline edits."
 )), true);
 const modifiedChangedTextOverlayColor = registerColor("inlineEdit.modifiedChangedTextBackground", ( transparent(diffInserted, 0.7)), ( localize(
-    1333,
+    1354,
     "Overlay color for the changed text in the modified text of inline edits."
 )), true);
 const inlineEditIndicatorPrimaryForeground = registerColor(
     "inlineEdit.gutterIndicator.primaryForeground",
     buttonForeground,
-    ( localize(1334, "Foreground color for the primary inline edit gutter indicator."))
+    ( localize(1355, "Foreground color for the primary inline edit gutter indicator."))
 );
 const inlineEditIndicatorPrimaryBorder = registerColor(
     "inlineEdit.gutterIndicator.primaryBorder",
     buttonBackground,
-    ( localize(1335, "Border color for the primary inline edit gutter indicator."))
+    ( localize(1356, "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(1336, "Background color for the primary inline edit gutter indicator.")));
+}, ( localize(1357, "Background color for the primary inline edit gutter indicator.")));
 const inlineEditIndicatorSecondaryForeground = registerColor(
     "inlineEdit.gutterIndicator.secondaryForeground",
     editorHoverForeground,
-    ( localize(1337, "Foreground color for the secondary inline edit gutter indicator."))
+    ( localize(1358, "Foreground color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSecondaryBorder = registerColor(
     "inlineEdit.gutterIndicator.secondaryBorder",
     editorHoverBorder,
-    ( localize(1338, "Border color for the secondary inline edit gutter indicator."))
+    ( localize(1359, "Border color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSecondaryBackground = registerColor(
     "inlineEdit.gutterIndicator.secondaryBackground",
     editorHoverBackground,
-    ( localize(1339, "Background color for the secondary inline edit gutter indicator."))
+    ( localize(1360, "Background color for the secondary inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulForeground = registerColor(
     "inlineEdit.gutterIndicator.successfulForeground",
     buttonForeground,
-    ( localize(1340, "Foreground color for the successful inline edit gutter indicator."))
+    ( localize(1361, "Foreground color for the successful inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulBorder = registerColor(
     "inlineEdit.gutterIndicator.successfulBorder",
     buttonBackground,
-    ( localize(1341, "Border color for the successful inline edit gutter indicator."))
+    ( localize(1362, "Border color for the successful inline edit gutter indicator."))
 );
 const inlineEditIndicatorSuccessfulBackground = registerColor(
     "inlineEdit.gutterIndicator.successfulBackground",
     inlineEditIndicatorSuccessfulBorder,
-    ( localize(1342, "Background color for the successful inline edit gutter indicator."))
+    ( localize(1363, "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(1343, "Background color for the inline edit gutter indicator.")));
+}, ( localize(1364, "Background color for the inline edit gutter indicator.")));
 const originalBorder = registerColor("inlineEdit.originalBorder", {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1344, "Border color for the original text in inline edits.")));
+}, ( localize(1365, "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(1345, "Border color for the modified text in inline edits.")));
+}, ( localize(1366, "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(
-    1346,
+    1367,
     "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(
-    1347,
+    1368,
     "Original border color for the inline edits widget over the original text when tab will accept it."
 )));
 function getModifiedBorderColor(tabAction) {

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

@@ -3,7 +3,6 @@ import '../../../../../../../base/browser/dom.js';
 import '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { numberComparator } from '../../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../../base/common/arraysFind.js';
-import '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/observableInternal/index.js';
 import '../../../../../../../base/common/platform.js';
 import { splitLines } from '../../../../../../../base/common/strings.js';
@@ -118,10 +117,10 @@ function getEditorValidOverlayRect(editor) {
         name: "editor.validOverlay.width"
     }, r => {
         const hasMinimapOnTheRight = editor.layoutInfoMinimap.read(r).minimapLeft !== 0;
-        const editorWidth = editor.layoutInfoWidth.read(r) - contentLeft.read(r);
+        const editorWidth = Math.max(0, editor.layoutInfoWidth.read(r) - contentLeft.read(r));
         if (hasMinimapOnTheRight) {
             const minimapAndScrollbarWidth = editor.layoutInfoMinimap.read(r).minimapWidth + editor.layoutInfoVerticalScrollbarWidth.read(r);
-            return editorWidth - minimapAndScrollbarWidth;
+            return Math.max(0, editorWidth - minimapAndScrollbarWidth);
         }
         return editorWidth;
     });

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

@@ -217,6 +217,10 @@
 	.monaco-keybinding-key {
 		font-size: 13px;
 		opacity: 0.7;
+		padding: 0;
+		border: none;
+		margin: 0;
+		min-width: unset;
 	}
 
 	&.active {
@@ -260,3 +264,13 @@
 	width: 4px;
 }
 
+/* File icon in long distance hint widget */
+.inline-edits-long-distance-hint-widget.show-file-icons .target-file .file-icon::before {
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	vertical-align: text-bottom;
+	background-size: 16px;
+	background-position: center;
+	background-repeat: no-repeat;
+}

package/vscode/src/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine.js

@@ -11,7 +11,7 @@ class InsertFinalNewLineAction extends EditorAction {
     constructor() {
         super({
             id: InsertFinalNewLineAction.ID,
-            label: ( localize2(1348, "Insert Final New Line")),
+            label: ( localize2(1369, "Insert Final New Line")),
             precondition: EditorContextKeys.writable
         });
     }

package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js

@@ -11,7 +11,7 @@ class ExpandLineSelectionAction extends EditorAction {
     constructor() {
         super({
             id: "expandLineSelection",
-            label: ( localize2(1349, "Expand Line Selection")),
+            label: ( localize2(1370, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,