@codingame/monaco-vscode-api 18.4.0 → 19.0.1

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

@@ -1,127 +1,100 @@
 
 import { assertNever } from '../../../../../base/common/assert.js';
-import { DeferredPromise, AsyncIterableObject } from '../../../../../base/common/async.js';
-import { CancellationToken, CancellationTokenSource } from '../../../../../base/common/cancellation.js';
+import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
-import { SetMap } from '../../../../../base/common/map.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { StringReplacement } from '../../../../common/core/edits/stringEdit.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
-import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { TextReplacement } from '../../../../common/core/edits/textEdit.js';
-import { InlineCompletionTriggerKind, InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
+import { InlineCompletionEndOfLifeReasonKind } from '../../../../common/languages.js';
 import { fixBracketsInLine } from '../../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
-import { TextModelText } from '../../../../common/model/textModelText.js';
 import { SnippetParser, Text } from '../../../snippet/browser/snippetParser.js';
 import { getReadonlyEmptyArray } from '../utils.js';
+import { groupByMap } from '../../../../../base/common/collections.js';
+import { DirectedGraph } from './graph.js';
+import { CachedFunction } from '../../../../../base/common/cache.js';
+import { InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
+import { isDefined } from '../../../../../base/common/types.js';
+import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
 
-async function provideInlineCompletions(providers, positionOrRange, model, context, baseToken = CancellationToken.None, languageConfigurationService) {
-    const requestUuid = generateUuid();
-    const tokenSource = ( new CancellationTokenSource(baseToken));
-    const token = tokenSource.token;
+function provideInlineCompletions(providers, position, model, context, requestInfo, languageConfigurationService) {
+    const requestUuid = 'icr-' + generateUuid();
+    const cancellationTokenSource = ( new CancellationTokenSource());
+    let cancelReason = undefined;
     const contextWithUuid = { ...context, requestUuid: requestUuid };
-    const defaultReplaceRange = positionOrRange instanceof Position ? getDefaultRange(positionOrRange, model) : positionOrRange;
-    const multiMap = ( new SetMap());
-    for (const provider of providers) {
-        if (provider.groupId) {
-            multiMap.add(provider.groupId, provider);
-        }
+    const defaultReplaceRange = getDefaultRange(position, model);
+    const providersByGroupId = groupByMap(providers, p => p.groupId);
+    const yieldsToGraph = DirectedGraph.from(providers, p => {
+        return p.yieldsToGroupIds?.flatMap(groupId => providersByGroupId.get(groupId) ?? []) ?? [];
+    });
+    const { foundCycles } = yieldsToGraph.removeCycles();
+    if (foundCycles.length > 0) {
+        onUnexpectedExternalError(( new Error(`Inline completions: cyclic yield-to dependency detected.`
+            + ` Path: ${( foundCycles.map(s => s.toString ? ( s.toString()) : ('' + s))).join(' -> ')}`)));
     }
-    function getPreferredProviders(provider) {
-        if (!provider.yieldsToGroupIds) {
-            return [];
-        }
-        const result = [];
-        for (const groupId of provider.yieldsToGroupIds || []) {
-            const providers = multiMap.get(groupId);
-            for (const p of providers) {
-                result.push(p);
-            }
-        }
-        return result;
-    }
-    function findPreferredProviderCircle(provider, stack, seen) {
-        stack = [...stack, provider];
-        if (( seen.has(provider))) {
-            return stack;
-        }
-        seen.add(provider);
+    let runningCount = 0;
+    const queryProvider = ( new CachedFunction(async (provider) => {
         try {
-            const preferred = getPreferredProviders(provider);
-            for (const p of preferred) {
-                const c = findPreferredProviderCircle(p, stack, seen);
-                if (c) {
-                    return c;
-                }
+            runningCount++;
+            if (cancellationTokenSource.token.isCancellationRequested) {
+                return undefined;
             }
-        }
-        finally {
-            seen.delete(provider);
-        }
-        return undefined;
-    }
-    function queryProviderOrPreferredProvider(provider, states) {
-        const state = states.get(provider);
-        if (state) {
-            return state;
-        }
-        const circle = findPreferredProviderCircle(provider, [], ( new Set()));
-        if (circle) {
-            onUnexpectedExternalError(( new Error(`Inline completions: cyclic yield-to dependency detected.`
-                + ` Path: ${( circle.map(s => s.toString ? ( s.toString()) : ('' + s))).join(' -> ')}`)));
-        }
-        const deferredPromise = ( new DeferredPromise());
-        states.set(provider, deferredPromise.p);
-        (async () => {
-            if (!circle) {
-                const preferred = getPreferredProviders(provider);
-                for (const p of preferred) {
-                    const result = await queryProviderOrPreferredProvider(p, states);
-                    if (result && result.inlineSuggestions.items.length > 0) {
-                        return undefined;
+            const yieldsTo = yieldsToGraph.getOutgoing(provider);
+            for (const p of yieldsTo) {
+                const result = await queryProvider.get(p);
+                if (result) {
+                    for (const item of result.inlineSuggestions.items) {
+                        if (item.isInlineEdit || typeof item.insertText !== 'string') {
+                            return undefined;
+                        }
+                        const t = ( new TextReplacement(Range.lift(item.range) ?? defaultReplaceRange, item.insertText));
+                        if (inlineCompletionIsVisible(t, undefined, model, position)) {
+                            return undefined;
+                        }
                     }
                 }
             }
-            return query(provider);
-        })().then(c => deferredPromise.complete(c), e => deferredPromise.error(e));
-        return deferredPromise.p;
-    }
-    async function query(provider) {
-        let result;
-        try {
-            if (positionOrRange instanceof Position) {
-                result = await provider.provideInlineCompletions(model, positionOrRange, contextWithUuid, token);
+            let result;
+            try {
+                result = await provider.provideInlineCompletions(model, position, contextWithUuid, cancellationTokenSource.token);
             }
-            else {
-                result = await provider.provideInlineEditsForRange?.(model, positionOrRange, contextWithUuid, token);
+            catch (e) {
+                onUnexpectedExternalError(e);
+                return undefined;
             }
+            if (!result) {
+                return undefined;
+            }
+            const data = [];
+            const list = ( new InlineSuggestionList(result, data, provider));
+            list.addRef();
+            runWhenCancelled(cancellationTokenSource.token, () => {
+                return list.removeRef(cancelReason);
+            });
+            for (const item of result.items) {
+                data.push(toInlineSuggestData(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid, requestInfo));
+            }
+            return list;
         }
-        catch (e) {
-            onUnexpectedExternalError(e);
-            return undefined;
-        }
-        if (!result) {
-            return undefined;
+        finally {
+            runningCount--;
         }
-        const data = [];
-        const list = ( new InlineSuggestionList(result, data, provider));
-        for (const item of result.items) {
-            data.push(createInlineCompletionItem(item, list, defaultReplaceRange, model, languageConfigurationService, contextWithUuid));
+    }));
+    const inlineCompletionLists = AsyncIterableObject.fromPromisesResolveOrder(( providers.map(p => queryProvider.get(p)))).filter(isDefined);
+    return {
+        get didAllProvidersReturn() { return runningCount === 0; },
+        lists: inlineCompletionLists,
+        cancelAndDispose: reason => {
+            if (cancelReason !== undefined) {
+                return;
+            }
+            cancelReason = reason;
+            cancellationTokenSource.dispose(true);
         }
-        runWhenCancelled(token, () => list.removeRef());
-        return list;
-    }
-    const states = ( new Map());
-    const inlineCompletionLists = AsyncIterableObject.fromPromisesResolveOrder(( providers.map(p => queryProviderOrPreferredProvider(p, states))));
-    if (token.isCancellationRequested) {
-        tokenSource.dispose(true);
-        return ( new InlineCompletionProviderResult([], ( new Set()), []));
-    }
-    const result = await addRefAndCreateResult(contextWithUuid, inlineCompletionLists, model);
-    tokenSource.dispose(true);
-    return result;
+    };
 }
 function runWhenCancelled(token, callback) {
     if (token.isCancellationRequested) {
@@ -136,61 +109,7 @@ function runWhenCancelled(token, callback) {
         return { dispose: () => listener.dispose() };
     }
 }
-async function addRefAndCreateResult(context, inlineCompletionLists, model) {
-    const itemsByHash = ( new Map());
-    let shouldStop = false;
-    const lists = [];
-    for await (const completions of inlineCompletionLists) {
-        if (!completions) {
-            continue;
-        }
-        completions.addRef();
-        lists.push(completions);
-        for (const item of completions.inlineSuggestionsData) {
-            if (!context.includeInlineEdits && (item.isInlineEdit || item.showInlineEditMenu)) {
-                continue;
-            }
-            if (!context.includeInlineCompletions && !(item.isInlineEdit || item.showInlineEditMenu)) {
-                continue;
-            }
-            itemsByHash.set(createHashFromSingleTextEdit(item.getSingleTextEdit()), item);
-            if (!(item.isInlineEdit || item.showInlineEditMenu) && context.triggerKind === InlineCompletionTriggerKind.Automatic) {
-                const minifiedEdit = item.getSingleTextEdit().removeCommonPrefix(( new TextModelText(model)));
-                if (!minifiedEdit.isEmpty) {
-                    shouldStop = true;
-                }
-            }
-        }
-        if (shouldStop) {
-            break;
-        }
-    }
-    return ( new InlineCompletionProviderResult(Array.from(( itemsByHash.values())), ( new Set(( itemsByHash.keys()))), lists));
-}
-class InlineCompletionProviderResult {
-    constructor(
-    completions, hashs, providerResults) {
-        this.completions = completions;
-        this.hashs = hashs;
-        this.providerResults = providerResults;
-    }
-    has(edit) {
-        return ( this.hashs.has(createHashFromSingleTextEdit(edit)));
-    }
-    isEmpty() {
-        return this.completions.length === 0
-            || this.completions.every(c => c.range.isEmpty() && c.insertText.length === 0);
-    }
-    dispose() {
-        for (const result of this.providerResults) {
-            result.removeRef();
-        }
-    }
-}
-function createHashFromSingleTextEdit(edit) {
-    return JSON.stringify([edit.text, ( edit.range.getStartPosition().toString())]);
-}
-function createInlineCompletionItem(inlineCompletion, source, defaultReplaceRange, textModel, languageConfigurationService, context) {
+function toInlineSuggestData(inlineCompletion, source, defaultReplaceRange, textModel, languageConfigurationService, context, requestInfo) {
     let insertText;
     let snippetInfo;
     let range = inlineCompletion.range ? Range.lift(inlineCompletion.range) : defaultReplaceRange;
@@ -253,11 +172,12 @@ function createInlineCompletionItem(inlineCompletion, source, defaultReplaceRang
         inlineCompletion,
         source,
         context,
-        inlineCompletion.isInlineEdit ?? false
+        inlineCompletion.isInlineEdit ?? false,
+        requestInfo
     ));
 }
 class InlineSuggestData {
-    constructor(range, insertText, snippetInfo, displayLocation, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit) {
+    constructor(range, insertText, snippetInfo, displayLocation, additionalTextEdits, sourceInlineCompletion, source, context, isInlineEdit, _requestInfo) {
         this.range = range;
         this.insertText = insertText;
         this.snippetInfo = snippetInfo;
@@ -267,25 +187,38 @@ class InlineSuggestData {
         this.source = source;
         this.context = context;
         this.isInlineEdit = isInlineEdit;
+        this._requestInfo = _requestInfo;
         this._didShow = false;
+        this._timeUntilShown = undefined;
+        this._showStartTime = undefined;
+        this._shownDuration = 0;
+        this._showUncollapsedStartTime = undefined;
+        this._showUncollapsedDuration = 0;
         this._didReportEndOfLife = false;
         this._lastSetEndOfLifeReason = undefined;
+        this._partiallyAcceptedCount = 0;
+        this._viewData = { editorType: _requestInfo.editorType };
     }
     get showInlineEditMenu() { return this.sourceInlineCompletion.showInlineEditMenu ?? false; }
     getSingleTextEdit() {
         return ( new TextReplacement(this.range, this.insertText));
     }
-    async reportInlineEditShown(commandService, updatedInsertText) {
+    async reportInlineEditShown(commandService, updatedInsertText, viewKind, viewData) {
+        this.updateShownDuration(viewKind);
         if (this._didShow) {
             return;
         }
         this._didShow = true;
+        this._viewData.viewKind = viewKind;
+        this._viewData.renderData = viewData;
+        this._timeUntilShown = Date.now() - this._requestInfo.startTime;
         this.source.provider.handleItemDidShow?.(this.source.inlineSuggestions, this.sourceInlineCompletion, updatedInsertText);
         if (this.sourceInlineCompletion.shownCommand) {
             await commandService.executeCommand(this.sourceInlineCompletion.shownCommand.id, ...(this.sourceInlineCompletion.shownCommand.arguments || []));
         }
     }
     reportPartialAccept(acceptedCharacters, info) {
+        this._partiallyAcceptedCount++;
         this.source.provider.handlePartialAccept?.(this.source.inlineSuggestions, this.sourceInlineCompletion, acceptedCharacters, info);
     }
     reportEndOfLife(reason) {
@@ -293,6 +226,7 @@ class InlineSuggestData {
             return;
         }
         this._didReportEndOfLife = true;
+        this.reportInlineEditHidden();
         if (!reason) {
             reason = this._lastSetEndOfLifeReason ?? { kind: InlineCompletionEndOfLifeReasonKind.Ignored, userTypingDisagreed: false, supersededBy: undefined };
         }
@@ -300,30 +234,84 @@ class InlineSuggestData {
             this.source.provider.handleRejection(this.source.inlineSuggestions, this.sourceInlineCompletion);
         }
         if (this.source.provider.handleEndOfLifetime) {
-            this.source.provider.handleEndOfLifetime(this.source.inlineSuggestions, this.sourceInlineCompletion, reason);
+            const summary = {
+                requestUuid: this.context.requestUuid,
+                partiallyAccepted: this._partiallyAcceptedCount,
+                shown: this._didShow,
+                shownDuration: this._shownDuration,
+                shownDurationUncollapsed: this._showUncollapsedDuration,
+                timeUntilShown: this._timeUntilShown,
+                editorType: this._viewData.editorType,
+                languageId: this._requestInfo.languageId,
+                requestReason: this._requestInfo.reason,
+                viewKind: this._viewData.viewKind,
+                error: this._viewData.error,
+                ...this._viewData.renderData,
+            };
+            this.source.provider.handleEndOfLifetime(this.source.inlineSuggestions, this.sourceInlineCompletion, reason, summary);
+        }
+    }
+    reportInlineEditError(message) {
+        if (this._viewData.error) {
+            this._viewData.error += `; ${message}`;
+        }
+        else {
+            this._viewData.error = message;
         }
     }
     setEndOfLifeReason(reason) {
+        this.reportInlineEditHidden();
         this._lastSetEndOfLifeReason = reason;
     }
+    updateShownDuration(viewKind) {
+        const timeNow = Date.now();
+        if (!this._showStartTime) {
+            this._showStartTime = timeNow;
+        }
+        const isCollapsed = viewKind === InlineCompletionViewKind.Collapsed;
+        if (!isCollapsed && this._showUncollapsedStartTime === undefined) {
+            this._showUncollapsedStartTime = timeNow;
+        }
+        if (isCollapsed && this._showUncollapsedStartTime !== undefined) {
+            this._showUncollapsedDuration += timeNow - this._showUncollapsedStartTime;
+        }
+    }
+    reportInlineEditHidden() {
+        if (this._showStartTime === undefined) {
+            return;
+        }
+        const timeNow = Date.now();
+        this._shownDuration += timeNow - this._showStartTime;
+        this._showStartTime = undefined;
+        if (this._showUncollapsedStartTime === undefined) {
+            return;
+        }
+        this._showUncollapsedDuration += timeNow - this._showUncollapsedStartTime;
+        this._showUncollapsedStartTime = undefined;
+    }
 }
+var InlineCompletionEditorType;
+(function (InlineCompletionEditorType) {
+    InlineCompletionEditorType["TextEditor"] = "textEditor";
+    InlineCompletionEditorType["DiffEditor"] = "diffEditor";
+})(InlineCompletionEditorType || (InlineCompletionEditorType = {}));
 class InlineSuggestionList {
     constructor(inlineSuggestions, inlineSuggestionsData, provider) {
         this.inlineSuggestions = inlineSuggestions;
         this.inlineSuggestionsData = inlineSuggestionsData;
         this.provider = provider;
-        this.refCount = 1;
+        this.refCount = 0;
     }
     addRef() {
         this.refCount++;
     }
-    removeRef() {
+    removeRef(reason = { kind: 'other' }) {
         this.refCount--;
         if (this.refCount === 0) {
             for (const item of this.inlineSuggestionsData) {
                 item.reportEndOfLife();
             }
-            this.provider.freeInlineCompletions(this.inlineSuggestions);
+            this.provider.disposeInlineCompletions(this.inlineSuggestions, reason);
         }
     }
 }
@@ -346,4 +334,4 @@ function closeBrackets(text, position, model, languageConfigurationService) {
     return fixedText;
 }
 
-export { InlineCompletionProviderResult, InlineSuggestData, InlineSuggestionList, provideInlineCompletions };
+export { InlineCompletionEditorType, InlineSuggestData, InlineSuggestionList, provideInlineCompletions, runWhenCancelled };

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

@@ -16,7 +16,6 @@ export type LogEntryData = IEventFetchEnd;
 export interface IDocumentEventDataSetChangeReason {
     sourceId: "TextModel.setChangeReason";
     source: "inlineSuggestion.accept" | "snippet" | string;
-    detailedSource?: string;
 }
 interface IDocumentEventFetchStart {
     sourceId: "InlineCompletions.fetch";

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

@@ -3,10 +3,11 @@ import { Permutation, compareBy } from '../../../../base/common/arrays.js';
 import '../../../../base/common/observableInternal/index.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { Position } from '../../../common/core/position.js';
-import { PositionOffsetTransformer } from '../../../common/core/text/positionToOffset.js';
+import '../../../common/core/text/positionToOffset.js';
 import { Range } from '../../../common/core/range.js';
 import { TextEdit } from '../../../common/core/edits/textEdit.js';
 import { getPositionOffsetTransformerFromTextModel } from '../../../common/core/text/getPositionOffsetTransformerFromTextModel.js';
+import { PositionOffsetTransformer } from '../../../common/core/text/positionToOffsetImpl.js';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';

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

@@ -10,6 +10,7 @@ import { LineTokens } from "../../../../../common/tokens/lineTokens.js";
 import { LineDecoration } from "../../../../../common/viewLayout/lineDecorations.js";
 import { GhostText, GhostTextReplacement } from "../../model/ghostText.js";
 import { IMouseEvent } from "../../../../../../base/browser/mouseEvent.js";
+import { InlineCompletionViewData } from "../inlineEdits/inlineEditsViewInterface.js";
 export interface IGhostTextWidgetModel {
     readonly targetTextModel: IObservable<ITextModel | undefined>;
     readonly ghostText: IObservable<GhostText | GhostTextReplacement | undefined>;
@@ -17,6 +18,7 @@ export interface IGhostTextWidgetModel {
         icon: IconPath | undefined;
     } | undefined>;
     readonly minReservedLineCount: IObservable<number>;
+    readonly handleInlineCompletionShown: IObservable<(viewData: InlineCompletionViewData) => void>;
 }
 export declare class GhostTextView extends Disposable {
     private readonly _editor;

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

@@ -112,6 +112,18 @@ let GhostTextView = class GhostTextView extends Disposable {
                     decorations: l.decorations,
                 };
             }));
+            const cursorColumn = this._editor.getSelection()?.getStartPosition().column;
+            const renderData = {
+                cursorColumnDistance: cursorColumn !== undefined ? Math.abs((inlineTextsWithTokens.length > 0 ? inlineTextsWithTokens[0].column : 1) - cursorColumn) : -1,
+                cursorLineDistance: inlineTextsWithTokens.length > 0 ? 0 : additionalLines.findIndex(line => line.content !== ''),
+                lineCountOriginal: inlineTextsWithTokens.length > 0 ? 1 : 0,
+                lineCountModified: additionalLines.length + (inlineTextsWithTokens.length > 0 ? 1 : 0),
+                characterCountOriginal: 0,
+                characterCountModified: inlineTextsWithTokens.reduce((acc, inline) => acc + inline.text.length, 0) + tokenizedAdditionalLines.reduce((acc, line) => acc + line.content.getTextLength(), 0),
+                disjointReplacements: inlineTextsWithTokens.length + (additionalLines.length > 0 ? 1 : 0),
+                sameShapeReplacements: inlineTextsWithTokens.length > 1 && inlineTextsWithTokens.length === 0 ? inlineTextsWithTokens.every(inline => inline.text.length === inlineTextsWithTokens[0].text.length) : undefined,
+            };
+            this._model.handleInlineCompletionShown.read(reader)?.(renderData);
             return {
                 replacedRange,
                 inlineTexts: inlineTextsWithTokens,

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import '../../../../../base/browser/dom.js';
+import { createStyleSheetFromObservable } from '../../../../../base/browser/domStylesheets.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
@@ -9,8 +9,8 @@ import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
 import { convertItemsToStableObservables } from '../utils.js';
 import { GhostTextView } from './ghostText/ghostTextView.js';
+import { InlineCompletionViewKind } from './inlineEdits/inlineEditsViewInterface.js';
 import { InlineEditsViewAndDiffProducer } from './inlineEdits/inlineEditsViewProducer.js';
-import { createStyleSheetFromObservable } from '../../../../../base/browser/domImpl/domObservable.js';
 import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { mapObservableArrayCached, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
 import { constObservable } from '../../../../../base/common/observableInternal/observables/constObservable.js';
@@ -36,6 +36,13 @@ let InlineCompletionsView = class InlineCompletionsView extends Disposable {
             })),
             minReservedLineCount: constObservable(0),
             targetTextModel: ( this._model.map(v => v?.textModel)),
+            handleInlineCompletionShown: ( this._model.map((model, reader) => {
+                const inlineCompletion = model?.inlineCompletionState.read(reader)?.inlineCompletion;
+                if (inlineCompletion) {
+                    return (viewData) => model.handleInlineSuggestionShown(inlineCompletion, InlineCompletionViewKind.GhostText, viewData);
+                }
+                return () => { };
+            })),
         }, ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ({ syntaxHighlightingEnabled: v.syntaxHighlightingEnabled }))), false, false)).recomputeInitiallyAndOnChange(store)).recomputeInitiallyAndOnChange(this._store);
         this._inlineEdit = derived(this, reader => this._model.read(reader)?.inlineEditState.read(reader)?.inlineEdit);
         this._everHadInlineEdit = derivedObservableWithCache(this, (reader, last) => last || !!this._inlineEdit.read(reader) || !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineCompletion?.showInlineEditMenu);
@@ -49,9 +56,6 @@ let InlineCompletionsView = class InlineCompletionsView extends Disposable {
         this._fontFamily = ( this._editorObs.getOption(EditorOption.inlineSuggest).map(val => val.fontFamily));
         this._register(createStyleSheetFromObservable(derived(reader => {
             const fontFamily = this._fontFamily.read(reader);
-            if (fontFamily === '' || fontFamily === 'default') {
-                return '';
-            }
             return `
 .monaco-editor .ghost-text-decoration,
 .monaco-editor .ghost-text-decoration-preview,

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import '../../../../../../../base/browser/dom.js';
+import { n } from '../../../../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../../../../base/browser/ui/actionbar/actionbar.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
@@ -31,7 +31,6 @@ import { observableValue } from '../../../../../../../base/common/observableInte
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
 import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
-import { n } from '../../../../../../../base/browser/domImpl/n.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
@@ -65,35 +64,39 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1274, "Go To"))} / ${( localize(1275, "Accept"))}`,
+            title: `${( localize(1285, "Go To"))} / ${( localize(1286, "Accept"))}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1276, "Reject")),
+            title: ( localize(1287, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
-        const extensionCommands = ( this._model.extensionCommands.map(
-            (c, idx) => option(createOptionArgs({ id: c.id + '_' + idx, title: c.title, icon: Codicon.symbolEvent, commandId: c.id, commandArgs: c.arguments }))
-        ));
+        const extensionCommands = ( this._model.extensionCommands.map((c, idx) => option(createOptionArgs({
+            id: c.command.id + '_' + idx,
+            title: c.command.title,
+            icon: c.icon ?? Codicon.symbolEvent,
+            commandId: c.command.id,
+            commandArgs: c.command.arguments
+        }))));
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1277, "Show Expanded")),
+                title: ( localize(1288, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1278, "Show Collapsed")),
+                title: ( localize(1289, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1279, "Settings")),
+            title: ( localize(1290, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../../../../external/tslib/tslib.es6.js';
-import { trackFocus } from '../../../../../../../base/browser/dom.js';
+import { n, trackFocus } from '../../../../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
@@ -25,7 +25,6 @@ import { derived } from '../../../../../../../base/common/observableInternal/obs
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
-import { n } from '../../../../../../../base/browser/domImpl/n.js';
 import { runOnChange } from '../../../../../../../base/common/observableInternal/utils/runOnChange.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
@@ -173,7 +172,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                 return undefined;
             }
             const layout = this._editorObs.layoutInfo.read(reader);
-            const lineHeight = this._editorObs.getOption(EditorOption.lineHeight).read(reader);
+            const lineHeight = this._editorObs.observeLineHeightForLine(( s.range.map(r => r.startLineNumber))).read(reader);
             const gutterViewPortPadding = 1;
             const gutterWidthWithoutPadding = layout.decorationsLeft + layout.decorationsWidth - layout.glyphMarginLeft - 2 * gutterViewPortPadding;
             const gutterHeightWithoutPadding = layout.height - 2 * gutterViewPortPadding;

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

@@ -1,20 +1,20 @@
-import { SingleLineEdit } from "../../../../../common/core/edits/lineEdit.js";
+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 { AbstractText } from "../../../../../common/core/text/abstractText.js";
-import { Command } from "../../../../../common/languages.js";
+import { InlineCompletionCommand } from "../../../../../common/languages.js";
 import { InlineSuggestionItem } from "../../model/inlineSuggestionItem.js";
 export declare class InlineEditWithChanges {
     readonly originalText: AbstractText;
     readonly edit: TextEdit;
     readonly cursorPosition: Position;
-    readonly commands: readonly Command[];
+    readonly commands: readonly InlineCompletionCommand[];
     readonly inlineCompletion: InlineSuggestionItem;
-    get lineEdit(): SingleLineEdit;
+    get lineEdit(): LineReplacement;
     get originalLineRange(): LineRange;
     get modifiedLineRange(): LineRange;
     get displayRange(): LineRange;
-    constructor(originalText: AbstractText, edit: TextEdit, cursorPosition: Position, commands: readonly Command[], inlineCompletion: InlineSuggestionItem);
+    constructor(originalText: AbstractText, edit: TextEdit, cursorPosition: Position, commands: readonly InlineCompletionCommand[], inlineCompletion: InlineSuggestionItem);
     equals(other: InlineEditWithChanges): boolean;
 }