@codingame/monaco-vscode-api 10.1.3 → 11.0.0

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

@@ -1,4 +1,4 @@
-import { transaction, asyncTransaction } from '../../../../../base/common/observableInternal/base.js';
+import { asyncTransaction, transaction } from '../../../../../base/common/observableInternal/base.js';
 import '../../../../../base/common/arrays.js';
 import '../../../../../base/common/event.js';
 import '../../../../../base/common/lifecycle.js';
@@ -6,8 +6,10 @@ import '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/observableInternal/utils.js';
+import { splitLines } from '../../../../../base/common/strings.js';
 import { localize } from '../../../../../nls.js';
-import { Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { MenuId, Action2 } from '../../../../../platform/actions/common/actions.js';
+import { IClipboardService } from '../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { EditorAction } from '../../../../browser/editorExtensions.js';
@@ -16,12 +18,13 @@ import { Context } from '../../../suggest/browser/suggest.js';
 import { showNextInlineSuggestionActionId, showPreviousInlineSuggestionActionId, inlineSuggestCommitId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
+
 class ShowNextInlineSuggestionAction extends EditorAction {
     static { this.ID = showNextInlineSuggestionActionId; }
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize(5074, "Show Next Inline Suggestion")),
+            label: ( localize(5105, "Show Next Inline Suggestion")),
             alias: 'Show Next Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -43,7 +46,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize(5075, "Show Previous Inline Suggestion")),
+            label: ( localize(5106, "Show Previous Inline Suggestion")),
             alias: 'Show Previous Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -64,7 +67,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize(5076, "Trigger Inline Suggestion")),
+            label: ( localize(5107, "Trigger Inline Suggestion")),
             alias: 'Trigger Inline Suggestion',
             precondition: EditorContextKeys.writable
         });
@@ -81,7 +84,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize(5077, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize(5108, "Accept Next Word Of Inline Suggestion")),
             alias: 'Accept Next Word Of Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -97,7 +100,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5078, 'Accept Word')),
+                    title: ( localize(5109, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -112,7 +115,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize(5079, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize(5110, "Accept Next Line Of Inline Suggestion")),
             alias: 'Accept Next Line Of Inline Suggestion',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -123,7 +126,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5080, 'Accept Line')),
+                    title: ( localize(5111, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -138,7 +141,7 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize(5081, "Accept Inline Suggestion")),
+            label: ( localize(5112, "Accept Inline Suggestion")),
             alias: 'Accept Inline Suggestion',
             precondition: ( (ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
@@ -146,33 +149,46 @@ class AcceptInlineCompletion extends EditorAction {
             ))),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(5082, "Accept")),
+                    title: ( localize(5113, "Accept")),
                     group: 'primary',
                     order: 1,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(5082, "Accept")),
+                    title: ( localize(5113, "Accept")),
                     group: 'primary',
                     order: 1,
                 }],
