@codingame/monaco-vscode-api 18.4.0 → 19.0.1

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.js

@@ -25,7 +25,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1237, "Show Next Inline Suggestion")),
+            label: ( localize2(1248, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -46,7 +46,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1238, "Show Previous Inline Suggestion")),
+            label: ( localize2(1249, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -66,7 +66,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1239, "Trigger Inline Suggestion")),
+            label: ( localize2(1250, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -82,7 +82,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1240, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1251, "Trigger Next Edit Suggestion")),
             precondition: EditorContextKeys.writable,
         });
     }
@@ -93,7 +93,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
         if (!controller?.model.get()?.inlineEditAvailable.get()) {
             notificationService.notify({
                 severity: Severity$1.Info,
-                message: ( localize(1241, "No inline edit is available."))
+                message: ( localize(1252, "No inline edit is available."))
             });
         }
     }
@@ -114,7 +114,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1242, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1253, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -130,7 +130,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1243, 'Accept Word')),
+                    title: ( localize(1254, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -145,7 +145,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1244, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1255, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -155,7 +155,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1245, 'Accept Line')),
+                    title: ( localize(1256, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -170,19 +170,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1246, "Accept Inline Suggestion")),
+            label: ( localize2(1257, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1247, "Accept")),
+                    title: ( localize(1258, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1247, "Accept")),
+                    title: ( localize(1258, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -213,11 +213,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1248, "Jump to next inline edit")),
+            label: ( localize2(1259, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1249, "Jump")),
+                    title: ( localize(1260, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -241,7 +241,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1250, "Hide Inline Suggestion")),
+            label: ( localize2(1261, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -252,7 +252,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1251, "Reject")),
+                    title: ( localize(1262, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -271,7 +271,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1252, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1263, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -293,7 +293,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1253, "Always Show Toolbar")),
+            title: ( localize(1264, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -315,7 +315,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1254, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1265, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js

@@ -3,23 +3,23 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1255, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1256, "Whether the inline suggestion starts with whitespace")))); }
+    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1266, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1267, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1257,
+     1268,
      "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab"
     )))); }
     static { this.suppressSuggestions = ( new RawContextKey('inlineSuggestionSuppressSuggestions', undefined, ( localize(
-     1258,
+     1269,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1259, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1260, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1261, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1262, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1263, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1264, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1265, "Whether the current code editor is showing an inline edits preview")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1270, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1271, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1272, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1273, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1274, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1275, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1276, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js

@@ -278,7 +278,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1266,
+                1277,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js

@@ -130,7 +130,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(1267, 'There are inline completions here');
+        return localize(1278, 'There are inline completions here');
     }
     renderScreenReaderText(context, part) {
         const disposables = ( new DisposableStore());
@@ -139,7 +139,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents', { ['aria-live']: 'assertive' }));
         const renderer = ( new MarkdownRenderer({ editor: this._editor }, this._languageService, this._openerService));
         const render = (code) => {
-            const inlineSuggestionAvailable = ( localize(1268, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1279, "Suggestion:"));
             const renderedContents = disposables.add(renderer.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
                 asyncRenderCallback: () => {
                     hoverContentsElement.className = 'hover-contents code-hover-contents';

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

@@ -12,7 +12,7 @@ import { IKeybindingService } from "../../../../../platform/keybinding/common/ke
 import { ITelemetryService } from "../../../../../platform/telemetry/common/telemetry.service.js";
 import { ICodeEditor, IContentWidget, IContentWidgetPosition } from "../../../../browser/editorBrowser.js";
 import { Position } from "../../../../common/core/position.js";
-import { Command, InlineCompletionWarning } from "../../../../common/languages.js";
+import { InlineCompletionCommand, InlineCompletionWarning } from "../../../../common/languages.js";
 import { InlineCompletionsModel } from "../model/inlineCompletionsModel.js";
 export declare class InlineCompletionsHintsWidget extends Disposable {
     private readonly editor;
@@ -54,7 +54,7 @@ export declare class InlineSuggestionHintsContentWidget extends Disposable imple
     private readonly inlineCompletionsActionsMenus;
     private readonly clearAvailableSuggestionCountLabelDebounced;
     private readonly disableButtonsDebounced;
-    constructor(editor: ICodeEditor, withBorder: boolean, _position: IObservable<Position | null>, _currentSuggestionIdx: IObservable<number>, _suggestionCount: IObservable<number | undefined>, _extraCommands: IObservable<Command[]>, _warning: IObservable<InlineCompletionWarning | undefined>, _relayout: () => void, _commandService: ICommandService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, _contextKeyService: IContextKeyService, _menuService: IMenuService);
+    constructor(editor: ICodeEditor, withBorder: boolean, _position: IObservable<Position | null>, _currentSuggestionIdx: IObservable<number>, _suggestionCount: IObservable<number | undefined>, _extraCommands: IObservable<InlineCompletionCommand[]>, _warning: IObservable<InlineCompletionWarning | undefined>, _relayout: () => void, _commandService: ICommandService, instantiationService: IInstantiationService, keybindingService: IKeybindingService, _contextKeyService: IContextKeyService, _menuService: IMenuService);
     getId(): string;
     getDomNode(): HTMLElement;
     getPosition(): IContentWidgetPosition | null;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js

@@ -1,7 +1,7 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { h } from '../../../../../base/browser/dom.js';
+import { n, h } from '../../../../../base/browser/dom.js';
 import { renderMarkdown } from '../../../../../base/browser/markdownRenderer.js';
 import { ActionViewItem } from '../../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
@@ -33,10 +33,9 @@ import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { PositionAffinity } from '../../../../common/model.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from '../controller/commandIds.js';
 import * as inlineCompletionsHintsWidget from './inlineCompletionsHintsWidget.css';
-import { n } from '../../../../../base/browser/domImpl/n.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
 var InlineSuggestionHintsContentWidget_1;
@@ -98,8 +97,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1269, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1270, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1280, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1281, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
@@ -117,7 +116,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1271, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1282, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -165,9 +164,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1272, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1283, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1273, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1284, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';
@@ -230,12 +229,12 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             const extraCommands = this._extraCommands.read(reader);
             const extraActions = ( extraCommands.map(c => ({
                 class: undefined,
-                id: c.id,
+                id: c.command.id,
                 enabled: true,
-                tooltip: c.tooltip || '',
-                label: c.title,
+                tooltip: c.command.tooltip || '',
+                label: c.command.title,
                 run: (event) => {
-                    return this._commandService.executeCommand(c.id);
+                    return this._commandService.executeCommand(c.command.id);
                 },
             })));
             for (const [_, group] of this.inlineCompletionsActionsMenus.getActions()) {

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

@@ -8,9 +8,8 @@ import { TriggerInlineSuggestionAction, ExplicitTriggerInlineEditAction, Trigger
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
 import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
 import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
-import { InlineEditsAdapterContribution } from './model/inlineEditsAdapter.js';
+import { SnoozeInlineCompletion, CancelSnoozeInlineCompletion } from '../../../browser/services/inlineCompletionsService.js';
 
-registerEditorContribution(InlineEditsAdapterContribution.ID, InlineEditsAdapterContribution, EditorContributionInstantiation.Eventually);
 registerEditorContribution(InlineCompletionsController.ID, wrapInHotClass1(InlineCompletionsController.hot), EditorContributionInstantiation.Eventually);
 registerEditorAction(TriggerInlineSuggestionAction);
 registerEditorAction(ExplicitTriggerInlineEditAction);
@@ -25,5 +24,7 @@ registerEditorAction(HideInlineCompletion);
 registerEditorAction(JumpToNextInlineEdit);
 registerAction2(ToggleAlwaysShowInlineSuggestionToolbar);
 registerEditorAction(DevExtractReproSample);
+registerAction2(SnoozeInlineCompletion);
+registerAction2(CancelSnoozeInlineCompletion);
 HoverParticipantRegistry.register(InlineCompletionsHoverParticipant);
 AccessibleViewRegistry.register(( new InlineCompletionsAccessibleView()));

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

@@ -22,4 +22,11 @@ export declare class ObservableAnimatedValue {
     changeAnimation(fn: (prev: AnimatedValue) => AnimatedValue, tx: ITransaction | undefined): void;
     getValue(reader: IReader | undefined): number;
 }
+export declare class AnimationFrameScheduler {
+    static instance: AnimationFrameScheduler;
+    private readonly _counter;
+    private _isScheduled;
+    invalidateOnNextAnimationFrame(reader: IReader | undefined): void;
+    private _update;
+}
 export {};

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

@@ -1,8 +1,8 @@
 
 import { getActiveWindow } from '../../../../../base/browser/dom.js';
 import '../../../../../base/common/observableInternal/index.js';
-import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
+import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 
 class AnimatedValue {
     static const(value) {
@@ -55,17 +55,17 @@ class ObservableAnimatedValue {
     getValue(reader) {
         const value = this._value.read(reader);
         if (!value.isFinished()) {
-            Scheduler.instance.invalidateOnNextAnimationFrame(reader);
+            AnimationFrameScheduler.instance.invalidateOnNextAnimationFrame(reader);
         }
         return value.getValue();
     }
 }
-class Scheduler {
+class AnimationFrameScheduler {
     constructor() {
         this._counter = observableSignal(this);
         this._isScheduled = false;
     }
-    static { this.instance = ( new Scheduler()); }
+    static { this.instance = ( new AnimationFrameScheduler()); }
     invalidateOnNextAnimationFrame(reader) {
         this._counter.read(reader);
         if (!this._isScheduled) {
@@ -81,4 +81,4 @@ class Scheduler {
     }
 }
 
-export { AnimatedValue, ObservableAnimatedValue, easeOutCubic, easeOutExpo };
+export { AnimatedValue, AnimationFrameScheduler, ObservableAnimatedValue, easeOutCubic, easeOutExpo };

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

@@ -1,5 +1,6 @@
 import { Disposable } from "../../../../../base/common/lifecycle.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
+import { ILoggerService } from "../../../../../platform/log/common/log.service.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
 export interface ITextModelChangeRecorderMetadata {
     source?: string;
@@ -10,6 +11,7 @@ export interface ITextModelChangeRecorderMetadata {
 export declare class TextModelChangeRecorder extends Disposable {
     private readonly _editor;
     private readonly _instantiationService;
+    private readonly _loggerService;
     private readonly _structuredLogger;
-    constructor(_editor: ICodeEditor, _instantiationService: IInstantiationService);
+    constructor(_editor: ICodeEditor, _instantiationService: IInstantiationService, _loggerService: ILoggerService);
 }

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

@@ -3,59 +3,64 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { canLog, LogLevel } from '../../../../../platform/log/common/log.js';
+import { ILoggerService } from '../../../../../platform/log/common/log.service.js';
 import { CodeEditorWidget } from '../../../../browser/widget/codeEditor/codeEditorWidget.js';
-import { TextModelEditReason } from '../../../../common/textModelEditReason.js';
 import { StructuredLogger } from '../structuredLogger.js';
-import { autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
-    constructor(_editor, _instantiationService) {
+    constructor(_editor, _instantiationService, _loggerService) {
         super();
         this._editor = _editor;
         this._instantiationService = _instantiationService;
+        this._loggerService = _loggerService;
         this._structuredLogger = this._register(this._instantiationService.createInstance(StructuredLogger.cast(), 'editor.inlineSuggest.logChangeReason.commandId'));
-        this._register(autorunWithStore((reader, store) => {
+        const logger = this._loggerService?.createLogger('textModelChanges', { hidden: false, name: 'Text Model Changes Reason' });
+        const loggingLevel = observableFromEvent(this, logger.onDidChangeLogLevel, () => logger.getLevel());
+        this._register(autorun(reader => {
+            if (!canLog(loggingLevel.read(reader), LogLevel.Trace)) {
+                return;
+            }
+            reader.store.add(this._editor.onDidChangeModelContent((e) => {
+                if (this._editor.getModel()?.uri.scheme === 'output') {
+                    return;
+                }
+                logger.trace('onDidChangeModelContent: ' + ( e.detailedReasons.map(r => r.toKey(Number.MAX_VALUE))).join(', '));
+            }));
+        }));
+        this._register(autorun(reader => {
             if (!(this._editor instanceof CodeEditorWidget)) {
                 return;
             }
             if (!this._structuredLogger.isEnabled.read(reader)) {
                 return;
             }
-            const sources = [];
-            store.add(this._editor.onBeforeExecuteEdit(({ source }) => {
-                if (source) {
-                    sources.push(source);
-                }
-            }));
-            store.add(this._editor.onDidChangeModelContent(e => {
+            reader.store.add(this._editor.onDidChangeModelContent(e => {
                 const tm = this._editor.getModel();
                 if (!tm) {
                     return;
                 }
-                const metadata = TextModelEditReason._getCurrentMetadata();
-                if (sources.length === 0 && metadata.source) {
-                    sources.push(metadata.source);
-                }
-                for (const source of sources) {
-                    const data = {
-                        ...metadata,
-                        sourceId: 'TextModel.setChangeReason',
-                        source: source,
-                        time: Date.now(),
-                        modelUri: tm.uri,
-                        modelVersion: tm.getVersionId(),
-                    };
-                    setTimeout(() => {
-                        this._structuredLogger.log(data);
-                    }, 0);
-                }
-                sources.length = 0;
+                const reason = e.detailedReasons[0];
+                const data = {
+                    ...reason.metadata,
+                    sourceId: 'TextModel.setChangeReason',
+                    source: reason.metadata.source,
+                    time: Date.now(),
+                    modelUri: tm.uri,
+                    modelVersion: tm.getVersionId(),
+                };
+                setTimeout(() => {
+                    this._structuredLogger.log(data);
+                }, 0);
             }));
         }));
     }
 };
 TextModelChangeRecorder = ( __decorate([
-    ( __param(1, IInstantiationService))
+    ( __param(1, IInstantiationService)),
+    ( __param(2, ILoggerService))
 ], TextModelChangeRecorder));
 
 export { TextModelChangeRecorder };

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

@@ -5,11 +5,13 @@ import { Position } from '../../../../common/core/position.js';
 import { Range } from '../../../../common/core/range.js';
 import { TextEdit, TextReplacement } from '../../../../common/core/edits/textEdit.js';
 import { LineDecoration } from '../../../../common/viewLayout/lineDecorations.js';
+import { assertFn, checkAdjacentItems } from '../../../../../base/common/assert.js';
 
 class GhostText {
     constructor(lineNumber, parts) {
         this.lineNumber = lineNumber;
         this.parts = parts;
+        assertFn(() => checkAdjacentItems(parts, (p1, p2) => p1.column <= p2.column));
     }
     equals(other) {
         return this.lineNumber === other.lineNumber &&

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

@@ -0,0 +1,9 @@
+export declare class DirectedGraph<T> {
+    private readonly _nodes;
+    private readonly _outgoingEdges;
+    static from<T>(nodes: readonly T[], getOutgoing: (node: T) => readonly T[]): DirectedGraph<T>;
+    removeCycles(): {
+        foundCycles: T[];
+    };
+    getOutgoing(node: T): readonly T[];
+}

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

@@ -0,0 +1,66 @@
+
+
+class DirectedGraph {
+    constructor() {
+        this._nodes = ( new Set());
+        this._outgoingEdges = ( new Map());
+    }
+    static from(nodes, getOutgoing) {
+        const graph = ( new DirectedGraph());
+        for (const node of nodes) {
+            graph._nodes.add(node);
+        }
+        for (const node of nodes) {
+            const outgoing = getOutgoing(node);
+            if (outgoing.length > 0) {
+                const outgoingSet = ( new Set());
+                for (const target of outgoing) {
+                    outgoingSet.add(target);
+                }
+                graph._outgoingEdges.set(node, outgoingSet);
+            }
+        }
+        return graph;
+    }
+    removeCycles() {
+        const foundCycles = [];
+        const visited = ( new Set());
+        const recursionStack = ( new Set());
+        const toRemove = [];
+        const dfs = (node) => {
+            visited.add(node);
+            recursionStack.add(node);
+            const outgoing = this._outgoingEdges.get(node);
+            if (outgoing) {
+                for (const neighbor of outgoing) {
+                    if (!( visited.has(neighbor))) {
+                        dfs(neighbor);
+                    }
+                    else if (( recursionStack.has(neighbor))) {
+                        foundCycles.push(neighbor);
+                        toRemove.push({ from: node, to: neighbor });
+                    }
+                }
+            }
+            recursionStack.delete(node);
+        };
+        for (const node of this._nodes) {
+            if (!( visited.has(node))) {
+                dfs(node);
+            }
+        }
+        for (const { from, to } of toRemove) {
+            const outgoingSet = this._outgoingEdges.get(from);
+            if (outgoingSet) {
+                outgoingSet.delete(to);
+            }
+        }
+        return { foundCycles };
+    }
+    getOutgoing(node) {
+        const outgoing = this._outgoingEdges.get(node);
+        return outgoing ? Array.from(outgoing) : [];
+    }
+}
+
+export { DirectedGraph };