@codingame/monaco-vscode-api 6.0.3 → 7.0.1

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

@@ -1,17 +1,18 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { createStyleSheet2 } from '../../../../base/browser/dom.js';
+import { createStyleSheetFromObservable } from '../../../../base/browser/domObservable.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { timeout } from '../../../../base/common/async.js';
 import { cancelOnDispose } from '../../../../base/common/cancellation.js';
-import { itemsEquals, itemEquals } from '../../../../base/common/equals.js';
-import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { disposableObservableValue, observableValue, observableValueOpts, transaction } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, mapObservableArrayCached, observableSignal, constObservable } from '../../../../base/common/observableInternal/utils.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { transaction, observableValue } from '../../../../base/common/observableInternal/base.js';
+import { derived, derivedDisposable } from '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, mapObservableArrayCached, observableSignal, constObservable, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
 import { waitForState } from '../../../../base/common/observableInternal/promise.js';
+import '../../../../base/common/arrays.js';
 import { isUndefined } from '../../../../base/common/types.js';
 import { CoreEditingCommands } from '../../../browser/coreCommands.js';
+import { observableCodeEditor, reactToChange, reactToChangeWithStore } from '../../../browser/observableCodeEditor.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { CursorChangeReason } from '../../../common/cursorEvents.js';
@@ -21,7 +22,7 @@ import { inlineSuggestCommitId } from './commandIds.js';
 import { GhostTextWidget } from './ghostTextWidget.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineSuggestionHintsContentWidget, InlineCompletionsHintsWidget } from './inlineCompletionsHintsWidget.js';
-import { VersionIdChangeReason, InlineCompletionsModel } from './inlineCompletionsModel.js';
+import { InlineCompletionsModel } from './inlineCompletionsModel.js';
 import { SuggestWidgetAdaptor } from './suggestWidgetInlineCompletionProvider.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
@@ -52,90 +53,51 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this._accessibilitySignalService = _accessibilitySignalService;
         this._keybindingService = _keybindingService;
         this._accessibilityService = _accessibilityService;
-        this.model = this._register(disposableObservableValue('inlineCompletionModel', undefined));
-        this._textModelVersionId = observableValue(this, -1);
-        this._positions = observableValueOpts({ owner: this, equalsFn: itemsEquals(itemEquals()) }, [( (new Position(1, 1)))]);
-        this._suggestWidgetAdaptor = this._register(( (new SuggestWidgetAdaptor(
-            this.editor,
-            () => this.model.get()?.selectedInlineCompletion.get()?.toSingleTextEdit(undefined),
-            (tx) => this.updateObservables(tx, VersionIdChangeReason.Other),
-            (item) => {
-                transaction(tx => {
-                    this.updateObservables(tx, VersionIdChangeReason.Other);
-                    this.model.get()?.handleSuggestAccepted(item);
-                });
-            }
-        ))));
-        this._enabledInConfig = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
-        this._isScreenReaderEnabled = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
-        this._editorDictationInProgress = observableFromEvent(this._contextKeyService.onDidChangeContext, () => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('editorDictation.inProgress') === true);
+        this._editorObs = observableCodeEditor(this.editor);
+        this._positions = derived(this, reader => this._editorObs.selections.read(reader)?.map(s => s.getEndPosition()) ?? [( (new Position(1, 1)))]);
+        this._suggestWidgetAdaptor = this._register(( (new SuggestWidgetAdaptor(this.editor, () => {
+            this._editorObs.forceUpdate();
+            return this.model.get()?.selectedInlineCompletion.get()?.toSingleTextEdit(undefined);
+        }, (item) => this._editorObs.forceUpdate(_tx => {
+            this.model.get()?.handleSuggestAccepted(item);
+        })))));
+        this._suggestWidgetSelectedItem = observableFromEvent(this, cb => this._suggestWidgetAdaptor.onDidSelectedItemChange(() => {
+            this._editorObs.forceUpdate(_tx => cb(undefined));
+        }), () => this._suggestWidgetAdaptor.selectedItem);
+        this._enabledInConfig = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
+        this._isScreenReaderEnabled = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
+        this._editorDictationInProgress = observableFromEvent(this, this._contextKeyService.onDidChangeContext, () => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('editorDictation.inProgress') === true);
         this._enabled = derived(this, reader => this._enabledInConfig.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._editorDictationInProgress.read(reader)));