-            kbOpts: {
-                primary: 2 ,
-                weight: 200,
-                kbExpr: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
-                    InlineCompletionContextKeys.inlineSuggestionVisible,
-                     (EditorContextKeys.tabMovesFocus.toNegated()),
-                     (Context.Visible.toNegated()),
-                     (EditorContextKeys.hoverFocused.toNegated()),
-                    InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize
-                )),  (ContextKeyExpr.and(
-                    InlineCompletionContextKeys.inlineEditVisible,
-                     (EditorContextKeys.tabMovesFocus.toNegated()),
-                     (Context.Visible.toNegated()),
-                     (EditorContextKeys.hoverFocused.toNegated()),
-                    (InlineCompletionContextKeys.hasSelection.toNegated()),
-                    InlineCompletionContextKeys.cursorAtInlineEdit
-                ))))),
-            }
+            kbOpts: [
+                {
+                    primary: 2 ,
+                    weight: 200,
+                    kbExpr: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
+                        InlineCompletionContextKeys.inlineSuggestionVisible,
+                         (EditorContextKeys.tabMovesFocus.toNegated()),
+                         (Context.Visible.toNegated()),
+                         (EditorContextKeys.hoverFocused.toNegated()),
+                        InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize
+                    )),  (ContextKeyExpr.and(
+                        InlineCompletionContextKeys.inlineEditVisible,
+                         (EditorContextKeys.tabMovesFocus.toNegated()),
+                         (Context.Visible.toNegated()),
+                         (EditorContextKeys.hoverFocused.toNegated()),
+                        (InlineCompletionContextKeys.hasSelection.toNegated()),
+                        InlineCompletionContextKeys.cursorAtInlineEdit
+                    ))))),
+                },
+                {
+                    primary: 2048  | 3 ,
+                    weight: 200,
+                    kbExpr: ( (ContextKeyExpr.and(
+                        EditorContextKeys.editorTextFocus,
+                        InlineCompletionContextKeys.inlineEditVisible,
+                         (Context.Visible.toNegated()),
+                         (EditorContextKeys.hoverFocused.toNegated()),
+                         (EditorContextKeys.tabMovesFocus.toNegated())
+                    ))),
+                }
+            ],
         });
     }
     async run(accessor, editor) {
@@ -187,12 +203,12 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.jump',
-            label: ( localize(5083, "Jump to next inline edit")),
+            label: ( localize(5114, "Jump to next inline edit")),
             alias: 'Jump to next inline edit',
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(5084, "Jump")),
+                    title: ( localize(5115, "Jump")),
                     group: 'primary',
                     order: 2,
                     when: ( (InlineCompletionContextKeys.cursorAtInlineEdit.toNegated())),
@@ -223,7 +239,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize(5085, "Hide Inline Suggestion")),
+            label: ( localize(5116, "Hide Inline Suggestion")),
             alias: 'Hide Inline Suggestion',
             precondition: ( (ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
@@ -247,7 +263,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(5086, "Always Show Toolbar")),
+            title: ( localize(5117, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -265,4 +281,29 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
         configService.updateValue('editor.inlineSuggest.showToolbar', newValue);
     }
 }
-export { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, TriggerInlineSuggestionAction };
+class DevExtractReproSample extends EditorAction {
+    constructor() {
+        super({
+            id: 'editor.action.inlineSuggest.dev.extractRepro',
+            label: ( localize(5118, "Developer: Extract Inline Suggest State")),
+            alias: 'Developer: Inline Suggest Extract Repro',
+            precondition: InlineCompletionContextKeys.inlineEditVisible,
+        });
+    }
+    async run(accessor, editor) {
+        const clipboardService = accessor.get(IClipboardService);
+        const controller = InlineCompletionsController.get(editor);
+        const m = controller?.model.get();
+        if (!m) {
+            return;
+        }
+        const repro = m.extractReproSample();
+        const inlineCompletionLines = splitLines(JSON.stringify({ inlineCompletion: repro.inlineCompletion }, null, 4));
+        const json = ( (inlineCompletionLines.map(l => '// ' + l))).join('\n');
+        const reproStr = `${repro.documentValue}\n\n// <json>\n${json}\n// </json>\n`;
+        await clipboardService.writeText(reproStr);
+        return { reproCase: reproStr };
+    }
+}
+
+export { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, TriggerInlineSuggestionAction };

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

@@ -10,21 +10,22 @@ import { CursorColumns } from '../../../../common/core/cursorColumns.js';
 import { RawContextKey } from '../../../../../platform/contextkey/common/contextkey.js';
 import { localize } from '../../../../../nls.js';
 import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
+
 class InlineCompletionContextKeys extends Disposable {
-    static { this.inlineSuggestionVisible = ( (new RawContextKey('inlineSuggestionVisible', false, ( localize(9989, "Whether an inline suggestion is visible"))))); }
-    static { this.inlineSuggestionHasIndentation = ( (new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(9990, "Whether the inline suggestion starts with whitespace"))))); }
+    static { this.inlineSuggestionVisible = ( (new RawContextKey('inlineSuggestionVisible', false, ( localize(10071, "Whether an inline suggestion is visible"))))); }
+    static { this.inlineSuggestionHasIndentation = ( (new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(10072, "Whether the inline suggestion starts with whitespace"))))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( (new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-        9991,
+        10073,
         "Whether the inline suggestion starts with whitespace that is less than what would be inserted by tab"
     ))))); }
     static { this.suppressSuggestions = ( (new RawContextKey('inlineSuggestionSuppressSuggestions', undefined, ( localize(
-        9992,
+        10074,
         "Whether suggestions should be suppressed for the current suggestion"
     ))))); }
