@codingame/monaco-vscode-api 22.1.9 → 23.0.0

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

@@ -82,6 +82,4 @@ export interface LineData {
     content: LineTokens;
     decorations: LineDecoration[];
 }
-export declare const ttPolicy: Pick<TrustedTypePolicy<{
-    createHTML: (value: string) => string;
-}>, "name" | "createHTML"> | undefined;
+export declare const ttPolicy: Pick<TrustedTypePolicy, "name" | "createHTML"> | undefined;

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

@@ -37,12 +37,10 @@ import { derived } from '../../../../../../base/common/observableInternal/observ
 import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableSignalFromEvent } from '../../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 
-var GhostTextView_1;
 registerCss(ghostTextView);
 const GHOST_TEXT_CLASS_NAME = 'ghost-text';
 let GhostTextView = class GhostTextView extends Disposable {
-    static { GhostTextView_1 = this; }
-    static { this.hot = createHotClass(GhostTextView_1); }
+    static { this.hot = createHotClass(this); }
     constructor(_editor, _model, _options, _shouldKeepCursorStable, _isClickable, _languageService) {
         super();
         this._editor = _editor;
@@ -234,7 +232,7 @@ let GhostTextView = class GhostTextView extends Disposable {
         return this._additionalLinesWidget.viewZoneId === viewZoneId;
     }
 };
-GhostTextView = GhostTextView_1 = ( __decorate([
+GhostTextView = ( __decorate([
     ( __param(5, ILanguageService))
 ], GhostTextView));
 class GhostTextAttachedData {

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

@@ -64,13 +64,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1301, "Go To"))} / ${( localize(1302, "Accept"))}`,
+            title: `${( localize(1303, "Go To"))} / ${( localize(1304, "Accept"))}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1303, "Reject")),
+            title: ( localize(1305, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -84,19 +84,25 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1304, "Show Expanded")),
+                title: ( localize(1306, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1305, "Show Collapsed")),
+                title: ( localize(1307, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
+        const snooze = option(createOptionArgs({
+            id: 'snooze',
+            title: ( localize(1308, "Snooze")),
+            icon: Codicon.bellSlash,
+            commandId: 'editor.action.inlineSuggest.snooze'
+        }));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1306, "Settings")),
+            title: ( localize(1309, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']
@@ -116,6 +122,7 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             reject,
             toggleCollapsedMode,
             extensionCommands.length ? separator() : undefined,
+            snooze,
             settings,
             ...extensionCommands,
             actionBarFooter ? separator() : undefined,

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

@@ -4,7 +4,7 @@ import { IAccessibilityService } from "../../../../../../../platform/accessibili
 import { IInstantiationService } from "../../../../../../../platform/instantiation/common/instantiation.js";
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
-import { HoverService } from "../../../../../../browser/services/hoverService/hoverService.js";
+import { HoverService } from "../../../../../../../platform/hover/browser/hoverService.js";
 import { LineRange } from "../../../../../../common/core/ranges/lineRange.js";
 import { IInlineEditModel } from "../inlineEditsViewInterface.js";
 export declare class InlineEditsGutterIndicator extends Disposable {

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

@@ -90,7 +90,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             }
             return {
                 range,
-                lineOffsetRange: this._editorObs.observeLineOffsetRange(range, this._store),
+                lineOffsetRange: this._editorObs.observeLineOffsetRange(range, reader.store),
             };
         });
         this._stickyScrollController = StickyScrollController.get(this._editorObs.editor);

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

@@ -1,7 +1,7 @@
 import { LineReplacement } from "../../../../../common/core/edits/lineEdit.js";
-import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
-import { Position } from "../../../../../common/core/position.js";
 import { TextEdit } from "../../../../../common/core/edits/textEdit.js";
+import { Position } from "../../../../../common/core/position.js";
+import { LineRange } from "../../../../../common/core/ranges/lineRange.js";
 import { AbstractText } from "../../../../../common/core/text/abstractText.js";
 import { InlineCompletionCommand } from "../../../../../common/languages.js";
 import { InlineSuggestionItem } from "../../model/inlineSuggestionItem.js";
