@codingame/monaco-vscode-api 15.0.2 → 16.0.0

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(1177, "Convert Indentation to Spaces")),
+            label: ( localize2(1207, "Convert Indentation to Spaces")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1178, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1208, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -54,10 +54,10 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize2(1179, "Convert Indentation to Tabs")),
+            label: ( localize2(1209, "Convert Indentation to Tabs")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1180, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1210, "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(1181, "Configured Tab Size"))
+                ? ( localize(1211, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1182, "Default Tab Size"))
+                    ? ( localize(1212, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1183, "Current Tab Size"))
+                        ? ( localize(1213, "Current Tab Size"))
                         : undefined)
         })));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1184, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1214, "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(1185, "Indent Using Tabs")),
+            label: ( localize2(1215, "Indent Using Tabs")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1186, "Use indentation with tabs.")),
+                description: ( localize2(1216, "Use indentation with tabs.")),
             }
         });
     }
@@ -148,10 +148,10 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize2(1187, "Indent Using Spaces")),
+            label: ( localize2(1217, "Indent Using Spaces")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1188, "Use indentation with spaces.")),
+                description: ( localize2(1218, "Use indentation with spaces.")),
             }
         });
     }
@@ -161,10 +161,10 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize2(1189, "Change Tab Display Size")),
+            label: ( localize2(1219, "Change Tab Display Size")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1190, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1220, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -174,10 +174,10 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize2(1191, "Detect Indentation from Content")),
+            label: ( localize2(1221, "Detect Indentation from Content")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1192, "Detect the indentation from content.")),
+                description: ( localize2(1222, "Detect the indentation from content.")),
             }
         });
     }
@@ -195,10 +195,10 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize2(1193, "Reindent Lines")),
+            label: ( localize2(1223, "Reindent Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1194, "Reindent the lines of the editor.")),
+                description: ( localize2(1224, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -220,10 +220,10 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize2(1195, "Reindent Selected Lines")),
+            label: ( localize2(1225, "Reindent Selected Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1196, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1226, "Reindent the selected lines of the editor.")),
             }
         });
     }

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

@@ -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(1197, "Double-click to insert")))], false, 10001)));
+                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1227, "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(1198, "cmd + click"))
-                        : ( localize(1199, "ctrl + click"))
+                        ? ( localize(1228, "cmd + click"))
+                        : ( localize(1229, "ctrl + click"))
                     : isMacintosh
-                        ? ( localize(1200, "option + click"))
-                        : ( localize(1201, "alt + click"));
+                        ? ( localize(1230, "option + click"))
+                        : ( localize(1231, "alt + click"));
                 if (part.part.location && part.part.command) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1202, 'Go to Definition ({0}), right click for more', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1232, 'Go to Definition ({0}), right click for more', kb)));
                 }
                 else if (part.part.location) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1203, 'Go to Definition ({0})', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1233, 'Go to Definition ({0})', kb)));
                 }
                 else if (part.part.command) {
-                    linkHint = ( new MarkdownString(`[${( localize(1204, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
+                    linkHint = ( new MarkdownString(`[${( localize(1234, "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

@@ -24,7 +24,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1205, "Show Next Inline Suggestion")),
+            label: ( localize2(1235, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -45,7 +45,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1206, "Show Previous Inline Suggestion")),
+            label: ( localize2(1236, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -65,7 +65,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1207, "Trigger Inline Suggestion")),
+            label: ( localize2(1237, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -81,7 +81,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1208, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1238, "Trigger Next Edit Suggestion")),
             precondition: EditorContextKeys.writable,
         });
     }
@@ -92,7 +92,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
         if (!controller?.model.get()?.inlineEditAvailable.get()) {
             notificationService.notify({
                 severity: Severity$1.Info,
-                message: ( localize(1209, "No inline edit is available."))
+                message: ( localize(1239, "No inline edit is available."))
             });
         }
     }
@@ -113,7 +113,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1210, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1240, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -128,7 +128,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1211, 'Accept Word')),
+                    title: ( localize(1241, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -143,7 +143,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1212, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1242, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -153,7 +153,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1213, 'Accept Line')),
+                    title: ( localize(1243, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -168,19 +168,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1214, "Accept Inline Suggestion")),
+            label: ( localize2(1244, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1215, "Accept")),
+                    title: ( localize(1245, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1215, "Accept")),
+                    title: ( localize(1245, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -211,11 +211,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1216, "Jump to next inline edit")),
+            label: ( localize2(1246, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1217, "Jump")),
+                    title: ( localize(1247, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -238,7 +238,7 @@ class AcceptNextInlineEditPart extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextInlineEditPart',
-            label: ( localize2(1218, "Accept Next Inline Edit Part")),
+            label: ( localize2(1248, "Accept Next Inline Edit Part")),
             precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible)),
             kbOpts: {
                 weight: KeybindingWeight.EditorContrib + 1,
@@ -256,7 +256,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1219, "Hide Inline Suggestion")),
+            label: ( localize2(1249, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -267,7 +267,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1220, "Reject")),
+                    title: ( localize(1250, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -286,7 +286,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1221, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1251, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -308,7 +308,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1222, "Always Show Toolbar")),
+            title: ( localize(1252, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -330,7 +330,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1223, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1253, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
             precondition: InlineCompletionContextKeys.inlineEditVisible,
         });

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