-    static { this.cursorInIndentation = ( (new RawContextKey('cursorInIndentation', false, ( localize(9993, "Whether the cursor is in indentation"))))); }
-    static { this.hasSelection = ( (new RawContextKey('editor.hasSelection', false, ( localize(9994, "Whether the editor has a selection"))))); }
-    static { this.cursorAtInlineEdit = ( (new RawContextKey('cursorAtInlineEdit', false, ( localize(9995, "Whether the cursor is at an inline edit"))))); }
-    static { this.inlineEditVisible = ( (new RawContextKey('inlineEditIsVisible', false, ( localize(9996, "Whether an inline edit is visible"))))); }
+    static { this.cursorInIndentation = ( (new RawContextKey('cursorInIndentation', false, ( localize(10075, "Whether the cursor is in indentation"))))); }
+    static { this.hasSelection = ( (new RawContextKey('editor.hasSelection', false, ( localize(10076, "Whether the editor has a selection"))))); }
+    static { this.cursorAtInlineEdit = ( (new RawContextKey('cursorAtInlineEdit', false, ( localize(10077, "Whether the cursor is at an inline edit"))))); }
+    static { this.inlineEditVisible = ( (new RawContextKey('inlineEditIsVisible', false, ( localize(10078, "Whether an inline edit is visible"))))); }
     constructor(contextKeyService, model) {
         super();
         this.contextKeyService = contextKeyService;
@@ -33,10 +34,10 @@ class InlineCompletionContextKeys extends Disposable {
         this.inlineCompletionSuggestsIndentation = InlineCompletionContextKeys.inlineSuggestionHasIndentation.bindTo(this.contextKeyService);
         this.inlineCompletionSuggestsIndentationLessThanTabSize = InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize.bindTo(this.contextKeyService);
         this.suppressSuggestions = InlineCompletionContextKeys.suppressSuggestions.bindTo(this.contextKeyService);
-        this._register(bindContextKey(InlineCompletionContextKeys.inlineEditVisible, this.contextKeyService, reader => this.model.read(reader)?.stateInlineEdit.read(reader) !== undefined));
+        this._register(bindContextKey(InlineCompletionContextKeys.inlineEditVisible, this.contextKeyService, reader => this.model.read(reader)?.inlineEditState.read(reader) !== undefined));
         this._register(autorun(reader => {
             const model = this.model.read(reader);
-            const state = model?.state.read(reader);
+            const state = model?.inlineCompletionState.read(reader);
             const isInlineCompletionVisible = !!state?.inlineCompletion && state?.primaryGhostText !== undefined && !state?.primaryGhostText.isEmpty();
             this.inlineCompletionVisible.set(isInlineCompletionVisible);
             if (state?.primaryGhostText && state?.inlineCompletion) {
@@ -69,4 +70,5 @@ class InlineCompletionContextKeys extends Disposable {
         }));
     }
 }
+
 export { InlineCompletionContextKeys };

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

@@ -11,7 +11,7 @@ import '../../../../../base/common/event.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/derived.js';
 import { waitForState } from '../../../../../base/common/observableInternal/utilsCancellation.js';
-import { observableFromEvent, mapObservableArrayCached, derivedObservableWithCache, observableSignal, runOnChange, runOnChangeWithStore, constObservable } from '../../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent, mapObservableArrayCached, constObservable, derivedObservableWithCache, observableSignal, runOnChange, runOnChangeWithStore } from '../../../../../base/common/observableInternal/utils.js';
 import { isUndefined } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
@@ -22,22 +22,21 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
-import { bindContextKey } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { hotClassGetOriginalInstance } from '../../../../../platform/observable/common/wrapInHotClass.js';
 import { CoreEditingCommands } from '../../../../browser/coreCommands.js';
 import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
-import { LineRange } from '../../../../common/core/lineRange.js';
 import { Position } from '../../../../common/core/position.js';
 import { ILanguageFeatureDebounceService } from '../../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../../common/services/languageFeatures.js';
 import { InlineSuggestionHintsContentWidget, InlineCompletionsHintsWidget } from '../hintsWidget/inlineCompletionsHintsWidget.js';
 import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
 import { SuggestWidgetAdaptor } from '../model/suggestWidgetAdaptor.js';
-import { convertItemsToStableObservables } from '../utils.js';
+import { convertItemsToStableObservables, ObservableContextKeyService } from '../utils.js';
 import { GhostTextView } from '../view/ghostText/ghostTextView.js';
 import { InlineEditsViewAndDiffProducer } from '../view/inlineEdits/inlineEditsView.js';
 import { inlineSuggestCommitId } from './commandIds.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
+
 var InlineCompletionsController_1;
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
     static { InlineCompletionsController_1 = this; }
@@ -74,6 +73,26 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         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._debounceValue = this._debounceService.for(this._languageFeaturesService.inlineCompletionsProvider, 'InlineCompletionsDebounce', { min: 50, max: 50 });
+        this._cursorIsInIndentation = derived(this, reader => {
+            const cursorPos = this._editorObs.cursorPosition.read(reader);
+            if (cursorPos === null) {
+                return false;
+            }
+            const model = this._editorObs.model.read(reader);
+            if (!model) {
+                return false;
+            }
+            this._editorObs.versionId.read(reader);
+            const indentMaxColumn = model.getLineIndentColumn(cursorPos.lineNumber);
+            return cursorPos.column <= indentMaxColumn;
+        });
+        this._shouldHideInlineEdit = derived(this, reader => {
+            return this._cursorIsInIndentation.read(reader);
+        });
+        this.optionPreview = ( (this._editorObs.getOption(121 ).map(v => v.preview)));
+        this.optionPreviewMode = ( (this._editorObs.getOption(121 ).map(v => v.previewMode)));
+        this.optionMode = ( (this._editorObs.getOption(64 ).map(v => v.mode)));
+        this.optionInlineEditsEnabled = ( (this._editorObs.getOption(64 ).map(v => !!v.edits.experimental?.enabled)));
         this.model = derivedDisposable(this, reader => {
             if (this._editorObs.isReadonly.read(reader)) {
                 return undefined;
@@ -82,7 +101,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             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(121 ).preview), observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(121 ).previewMode), observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(64 ).mode), this._enabled);
+            const model = this._instantiationService.createInstance(InlineCompletionsModel, textModel, this._suggestWidgetSelectedItem, this._editorObs.versionId, this._positions, this._debounceValue, this.optionPreview, this.optionPreviewMode, this.optionMode, this._enabled, this.optionInlineEditsEnabled, this._shouldHideInlineEdit, this.editor);
             return model;
         }).recomputeInitiallyAndOnChange(this._store);
         this._ghostTexts = derived(this, (reader) => {
@@ -96,7 +115,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             targetTextModel: ( (this.model.map(v => v?.textModel))),
         })).recomputeInitiallyAndOnChange(store)).recomputeInitiallyAndOnChange(this._store);
         this._inlineEdit = derived(this, reader => {
-            const s = this.model.read(reader)?.stateWithInlineEdit.read(reader);
+            const s = this.model.read(reader)?.state.read(reader);
             if (s?.kind === 'inlineEdit') {
                 return s.inlineEdit;
             }
@@ -107,24 +126,12 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             if (!this._everHadInlineEdit.read(reader)) {
                 return undefined;
             }
-            return this._instantiationService.createInstance(InlineEditsViewAndDiffProducer.hot.read(reader), this.editor, this._inlineEdit);
+            return this._instantiationService.createInstance(InlineEditsViewAndDiffProducer.hot.read(reader), this.editor, this._inlineEdit, this.model);
         })
             .recomputeInitiallyAndOnChange(this._store);
         this._playAccessibilitySignal = observableSignal(this);
         this._fontFamily = ( (this._editorObs.getOption(64 ).map(val => val.fontFamily)));