-        this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).fontFamily);
+        this._debounceValue = this._debounceService.for(this._languageFeaturesService.inlineCompletionsProvider, 'InlineCompletionsDebounce', { min: 50, max: 50 });
+        this.model = derivedDisposable(this, reader => {
+            if (this._editorObs.isReadonly.read(reader)) {
+                return undefined;
+            }
+            const textModel = this._editorObs.model.read(reader);
+            if (!textModel) {
+                return undefined;
+            }
+            const model = this._instantiationService.createInstance(InlineCompletionsModel, textModel, this._suggestWidgetSelectedItem, this._editorObs.versionId, this._positions, this._debounceValue, observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.suggest).preview), observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.suggest).previewMode), observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).mode), this._enabled);
+            return model;
+        }).recomputeInitiallyAndOnChange(this._store);
         this._ghostTexts = derived(this, (reader) => {
             const model = this.model.read(reader);
             return model?.ghostTexts.read(reader) ?? [];
         });
         this._stablizedGhostTexts = convertItemsToStableObservables(this._ghostTexts, this._store);
-        this._ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) => {
-            return store.add(this._instantiationService.createInstance(GhostTextWidget, this.editor, {
-                ghostText: ghostText,
-                minReservedLineCount: constObservable(0),
-                targetTextModel: ( (this.model.map(v => v?.textModel))),
-            }));
-        }).recomputeInitiallyAndOnChange(this._store);
-        this._debounceValue = this._debounceService.for(this._languageFeaturesService.inlineCompletionsProvider, 'InlineCompletionsDebounce', { min: 50, max: 50 });
+        this._ghostTextWidgets = mapObservableArrayCached(this, this._stablizedGhostTexts, (ghostText, store) => store.add(this._instantiationService.createInstance(GhostTextWidget, this.editor, {
+            ghostText: ghostText,
+            minReservedLineCount: constObservable(0),
+            targetTextModel: ( (this.model.map(v => v?.textModel))),
+        }))).recomputeInitiallyAndOnChange(this._store);
         this._playAccessibilitySignal = observableSignal(this);
-        this._isReadonly = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
-        this._textModel = observableFromEvent(this.editor.onDidChangeModel, () => this.editor.getModel());
-        this._textModelIfWritable = derived(reader => this._isReadonly.read(reader) ? undefined : this._textModel.read(reader));
+        this._fontFamily = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).fontFamily);
         this._register(( (new InlineCompletionContextKeys(this._contextKeyService, this.model))));