@@ -3,23 +3,23 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1224, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1225, "Whether the inline suggestion starts with whitespace")))); }
+    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1254, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1255, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1226,
+     1256,
      "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(
-     1227,
+     1257,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1228, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1229, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1230, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1231, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1232, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1233, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1234, "Whether the current code editor is showing an inline edits preview")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1258, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1259, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1260, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1261, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1262, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1263, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1264, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

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

@@ -207,7 +207,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }));
         const currentInlineCompletionBySemanticId = derivedObservableWithCache(this, (reader, last) => {
             const model = this.model.read(reader);
-            const state = model?.inlineCompletionState.read(reader);
+            const state = model?.state.read(reader);
             if (this._suggestWidgetAdapter.selectedItem.get()) {
                 return last;
             }
@@ -219,16 +219,21 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             return {};
         }), async (_value, _, _deltas, store) => {
             const model = this.model.get();
-            const state = model?.inlineCompletionState.get();
+            const state = model?.state.get();
             if (!state || !model) {
                 return;
             }
-            const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+            const lineText = state.kind === 'ghostText' ? model.textModel.getLineContent(state.primaryGhostText.lineNumber) : '';
             await timeout(50, cancelOnDispose(store));
             await waitForState(this._suggestWidgetAdapter.selectedItem, isUndefined, () => false, cancelOnDispose(store));
             await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
             if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
-                this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
+                if (state.kind === 'ghostText') {
+                    this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
+                }
+                else {
+                    this._provideScreenReaderUpdate('');
+                }
             }
         }));
         this._register(this._configurationService.onDidChangeConfiguration(e => {
@@ -267,7 +272,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1235,
+                1265,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));

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(1236, 'There are inline completions here');
+        return localize(1266, '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(1237, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1267, "Suggestion:"));
             const renderedContents = disposables.add(renderer.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock('text', code), {
                 asyncRenderCallback: () => {
                     hoverContentsElement.className = 'hover-contents code-hover-contents';

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

@@ -0,0 +1,35 @@
+.monaco-editor .inlineSuggestionsHints {
+	padding: 4px;
+	.warningMessage p {
+		margin: 0;
+	}
+}
+.monaco-editor .inlineSuggestionsHints.withBorder {
+	z-index: 39;
+	color: var(--vscode-editorHoverWidget-foreground);
+	background-color: var(--vscode-editorHoverWidget-background);
+	border: 1px solid var(--vscode-editorHoverWidget-border);
+}
+.monaco-editor .inlineSuggestionsHints a {
+	color: var(--vscode-foreground) !important;
+}
+.monaco-editor .inlineSuggestionsHints a:hover {
+	color: var(--vscode-foreground) !important;
+}
+.monaco-editor .inlineSuggestionsHints .keybinding {
+	display: flex;
+	margin-left: 4px;
+	opacity: 0.6;
+}
+.monaco-editor .inlineSuggestionsHints .keybinding .monaco-keybinding-key {
+	font-size: 8px;
+	padding: 2px 3px;
+}
+.monaco-editor .inlineSuggestionsHints .availableSuggestionCount a {
+	display: flex;
+	min-width: 19px;
+	justify-content: center;
+}
+.monaco-editor .inlineSuggestionStatusBarItemLabel {
+	margin-right: 2px;
+}

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

@@ -31,7 +31,7 @@ import { Position } from '../../../../common/core/position.js';
 import { InlineCompletionTriggerKind } from '../../../../common/languages.js';
 import { PositionAffinity } from '../../../../common/model.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from '../controller/commandIds.js';
-import './inlineCompletionsHintsWidget.css.js';
+import './inlineCompletionsHintsWidget.css';
 import { n } from '../../../../../base/browser/domImpl/n.js';
 import { observableFromEvent, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils.js';
 import { derived, derivedWithStore } from '../../../../../base/common/observableInternal/derived.js';
@@ -95,8 +95,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1238, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1239, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1268, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1269, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
@@ -114,7 +114,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1240, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1270, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -162,9 +162,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1241, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1271, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1242, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1272, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService));
         this.clearAvailableSuggestionCountLabelDebounced = this._register(( new RunOnceScheduler(() => {
             this.availableSuggestionCountAction.label = '';

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

@@ -6,13 +6,20 @@ import { InlineCompletionsController } from './controller/inlineCompletionsContr
 import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { TextEdit } from '../../../common/core/textEdit.js';
+import { LineEdit } from '../../../common/core/lineEdit.js';
+import { TextModelText } from '../../../common/model/textModelText.js';
+import { localize } from '../../../../nls.js';
 
 class InlineCompletionsAccessibleView {
     constructor() {
         this.type = AccessibleViewType.View;
         this.priority = 95;
         this.name = 'inline-completions';
-        this.when = ( ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible));
+        this.when = ( ContextKeyExpr.or(
+            InlineCompletionContextKeys.inlineSuggestionVisible,
+            InlineCompletionContextKeys.inlineEditVisible
+        ));
     }
     getProvider(accessor) {
         const codeEditorService = accessor.get(ICodeEditorService);
@@ -21,7 +28,7 @@ class InlineCompletionsAccessibleView {
             return;
         }
         const model = InlineCompletionsController.get(editor)?.model.get();
-        if (!model?.inlineCompletionState.get()) {
+        if (!model?.state.get()) {
             return;
         }
         return ( new InlineCompletionsAccessibleViewContentProvider(editor, model));
@@ -39,16 +46,23 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable {
         this.options = { language: this._editor.getModel()?.getLanguageId() ?? undefined, type: AccessibleViewType.View };
     }
     provideContent() {
-        const state = this._model.inlineCompletionState.get();
+        const state = this._model.state.get();
         if (!state) {
             throw ( new Error('Inline completion is visible but state is not available'));
         }
-        const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
-        const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
-        if (!ghostText) {
-            throw ( new Error('Inline completion is visible but ghost text is not available'));
+        if (state.kind === 'ghostText') {
+            const lineText = this._model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+            const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
+            if (!ghostText) {
+                throw ( new Error('Inline completion is visible but ghost text is not available'));
+            }
+            return lineText + ghostText;
+        }
+        else {
+            const text = ( new TextModelText(this._model.textModel));
+            const lineEdit = LineEdit.fromTextEdit(( new TextEdit(state.edits)), text);
+            return ( localize(1273, 'There is an inline edit available:')) + '\n' + lineEdit.humanReadablePatch(text.getLines());
         }
-        return lineText + ghostText;
     }
     provideNextContent() {
         this._model.next().then((() => this._onDidChangeContent.fire()));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/changeRecorder.js

@@ -4,7 +4,7 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { CodeEditorWidget } from '../../../../browser/widget/codeEditor/codeEditorWidget.js';
-import { StructuredLogger } from './inlineCompletionsSource.js';
+import { StructuredLogger } from '../structuredLogger.js';
 import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 
 let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/ghostText.d.ts

@@ -20,8 +20,8 @@ export declare class GhostTextPart {
     readonly text: string;
     readonly preview: boolean;
     private _inlineDecorations;
-    constructor(column: number, text: string, preview: boolean, _inlineDecorations?: InlineDecoration[]);
     readonly lines: IGhostTextLine[];
+    constructor(column: number, text: string, preview: boolean, _inlineDecorations?: InlineDecoration[]);
     equals(other: GhostTextPart): boolean;
 }
 export declare class GhostTextReplacement {
@@ -30,8 +30,8 @@ export declare class GhostTextReplacement {
     readonly text: string;
     readonly additionalReservedLineCount: number;
     readonly parts: ReadonlyArray<GhostTextPart>;
-    constructor(lineNumber: number, columnRange: ColumnRange, text: string, additionalReservedLineCount?: number);
     readonly newLines: string[];
+    constructor(lineNumber: number, columnRange: ColumnRange, text: string, additionalReservedLineCount?: number);
     renderForScreenReader(_lineText: string): string;
     render(documentText: string, debug?: boolean): string;
     get lineCount(): number;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.d.ts

@@ -37,13 +37,18 @@ export declare class InlineCompletionsModel extends Disposable {
     readonly primaryPosition: IObservable<Position>;
     private _isAcceptingPartially;
     get isAcceptingPartially(): boolean;
+    private readonly _onDidAccept;
+    readonly onDidAccept: import("../../../../../base/common/event.js").Event<void>;
     private readonly _editorObs;
     private readonly _suggestPreviewEnabled;
     private readonly _suggestPreviewMode;
     private readonly _inlineSuggestMode;
     private readonly _inlineEditsEnabled;
-    private readonly _inlineEditsShowCollapsed;
+    private readonly _inlineEditsShowCollapsedEnabled;
     constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService, _accessibilityService: IAccessibilityService);
+    private _lastShownInlineCompletionInfo;
+    private _lastAcceptedInlineCompletionInfo;
+    private readonly _didUndoInlineEdits;
     debugGetSelectedSuggestItem(): IObservable<SuggestItemInfo | undefined>;
     getIndentationInfo(reader: IReader): {
         startsWithIndentation: boolean;
@@ -102,6 +107,7 @@ export declare class InlineCompletionsModel extends Disposable {
     readonly warning: IObservable<import("../../../../common/languages.js").InlineCompletionWarning | undefined>;
     readonly ghostTexts: IObservable<readonly GhostTextOrReplacement[] | undefined>;
     readonly primaryGhostText: IObservable<GhostTextOrReplacement | undefined>;
+    readonly showCollapsed: IObservable<boolean>;
     private readonly _tabShouldIndent;
     readonly tabShouldJumpToInlineEdit: IObservable<boolean>;
     readonly tabShouldAcceptInlineEdit: IObservable<boolean>;
@@ -113,11 +119,11 @@ export declare class InlineCompletionsModel extends Disposable {
     acceptNextLine(editor: ICodeEditor): Promise<void>;
     private _acceptNext;
     private readonly _inAcceptPartialFlow;
-    readonly inAcceptPartialFlow: IObservable<boolean>;
+    readonly inPartialAcceptFlow: IObservable<boolean>;
     acceptNextInlineEditPart(editor: ICodeEditor): Promise<void>;
     handleSuggestAccepted(item: SuggestItemInfo): void;
     extractReproSample(): Repro;
-    private readonly _jumpedTo;
+    private readonly _jumpedToId;
     private readonly _inAcceptFlow;
     readonly inAcceptFlow: IObservable<boolean>;
     jump(): void;