-        this._cursorIsInIndentation = derived(this, reader => {
-            const cursorPos = this._editorObs.cursorPosition.read(reader);
-            if (cursorPos === null) {
-                return false;
-            }
-            const model = this._editorObs.model.read(reader);
-            if (!model) {
-                return false;
-            }
-            this._editorObs.versionId.read(reader);
-            const indentMaxColumn = model.getLineIndentColumn(cursorPos.lineNumber);
-            return cursorPos.column <= indentMaxColumn;
-        });
+        this._hideInlineEditOnSelectionChange = ( (this._editorObs.getOption(64 ).map(val => true)));
         this._register(( (new InlineCompletionContextKeys(this._contextKeyService, this.model))));
         this._register(runOnChange(this._editorObs.onDidType, (_value, _changes) => {
             if (this._enabled.get()) {
@@ -149,7 +156,19 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             if (( (changes.some(
                 e => e.reason === 3  || e.source === 'api'
             )))) {
-                this.model.get()?.stop();
+                if (!this._hideInlineEditOnSelectionChange.get() && this.model.get()?.state.get()?.kind === 'inlineEdit') {
+                    return;
+                }
+                const m = this.model.get();
+                if (!m) {
+                    return;
+                }
+                if (m.inlineCompletionState.get()?.primaryGhostText) {
+                    this.model.get()?.stop();
+                }
+                else if (m.state.get()?.inlineCompletion) {
+                    this.model.get()?.collapseInlineEdit();
+                }
             }
         }));
         this._register(this.editor.onDidBlurEditorWidget(() => {
@@ -159,12 +178,15 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 || InlineSuggestionHintsContentWidget.dropDownVisible) {
                 return;
             }
+            if (this.model.get()?.inlineEditAvailable.get()) {
+                return;
+            }
             transaction(tx => {
                 this.model.get()?.stop(tx);
             });
         }));
         this._register(autorun(reader => {
-            const state = this.model.read(reader)?.state.read(reader);
+            const state = this.model.read(reader)?.inlineCompletionState.read(reader);
             if (state?.suggestItem) {
                 if (state.primaryGhostText.lineCount >= 2) {
                     this._suggestWidgetAdaptor.forceRenderingAbove();
@@ -179,7 +201,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }));
         const currentInlineCompletionBySemanticId = derivedObservableWithCache(this, (reader, last) => {
             const model = this.model.read(reader);
-            const state = model?.state.read(reader);
+            const state = model?.inlineCompletionState.read(reader);
             if (this._suggestWidgetSelectedItem.get()) {
                 return last;
             }
@@ -191,7 +213,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             return {};
         }), async (_value, _, _deltas, store) => {
             const model = this.model.get();
-            const state = model?.state.get();
+            const state = model?.inlineCompletionState.get();
             if (!state || !model) {
                 return;
             }
@@ -222,19 +244,13 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             }
         }));
         this.editor.updateOptions({ inlineCompletionsAccessibilityVerbose: this._configurationService.getValue('accessibility.verbosity.inlineCompletions') });
