@codingame/monaco-vscode-api 20.5.0 → 21.0.0

package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js

@@ -20,6 +20,8 @@ import { localize } from '../../../../nls.js';
 import { MarkerSeverity, IMarkerData } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Codicon } from '../../../../base/common/codicons.js';
 
 const $ = $$1;
 class MarkerHover {
@@ -166,7 +168,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             const markerController = MarkerController.get(this._editor);
             if (markerController) {
                 context.statusBar.addAction({
-                    label: ( localize(1224, "View Problem")),
+                    label: ( localize(1226, "View Problem")),
                     commandId: NextMarkerAction.ID,
                     run: () => {
                         context.hide();
@@ -181,14 +183,14 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
             if (this.recentMarkerCodeActionsInfo) {
                 if (IMarkerData.makeKey(this.recentMarkerCodeActionsInfo.marker) === IMarkerData.makeKey(markerHover.marker)) {
                     if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
-                        quickfixPlaceholderElement.textContent = ( localize(1225, "No quick fixes available"));
+                        quickfixPlaceholderElement.textContent = ( localize(1227, "No quick fixes available"));
                     }
                 }
                 else {
                     this.recentMarkerCodeActionsInfo = undefined;
                 }
             }
-            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1226, "Checking for quick fixes...")), 200, disposables);
+            const updatePlaceholderDisposable = this.recentMarkerCodeActionsInfo && !this.recentMarkerCodeActionsInfo.hasCodeActions ? Disposable.None : disposableTimeout(() => quickfixPlaceholderElement.textContent = ( localize(1228, "Checking for quick fixes...")), 200, disposables);
             if (!quickfixPlaceholderElement.textContent) {
                 quickfixPlaceholderElement.textContent = String.fromCharCode(0xA0);
             }
@@ -199,7 +201,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                 this.recentMarkerCodeActionsInfo = { marker: markerHover.marker, hasCodeActions: actions.validActions.length > 0 };
                 if (!this.recentMarkerCodeActionsInfo.hasCodeActions) {
                     actions.dispose();
-                    quickfixPlaceholderElement.textContent = ( localize(1225, "No quick fixes available"));
+                    quickfixPlaceholderElement.textContent = ( localize(1227, "No quick fixes available"));
                     return;
                 }
                 quickfixPlaceholderElement.style.display = 'none';
@@ -210,7 +212,7 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     }
                 }));
                 context.statusBar.addAction({
-                    label: ( localize(1227, "Quick Fix...")),
+                    label: ( localize(1229, "Quick Fix...")),
                     commandId: quickFixCommandId,
                     run: (target) => {
                         showing = true;
@@ -230,12 +232,14 @@ let MarkerHoverParticipant = class MarkerHoverParticipant {
                     context.statusBar.addAction({
                         label: aiCodeAction.action.title,
                         commandId: aiCodeAction.action.command?.id ?? '',
+                        iconClass: ThemeIcon.asClassName(Codicon.sparkle),
                         run: () => {
                             const controller = CodeActionController.get(this._editor);
                             controller?.applyCodeAction(aiCodeAction, false, false, ApplyCodeActionReason.FromProblemsHover);
                         }
                     });
                 }
+                context.onContentsChanged();
             }, onUnexpectedError);
         }
         return disposables;

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

@@ -97,7 +97,7 @@ class InPlaceReplaceUp extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.up',
-            label: ( localize2(1228, "Replace with Previous Value")),
+            label: ( localize2(1230, "Replace with Previous Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -118,7 +118,7 @@ class InPlaceReplaceDown extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inPlaceReplace.down',
-            label: ( localize2(1229, "Replace with Next Value")),
+            label: ( localize2(1231, "Replace with Next Value")),
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,

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

@@ -23,10 +23,10 @@ class IndentationToSpacesAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToSpacesAction.ID,
-            label: ( localize2(1230, "Convert Indentation to Spaces")),
+            label: ( localize2(1232, "Convert Indentation to Spaces")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1231, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1233, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -54,10 +54,10 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize2(1232, "Convert Indentation to Tabs")),
+            label: ( localize2(1234, "Convert Indentation to Tabs")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1233, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1235, "Convert the spaces indentation to tabs.")),
             }
         });
     }