@@ -9,12 +9,13 @@ export declare class InlineEditWithChanges {
     readonly originalText: AbstractText;
     readonly edit: TextEdit;
     readonly cursorPosition: Position;
+    readonly multiCursorPositions: readonly Position[];
     readonly commands: readonly InlineCompletionCommand[];
     readonly inlineCompletion: InlineSuggestionItem;
     get lineEdit(): LineReplacement;
     get originalLineRange(): LineRange;
     get modifiedLineRange(): LineRange;
     get displayRange(): LineRange;
-    constructor(originalText: AbstractText, edit: TextEdit, cursorPosition: Position, commands: readonly InlineCompletionCommand[], inlineCompletion: InlineSuggestionItem);
+    constructor(originalText: AbstractText, edit: TextEdit, cursorPosition: Position, multiCursorPositions: readonly Position[], commands: readonly InlineCompletionCommand[], inlineCompletion: InlineSuggestionItem);
     equals(other: InlineEditWithChanges): boolean;
 }

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

@@ -4,6 +4,9 @@ import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 
 class InlineEditWithChanges {
     get lineEdit() {
+        if (this.edit.replacements.length === 0) {
+            return ( new LineReplacement(( new LineRange(1, 1)), []));
+        }
         return LineReplacement.fromSingleTextEdit(this.edit.toReplacement(this.originalText), this.originalText);
     }
     get originalLineRange() { return this.lineEdit.lineRange; }
@@ -11,10 +14,11 @@ class InlineEditWithChanges {
     get displayRange() {
         return this.originalText.lineRange.intersect(this.originalLineRange.join(LineRange.ofLength(this.originalLineRange.startLineNumber, this.lineEdit.newLines.length)));
     }
-    constructor(originalText, edit, cursorPosition, commands, inlineCompletion) {
+    constructor(originalText, edit, cursorPosition, multiCursorPositions, commands, inlineCompletion) {
         this.originalText = originalText;
         this.edit = edit;
         this.cursorPosition = cursorPosition;
+        this.multiCursorPositions = multiCursorPositions;
         this.commands = commands;
         this.inlineCompletion = inlineCompletion;
     }

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

@@ -2,9 +2,9 @@ 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/ranges/lineRange.js";
-import { Command, InlineCompletionCommand, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
+import { Command, InlineCompletionCommand } from "../../../../../common/languages.js";
 import { InlineCompletionsModel } from "../../model/inlineCompletionsModel.js";
-import { InlineCompletionItem } from "../../model/inlineSuggestionItem.js";
+import { InlineCompletionItem, InlineSuggestHint } from "../../model/inlineSuggestionItem.js";
 import { IInlineEditHost, IInlineEditModel, InlineCompletionViewData, InlineCompletionViewKind, InlineEditTabAction } from "./inlineEditsViewInterface.js";
 import { InlineEditWithChanges } from "./inlineEditWithChanges.js";
 export declare class InlineEditModel implements IInlineEditModel {
@@ -15,12 +15,11 @@ export declare class InlineEditModel implements IInlineEditModel {
     readonly displayName: string;
     readonly extensionCommands: InlineCompletionCommand[];
     readonly isInDiffEditor: boolean;
-    readonly displayLocation: InlineCompletionDisplayLocation | undefined;
+    readonly displayLocation: InlineSuggestHint | undefined;
     readonly showCollapsed: IObservable<boolean>;
     constructor(_model: InlineCompletionsModel, inlineEdit: InlineEditWithChanges, tabAction: IObservable<InlineEditTabAction>);
     accept(): void;
     jump(): void;
-    abort(reason: string): void;
     handleInlineEditShown(viewKind: InlineCompletionViewKind, viewData: InlineCompletionViewData): void;
 }
 export declare class InlineEditHost implements IInlineEditHost {

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

@@ -14,10 +14,10 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1307, "Inline Edit"));
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1310, "Inline Edit"));
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
         this.isInDiffEditor = this._model.isInDiffEditor;
-        this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;
+        this.displayLocation = this.inlineEdit.inlineCompletion.hint;
         this.showCollapsed = this._model.showCollapsed;
     }
     accept() {
@@ -26,11 +26,6 @@ class InlineEditModel {
     jump() {
         this._model.jump();
     }
-    abort(reason) {
-        console.error(reason);
-        this.inlineEdit.inlineCompletion.reportInlineEditError(reason);
-        this._model.stop();
-    }
     handleInlineEditShown(viewKind, viewData) {
         this._model.handleInlineSuggestionShown(this.inlineEdit.inlineCompletion, viewKind, viewData);
     }
@@ -54,7 +49,7 @@ class GhostTextIndicator {
             }
             return InlineEditTabAction.Inactive;
         });
-        this.model = ( new InlineEditModel(model, ( new InlineEditWithChanges(( new StringText('')), ( new TextEdit([inlineCompletion.getSingleTextEdit()])), model.primaryPosition.get(), inlineCompletion.source.inlineSuggestions.commands ?? [], inlineCompletion)), tabAction));
+        this.model = ( new InlineEditModel(model, ( new InlineEditWithChanges(( new StringText('')), ( new TextEdit([inlineCompletion.getSingleTextEdit()])), model.primaryPosition.get(), model.allPositions.get(), inlineCompletion.source.inlineSuggestions.commands ?? [], inlineCompletion)), tabAction));
     }
 }
 

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

