@codingame/monaco-vscode-api 4.5.1 → 5.0.0

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

@@ -30,6 +30,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 var InlineSuggestionHintsContentWidget_1;
+const _moduleId = "vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget";
 let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Disposable {
     constructor(editor, model, instantiationService) {
         super();
@@ -48,10 +49,10 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
             if (this.sessionPosition && this.sessionPosition.lineNumber !== ghostText.lineNumber) {
                 this.sessionPosition = undefined;
             }
-            const position = ( new Position(
+            const position = ( (new Position(
                 ghostText.lineNumber,
                 Math.min(firstColumn, this.sessionPosition?.column ?? Number.MAX_SAFE_INTEGER)
-            ));
+            )));
             this.sessionPosition = position;
             return position;
         });
@@ -60,9 +61,7 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
             if (!model || !this.alwaysShowToolbar.read(reader)) {
                 return;
             }
-            const contentWidget = store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget, this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, ( model.selectedInlineCompletion.map(
-                v =>  v?.inlineCompletion.source.inlineCompletions.commands ?? []
-            ))));
+            const contentWidget = store.add(this.instantiationService.createInstance(InlineSuggestionHintsContentWidget, this.editor, true, this.position, model.selectedInlineCompletionIndex, model.inlineCompletionsCount, model.activeCommands));
             editor.addContentWidget(contentWidget);
             store.add(toDisposable(() => editor.removeContentWidget(contentWidget)));
             store.add(autorun(reader => {
@@ -77,42 +76,28 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
         }));
     }
 };
-InlineCompletionsHintsWidget = ( __decorate([
-    ( __param(2, IInstantiationService))
-], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localizeWithPath(
-    'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget',
-    'parameterHintsNextIcon',
-    'Icon for show next parameter hint.'
-)));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localizeWithPath(
-    'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget',
-    'parameterHintsPreviousIcon',
-    'Icon for show previous parameter hint.'
-)));
+InlineCompletionsHintsWidget = ( (__decorate([
+    ( (__param(2, IInstantiationService)))
+], InlineCompletionsHintsWidget)));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localizeWithPath(_moduleId, 0, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localizeWithPath(_moduleId, 1, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this._dropDownVisible = false; }
     static get dropDownVisible() { return this._dropDownVisible; }
     static { this.id = 0; }
     createCommandAction(commandId, label, iconClassName) {
-        const action = ( new Action(
+        const action = ( (new Action(
             commandId,
             label,
             iconClassName,
             true,
             () => this._commandService.executeCommand(commandId)
-        ));
+        )));
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localizeWithPath(
-                'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget',
-                { key: 'content', comment: ['A label', 'A keybinding'] },
-                '{0} ({1})',
-                label,
-                kb.getLabel()
-            ));
+            tooltip = ( localizeWithPath(_moduleId, 2, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -135,25 +120,16 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         this.nodes = h('div.inlineSuggestionsHints', { className: this.withBorder ? '.withBorder' : '' }, [
             h('div@toolBar'),
         ]);
-        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localizeWithPath(
-            'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget',
-            'previous',
-            'Previous'
-        )), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
-        this.availableSuggestionCountAction = ( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false));
-        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localizeWithPath(
-            'vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget',
-            'next',
-            'Next'
-        )), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
+        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localizeWithPath(_moduleId, 3, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
+        this.availableSuggestionCountAction = ( (new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
+        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localizeWithPath(_moduleId, 4, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
-        this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
+        this.clearAvailableSuggestionCountLabelDebounced = this._register(( (new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';
-        }, 100)));
-        this.disableButtonsDebounced = this._register(( new RunOnceScheduler(() => {
+        }, 100))));
+        this.disableButtonsDebounced = this._register(( (new RunOnceScheduler(() => {
             this.previousAction.enabled = this.nextAction.enabled = false;
-        }, 100)));
-        this.lastCommands = [];
+        }, 100))));
         this.toolBar = this._register(instantiationService.createInstance(CustomizedMenuWorkbenchToolBar, this.nodes.toolBar, MenuId.InlineSuggestionToolbar, {
             menuOptions: { renderShortTitle: true },
             toolbarOptions: { primaryGroup: g => g.startsWith('primary') },
@@ -162,7 +138,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
                     return instantiationService.createInstance(StatusBarViewItem, action, undefined);
                 }
                 if (action === this.availableSuggestionCountAction) {
-                    const a = ( new ActionViewItemWithClassName(undefined, action, { label: true, icon: false }));
+                    const a = ( (new ActionViewItemWithClassName(undefined, action, { label: true, icon: false })));
                     a.setClass('availableSuggestionCount');
                     return a;
                 }
@@ -202,11 +178,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         }));
         this._register(autorun(reader => {
             const extraCommands = this._extraCommands.read(reader);
-            if (equals(this.lastCommands, extraCommands)) {
-                return;
-            }
-            this.lastCommands = extraCommands;
-            const extraActions = ( extraCommands.map(c => ({
+            const extraActions = ( (extraCommands.map(c => ({
                 class: undefined,
                 id: c.id,
                 enabled: true,
@@ -215,7 +187,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
                 run: (event) => {
                     return this._commandService.executeCommand(c.id);
                 },
-            })));
+            }))));
             for (const [_, group] of this.inlineCompletionsActionsMenus.getActions()) {
                 for (const action of group) {
                     if (action instanceof MenuItemAction) {
@@ -224,7 +196,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
                 }
             }
             if (extraActions.length > 0) {
-                extraActions.unshift(( new Separator()));
+                extraActions.unshift(( (new Separator())));
             }
             this.toolBar.setAdditionalSecondaryActions(extraActions);
         }));
@@ -241,13 +213,13 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         };
     }
 };
