@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -5,7 +5,7 @@ import { SetMap } from '../../../../base/common/map.js';
 import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
 import { Range } from '../../../common/core/range.js';
 import { fixBracketsInLine } from '../../../common/model/bracketPairsTextModelPart/fixBrackets.js';
-import { SingleTextEdit } from './singleTextEdit.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) {

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

@@ -1,90 +1,82 @@
 import { LcsDiff } from '../../../../base/common/diff/diff.js';
 import { commonPrefixLength, getLeadingWhitespace } from '../../../../base/common/strings.js';
 import { Range } from '../../../common/core/range.js';
+import { TextLength } from '../../../common/core/textLength.js';
+import { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { GhostTextPart, GhostText } from './ghostText.js';
-import { addPositions, lengthOfText } from './utils.js';
-class SingleTextEdit {
-    constructor(range, text) {
-        this.range = range;
-        this.text = text;
+function singleTextRemoveCommonPrefix(edit, model, validModelRange) {
+    const modelRange = validModelRange ? edit.range.intersectRanges(validModelRange) : edit.range;
+    if (!modelRange) {
+        return edit;
     }
-    static equals(first, second) {
-        return first.range.equalsRange(second.range) && first.text === second.text;
+    const valueToReplace = model.getValueInRange(modelRange, 1 );
+    const commonPrefixLen = commonPrefixLength(valueToReplace, edit.text);
+    const start = TextLength.ofText(valueToReplace.substring(0, commonPrefixLen)).addToPosition(edit.range.getStartPosition());
+    const text = edit.text.substring(commonPrefixLen);
+    const range = Range.fromPositions(start, edit.range.getEndPosition());
+    return ( new SingleTextEdit(range, text));
+}
+function singleTextEditAugments(edit, base) {
+    return edit.text.startsWith(base.text) && rangeExtends(edit.range, base.range);
+}
+function computeGhostText(edit, model, mode, cursorPosition, previewSuffixLength = 0) {
+    let e = singleTextRemoveCommonPrefix(edit, model);
+    if (e.range.endLineNumber !== e.range.startLineNumber) {
+        return undefined;
     }
-    removeCommonPrefix(model, validModelRange) {
-        const modelRange = validModelRange ? this.range.intersectRanges(validModelRange) : this.range;
-        if (!modelRange) {
-            return this;
-        }
-        const valueToReplace = model.getValueInRange(modelRange, 1 );
-        const commonPrefixLen = commonPrefixLength(valueToReplace, this.text);
-        const start = addPositions(this.range.getStartPosition(), lengthOfText(valueToReplace.substring(0, commonPrefixLen)));
-        const text = this.text.substring(commonPrefixLen);
-        const range = Range.fromPositions(start, this.range.getEndPosition());
-        return ( new SingleTextEdit(range, text));
+    const sourceLine = model.getLineContent(e.range.startLineNumber);
+    const sourceIndentationLength = getLeadingWhitespace(sourceLine).length;
+    const suggestionTouchesIndentation = e.range.startColumn - 1 <= sourceIndentationLength;
+    if (suggestionTouchesIndentation) {
+        const suggestionAddedIndentationLength = getLeadingWhitespace(e.text).length;
+        const replacedIndentation = sourceLine.substring(e.range.startColumn - 1, sourceIndentationLength);
+        const [startPosition, endPosition] = [e.range.getStartPosition(), e.range.getEndPosition()];
+        const newStartPosition = startPosition.column + replacedIndentation.length <= endPosition.column
+            ? startPosition.delta(0, replacedIndentation.length)
+            : endPosition;
+        const rangeThatDoesNotReplaceIndentation = Range.fromPositions(newStartPosition, endPosition);
+        const suggestionWithoutIndentationChange = e.text.startsWith(replacedIndentation)
+            ? e.text.substring(replacedIndentation.length)
+            : e.text.substring(suggestionAddedIndentationLength);
+        e = ( new SingleTextEdit(rangeThatDoesNotReplaceIndentation, suggestionWithoutIndentationChange));
     }
-    augments(base) {
-        return this.text.startsWith(base.text) && rangeExtends(this.range, base.range);
+    const valueToBeReplaced = model.getValueInRange(e.range);
+    const changes = cachingDiff(valueToBeReplaced, e.text);
+    if (!changes) {
+        return undefined;
     }
-    computeGhostText(model, mode, cursorPosition, previewSuffixLength = 0) {
-        let edit = this.removeCommonPrefix(model);
-        if (edit.range.endLineNumber !== edit.range.startLineNumber) {
+    const lineNumber = e.range.startLineNumber;
+    const parts = ( new Array());
+    if (mode === 'prefix') {
+        const filteredChanges = changes.filter(c => c.originalLength === 0);
+        if (filteredChanges.length > 1 || filteredChanges.length === 1 && filteredChanges[0].originalStart !== valueToBeReplaced.length) {
             return undefined;
         }
-        const sourceLine = model.getLineContent(edit.range.startLineNumber);
-        const sourceIndentationLength = getLeadingWhitespace(sourceLine).length;
-        const suggestionTouchesIndentation = edit.range.startColumn - 1 <= sourceIndentationLength;
-        if (suggestionTouchesIndentation) {
-            const suggestionAddedIndentationLength = getLeadingWhitespace(edit.text).length;
-            const replacedIndentation = sourceLine.substring(edit.range.startColumn - 1, sourceIndentationLength);
-            const [startPosition, endPosition] = [edit.range.getStartPosition(), edit.range.getEndPosition()];
-            const newStartPosition = startPosition.column + replacedIndentation.length <= endPosition.column
-                ? startPosition.delta(0, replacedIndentation.length)
-                : endPosition;
-            const rangeThatDoesNotReplaceIndentation = Range.fromPositions(newStartPosition, endPosition);
-            const suggestionWithoutIndentationChange = edit.text.startsWith(replacedIndentation)
-                ? edit.text.substring(replacedIndentation.length)
-                : edit.text.substring(suggestionAddedIndentationLength);
-            edit = ( new SingleTextEdit(rangeThatDoesNotReplaceIndentation, suggestionWithoutIndentationChange));
+    }
+    const previewStartInCompletionText = e.text.length - previewSuffixLength;
+    for (const c of changes) {
+        const insertColumn = e.range.startColumn + c.originalStart + c.originalLength;
+        if (mode === 'subwordSmart' && cursorPosition && cursorPosition.lineNumber === e.range.startLineNumber && insertColumn < cursorPosition.column) {
+            return undefined;
         }
-        const valueToBeReplaced = model.getValueInRange(edit.range);
-        const changes = cachingDiff(valueToBeReplaced, edit.text);
-        if (!changes) {
+        if (c.originalLength > 0) {
             return undefined;
         }
-        const lineNumber = edit.range.startLineNumber;
-        const parts = ( new Array());
-        if (mode === 'prefix') {
-            const filteredChanges = changes.filter(c => c.originalLength === 0);
-            if (filteredChanges.length > 1 || filteredChanges.length === 1 && filteredChanges[0].originalStart !== valueToBeReplaced.length) {
-                return undefined;
-            }
+        if (c.modifiedLength === 0) {
+            continue;
         }
-        const previewStartInCompletionText = edit.text.length - previewSuffixLength;
-        for (const c of changes) {
-            const insertColumn = edit.range.startColumn + c.originalStart + c.originalLength;
-            if (mode === 'subwordSmart' && cursorPosition && cursorPosition.lineNumber === edit.range.startLineNumber && insertColumn < cursorPosition.column) {
-                return undefined;
-            }
-            if (c.originalLength > 0) {
-                return undefined;
-            }
-            if (c.modifiedLength === 0) {
-                continue;
-            }
-            const modifiedEnd = c.modifiedStart + c.modifiedLength;
-            const nonPreviewTextEnd = Math.max(c.modifiedStart, Math.min(modifiedEnd, previewStartInCompletionText));
-            const nonPreviewText = edit.text.substring(c.modifiedStart, nonPreviewTextEnd);
-            const italicText = edit.text.substring(nonPreviewTextEnd, Math.max(c.modifiedStart, modifiedEnd));
-            if (nonPreviewText.length > 0) {
-                parts.push(( new GhostTextPart(insertColumn, nonPreviewText, false)));
-            }
-            if (italicText.length > 0) {
-                parts.push(( new GhostTextPart(insertColumn, italicText, true)));
-            }
+        const modifiedEnd = c.modifiedStart + c.modifiedLength;
+        const nonPreviewTextEnd = Math.max(c.modifiedStart, Math.min(modifiedEnd, previewStartInCompletionText));
+        const nonPreviewText = e.text.substring(c.modifiedStart, nonPreviewTextEnd);
+        const italicText = e.text.substring(nonPreviewTextEnd, Math.max(c.modifiedStart, modifiedEnd));
+        if (nonPreviewText.length > 0) {
+            parts.push(( new GhostTextPart(insertColumn, nonPreviewText, false)));
+        }
+        if (italicText.length > 0) {
+            parts.push(( new GhostTextPart(insertColumn, italicText, true)));
         }
-        return ( new GhostText(lineNumber, parts));
     }
+    return ( new GhostText(lineNumber, parts));
 }
 function rangeExtends(extendingRange, rangeToExtend) {
     return rangeToExtend.getStartPosition().equals(extendingRange.getStartPosition())
@@ -170,4 +162,4 @@ function smartDiff(originalValue, newValue, smartBracketMatching) {
     const elements2 = getElements(newValue);
     return ( new LcsDiff({ getElements: () => elements1 }, { getElements: () => elements2 })).ComputeDiff(false).changes;
 }
-export { SingleTextEdit };
+export { computeGhostText, singleTextEditAugments, singleTextRemoveCommonPrefix };

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

@@ -6,10 +6,15 @@ import { SelectedSuggestionInfo } from '../../../common/languages.js';
 import { SnippetParser } from '../../snippet/browser/snippetParser.js';
 import { SnippetSession } from '../../snippet/browser/snippetSession.js';
 import { SuggestController } from '../../suggest/browser/suggestController.js';
-import { SingleTextEdit } from './singleTextEdit.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 { SingleTextEdit } from '../../../common/core/textEdit.js';
 import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
 import { findFirstMaxBy } from '../../../../base/common/arraysFind.js';
-import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import { singleTextRemoveCommonPrefix, singleTextEditAugments } from './singleTextEdit.js';
 class SuggestWidgetAdaptor extends Disposable {
     get selectedItem() {
         return this._selectedItem;
@@ -47,7 +52,8 @@ class SuggestWidgetAdaptor extends Disposable {
                     if (!textModel) {
                         return -1;
                     }
-                    const itemToPreselect = this.suggestControllerPreselector()?.removeCommonPrefix(textModel);
+                    const i = this.suggestControllerPreselector();
+                    const itemToPreselect = i ? singleTextRemoveCommonPrefix(i, textModel) : undefined;
                     if (!itemToPreselect) {
                         return -1;
                     }
@@ -55,8 +61,8 @@ class SuggestWidgetAdaptor extends Disposable {
                     const candidates = ( suggestItems
                         .map((suggestItem, index) => {
                         const suggestItemInfo = SuggestItemInfo.fromSuggestion(suggestController, textModel, position, suggestItem, this.isShiftKeyPressed);
-                        const suggestItemTextEdit = suggestItemInfo.toSingleTextEdit().removeCommonPrefix(textModel);
-                        const valid = itemToPreselect.augments(suggestItemTextEdit);
+                        const suggestItemTextEdit = singleTextRemoveCommonPrefix(suggestItemInfo.toSingleTextEdit(), textModel);
+                        const valid = singleTextEditAugments(itemToPreselect, suggestItemTextEdit);
                         return { index, valid, prefixLength: suggestItemTextEdit.text.length, suggestItem };
                     }))
                         .filter(item => item && item.valid && item.prefixLength > 0);

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

@@ -1,38 +1,11 @@
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
-function applyEdits(text, edits) {
-    const transformer = ( new PositionOffsetTransformer(text));
-    const offsetEdits = ( edits.map(e => {
-        const range = Range.lift(e.range);
-        return ({
-            startOffset: transformer.getOffset(range.getStartPosition()),
-            endOffset: transformer.getOffset(range.getEndPosition()),
-            text: e.text
-        });
-    }));
-    offsetEdits.sort((a, b) => b.startOffset - a.startOffset);
-    for (const edit of offsetEdits) {
-        text = text.substring(0, edit.startOffset) + edit.text + text.substring(edit.endOffset);
-    }
-    return text;
-}
-class PositionOffsetTransformer {
-    constructor(text) {
-        this.lineStartOffsetByLineIdx = [];
-        this.lineStartOffsetByLineIdx.push(0);
-        for (let i = 0; i < text.length; i++) {
-            if (text.charAt(i) === '\n') {
-                this.lineStartOffsetByLineIdx.push(i + 1);
-            }
-        }
-    }
-    getOffset(position) {
-        return this.lineStartOffsetByLineIdx[position.lineNumber - 1] + position.column - 1;
-    }
-}
 const array = [];
 function getReadonlyEmptyArray() {
     return array;
@@ -79,57 +52,4 @@ function subtractPositions(pos1, pos2) {
         pos1.lineNumber - pos2.lineNumber === 0 ? pos1.column - pos2.column + 1 : pos1.column
     ));
 }
-function lengthOfText(text) {
-    let line = 1;
-    let column = 1;
-    for (const c of text) {
-        if (c === '\n') {
-            line++;
-            column = 1;
-        }
-        else {
-            column++;
-        }
-    }
-    return ( new Position(line, column));
-}
-function getNewRanges(edits) {
-    const newRanges = [];
-    let previousEditEndLineNumber = 0;
-    let lineOffset = 0;
-    let columnOffset = 0;
-    for (const edit of edits) {
-        const text = edit.text ?? '';
-        const textLength = lengthOfText(text);
-        const newRangeStart = Position.lift({
-            lineNumber: edit.range.startLineNumber + lineOffset,
-            column: edit.range.startColumn + (edit.range.startLineNumber === previousEditEndLineNumber ? columnOffset : 0)
-        });
-        const newRangeEnd = addPositions(newRangeStart, textLength);
-        newRanges.push(Range.fromPositions(newRangeStart, newRangeEnd));
-        lineOffset += textLength.lineNumber - edit.range.endLineNumber + edit.range.startLineNumber - 1;
-        columnOffset = newRangeEnd.column - edit.range.endColumn;
-        previousEditEndLineNumber = edit.range.endLineNumber;
-    }
-    return newRanges;
-}
-class Permutation {
-    constructor(_indexMap) {
-        this._indexMap = _indexMap;
-    }
-    static createSortPermutation(arr, compareFn) {
-        const sortIndices = Array.from(( arr.keys())).sort((index1, index2) => compareFn(arr[index1], arr[index2]));
-        return ( new Permutation(sortIndices));
-    }
-    apply(arr) {
-        return ( arr.map((_, index) => arr[this._indexMap[index]]));
-    }
-    inverse() {
-        const inverseIndexMap = this._indexMap.slice();
-        for (let i = 0; i < this._indexMap.length; i++) {
-            inverseIndexMap[this._indexMap[i]] = i;
-        }
-        return ( new Permutation(inverseIndexMap));
-    }
-}
-export { ColumnRange, Permutation, addPositions, applyEdits, applyObservableDecorations, getNewRanges, getReadonlyEmptyArray, lengthOfText, subtractPositions };
+export { ColumnRange, addPositions, applyObservableDecorations, getReadonlyEmptyArray, subtractPositions };

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

@@ -32,7 +32,7 @@ class AcceptInlineEdit extends EditorAction {
     }
     async run(accessor, editor) {
         const controller = InlineEditController.get(editor);
-        controller?.accept();
+        await controller?.accept();
     }
 }
 class TriggerInlineEdit extends EditorAction {
@@ -139,7 +139,7 @@ class RejectInlineEdit extends EditorAction {
     }
     async run(accessor, editor) {
         const controller = InlineEditController.get(editor);
-        controller?.clear();
+        await controller?.clear();
     }
 }
 export { AcceptInlineEdit, JumpBackInlineEdit, JumpToInlineEdit, RejectInlineEdit, TriggerInlineEdit };

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

@@ -1,5 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import './inlineEdit.css.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -8,9 +13,6 @@ import { InjectedTextCursorStops } from '../../../common/model.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
 import { AdditionalLinesWidget } from '../../inlineCompletions/browser/ghostTextWidget.js';
 import { ColumnRange, applyObservableDecorations } from '../../inlineCompletions/browser/utils.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 const INLINE_EDIT_DESCRIPTION = 'inline-edit';
 let GhostTextWidget = class GhostTextWidget extends Disposable {
     constructor(editor, model, languageService) {
@@ -138,7 +140,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
                 }
                 else {
                     const lines = uiState.range.endLineNumber - uiState.range.startLineNumber;
-                    for (let i = 0; i <= lines; i++) {
+                    for (let i = 0; i < lines; i++) {
                         const line = uiState.range.startLineNumber + i;
                         const firstNonWhitespace = uiState.targetTextModel.getLineFirstNonWhitespaceColumn(line);
                         const lastNonWhitespace = uiState.targetTextModel.getLineLastNonWhitespaceColumn(line);

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

@@ -1,11 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/observableInternal/derived.js';
+import '../../../../base/common/observableInternal/autorun.js';
+import { constObservable } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { HoverForeignElementAnchor } from '../../hover/browser/hoverTypes.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { InlineEditController } from './inlineEditController.js';
 import { InlineEditHintsContentWidget } from './inlineEditHintsWidget.js';
-import { constObservable } from '../../../../base/common/observableInternal/utils.js';
 class InlineEditHover {
     constructor(owner, range, controller) {
         this.owner = owner;

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

@@ -1,5 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { disposableObservableValue, observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, constObservable, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -8,15 +13,12 @@ import { RawContextKey, IContextKeyService } from '../../../../platform/contextk
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { InlineEditTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { GhostText, GhostTextPart } from '../../inlineCompletions/browser/ghostText.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { InlineEditHintsWidget } from './inlineEditHintsWidget.js';
 import { createStyleSheet2 } from '../../../../base/browser/dom.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { disposableObservableValue } from '../../../../base/common/observableInternal/base.js';
-import { observableFromEvent, constObservable, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { onUnexpectedExternalError } from '../../../../base/common/errors.js';
 var InlineEditController_1;
 class InlineEditWidget {
     constructor(widget, edit) {
@@ -48,7 +50,7 @@ let InlineEditController = class InlineEditController extends Disposable {
         this._isVisibleContext = InlineEditController_1.inlineEditVisibleContext.bindTo(this.contextKeyService);
         this._isCursorAtInlineEditContext = InlineEditController_1.cursorAtInlineEditContext.bindTo(this.contextKeyService);
         this._currentEdit = this._register(disposableObservableValue(this, undefined));
-        this._isAccepting = false;
+        this._isAccepting = observableValue(this, false);
         this._enabled = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).enabled);
         this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).fontFamily);
         this._backgroundColoring = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(63 ).backgroundColoring);
@@ -58,6 +60,9 @@ let InlineEditController = class InlineEditController extends Disposable {
                 return;
             }
             modelChangedSignal.read(reader);
+            if (this._isAccepting.read(reader)) {
+                return;
+            }
             this.getInlineEdit(editor, true);
         }));
         const cursorPosition = observableFromEvent(editor.onDidChangeCursorPosition, () => editor.getPosition());
@@ -84,7 +89,7 @@ let InlineEditController = class InlineEditController extends Disposable {
             }
         }));
         const editorBlurSingal = observableSignalFromEvent('InlineEditController.editorBlurSignal', editor.onDidBlurEditorWidget);
-        this._register(autorun(reader => {
+        this._register(autorun(async (reader) => {
             if (!this._enabled.read(reader)) {
                 return;
             }
@@ -92,9 +97,9 @@ let InlineEditController = class InlineEditController extends Disposable {
             if (this._configurationService.getValue('editor.experimentalInlineEdit.keepOnBlur') || editor.getOption(63 ).keepOnBlur) {
                 return;
             }
-            this._currentRequestCts?.dispose();
+            this._currentRequestCts?.dispose(true);
             this._currentRequestCts = undefined;
-            this.clear(false);
+            await this.clear(false);
         }));
         const editorFocusSignal = observableSignalFromEvent('InlineEditController.editorFocusSignal', editor.onDidFocusEditorText);
         this._register(autorun(reader => {
@@ -181,8 +186,7 @@ let InlineEditController = class InlineEditController extends Disposable {
     }
     async getInlineEdit(editor, auto) {
         this._isCursorAtInlineEditContext.set(false);
-        this.clear();
-        this._isAccepting = false;
+        await this.clear();
         const edit = await this.fetchInlineEdit(editor, auto);
         if (!edit) {
             return;
@@ -209,8 +213,8 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.setPosition(this._jumpBackPosition);
         this.editor.revealPositionInCenterIfOutsideViewport(this._jumpBackPosition);
     }
-    accept() {
-        this._isAccepting = true;
+    async accept() {
+        this._isAccepting.set(true, undefined);
         const data = this._currentEdit.get()?.edit;
         if (!data) {
             return;
@@ -222,10 +226,15 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.pushUndoStop();
         this.editor.executeEdits('acceptCurrent', [EditOperation.replace(Range.lift(data.range), text)]);
         if (data.accepted) {
-            this._commandService.executeCommand(data.accepted.id, ...(data.accepted.arguments || []));
+            await this._commandService
+                .executeCommand(data.accepted.id, ...(data.accepted.arguments || []))
+                .then(undefined, onUnexpectedExternalError);
         }
         this.freeEdit(data);
-        this._currentEdit.set(undefined, undefined);
+        transaction((tx) => {
+            this._currentEdit.set(undefined, tx);
+            this._isAccepting.set(false, tx);
+        });
     }
     jumpToCurrent() {
         this._jumpBackPosition = this.editor.getSelection()?.getStartPosition();
@@ -237,10 +246,12 @@ let InlineEditController = class InlineEditController extends Disposable {
         this.editor.setPosition(position);
         this.editor.revealPositionInCenterIfOutsideViewport(position);
     }
-    clear(sendRejection = true) {
+    async clear(sendRejection = true) {
         const edit = this._currentEdit.get()?.edit;
-        if (edit && edit?.rejected && !this._isAccepting && sendRejection) {
-            this._commandService.executeCommand(edit.rejected.id, ...(edit.rejected.arguments || []));
+        if (edit && edit?.rejected && sendRejection) {
+            await this._commandService
+                .executeCommand(edit.rejected.id, ...(edit.rejected.arguments || []))
+                .then(undefined, onUnexpectedExternalError);
         }
         if (edit) {
             this.freeEdit(edit);

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

@@ -4,6 +4,10 @@ import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../bas
 import { Separator } from '../../../../base/common/actions.js';
 import { equals } from '../../../../base/common/arrays.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { OS } from '../../../../base/common/platform.js';
 import './inlineEditHintsWidget.css.js';
 import { Position } from '../../../common/core/position.js';
@@ -15,9 +19,6 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { autorun, autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 var InlineEditHintsContentWidget_1;
 let InlineEditHintsWidget = class InlineEditHintsWidget extends Disposable {
     constructor(editor, model, instantiationService) {
@@ -135,7 +136,7 @@ class StatusBarViewItem extends MenuEntryActionViewItem {
         }
         if (this.label) {
             const div = h('div.keybinding').root;
-            const k = ( 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);

package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js

@@ -28,7 +28,7 @@ class ExpandLineSelectionAction extends EditorAction {
         const viewModel = editor._getViewModel();
         viewModel.model.pushStackElement();
         viewModel.setCursorStates(args.source, 3 , CursorMoveCommands.expandLineSelection(viewModel, viewModel.getCursorStates()));
-        viewModel.revealPrimaryCursor(args.source, true);
+        viewModel.revealAllCursors(args.source, true);
     }
 }
 registerEditorAction(ExpandLineSelectionAction);