-        this._register(autorun(reader => {
-            const textModel = this._textModelIfWritable.read(reader);
-            transaction(tx => {
-                this.model.set(undefined, tx);
-                this.updateObservables(tx, VersionIdChangeReason.Other);
-                if (textModel) {
-                    const model = _instantiationService.createInstance(InlineCompletionsModel, textModel, this._suggestWidgetAdaptor.selectedItem, this._textModelVersionId, this._positions, this._debounceValue, observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.suggest).preview), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.suggest).previewMode), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.inlineSuggest).mode), this._enabled);
-                    this.model.set(model, tx);
-                }
-            });
-        }));
-        const styleElement = this._register(createStyleSheet2());
-        this._register(autorun(reader => {
-            const fontFamily = this._fontFamily.read(reader);
-            styleElement.setStyle(fontFamily === '' || fontFamily === 'default' ? `` : `
-.monaco-editor .ghost-text-decoration,
-.monaco-editor .ghost-text-decoration-preview,
-.monaco-editor .ghost-text {
-	font-family: ${fontFamily};
-}`);
-        }));
-        const getReason = (e) => {
-            if (e.isUndoing) {
-                return VersionIdChangeReason.Undo;
-            }
-            if (e.isRedoing) {
-                return VersionIdChangeReason.Redo;
-            }
-            if (this.model.get()?.isAcceptingPartially) {
-                return VersionIdChangeReason.AcceptWord;
-            }
-            return VersionIdChangeReason.Other;
-        };
-        this._register(editor.onDidChangeModelContent((e) => transaction(tx =>
-        this.updateObservables(tx, getReason(e)))));
-        this._register(editor.onDidChangeCursorPosition(e => transaction(tx => {
-            this.updateObservables(tx, VersionIdChangeReason.Other);
-            if (e.reason === CursorChangeReason.Explicit || e.source === 'api') {
-                this.model.get()?.stop(tx);
-            }
-        })));
-        this._register(editor.onDidType(() => transaction(tx => {
-            this.updateObservables(tx, VersionIdChangeReason.Other);
+        this._register(reactToChange(this._editorObs.onDidType, (_value, _changes) => {
             if (this._enabled.get()) {
-                this.model.get()?.trigger(tx);
+                this.model.get()?.trigger();
             }
-        })));
+        }));
         this._register(this._commandService.onDidExecuteCommand((e) => {
             const commands = ( (new Set([
                 CoreEditingCommands.Tab.id,
@@ -145,17 +107,21 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 'acceptSelectedSuggestion',
             ])));
             if (( (commands.has(e.commandId))) && editor.hasTextFocus() && this._enabled.get()) {
-                transaction(tx => {
+                this._editorObs.forceUpdate(tx => {
                     this.model.get()?.trigger(tx);
                 });
             }
         }));
-        this._register(this.editor.onDidBlurEditorWidget(() => {
-            if (this._contextKeyService.getContextKeyValue('accessibleViewIsShown') || this._configurationService.getValue('editor.inlineSuggest.keepOnBlur') ||
-                editor.getOption(EditorOption.inlineSuggest).keepOnBlur) {
-                return;
+        this._register(reactToChange(this._editorObs.selections, (_value, changes) => {
+            if (( (changes.some(e => e.reason === CursorChangeReason.Explicit || e.source === 'api')))) {
+                this.model.get()?.stop();
             }
-            if (InlineSuggestionHintsContentWidget.dropDownVisible) {
+        }));
+        this._register(this.editor.onDidBlurEditorWidget(() => {
+            if (this._contextKeyService.getContextKeyValue('accessibleViewIsShown')
+                || this._configurationService.getValue('editor.inlineSuggest.keepOnBlur')
+                || editor.getOption(EditorOption.inlineSuggest).keepOnBlur
+                || InlineSuggestionHintsContentWidget.dropDownVisible) {
                 return;
             }
             transaction(tx => {
@@ -176,36 +142,45 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this._register(toDisposable(() => {
             this._suggestWidgetAdaptor.stopForceRenderingAbove();
         }));
-        const cancellationStore = this._register(( (new DisposableStore())));
-        let lastInlineCompletionId = undefined;
-        this._register(autorunHandleChanges({
-            handleChange: (context, changeSummary) => {
-                if (context.didChange(this._playAccessibilitySignal)) {
-                    lastInlineCompletionId = undefined;
-                }
-                return true;
-            },
-        }, async (reader, _) => {
-            this._playAccessibilitySignal.read(reader);
+        const currentInlineCompletionBySemanticId = derivedObservableWithCache(this, (reader, last) => {
             const model = this.model.read(reader);
             const state = model?.state.read(reader);
-            if (!model || !state || !state.inlineCompletion) {
-                lastInlineCompletionId = undefined;
+            if (this._suggestWidgetSelectedItem.get()) {
+                return last;
+            }
+            return state?.inlineCompletion?.semanticId;
+        });
+        this._register(reactToChangeWithStore(derived(reader => {
+            this._playAccessibilitySignal.read(reader);
+            currentInlineCompletionBySemanticId.read(reader);
+            return {};
+        }), async (_value, _deltas, store) => {
+            const model = this.model.get();
+            const state = model?.state.get();
+            if (!state || !model) {
                 return;
             }
-            if (state.inlineCompletion.semanticId !== lastInlineCompletionId) {
-                cancellationStore.clear();
-                lastInlineCompletionId = state.inlineCompletion.semanticId;
-                const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
-                await timeout(50, cancelOnDispose(cancellationStore));
-                await waitForState(this._suggestWidgetAdaptor.selectedItem, isUndefined, () => false, cancelOnDispose(cancellationStore));
-                await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
-                if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
-                    this.provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
-                }
+            const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+            await timeout(50, cancelOnDispose(store));
+            await waitForState(this._suggestWidgetSelectedItem, isUndefined, () => false, cancelOnDispose(store));
+            await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
+            if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
+                this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
             }
         }));
         this._register(( (new InlineCompletionsHintsWidget(this.editor, this.model, this._instantiationService))));
+        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,
+.monaco-editor .ghost-text {
+	font-family: ${fontFamily};
+}`;
+        })));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration('accessibility.verbosity.inlineCompletions')) {
                 this.editor.updateOptions({ inlineCompletionsAccessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.inlineCompletions') });
@@ -216,7 +191,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
     playAccessibilitySignal(tx) {
         this._playAccessibilitySignal.trigger(tx);
     }
-    provideScreenReaderUpdate(content) {
+    _provideScreenReaderUpdate(content) {
         const accessibleViewShowing = this._contextKeyService.getContextKeyValue('accessibleViewIsShown');
         const accessibleViewKeybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView');
         let hint;
@@ -228,12 +203,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 accessibleViewKeybinding.getAriaLabel()
             ));
         }
-        hint ? alert(content + ', ' + hint) : alert(content);
-    }
-    updateObservables(tx, changeReason) {
-        const newModel = this.editor.getModel();
-        this._textModelVersionId.set(newModel?.getVersionId() ?? -1, tx, changeReason);
-        this._positions.set(this.editor.getSelections()?.map(selection => selection.getPosition()) ?? [( (new Position(1, 1)))], tx);
+        alert(hint ? content + ', ' + hint : content);
     }
     shouldShowHoverAt(range) {
         const ghostText = this.model.get()?.primaryGhostText.get();

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

@@ -40,7 +40,7 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
         this.editor = editor;
         this.model = model;
         this.instantiationService = instantiationService;
-        this.alwaysShowToolbar = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).showToolbar === 'always');
+        this.alwaysShowToolbar = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).showToolbar === 'always');
         this.sessionPosition = undefined;
         this.position = derived(this, reader => {
             const ghostText = this.model.read(reader)?.primaryGhostText.read(reader);

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Permutation } from '../../../../base/common/arrays.js';
+import { Permutation, compareBy } 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';
+import { observableValue, transaction, subtransaction } from '../../../../base/common/observableInternal/base.js';
 import { derived, derivedHandleChanges, derivedOpts } from '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import { observableSignal, recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils.js';
@@ -28,20 +28,13 @@ 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';
-var VersionIdChangeReason;
-( (function(VersionIdChangeReason) {
-    VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";
-    VersionIdChangeReason[VersionIdChangeReason["Redo"] = 1] = "Redo";
-    VersionIdChangeReason[VersionIdChangeReason["AcceptWord"] = 2] = "AcceptWord";
-    VersionIdChangeReason[VersionIdChangeReason["Other"] = 3] = "Other";
-})(VersionIdChangeReason || (VersionIdChangeReason = {})));
 let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
     get isAcceptingPartially() { return this._isAcceptingPartially; }
-    constructor(textModel, selectedSuggestItem, textModelVersionId, _positions, _debounceValue, _suggestPreviewEnabled, _suggestPreviewMode, _inlineSuggestMode, _enabled, _instantiationService, _commandService, _languageConfigurationService) {
+    constructor(textModel, selectedSuggestItem, _textModelVersionId, _positions, _debounceValue, _suggestPreviewEnabled, _suggestPreviewMode, _inlineSuggestMode, _enabled, _instantiationService, _commandService, _languageConfigurationService) {
         super();
         this.textModel = textModel;
         this.selectedSuggestItem = selectedSuggestItem;
-        this.textModelVersionId = textModelVersionId;
+        this._textModelVersionId = _textModelVersionId;
         this._positions = _positions;
         this._debounceValue = _debounceValue;
         this._suggestPreviewEnabled = _suggestPreviewEnabled;
@@ -51,7 +44,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._instantiationService = _instantiationService;
         this._commandService = _commandService;
         this._languageConfigurationService = _languageConfigurationService;
-        this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this.textModelVersionId, this._debounceValue));
+        this._source = this._register(this._instantiationService.createInstance(InlineCompletionsSource, this.textModel, this._textModelVersionId, this._debounceValue));
         this._isActive = observableValue(this, false);
         this._forceUpdateExplicitlySignal = observableSignal(this);
         this._selectedInlineCompletionId = observableValue(this, undefined);
@@ -69,7 +62,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 inlineCompletionTriggerKind: InlineCompletionTriggerKind.Automatic
             }),
             handleChange: (ctx, changeSummary) => {
-                if (ctx.didChange(this.textModelVersionId) && ( this._preserveCurrentCompletionReasons.has(ctx.change))) {
+                if (ctx.didChange(this._textModelVersionId) && ( this._preserveCurrentCompletionReasons.has(this._getReason(ctx.change)))) {
                     changeSummary.preserveCurrentCompletion = true;
                 }
                 else if (ctx.didChange(this._forceUpdateExplicitlySignal)) {
@@ -84,7 +77,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 this._source.cancelUpdate();
                 return undefined;
             }
-            this.textModelVersionId.read(reader);
+            this._textModelVersionId.read(reader);
             const suggestWidgetInlineCompletions = this._source.suggestWidgetInlineCompletions.get();
             const suggestItem = this.selectedSuggestItem.read(reader);
             if (suggestWidgetInlineCompletions && !suggestItem) {
@@ -195,20 +188,14 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 return { edits, primaryGhostText: ghostTexts[0], ghostTexts, inlineCompletion, suggestItem: undefined };
             }
         });
-        this.ghostTexts = derivedOpts({
-            owner: this,
-            equalsFn: ghostTextsOrReplacementsEqual
-        }, reader => {
+        this.ghostTexts = derivedOpts({ owner: this, equalsFn: ghostTextsOrReplacementsEqual }, reader => {
             const v = this.state.read(reader);
             if (!v) {
                 return undefined;
             }
             return v.ghostTexts;
         });
-        this.primaryGhostText = derivedOpts({
-            owner: this,
-            equalsFn: ghostTextOrReplacementEquals
-        }, reader => {
+        this.primaryGhostText = derivedOpts({ owner: this, equalsFn: ghostTextOrReplacementEquals }, reader => {
             const v = this.state.read(reader);
             if (!v) {
                 return undefined;
@@ -230,6 +217,18 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             }
         }));
     }
+    _getReason(e) {
+        if (e?.isUndoing) {
+            return VersionIdChangeReason.Undo;
+        }
+        if (e?.isRedoing) {
+            return VersionIdChangeReason.Redo;
+        }
+        if (this.isAcceptingPartially) {
+            return VersionIdChangeReason.AcceptWord;
+        }
+        return VersionIdChangeReason.Other;
+    }
     async trigger(tx) {
         this._isActive.set(true, tx);
         await this._fetchInlineCompletionsPromise.get();
@@ -286,6 +285,9 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             return;
         }
         const completion = state.inlineCompletion.toInlineCompletion(undefined);
+        if (completion.command) {
+            completion.source.addRef();
+        }
         editor.pushUndoStop();
         if (completion.snippetInfo) {
             editor.executeEdits('inlineSuggestion.accept', [
@@ -304,13 +306,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             ]);
             editor.setSelections(selections, 'inlineCompletionAccept');
         }
-        if (completion.command) {
-            completion.source.addRef();
-        }
-        transaction(tx => {
-            this._source.clear(tx);
-            this._isActive.set(false, tx);
-        });
+        this.stop();
         if (completion.command) {
             await this._commandService
                 .executeCommand(completion.command.id, ...(completion.command.arguments || []))
@@ -400,9 +396,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             if (completion.source.provider.handlePartialAccept) {
                 const acceptedRange = Range.fromPositions(completion.range.getStartPosition(), TextLength.ofText(partialGhostTextVal).addToPosition(ghostTextPos));
                 const text = editor.getModel().getValueInRange(acceptedRange, EndOfLinePreference.LF);
-                completion.source.provider.handlePartialAccept(completion.source.inlineCompletions, completion.sourceInlineCompletion, text.length, {
-                    kind,
-                });
+                completion.source.provider.handlePartialAccept(completion.source.inlineCompletions, completion.sourceInlineCompletion, text.length, { kind, });
             }
         }
         finally {
@@ -426,6 +420,13 @@ InlineCompletionsModel = ( __decorate([
     ( __param(10, ICommandService)),
     ( __param(11, ILanguageConfigurationService))
 ], InlineCompletionsModel));
+var VersionIdChangeReason;
+( (function(VersionIdChangeReason) {
+    VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";
+    VersionIdChangeReason[VersionIdChangeReason["Redo"] = 1] = "Redo";
+    VersionIdChangeReason[VersionIdChangeReason["AcceptWord"] = 2] = "AcceptWord";
+    VersionIdChangeReason[VersionIdChangeReason["Other"] = 3] = "Other";
+})(VersionIdChangeReason || (VersionIdChangeReason = {})));
 function getSecondaryEdits(textModel, positions, primaryEdit) {
     if (positions.length === 1) {
         return [];
@@ -459,7 +460,7 @@ function substringPos(text, pos) {
     return subtext;
 }
 function getEndPositionsAfterApplying(edits) {
-    const sortPerm = Permutation.createSortPermutation(edits, (edit1, edit2) => Range.compareRangesUsingStarts(edit1.range, edit2.range));
+    const sortPerm = Permutation.createSortPermutation(edits, compareBy(e => e.range, Range.compareRangesUsingStarts));
     const edit = ( new TextEdit(sortPerm.apply(edits)));
     const sortedNewRanges = edit.getNewRanges();
     const newRanges = sortPerm.inverse().apply(sortedNewRanges);

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

@@ -48,12 +48,12 @@ let InlineCompletionsSource = class InlineCompletionsSource extends Disposable {
             if (shouldDebounce) {
                 await wait(this._debounceValue.get(this.textModel), source.token);
             }
-            if (source.token.isCancellationRequested || this.textModel.getVersionId() !== request.versionId) {
+            if (source.token.isCancellationRequested || this._store.isDisposed || this.textModel.getVersionId() !== request.versionId) {
                 return false;
             }
             const startTime = ( new Date());
             const updatedCompletions = await provideInlineCompletions(this.languageFeaturesService.inlineCompletionsProvider, position, this.textModel, context, source.token, this.languageConfigurationService);
-            if (source.token.isCancellationRequested || this.textModel.getVersionId() !== request.versionId) {
+            if (source.token.isCancellationRequested || this._store.isDisposed || this.textModel.getVersionId() !== request.versionId) {
                 return false;
             }
             const endTime = ( new Date());

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

@@ -3,13 +3,14 @@ import { DeferredPromise } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { SetMap } from '../../../../base/common/map.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
+import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { fixBracketsInLine } from '../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
 import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { getReadonlyEmptyArray } from './utils.js';
 import { SnippetParser, Text } from '../../snippet/browser/snippetParser.js';
-async function provideInlineCompletions(registry, position, model, context, token = CancellationToken.None, languageConfigurationService) {
-    const defaultReplaceRange = getDefaultRange(position, model);
+async function provideInlineCompletions(registry, positionOrRange, model, context, token = CancellationToken.None, languageConfigurationService) {
+    const defaultReplaceRange = positionOrRange instanceof Position ? getDefaultRange(positionOrRange, model) : positionOrRange;
     const providers = registry.all(model);
     const multiMap = ( new SetMap());
     for (const provider of providers) {
@@ -76,8 +77,14 @@ async function provideInlineCompletions(registry, position, model, context, toke
                 }
             }
             try {
-                const completions = await provider.provideInlineCompletions(model, position, context, token);
-                return completions;
+                if (positionOrRange instanceof Position) {
+                    const completions = await provider.provideInlineCompletions(model, positionOrRange, context, token);
+                    return completions;
+                }
+                else {
+                    const completions = await provider.provideInlineEdits?.(model, positionOrRange, context, token);
+                    return completions;
+                }
             }
             catch (e) {
                 onUnexpectedExternalError(e);

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

@@ -1,35 +1,30 @@
-import { Event } from '../../../../base/common/event.js';
+import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { findFirstMax } from '../../../../base/common/arraysFind.js';
+import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { CompletionItemInsertTextRule, SelectedSuggestionInfo } from '../../../common/languages.js';
+import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEdit.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { SnippetSession } from '../../snippet/browser/snippetSession.js';
 import { SuggestController } from '../../suggest/browser/suggestController.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/observableInternal/derived.js';
-import '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
-import '../../../../base/common/cancellation.js';
-import { compareBy, numberComparator } from '../../../../base/common/arrays.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() {
-        return this._selectedItem;
+        return this._currentSuggestItemInfo;
     }
-    constructor(editor, suggestControllerPreselector, checkModelVersion, onWillAccept) {
+    constructor(editor, suggestControllerPreselector, onWillAccept) {
         super();
         this.editor = editor;
         this.suggestControllerPreselector = suggestControllerPreselector;
-        this.checkModelVersion = checkModelVersion;
         this.onWillAccept = onWillAccept;
         this.isSuggestWidgetVisible = false;
         this.isShiftKeyPressed = false;
         this._isActive = false;
         this._currentSuggestItemInfo = undefined;
-        this._selectedItem = observableValue(this, undefined);
+        this._onDidSelectedItemChange = this._register(( new Emitter()));
+        this.onDidSelectedItemChange = this._onDidSelectedItemChange.event;
         this._register(editor.onKeyDown(e => {
             if (e.shiftKey && !this.isShiftKeyPressed) {
                 this.isShiftKeyPressed = true;
@@ -47,7 +42,6 @@ class SuggestWidgetAdaptor extends Disposable {
             this._register(suggestController.registerSelector({
                 priority: 100,
                 select: (model, pos, suggestItems) => {
-                    transaction(tx => this.checkModelVersion(tx));
                     const textModel = this.editor.getModel();
                     if (!textModel) {
                         return -1;
@@ -109,10 +103,7 @@ class SuggestWidgetAdaptor extends Disposable {
         if (this._isActive !== newActive || !suggestItemInfoEquals(this._currentSuggestItemInfo, newInlineCompletion)) {
             this._isActive = newActive;
             this._currentSuggestItemInfo = newInlineCompletion;
-            transaction(tx => {
-                this.checkModelVersion(tx);
-                this._selectedItem.set(this._isActive ? this._currentSuggestItemInfo : undefined, tx);
-            });
+            this._onDidSelectedItemChange.fire();
         }
     }
     getSuggestItemInfo() {

package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js

@@ -23,7 +23,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
         this.model = model;
         this.languageService = languageService;
         this.isDisposed = observableValue(this, false);
-        this.currentTextModel = observableFromEvent(this.editor.onDidChangeModel, () =>  this.editor.getModel());
+        this.currentTextModel = observableFromEvent(this, this.editor.onDidChangeModel, () =>  this.editor.getModel());
         this.uiState = derived(this, reader => {
             if (this.isDisposed.read(reader)) {
                 return undefined;