-InlineSuggestionHintsContentWidget = InlineSuggestionHintsContentWidget_1 = ( __decorate([
-    ( __param(6, ICommandService)),
-    ( __param(7, IInstantiationService)),
-    ( __param(8, IKeybindingService)),
-    ( __param(9, IContextKeyService)),
-    ( __param(10, IMenuService))
-], InlineSuggestionHintsContentWidget));
+InlineSuggestionHintsContentWidget = InlineSuggestionHintsContentWidget_1 = ( (__decorate([
+    ( (__param(6, ICommandService))),
+    ( (__param(7, IInstantiationService))),
+    ( (__param(8, IKeybindingService))),
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, IMenuService)))
+], InlineSuggestionHintsContentWidget)));
 class ActionViewItemWithClassName extends ActionViewItem {
     constructor() {
         super(...arguments);
@@ -273,7 +245,7 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
         }
         if (this.label) {
             const div = h('div.keybinding').root;
-            const k = this._register(( new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions })));
+            const k = this._register(( (new KeybindingLabel(div, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions }))));
             k.set(kb);
             this.label.textContent = this._action.label;
             this.label.appendChild(div);
@@ -284,8 +256,8 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
     }
 }
 let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extends WorkbenchToolBar {
-    constructor(container, menuId, options2, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService) {
-        super(container, { resetMenu: menuId, ...options2 }, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService);
+    constructor(container, menuId, options2, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService) {
+        super(container, { resetMenu: menuId, ...options2 }, menuService, contextKeyService, contextMenuService, keybindingService, commandService, telemetryService);
         this.menuId = menuId;
         this.options2 = options2;
         this.menuService = menuService;
@@ -319,11 +291,12 @@ let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extend
         this.updateToolbar();
     }
 };
-CustomizedMenuWorkbenchToolBar = ( __decorate([
-    ( __param(3, IMenuService)),
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IContextMenuService)),
-    ( __param(6, IKeybindingService)),
-    ( __param(7, ITelemetryService))
-], CustomizedMenuWorkbenchToolBar));
+CustomizedMenuWorkbenchToolBar = ( (__decorate([
+    ( (__param(3, IMenuService))),
+    ( (__param(4, IContextKeyService))),
+    ( (__param(5, IContextMenuService))),
+    ( (__param(6, IKeybindingService))),
+    ( (__param(7, ICommandService))),
+    ( (__param(8, ITelemetryService)))
+], CustomizedMenuWorkbenchToolBar)));
 export { CustomizedMenuWorkbenchToolBar, InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget };

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Permutation } from '../../../../base/common/arrays.js';
 import { mapFindFirst } from '../../../../base/common/arraysFind.js';