@@ -99,16 +99,16 @@ class ChangeIndentationSizeAction extends EditorAction {
             id: ( n.toString()),
             label: ( n.toString()),
             description: (n === creationOpts.tabSize && n === modelOpts.tabSize
-                ? ( localize(1234, "Configured Tab Size"))
+                ? ( localize(1236, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1235, "Default Tab Size"))
+                    ? ( localize(1237, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1236, "Current Tab Size"))
+                        ? ( localize(1238, "Current Tab Size"))
                         : undefined)
         })));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1237, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1239, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
                 if (pick) {
                     if (model && !model.isDisposed()) {
                         const pickedVal = parseInt(pick.label, 10);
@@ -135,10 +135,10 @@ class IndentUsingTabs extends ChangeIndentationSizeAction {
     constructor() {
         super(false, false, {
             id: IndentUsingTabs.ID,
-            label: ( localize2(1238, "Indent Using Tabs")),
+            label: ( localize2(1240, "Indent Using Tabs")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1239, "Use indentation with tabs.")),
+                description: ( localize2(1241, "Use indentation with tabs.")),
             }
         });
     }
@@ -148,10 +148,10 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize2(1240, "Indent Using Spaces")),
+            label: ( localize2(1242, "Indent Using Spaces")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1241, "Use indentation with spaces.")),
+                description: ( localize2(1243, "Use indentation with spaces.")),
             }
         });
     }
@@ -161,10 +161,10 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize2(1242, "Change Tab Display Size")),
+            label: ( localize2(1244, "Change Tab Display Size")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1243, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1245, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -174,10 +174,10 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize2(1244, "Detect Indentation from Content")),
+            label: ( localize2(1246, "Detect Indentation from Content")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1245, "Detect the indentation from content.")),
+                description: ( localize2(1247, "Detect the indentation from content.")),
             }
         });
     }