-        this._register(bindContextKey(InlineCompletionContextKeys.cursorInIndentation, this._contextKeyService, reader => this._cursorIsInIndentation.read(reader)));
-        this._register(bindContextKey(InlineCompletionContextKeys.hasSelection, this._contextKeyService, reader => !this._editorObs.cursorSelection.read(reader)?.isEmpty()));
-        this._register(bindContextKey(InlineCompletionContextKeys.cursorAtInlineEdit, this._contextKeyService, reader => {
-            const cursorPos = this._editorObs.cursorPosition.read(reader);
-            if (cursorPos === null) {
-                return false;
-            }
-            const edit = this.model.read(reader)?.stateInlineEdit.read(reader);
-            if (!edit) {
-                return false;
-            }
-            return LineRange.fromRangeInclusive(edit.inlineEdit.range).contains(cursorPos.lineNumber);
-        }));
+        const contextKeySvcObs = ( (new ObservableContextKeyService(this._contextKeyService)));
+        this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.cursorInIndentation, this._cursorIsInIndentation));
+        this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.hasSelection, reader => !this._editorObs.cursorSelection.read(reader)?.isEmpty()));
+        this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.cursorAtInlineEdit, ( (this.model.map((m, reader) => {
+            const s = m?.state?.read(reader);
+            return s?.kind === 'inlineEdit' && s.cursorAtInlineEdit;
+        })))));
     }
     playAccessibilitySignal(tx) {
         this._playAccessibilitySignal.trigger(tx);
@@ -245,7 +261,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(152 )) {
             hint = ( localize(
-                5087,
+                5119,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));
@@ -273,16 +289,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
     }
     jump() {
         const m = this.model.get();
-        const s = m?.stateInlineEdit.get();
-        if (!s) {
-            return;
-        }
-        transaction(tx => {
-            m.dontRefetchSignal.trigger(tx);
-            this.editor.setPosition(s.inlineEdit.range.getStartPosition(), 'inlineCompletions.jump');
-            this.editor.revealLine(s.inlineEdit.range.startLineNumber);
-            this.editor.focus();
-        });
+        m?.jump();
     }
 };
 InlineCompletionsController = InlineCompletionsController_1 = ( (__decorate([
@@ -296,4 +303,5 @@ InlineCompletionsController = InlineCompletionsController_1 = ( (__decorate([
     ( (__param(8, IKeybindingService))),
     ( (__param(9, IAccessibilityService)))
 ], InlineCompletionsController)));
+
 export { InlineCompletionsController };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { append, reset, $ } from '../../../../../base/browser/dom.js';
+import { $, append, reset } from '../../../../../base/browser/dom.js';
 import { MarkdownString } from '../../../../../base/common/htmlContent.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/arrays.js';
@@ -19,6 +19,7 @@ import { IAccessibilityService } from '../../../../../platform/accessibility/com
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
+
 class InlineCompletionsHover {
     constructor(owner, range, controller) {
         this.owner = owner;
@@ -126,7 +127,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         );
     }
     getAccessibleContent(hoverPart) {
-        return ( localize(5088, 'There are inline completions here'));
+        return ( localize(5120, 'There are inline completions here'));
     }
     renderScreenReaderText(context, part) {
         const disposables = ( (new DisposableStore()));
@@ -139,7 +140,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
                 hoverContentsElement.className = 'hover-contents code-hover-contents';
                 context.onContentsChanged();
             }));
-            const inlineSuggestionAvailable = ( localize(5089, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(5121, "Suggestion:"));
             const renderedContents = disposables.add(renderer.render(( (new MarkdownString())).appendText(inlineSuggestionAvailable).appendCodeblock('text', code)));
             hoverContentsElement.replaceChildren(renderedContents.element);
         };
@@ -164,4 +165,5 @@ InlineCompletionsHoverParticipant = ( (__decorate([
     ( (__param(4, IInstantiationService))),
     ( (__param(5, ITelemetryService)))
 ], InlineCompletionsHoverParticipant)));
+
 export { InlineCompletionsHover, InlineCompletionsHoverParticipant };

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

@@ -1,4 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
 var css = ".monaco-editor .inlineSuggestionsHints.withBorder{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);color:var(--vscode-editorHoverWidget-foreground);z-index:39}.monaco-editor .inlineSuggestionsHints a,.monaco-editor .inlineSuggestionsHints a:hover{color:var(--vscode-foreground)}.monaco-editor .inlineSuggestionsHints .keybinding{display:flex;margin-left:4px;opacity:.6}.monaco-editor .inlineSuggestionsHints .keybinding .monaco-keybinding-key{font-size:8px;padding:2px 3px}.monaco-editor .inlineSuggestionsHints .availableSuggestionCount a{display:flex;justify-content:center;min-width:19px}.monaco-editor .inlineSuggestionStatusBarItemLabel{margin-right:2px}";
 n(css,{});
+
 export { css, css as default };

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

@@ -8,7 +8,7 @@ import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/event.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { derived, derivedWithStore } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
 import { observableFromEvent, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils.js';
@@ -30,6 +30,7 @@ import { Position } from '../../../../common/core/position.js';
 import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from '../controller/commandIds.js';
 import './inlineCompletionsHintsWidget.css.js';
+
 var InlineSuggestionHintsContentWidget_1;
 let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Disposable {
     constructor(editor, model, instantiationService) {
@@ -88,8 +89,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( (__decorate([
     ( (__param(2, IInstantiationService)))
 ], InlineCompletionsHintsWidget)));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(9997, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(9998, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(10079, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(10080, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this._dropDownVisible = false; }
@@ -106,7 +107,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(9999, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(10081, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -129,9 +130,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         this.nodes = h('div.inlineSuggestionsHints', { className: this.withBorder ? '.withBorder' : '' }, [
             h('div@toolBar'),
         ]);
-        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(10000, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
+        this.previousAction = this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(10082, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon));
         this.availableSuggestionCountAction = ( (new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localize(10001, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
+        this.nextAction = this.createCommandAction(showNextInlineSuggestionActionId, ( localize(10083, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( (new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';
@@ -274,6 +275,7 @@ let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extend
         this.menu = this._store.add(this.menuService.createMenu(this.menuId, this.contextKeyService, { emitEventsForSubmenuChanges: true }));
         this.additionalActions = [];
         this.prependedPrimaryActions = [];
+        this.additionalPrimaryActions = [];
         this._store.add(this.menu.onDidChange(() => this.updateToolbar()));
         this.updateToolbar();
     }
@@ -283,6 +285,7 @@ let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extend
         createAndFillInActionBarActions(this.menu, this.options2?.menuOptions, { primary, secondary }, this.options2?.toolbarOptions?.primaryGroup, this.options2?.toolbarOptions?.shouldInlineSubmenu, this.options2?.toolbarOptions?.useSeparatorsInPrimaryActions);
         secondary.push(...this.additionalActions);
         primary.unshift(...this.prependedPrimaryActions);
+        primary.push(...this.additionalPrimaryActions);
         this.setActions(primary, secondary);
     }
     setPrependedPrimaryActions(actions) {
@@ -292,6 +295,13 @@ let CustomizedMenuWorkbenchToolBar = class CustomizedMenuWorkbenchToolBar extend
         this.prependedPrimaryActions = actions;
         this.updateToolbar();
     }
+    setAdditionalPrimaryActions(actions) {
+        if (equals(this.additionalPrimaryActions, actions, (a, b) => a === b)) {
+            return;
+        }
+        this.additionalPrimaryActions = actions;
+        this.updateToolbar();
+    }
     setAdditionalSecondaryActions(actions) {
         if (equals(this.additionalActions, actions, (a, b) => a === b)) {
             return;
@@ -308,4 +318,5 @@ CustomizedMenuWorkbenchToolBar = ( (__decorate([
     ( (__param(7, ICommandService))),
     ( (__param(8, ITelemetryService)))
 ], CustomizedMenuWorkbenchToolBar)));
+
 export { CustomizedMenuWorkbenchToolBar, InlineCompletionsHintsWidget, InlineSuggestionHintsContentWidget };