+import { itemsEquals } from '../../../../base/common/equals.js';
 import { BugIndicatingError, onUnexpectedExternalError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
@@ -14,17 +15,17 @@ import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
+import { TextLength } from '../../../common/core/textLength.js';
 import { InlineCompletionTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { GhostText, ghostTextsOrReplacementsEqual, ghostTextOrReplacementEquals } from './ghostText.js';
 import { InlineCompletionsSource } from './inlineCompletionsSource.js';
-import { SingleTextEdit, TextEdit } from '../../../common/core/textEdit.js';
+import { singleTextRemoveCommonPrefix, computeGhostText, singleTextEditAugments } from './singleTextEdit.js';
 import { subtractPositions, addPositions } from './utils.js';
 import { SnippetController2 } from '../../snippet/browser/snippetController2.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { singleTextRemoveCommonPrefix, computeGhostText, singleTextEditAugments } from './singleTextEdit.js';
-import { TextLength } from '../../../common/core/textLength.js';
 var VersionIdChangeReason;
 ( (function(VersionIdChangeReason) {
     VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";
@@ -50,7 +51,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._languageConfigurationService = _languageConfigurationService;
         this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this.textModelVersionId, this._debounceValue));
         this._isActive = observableValue(this, false);
-        this._forceUpdateSignal = observableSignal('forceUpdate');
+        this._forceUpdateExplicitlySignal = observableSignal(this);
         this._selectedInlineCompletionId = observableValue(this, undefined);
         this._primaryPosition = derived(this, reader => this._positions.read(reader)[0] ?? ( new Position(1, 1)));
         this._isAcceptingPartially = false;
@@ -59,7 +60,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             VersionIdChangeReason.Undo,
             VersionIdChangeReason.AcceptWord,
         ]));