@@ -195,10 +195,10 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize2(1246, "Reindent Lines")),
+            label: ( localize2(1248, "Reindent Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1247, "Reindent the lines of the editor.")),
+                description: ( localize2(1249, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -220,10 +220,10 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize2(1248, "Reindent Selected Lines")),
+            label: ( localize2(1250, "Reindent Selected Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1249, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1251, "Reindent the selected lines of the editor.")),
             }
         });
     }

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js

@@ -107,7 +107,7 @@ let InlayHintsController = class InlayHintsController {
         this._sessionDisposables = ( new DisposableStore());
         this._decorationsMetadata = ( new Map());
         this._activeRenderMode = RenderMode.Normal;
-        this._ruleFactory = ( new DynamicCssRules(this._editor));
+        this._ruleFactory = this._disposables.add(( new DynamicCssRules(this._editor)));
         this._debounceInfo = _featureDebounce.for(_languageFeaturesService.inlayHintsProvider, 'InlayHint', { min: 25 });
         this._disposables.add(_languageFeaturesService.inlayHintsProvider.onDidChange(() => this._update()));
         this._disposables.add(_editor.onDidChangeModel(() => this._update()));

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.d.ts

@@ -1,4 +1,4 @@
-import { AsyncIterableObject } from "../../../../base/common/async.js";
+import { AsyncIterableProducer } from "../../../../base/common/async.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { ICodeEditor, IEditorMouseEvent } from "../../../browser/editorBrowser.js";
 import { IModelDecoration } from "../../../common/model.js";
@@ -19,6 +19,6 @@ export declare class InlayHintsHover extends MarkdownHoverParticipant implements
     constructor(editor: ICodeEditor, languageService: ILanguageService, openerService: IOpenerService, keybindingService: IKeybindingService, hoverService: IHoverService, configurationService: IConfigurationService, _resolverService: ITextModelService, languageFeaturesService: ILanguageFeaturesService, commandService: ICommandService);
     suggestHoverAnchor(mouseEvent: IEditorMouseEvent): HoverAnchor | null;
     computeSync(): MarkdownHover[];
-    computeAsync(anchor: HoverAnchor, _lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterableObject<MarkdownHover>;
+    computeAsync(anchor: HoverAnchor, _lineDecorations: IModelDecoration[], source: HoverStartSource, token: CancellationToken): AsyncIterableProducer<MarkdownHover>;
     private _resolveInlayHintLabelPartHover;
 }

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { AsyncIterableObject } from '../../../../base/common/async.js';
+import { AsyncIterableProducer } from '../../../../base/common/async.js';
 import { MarkdownString, isEmptyMarkdownString } from '../../../../base/common/htmlContent.js';
 import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { Position } from '../../../common/core/position.js';
@@ -54,9 +54,9 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
     }
     computeAsync(anchor, _lineDecorations, source, token) {
         if (!(anchor instanceof InlayHintsHoverAnchor)) {
-            return AsyncIterableObject.EMPTY;
+            return AsyncIterableProducer.EMPTY;
         }
-        return (new AsyncIterableObject(async (executor) => {
+        return (new AsyncIterableProducer(async (executor) => {
             const { part } = anchor;
             await part.item.resolve(token);
             if (token.isCancellationRequested) {
@@ -73,7 +73,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 executor.emitOne(( new MarkdownHover(this, anchor.range, [itemTooltip], false, 0)));
             }
             if (isNonEmptyArray(part.item.hint.textEdits)) {
-                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1250, "Double-click to insert")))], false, 10001)));
+                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1252, "Double-click to insert")))], false, 10001)));
             }
             let partTooltip;
             if (typeof part.part.tooltip === 'string') {
@@ -90,19 +90,19 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
                 const kb = useMetaKey
                     ? isMacintosh
-                        ? ( localize(1251, "cmd + click"))
-                        : ( localize(1252, "ctrl + click"))
+                        ? ( localize(1253, "cmd + click"))
+                        : ( localize(1254, "ctrl + click"))
                     : isMacintosh
-                        ? ( localize(1253, "option + click"))
-                        : ( localize(1254, "alt + click"));
+                        ? ( localize(1255, "option + click"))
+                        : ( localize(1256, "alt + click"));
                 if (part.part.location && part.part.command) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1255, 'Go to Definition ({0}), right click for more', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1257, 'Go to Definition ({0}), right click for more', kb)));
                 }
                 else if (part.part.location) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1256, 'Go to Definition ({0})', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1258, 'Go to Definition ({0})', kb)));
                 }
                 else if (part.part.command) {
-                    linkHint = ( new MarkdownString(`[${( localize(1257, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
+                    linkHint = ( new MarkdownString(`[${( localize(1259, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
                 }
                 if (linkHint) {
                     executor.emitOne(( new MarkdownHover(this, anchor.range, [linkHint], false, 10000)));

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

@@ -25,7 +25,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1258, "Show Next Inline Suggestion")),
+            label: ( localize2(1260, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -46,7 +46,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1259, "Show Previous Inline Suggestion")),
+            label: ( localize2(1261, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -66,7 +66,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1260, "Trigger Inline Suggestion")),
+            label: ( localize2(1262, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -82,7 +82,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1261, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1263, "Trigger Next Edit Suggestion")),
             precondition: EditorContextKeys.writable,
         });
     }
@@ -93,7 +93,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
         if (!controller?.model.get()?.inlineEditAvailable.get()) {
             notificationService.notify({
                 severity: Severity$1.Info,
-                message: ( localize(1262, "No inline edit is available."))
+                message: ( localize(1264, "No inline edit is available."))
             });
         }
     }
@@ -114,7 +114,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1263, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1265, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -131,7 +131,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1264, 'Accept Word')),
+                    title: ( localize(1266, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -146,7 +146,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1265, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1267, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -156,7 +156,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1266, 'Accept Line')),
+                    title: ( localize(1268, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -171,19 +171,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1267, "Accept Inline Suggestion")),
+            label: ( localize2(1269, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1268, "Accept")),
+                    title: ( localize(1270, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1268, "Accept")),
+                    title: ( localize(1270, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -214,11 +214,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1269, "Jump to next inline edit")),
+            label: ( localize2(1271, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1270, "Jump")),
+                    title: ( localize(1272, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -242,7 +242,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1271, "Hide Inline Suggestion")),
+            label: ( localize2(1273, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -253,7 +253,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1272, "Reject")),
+                    title: ( localize(1274, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -272,7 +272,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1273, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1275, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -294,7 +294,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1274, "Always Show Toolbar")),
+            title: ( localize(1276, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -316,7 +316,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1275, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1277, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,

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

@@ -3,24 +3,24 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1276, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1277, "Whether the inline suggestion starts with whitespace")))); }
+    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1278, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1279, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1278,
+     1280,
      "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(