@@ -43,5 +43,6 @@ export declare class InlineEditsView extends Disposable {
     private getCacheId;
     private determineView;
     private determineRenderState;
+    private _willRenderAboveCursor;
     private _viewHasBeenShownLongerThan;
 }

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

@@ -1,21 +1,23 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { $ } from '../../../../../../base/browser/dom.js';
 import { equalsIfDefined, itemEquals } from '../../../../../../base/common/equals.js';
-import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+import { onUnexpectedError, BugIndicatingError } from '../../../../../../base/common/errors.js';
 import { Event } from '../../../../../../base/common/event.js';
 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 { EditorOption } from '../../../../../common/config/editorOptions.js';
-import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
-import { Range } from '../../../../../common/core/range.js';
 import { TextReplacement } from '../../../../../common/core/edits/textEdit.js';
+import { Range } from '../../../../../common/core/range.js';
+import { LineRange } from '../../../../../common/core/ranges/lineRange.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 { InlineEditItem } from '../../model/inlineSuggestionItem.js';
 import { InlineEditsGutterIndicator } from './components/gutterIndicatorView.js';
 import { InlineEditsOnboardingExperience } from './inlineEditsNewUsers.js';
 import { InlineEditTabAction, InlineCompletionViewKind } from './inlineEditsViewInterface.js';