-        this._fetchInlineCompletions = derivedHandleChanges({
+        this._fetchInlineCompletionsPromise = derivedHandleChanges({
             owner: this,
             createEmptyChangeSummary: () => ({
                 preserveCurrentCompletion: false,
@@ -69,22 +70,19 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 if (ctx.didChange(this.textModelVersionId) && ( this._preserveCurrentCompletionReasons.has(ctx.change))) {
                     changeSummary.preserveCurrentCompletion = true;
                 }
-                else if (ctx.didChange(this._forceUpdateSignal)) {
-                    changeSummary.inlineCompletionTriggerKind = ctx.change;
+                else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
+                    changeSummary.inlineCompletionTriggerKind = InlineCompletionTriggerKind.Explicit;
                 }
                 return true;
             },
         }, (reader, changeSummary) => {
-            this._forceUpdateSignal.read(reader);
+            this._forceUpdateExplicitlySignal.read(reader);
             const shouldUpdate = (this._enabled.read(reader) && this.selectedSuggestItem.read(reader)) || this._isActive.read(reader);
             if (!shouldUpdate) {
                 this._source.cancelUpdate();
                 return undefined;
             }
             this.textModelVersionId.read(reader);
-            const itemToPreserveCandidate = this.selectedInlineCompletion.get();
-            const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable
-                ? itemToPreserveCandidate : undefined;
             const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.get();
             const suggestItem = this.selectedSuggestItem.read(reader);
             if (suggestWidgetInlineCompletions && !suggestItem) {
@@ -101,9 +99,12 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 triggerKind: changeSummary.inlineCompletionTriggerKind,
                 selectedSuggestionInfo: suggestItem?.toSelectedSuggestionInfo(),
             };
+            const itemToPreserveCandidate = this.selectedInlineCompletion.get();
+            const itemToPreserve = changeSummary.preserveCurrentCompletion || itemToPreserveCandidate?.forwardStable
+                ? itemToPreserveCandidate : undefined;
             return this._source.fetch(cursorPosition, context, itemToPreserve);
         });
-        this._filteredInlineCompletionItems = derived(this, reader => {
+        this._filteredInlineCompletionItems = derivedOpts({ owner: this, equalsFn: itemsEquals() }, reader => {
             const c = this._source.inlineCompletions.read(reader);
             if (!c) {
                 return [];
@@ -128,6 +129,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const idx = this.selectedInlineCompletionIndex.read(reader);
             return filteredCompletions[idx];
         });
+        this.activeCommands = derivedOpts({ owner: this, equalsFn: itemsEquals() }, r => this.selectedInlineCompletion.read(r)?.inlineCompletion.source.inlineCompletions.commands ?? []);
         this.lastTriggerKind = ( this._source.inlineCompletions.map(this, v => v?.request.context.triggerKind));
         this.inlineCompletionsCount = derived(this, reader => {
             if (this.lastTriggerKind.read(reader) === InlineCompletionTriggerKind.Explicit) {
@@ -139,7 +141,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
         this.state = derivedOpts({
             owner: this,
-            equalityComparer: (a, b) => {
+            equalsFn: (a, b) => {
                 if (!a || !b) {
                     return a === b;
                 }
@@ -193,7 +195,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
         this.ghostTexts = derivedOpts({
             owner: this,
-            equalityComparer: ghostTextsOrReplacementsEqual
+            equalsFn: ghostTextsOrReplacementsEqual
         }, reader => {
             const v = this.state.read(reader);
             if (!v) {
@@ -203,7 +205,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
         this.primaryGhostText = derivedOpts({
             owner: this,
-            equalityComparer: ghostTextOrReplacementEquals
+            equalsFn: ghostTextOrReplacementEquals
         }, reader => {
             const v = this.state.read(reader);
             if (!v) {
@@ -211,7 +213,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
             return v?.primaryGhostText;
         });
-        this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletions));
+        this._register(recomputeInitiallyAndOnChange(this._fetchInlineCompletionsPromise));
         let lastItem = undefined;
         this._register(autorun(reader => {
             const item = this.state.read(reader);
@@ -228,14 +230,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async trigger(tx) {
         this._isActive.set(true, tx);
-        await this._fetchInlineCompletions.get();
+        await this._fetchInlineCompletionsPromise.get();
     }
     async triggerExplicitly(tx) {
         subtransaction(tx, tx => {
             this._isActive.set(true, tx);
-            this._forceUpdateSignal.trigger(tx, InlineCompletionTriggerKind.Explicit);
+            this._forceUpdateExplicitlySignal.trigger(tx);
         });
-        await this._fetchInlineCompletions.get();
+        await this._fetchInlineCompletionsPromise.get();
     }
     stop(tx) {
         subtransaction(tx, tx => {
@@ -275,7 +277,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async accept(editor) {
         if (editor.getModel() !== this.textModel) {
-            throw new BugIndicatingError();
+            throw ( new BugIndicatingError());
         }
         const state = this.state.get();
         if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
@@ -285,7 +287,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         editor.pushUndoStop();
         if (completion.snippetInfo) {
             editor.executeEdits('inlineSuggestion.accept', [
-                EditOperation.replaceMove(completion.range, ''),
+                EditOperation.replace(completion.range, ''),
                 ...completion.additionalTextEdits
             ]);
             editor.setPosition(completion.snippetInfo.range.getStartPosition(), 'inlineCompletionAccept');
@@ -295,7 +297,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             const edits = state.edits;
             const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
             editor.executeEdits('inlineSuggestion.accept', [
-                ...( edits.map(edit => EditOperation.replaceMove(edit.range, edit.text))),
+                ...( edits.map(edit => EditOperation.replace(edit.range, edit.text))),
                 ...completion.additionalTextEdits
             ]);
             editor.setSelections(selections, 'inlineCompletionAccept');
@@ -353,7 +355,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     }
     async _acceptNext(editor, getAcceptUntilIndex, kind) {
         if (editor.getModel() !== this.textModel) {
-            throw new BugIndicatingError();
+            throw ( new BugIndicatingError());
         }
         const state = this.state.get();
         if (!state || state.primaryGhostText.isEmpty() || !state.inlineCompletion) {
@@ -386,7 +388,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const primaryEdit = ( new SingleTextEdit(replaceRange, newText));
                 const edits = [primaryEdit, ...getSecondaryEdits(this.textModel, positions, primaryEdit)];
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
-                editor.executeEdits('inlineSuggestion.accept', ( edits.map(edit => EditOperation.replaceMove(edit.range, edit.text))));
+                editor.executeEdits('inlineSuggestion.accept', ( edits.map(edit => EditOperation.replace(edit.range, edit.text))));
                 editor.setSelections(selections, 'inlineCompletionPartialAccept');
             }
             finally {

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

@@ -1,17 +1,19 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
+import { equalsIfDefined, itemEquals } from '../../../../base/common/equals.js';
 import { matchesSubString } from '../../../../base/common/filters.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { disposableObservableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { derivedOpts } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/utils.js';
-import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { SingleTextEdit } from '../../../common/core/textEdit.js';
+import { TextLength } from '../../../common/core/textLength.js';
 import { InlineCompletionTriggerKind } from '../../../common/languages.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { provideInlineCompletions } from './provideInlineCompletions.js';
-import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEdit.js';
 let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
     constructor(textModel, versionId, _debounceValue, languageFeaturesService, languageConfigurationService) {
@@ -119,18 +121,12 @@ class UpdateRequest {
     }
     satisfies(other) {
         return this.position.equals(other.position)
-            && equals(this.context.selectedSuggestionInfo, other.context.selectedSuggestionInfo, (v1, v2) => v1.equals(v2))
+            && equalsIfDefined(this.context.selectedSuggestionInfo, other.context.selectedSuggestionInfo, itemEquals())
             && (other.context.triggerKind === InlineCompletionTriggerKind.Automatic
                 || this.context.triggerKind === InlineCompletionTriggerKind.Explicit)
             && this.versionId === other.versionId;
     }
 }
-function equals(v1, v2, equals) {
-    if (!v1 || !v2) {
-        return v1 === v2;
-    }
-    return equals(v1, v2);
-}
 class UpdateOperation {
     constructor(request, cancellationTokenSource, promise) {
         this.request = request;
@@ -143,32 +139,20 @@ class UpdateOperation {
 }
 class UpToDateInlineCompletions {
     get inlineCompletions() { return this._inlineCompletions; }
-    constructor(inlineCompletionProviderResult, request, textModel, versionId) {
+    constructor(inlineCompletionProviderResult, request, _textModel, _versionId) {
         this.inlineCompletionProviderResult = inlineCompletionProviderResult;
         this.request = request;
-        this.textModel = textModel;
-        this.versionId = versionId;
+        this._textModel = _textModel;
+        this._versionId = _versionId;
         this._refCount = 1;
         this._prependedInlineCompletionItems = [];
-        this._rangeVersionIdValue = 0;
-        this._rangeVersionId = derived(this, reader => {
-            this.versionId.read(reader);
-            let changed = false;
-            for (const i of this._inlineCompletions) {
-                changed = changed || i._updateRange(this.textModel);
-            }
-            if (changed) {
-                this._rangeVersionIdValue++;
-            }
-            return this._rangeVersionIdValue;
-        });
-        const ids = textModel.deltaDecorations([], ( inlineCompletionProviderResult.completions.map(i => ({
+        const ids = _textModel.deltaDecorations([], ( inlineCompletionProviderResult.completions.map(i => ({
             range: i.range,
             options: {
                 description: 'inline-completion-tracking-range'
             },
         }))));
-        this._inlineCompletions = ( inlineCompletionProviderResult.completions.map((i, index) => ( new InlineCompletionWithUpdatedRange(i, ids[index], this._rangeVersionId))));
+        this._inlineCompletions = ( inlineCompletionProviderResult.completions.map((i, index) => ( new InlineCompletionWithUpdatedRange(i, ids[index], this._textModel, this._versionId))));
     }
     clone() {
         this._refCount++;
@@ -178,8 +162,8 @@ class UpToDateInlineCompletions {
         this._refCount--;
         if (this._refCount === 0) {
             setTimeout(() => {
-                if (!this.textModel.isDisposed()) {
-                    this.textModel.deltaDecorations(( this._inlineCompletions.map(i => i.decorationId)), []);
+                if (!this._textModel.isDisposed()) {
+                    this._textModel.deltaDecorations(( this._inlineCompletions.map(i => i.decorationId)), []);
                 }
             }, 0);
             this.inlineCompletionProviderResult.dispose();
@@ -192,13 +176,13 @@ class UpToDateInlineCompletions {
         if (addRefToSource) {
             inlineCompletion.source.addRef();
         }
-        const id = this.textModel.deltaDecorations([], [{
+        const id = this._textModel.deltaDecorations([], [{
                 range,
                 options: {
                     description: 'inline-completion-tracking-range'
                 },
             }])[0];
-        this._inlineCompletions.unshift(( new InlineCompletionWithUpdatedRange(inlineCompletion, id, this._rangeVersionId, range)));
+        this._inlineCompletions.unshift(( new InlineCompletionWithUpdatedRange(inlineCompletion, id, this._textModel, this._versionId)));
         this._prependedInlineCompletionItems.push(inlineCompletion);
     }
 }
@@ -206,28 +190,35 @@ class InlineCompletionWithUpdatedRange {
     get forwardStable() {
         return this.inlineCompletion.source.inlineCompletions.enableForwardStability ?? false;
     }
-    constructor(inlineCompletion, decorationId, rangeVersion, initialRange) {
+    constructor(inlineCompletion, decorationId, _textModel, _modelVersion) {
         this.inlineCompletion = inlineCompletion;
         this.decorationId = decorationId;
-        this.rangeVersion = rangeVersion;
+        this._textModel = _textModel;
+        this._modelVersion = _modelVersion;
         this.semanticId = JSON.stringify([
             this.inlineCompletion.filterText,
             this.inlineCompletion.insertText,
             ( this.inlineCompletion.range.getStartPosition().toString())
         ]);
-        this._isValid = true;
-        this._updatedRange = initialRange ?? inlineCompletion.range;
+        this._updatedRange = derivedOpts({ owner: this, equalsFn: Range.equalsRange }, reader => {
+            this._modelVersion.read(reader);
+            return this._textModel.getDecorationRange(this.decorationId);
+        });
     }
     toInlineCompletion(reader) {
-        return this.inlineCompletion.withRange(this._getUpdatedRange(reader));
+        return this.inlineCompletion.withRange(this._updatedRange.read(reader) ?? emptyRange);
     }
     toSingleTextEdit(reader) {
-        return ( new SingleTextEdit(this._getUpdatedRange(reader), this.inlineCompletion.insertText));
+        return ( new SingleTextEdit(
+            this._updatedRange.read(reader) ?? emptyRange,
+            this.inlineCompletion.insertText
+        ));
     }
     isVisible(model, cursorPosition, reader) {
         const minimizedReplacement = singleTextRemoveCommonPrefix(this._toFilterTextReplacement(reader), model);
-        if (!this._isValid
-            || !this.inlineCompletion.range.getStartPosition().equals(this._getUpdatedRange(reader).getStartPosition())
+        const updatedRange = this._updatedRange.read(reader);
+        if (!updatedRange
+            || !this.inlineCompletion.range.getStartPosition().equals(updatedRange.getStartPosition())
             || cursorPosition.lineNumber !== minimizedReplacement.range.startLineNumber) {
             return false;
         }
@@ -253,41 +244,19 @@ class InlineCompletionWithUpdatedRange {
             && !!matchesSubString(originalValueAfter, filterTextAfter);
     }
     canBeReused(model, position) {
-        const result = this._isValid
-            && this._getUpdatedRange(undefined).containsPosition(position)
+        const updatedRange = this._updatedRange.read(undefined);
+        const result = !!updatedRange
+            && updatedRange.containsPosition(position)
             && this.isVisible(model, position, undefined)
-            && !this._isSmallerThanOriginal(undefined);
+            && TextLength.ofRange(updatedRange).isGreaterThanOrEqualTo(TextLength.ofRange(this.inlineCompletion.range));
         return result;
     }
     _toFilterTextReplacement(reader) {
-        return ( new SingleTextEdit(this._getUpdatedRange(reader), this.inlineCompletion.filterText));
-    }
-    _isSmallerThanOriginal(reader) {
-        return length(this._getUpdatedRange(reader)).isBefore(length(this.inlineCompletion.range));
-    }
-    _getUpdatedRange(reader) {
-        this.rangeVersion.read(reader);
-        return this._updatedRange;
-    }
-    _updateRange(textModel) {
-        const range = textModel.getDecorationRange(this.decorationId);
-        if (!range) {
-            this._isValid = false;
-            return true;
-        }
-        if (!this._updatedRange.equalsRange(range)) {
-            this._updatedRange = range;
-            return true;
-        }
-        return false;
-    }
-}
-function length(range) {
-    if (range.startLineNumber === range.endLineNumber) {
-        return ( new Position(1, 1 + range.endColumn - range.startColumn));
-    }
-    else {
-        return ( new Position(1 + range.endLineNumber - range.startLineNumber, range.endColumn));
+        return ( new SingleTextEdit(
+            this._updatedRange.read(reader) ?? emptyRange,
+            this.inlineCompletion.filterText
+        ));
     }
 }
+const emptyRange = ( new Range(1, 1, 1, 1));
 export { InlineCompletionWithUpdatedRange, InlineCompletionsSource, UpToDateInlineCompletions };

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

@@ -130,7 +130,7 @@ function smartDiff(originalValue, newValue, smartBracketMatching) {
     const maxCharCode = Math.max(getMaxCharCode(originalValue), getMaxCharCode(newValue));
     function getUniqueCharCode(id) {
         if (id < 0) {
-            throw new Error('unexpected');
+            throw ( new Error('unexpected'));
         }
         return maxCharCode + id + 1;
     }

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

@@ -11,9 +11,9 @@ import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
-import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
-import { findFirstMaxBy } from '../../../../base/common/arraysFind.js';
+import { SingleTextEdit } from '../../../common/core/textEdit.js';
+import { findFirstMax } from '../../../../base/common/arraysFind.js';
 import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEdit.js';
 class SuggestWidgetAdaptor extends Disposable {
     get selectedItem() {
@@ -66,7 +66,7 @@ class SuggestWidgetAdaptor extends Disposable {
                         return { index, valid, prefixLength: suggestItemTextEdit.text.length, suggestItem };
                     }))
                         .filter(item => item && item.valid && item.prefixLength > 0);
-                    const result = findFirstMaxBy(candidates, compareBy(s => s.prefixLength, numberComparator));
+                    const result = findFirstMax(candidates, compareBy(s => s.prefixLength, numberComparator));
                     return result ? result.index : -1;
                 }
             }));