-     1279,
+     1281,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorBeforeGhostText = ( new RawContextKey('cursorBeforeGhostText', false, ( localize(1280, "Whether the cursor is at ghost text")))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1281, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1282, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1283, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1284, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1285, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1286, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1287, "Whether the current code editor is showing an inline edits preview")))); }
+    static { this.cursorBeforeGhostText = ( new RawContextKey('cursorBeforeGhostText', false, ( localize(1282, "Whether the cursor is at ghost text")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1283, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1284, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1285, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1286, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1287, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1288, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1289, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

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

@@ -6,6 +6,7 @@ import { cancelOnDispose } from '../../../../../base/common/cancellation.js';
 import { createHotClass } from '../../../../../base/common/hotReloadHelpers.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
+import { isEqual } from '../../../../../base/common/resources.js';
 import { isUndefined } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
 import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
@@ -40,8 +41,8 @@ import { observableValue } from '../../../../../base/common/observableInternal/o
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
-import { waitForState } from '../../../../../base/common/observableInternal/utils/utilsCancellation.js';
 import { derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils/utils.js';
+import { waitForState } from '../../../../../base/common/observableInternal/utils/utilsCancellation.js';
 
 var InlineCompletionsController_1;
 let InlineCompletionsController = class InlineCompletionsController extends Disposable {
@@ -123,13 +124,43 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             if (!model) {
                 return;
             }
-            if (model.state.read(reader) !== undefined) {
+            const state = model.state.read(reader);
+            if (!state) {
+                return;
+            }
+            if (!this._focusIsInEditorOrMenu.get()) {
+                return;
+            }
+            const nextEditUri = state.kind === 'inlineEdit' ? state.nextEditUri : undefined;
+            for (const ctrl of InlineCompletionsController_1._instances) {
+                if (ctrl === this) {
+                    continue;
+                }
+                else if (nextEditUri && isEqual(nextEditUri, ctrl.editor.getModel()?.uri)) {
+                    ctrl.model.get()?.trigger();
+                }
+                else {
+                    ctrl.reject();
+                }
+            }
+        }));
+        this._register(autorun(reader => {
+            const model = this.model.read(reader);
+            const uri = this.editor.getModel()?.uri;
+            if (!model || !uri) {
+                return;
+            }
+            reader.store.add(model.onDidAccept(() => {
                 for (const ctrl of InlineCompletionsController_1._instances) {
-                    if (ctrl !== this) {
-                        ctrl.reject();
+                    if (ctrl === this) {
+                        continue;
+                    }
+                    const state = ctrl.model.get()?.state.get();
+                    if (state?.kind === 'inlineEdit' && isEqual(state.nextEditUri, uri)) {
+                        ctrl.model.get()?.stop('automatic');
                     }
                 }
-            }
+            }));
         }));
         this._register(runOnChange(this._editorObs.onDidType, (_value, _changes) => {
             if (this._enabled.get()) {
@@ -175,7 +206,18 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }));
         this._register(autorun(reader => {
             const isFocused = this._focusIsInEditorOrMenu.read(reader);
+            const model = this.model.get();
             if (isFocused) {
+                const state = model?.state?.get();
+                if (!state || state.kind !== 'inlineEdit' || !state.nextEditUri) {
+                    transaction(tx => {
+                        for (const ctrl of InlineCompletionsController_1._instances) {
+                            if (ctrl !== this) {
+                                ctrl.model.get()?.stop('automatic', tx);
+                            }
+                        }
+                    });
+                }
                 return;
             }
             if (this._contextKeyService.getContextKeyValue('accessibleViewIsShown')
@@ -184,7 +226,6 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 || InlineSuggestionHintsContentWidget.dropDownVisible) {
                 return;
             }
-            const model = this.model.get();
             if (!model) {
                 return;
             }
@@ -271,7 +312,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             const model = this.model.read(reader);
             const state = model?.inlineCompletionState.read(reader);
             const primaryGhostText = state?.primaryGhostText;
-            if (!primaryGhostText) {
+            if (!primaryGhostText || primaryGhostText.isEmpty()) {
                 return undefined;
             }
             const firstPartPos = ( new Position(primaryGhostText.lineNumber, primaryGhostText.parts[0].column));
@@ -299,7 +340,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1288,
+                1290,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));
@@ -321,6 +362,13 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             const m = this.model.get();
             if (m) {
                 m.stop('explicitCancel', tx);
+                if (this._focusIsInEditorOrMenu.get()) {
+                    for (const ctrl of InlineCompletionsController_1._instances) {
+                        if (ctrl !== this) {
+                            ctrl.model.get()?.stop('automatic', tx);
+                        }
+                    }
+                }
             }
         });
     }

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

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