@@ -29,7 +31,6 @@ 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 { $ } from '../../../../../../base/browser/dom.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';
@@ -59,7 +60,7 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             let diff = lineRangeMappingFromRangeMappings(mappings, inlineEdit.originalText, ( new StringText(newText)));
             let state = this.determineRenderState(model, reader, diff, ( new StringText(newText)));
             if (!state) {
-                model.abort(`unable to determine view: tried to render ${this._previousView?.view}`);
+                onUnexpectedError(( new Error(`unable to determine view: tried to render ${this._previousView?.view}`)));
                 return undefined;
             }
             if (state.kind === InlineCompletionViewKind.SideBySide) {
@@ -243,14 +244,17 @@ let InlineEditsView = class InlineEditsView extends Disposable {
     }
     determineView(model, reader, diff, newText) {
         const inlineEdit = model.inlineEdit;
-        const canUseCache = this._previousView?.id === this.getCacheId(model);
+        const canUseCache = this._previousView?.id === this.getCacheId(model) && !model.displayLocation?.jumpToEdit;
         const reconsiderViewEditorWidthChange = this._previousView?.editorWidth !== this._editorObs.layoutInfoWidth.read(reader) &&
             (this._previousView?.view === InlineCompletionViewKind.SideBySide ||
                 this._previousView?.view === InlineCompletionViewKind.LineReplacement);
         if (canUseCache && !reconsiderViewEditorWidthChange) {
             return this._previousView.view;
         }
-        if (model.displayLocation) {
+        if (model.inlineEdit.inlineCompletion instanceof InlineEditItem && model.inlineEdit.inlineCompletion.uri) {
+            return InlineCompletionViewKind.Custom;
+        }
+        if (model.displayLocation && !model.inlineEdit.inlineCompletion.identity.jumpedTo.read(reader)) {
             return InlineCompletionViewKind.Custom;
         }
         const numOriginalLines = inlineEdit.originalLineRange.length;
@@ -307,7 +311,15 @@ let InlineEditsView = class InlineEditsView extends Disposable {
     }
     determineRenderState(model, reader, diff, newText) {
         const inlineEdit = model.inlineEdit;
-        const view = this.determineView(model, reader, diff, newText);
+        let view = this.determineView(model, reader, diff, newText);
+        if (this._willRenderAboveCursor(reader, inlineEdit, view)) {
+            switch (view) {
+                case InlineCompletionViewKind.LineReplacement:
+                case InlineCompletionViewKind.WordReplacements:
+                    view = InlineCompletionViewKind.SideBySide;
+                    break;
+            }
+        }
         this._previousView = { id: this.getCacheId(model), view, editorWidth: this._editor.getLayoutInfo().width, timestamp: Date.now() };
         const inner = diff.flatMap(d => d.innerChanges ?? []);
         const textModel = this._editor.getModel();
@@ -318,9 +330,9 @@ let InlineEditsView = class InlineEditsView extends Disposable {
             modified: newText.getValueOfRange(m.modifiedRange)
         })));
         const cursorPosition = inlineEdit.cursorPosition;
-        const startsWithEOL = stringChanges[0].modified.startsWith(textModel.getEOL());
+        const startsWithEOL = stringChanges.length === 0 ? false : stringChanges[0].modified.startsWith(textModel.getEOL());
         const viewData = {
-            cursorColumnDistance: inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
+            cursorColumnDistance: inlineEdit.edit.replacements.length === 0 ? 0 : inlineEdit.edit.replacements[0].range.getStartPosition().column - cursorPosition.column,
             cursorLineDistance: inlineEdit.lineEdit.lineRange.startLineNumber - cursorPosition.lineNumber + (startsWithEOL && inlineEdit.lineEdit.lineRange.startLineNumber >= cursorPosition.lineNumber ? 1 : 0),
             lineCountOriginal: inlineEdit.lineEdit.lineRange.length,
             lineCountModified: inlineEdit.lineEdit.newLines.length,
@@ -380,6 +392,24 @@ let InlineEditsView = class InlineEditsView extends Disposable {
         }
         return undefined;
     }
+    _willRenderAboveCursor(reader, inlineEdit, view) {
+        const useCodeShifting = this._useCodeShifting.read(reader);
+        if (useCodeShifting === 'always') {
+            return false;
+        }
+        for (const cursorPosition of inlineEdit.multiCursorPositions) {
+            if (view === InlineCompletionViewKind.WordReplacements &&
+                cursorPosition.lineNumber === inlineEdit.originalLineRange.startLineNumber + 1) {
+                return true;
+            }
+            if (view === InlineCompletionViewKind.LineReplacement &&
+                cursorPosition.lineNumber >= inlineEdit.originalLineRange.endLineNumberExclusive &&
+                cursorPosition.lineNumber < inlineEdit.modifiedLineRange.endLineNumberExclusive + inlineEdit.modifiedLineRange.length) {
+                return true;
+            }
+        }
+        return false;
+    }
     _viewHasBeenShownLongerThan(durationMs) {
         const viewCreationTime = this._previousView?.timestamp;
         if (!viewCreationTime) {

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

@@ -1,7 +1,8 @@
 import { IMouseEvent } from "../../../../../../base/browser/mouseEvent.js";
 import { Event } from "../../../../../../base/common/event.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
-import { Command, InlineCompletionCommand, InlineCompletionDisplayLocation } from "../../../../../common/languages.js";
+import { Command, InlineCompletionCommand } from "../../../../../common/languages.js";
+import { InlineSuggestHint } from "../../model/inlineSuggestionItem.js";
 import { InlineEditWithChanges } from "./inlineEditWithChanges.js";
 export declare enum InlineEditTabAction {
     Jump = "jump",
@@ -11,7 +12,7 @@ export declare enum InlineEditTabAction {
 export interface IInlineEditsView {
     isHovered: IObservable<boolean>;
     minEditorScrollHeight?: IObservable<number>;
-    onDidClick: Event<IMouseEvent>;
+    readonly onDidClick: Event<IMouseEvent>;
 }
 export interface IInlineEditHost {
     readonly onDidAccept: Event<void>;
@@ -25,11 +26,10 @@ export interface IInlineEditModel {
     inlineEdit: InlineEditWithChanges;
     tabAction: IObservable<InlineEditTabAction>;
     showCollapsed: IObservable<boolean>;
-    displayLocation: InlineCompletionDisplayLocation | undefined;
+    displayLocation: InlineSuggestHint | undefined;
     handleInlineEditShown(viewKind: string, viewData?: InlineCompletionViewData): void;
     accept(): void;
     jump(): void;
-    abort(reason: string): void;
 }
 export declare enum InlineCompletionViewKind {
     GhostText = "ghostText",

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

@@ -15,10 +15,8 @@ import { InlineEditsView } from './inlineEditsView.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
 
-var InlineEditsViewAndDiffProducer_1;
 let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extends Disposable {
-    static { InlineEditsViewAndDiffProducer_1 = this; }
-    static { this.hot = createHotClass(InlineEditsViewAndDiffProducer_1); }
+    static { this.hot = createHotClass(this); }
     constructor(_editor, _edit, _model, _focusIsInMenu, instantiationService) {
         super();
         this._editor = _editor;
@@ -52,6 +50,7 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
                 text,
                 diffEdits,
                 model.primaryPosition.read(undefined),
+                model.allPositions.read(undefined),
                 inlineEdit.commands,
                 inlineEdit.inlineCompletion
             ));
@@ -108,7 +107,7 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
         this._register(instantiationService.createInstance(InlineEditsView, this._editor, this._inlineEditHost, this._inlineEditModel, this._ghostTextIndicator, this._focusIsInMenu));
     }
 };
-InlineEditsViewAndDiffProducer = InlineEditsViewAndDiffProducer_1 = ( __decorate([
+InlineEditsViewAndDiffProducer = ( __decorate([
     ( __param(4, IInstantiationService))
 ], InlineEditsViewAndDiffProducer));
 

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

@@ -3,8 +3,8 @@ import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../../../../base/common/observable.js";
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
-import { InlineCompletionDisplayLocation } from "../../../../../../common/languages.js";
 import { ILanguageService } from "../../../../../../common/languages/language.service.js";
+import { InlineSuggestHint } from "../../../model/inlineSuggestionItem.js";
 import { IInlineEditsView, InlineEditTabAction } from "../inlineEditsViewInterface.js";
 export declare class InlineEditsCustomView extends Disposable implements IInlineEditsView {
     private readonly _editor;
@@ -16,7 +16,7 @@ export declare class InlineEditsCustomView extends Disposable implements IInline
     private readonly _viewRef;
     private readonly _editorObs;
     readonly minEditorScrollHeight: IObservable<number>;
-    constructor(_editor: ICodeEditor, displayLocation: IObservable<InlineCompletionDisplayLocation | undefined>, tabAction: IObservable<InlineEditTabAction>, themeService: IThemeService, _languageService: ILanguageService);
+    constructor(_editor: ICodeEditor, displayLocation: IObservable<InlineSuggestHint | undefined>, tabAction: IObservable<InlineEditTabAction>, themeService: IThemeService, _languageService: ILanguageService);
     private fitsInsideViewport;
     private getState;
     private getRendering;

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

@@ -22,7 +22,7 @@ import { renderLines, LineSource, RenderOptions } from '../../../../../../browse
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { Rect } from '../../../../../../common/core/2d/rect.js';
 import { LineRange } from '../../../../../../common/core/ranges/lineRange.js';
-import { InlineCompletionDisplayLocationKind } from '../../../../../../common/languages.js';
+import { InlineCompletionHintStyle } from '../../../../../../common/languages.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { TokenArray, LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
@@ -144,7 +144,7 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
         });
         const startLineNumber = displayLocation.range.startLineNumber;
         const endLineNumber = displayLocation.range.endLineNumber;
-        const fitsInsideViewport = this.fitsInsideViewport(( new LineRange(startLineNumber, endLineNumber + 1)), displayLocation.label, undefined);
+        const fitsInsideViewport = this.fitsInsideViewport(( new LineRange(startLineNumber, endLineNumber + 1)), displayLocation.content, undefined);
         const rect = derived(this, reader => {
             const w = this._editorObs.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
             const { lineWidth, lineWidthBelow, lineWidthAbove, startContentLeftOffset, endContentLeftOffset } = contentState.read(reader);
@@ -191,20 +191,20 @@ let InlineEditsCustomView = class InlineEditsCustomView extends Disposable {
                     break;
                 }
             }
-            const textRect = Rect.fromLeftTopWidthHeight(contentLeft + contentStartOffset - scrollLeft, topOfLine - scrollTop, w * displayLocation.label.length, lineHeight);
+            const textRect = Rect.fromLeftTopWidthHeight(contentLeft + contentStartOffset - scrollLeft, topOfLine - scrollTop, w * displayLocation.content.length, lineHeight);
             return textRect.withMargin(PADDING_VERTICALLY, PADDING_HORIZONTALLY).translateX(deltaX).translateY(deltaY);
         });
         return {
             rect,
-            label: displayLocation.label,
-            kind: displayLocation.kind
+            label: displayLocation.content,
+            kind: displayLocation.style
         };
     }
     getRendering(state, styles) {
         const line = createElement('div');
         const t = this._editor.getModel().tokenization.tokenizeLinesAt(1, [state.label])?.[0];
         let tokens;
-        if (t && state.kind === InlineCompletionDisplayLocationKind.Code) {
+        if (t && state.kind === InlineCompletionHintStyle.Code) {
             tokens = TokenArray.fromLineTokens(t).toLineTokens(state.label, this._languageService.languageIdCodec);
         }
         else {

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

@@ -45,7 +45,7 @@ let InlineEditsLineReplacementView = class InlineEditsLineReplacementView extend
         this._onDidClick = this._register(( new Emitter()));
         this.onDidClick = this._onDidClick.event;
         this._maxPrefixTrim = ( this._edit.map(
-            e => e ? getPrefixTrim(e.replacements.flatMap(r => [r.originalRange, r.modifiedRange]), e.originalRange, e.modifiedLines, this._editor.editor) : undefined
+            (e, reader) => e ? getPrefixTrim(e.replacements.flatMap(r => [r.originalRange, r.modifiedRange]), e.originalRange, e.modifiedLines, this._editor.editor, reader) : undefined
         ));
         this._modifiedLineElements = derived(this, reader => {
             const lines = [];

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

@@ -16,14 +16,14 @@ import '../../../../../../platform/theme/common/colors/searchColors.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1308, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1309, 'Background color for the modified text in inline edits.')), true);
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1311, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1312, 'Background color for the modified text in inline edits.')), true);
 registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1310,
+    1313,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
 const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1311,
+    1314,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
@@ -32,52 +32,52 @@ const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1312,
+    1315,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
 const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
-    1313,
+    1316,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1314, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1315, 'Border color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1317, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1318, '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(1316, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1317, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1318, 'Border color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1319, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1320, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1321, 'Border color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1322, 'Background color for the successful inline edit gutter indicator.')));
+}, ( localize(1319, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1320, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1321, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1322, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1323, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1324, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1325, '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(1323, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1326, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1324, 'Border color for the original text in inline edits.')));
+}, ( localize(1327, '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(1325, 'Border color for the modified text in inline edits.')));
+}, ( localize(1328, '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(
-    1326,
+    1329,
     'Modified border color for the inline edits widget when tab will accept it.'
 )));
 const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
@@ -86,7 +86,7 @@ const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1327,
+    1330,
     '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.d.ts

@@ -1,5 +1,5 @@
 import { DisposableStore } from "../../../../../../../base/common/lifecycle.js";
-import { IObservable, IReader } from "../../../../../../../base/common/observable.js";
+import { DebugLocation, IObservable, IReader } from "../../../../../../../base/common/observable.js";
 import { URI } from "../../../../../../../base/common/uri.js";
 import { MenuEntryActionViewItem } from "../../../../../../../platform/actions/browser/menuEntryActionViewItem.js";
 import { ICodeEditor } from "../../../../../../browser/editorBrowser.js";
@@ -14,7 +14,7 @@ import { RangeMapping } from "../../../../../../common/diff/rangeMapping.js";
 import { ITextModel } from "../../../../../../common/model.js";
 export declare function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): number;
 export declare function getOffsetForPos(editor: ObservableCodeEditor, pos: Position, reader: IReader): number;
-export declare function getPrefixTrim(diffRanges: Range[], originalLinesRange: LineRange, modifiedLines: string[], editor: ICodeEditor): {
+export declare function getPrefixTrim(diffRanges: Range[], originalLinesRange: LineRange, modifiedLines: string[], editor: ICodeEditor, reader?: IReader | undefined): {
     prefixTrim: number;
     prefixLeftOffset: number;
 };
@@ -69,7 +69,7 @@ export declare function observeElementPosition(element: HTMLElement, store: Disp
     top: import("../../../../../../../base/common/observable.js").ISettableObservable<number, void>;
     left: import("../../../../../../../base/common/observable.js").ISettableObservable<number, void>;
 };
-export declare function rectToProps(fn: (reader: IReader) => Rect): {
+export declare function rectToProps(fn: (reader: IReader) => Rect, debugLocation?: DebugLocation): {
     left: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
     top: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;
     width: import("../../../../../../../base/common/observable.js").IObservableWithChange<number, void>;