@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -3,6 +3,7 @@ import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes
 import '../../../../../base/common/observableInternal/index.js';
 import { splitLines } from '../../../../../base/common/strings.js';
 import { localize2, localize } from '../../../../../nls.js';
+import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../../platform/accessibility/common/accessibility.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';
@@ -24,7 +25,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1235, "Show Next Inline Suggestion")),
+            label: ( localize2(1234, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -45,7 +46,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1236, "Show Previous Inline Suggestion")),
+            label: ( localize2(1235, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -65,7 +66,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.trigger',
-            label: ( localize2(1237, "Trigger Inline Suggestion")),
+            label: ( localize2(1236, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -81,7 +82,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1238, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1237, "Trigger Next Edit Suggestion")),
             precondition: EditorContextKeys.writable,
         });
     }
@@ -92,7 +93,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
         if (!controller?.model.get()?.inlineEditAvailable.get()) {
             notificationService.notify({
                 severity: Severity$1.Info,
-                message: ( localize(1239, "No inline edit is available."))
+                message: ( localize(1238, "No inline edit is available."))
             });
         }
     }
@@ -113,7 +114,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1240, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1239, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -123,12 +124,13 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
                 primary: KeyMod$1.CtrlCmd | KeyCode.RightArrow,
                 kbExpr: ( ContextKeyExpr.and(
                     EditorContextKeys.writable,
-                    InlineCompletionContextKeys.inlineSuggestionVisible
+                    InlineCompletionContextKeys.inlineSuggestionVisible,
+                    ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 )),
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1241, 'Accept Word')),
+                    title: ( localize(1240, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -136,14 +138,14 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     }
     async run(accessor, editor) {
         const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.acceptNextWord(controller.editor);
+        await controller?.model.get()?.acceptNextWord();
     }
 }
 class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1242, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1241, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -153,7 +155,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1243, 'Accept Line')),
+                    title: ( localize(1242, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -161,26 +163,26 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     }
     async run(accessor, editor) {
         const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.acceptNextLine(controller.editor);
+        await controller?.model.get()?.acceptNextLine();
     }
 }
 class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1244, "Accept Inline Suggestion")),
+            label: ( localize2(1243, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1245, "Accept")),
+                    title: ( localize(1244, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1245, "Accept")),
+                    title: ( localize(1244, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -211,11 +213,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1246, "Jump to next inline edit")),
+            label: ( localize2(1245, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1247, "Jump")),
+                    title: ( localize(1246, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -234,29 +236,12 @@ class JumpToNextInlineEdit extends EditorAction {
         }
     }
 }
-class AcceptNextInlineEditPart extends EditorAction {
-    constructor() {
-        super({
-            id: 'editor.action.inlineSuggest.acceptNextInlineEditPart',
-            label: ( localize2(1248, "Accept Next Inline Edit Part")),
-            precondition: ( ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible)),
-            kbOpts: {
-                weight: KeybindingWeight.EditorContrib + 1,
-                kbExpr: ( ContextKeyExpr.and(EditorContextKeys.writable, InlineCompletionContextKeys.inlineEditVisible)),
-            },
-        });
-    }
-    async run(accessor, editor) {
-        const controller = InlineCompletionsController.get(editor);
-        await controller?.model.get()?.acceptNextInlineEditPart(controller.editor);
-    }
-}
 class HideInlineCompletion extends EditorAction {
     static { this.ID = hideInlineCompletionId; }
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1249, "Hide Inline Suggestion")),
+            label: ( localize2(1247, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -267,7 +252,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1250, "Reject")),
+                    title: ( localize(1248, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -286,7 +271,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1251, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1249, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -308,7 +293,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1252, "Always Show Toolbar")),
+            title: ( localize(1250, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -330,9 +315,12 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1253, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1251, "Developer: Extract Inline Suggest State")),
             alias: 'Developer: Inline Suggest Extract Repro',
-            precondition: InlineCompletionContextKeys.inlineEditVisible,
+            precondition: ( ContextKeyExpr.or(
+                InlineCompletionContextKeys.inlineEditVisible,
+                InlineCompletionContextKeys.inlineSuggestionVisible
+            )),
         });
     }
     async run(accessor, editor) {
@@ -351,4 +339,4 @@ class DevExtractReproSample extends EditorAction {
     }
 }
 
-export { AcceptInlineCompletion, AcceptNextInlineEditPart, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, ExplicitTriggerInlineEditAction, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ToggleInlineCompletionShowCollapsed, TriggerInlineEditAction, TriggerInlineSuggestionAction };
+export { AcceptInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptNextWordOfInlineCompletion, DevExtractReproSample, ExplicitTriggerInlineEditAction, HideInlineCompletion, JumpToNextInlineEdit, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, ToggleAlwaysShowInlineSuggestionToolbar, ToggleInlineCompletionShowCollapsed, TriggerInlineEditAction, TriggerInlineSuggestionAction };

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(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.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1252, "Whether an inline suggestion is visible")))); }
+    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1253, "Whether the inline suggestion starts with whitespace")))); }
     static { this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1256,
+     1254,
      "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(
-     1257,
+     1255,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    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")))); }
+    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1256, "Whether the cursor is in indentation")))); }
+    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1257, "Whether the editor has a selection")))); }
+    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1258, "Whether the cursor is at an inline edit")))); }
+    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1259, "Whether an inline edit is visible")))); }
+    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1260, "Whether tab should jump to an inline edit.")))); }
+    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1261, "Whether tab should accept the inline edit.")))); }
+    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1262, "Whether the current code editor is showing an inline edits preview")))); }
 }
 
 export { InlineCompletionContextKeys };

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

@@ -51,4 +51,5 @@ export declare class InlineCompletionsController extends Disposable {
     shouldShowHoverAtViewZone(viewZoneId: string): boolean;
     reject(): void;
     jump(): void;
+    testOnlyDisableUi(): void;
 }

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

@@ -72,7 +72,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this._suggestWidgetAdapter = this._register(( new ObservableSuggestWidgetAdapter(
             this._editorObs,
             item => this.model.get()?.handleSuggestAccepted(item),
-            () => this.model.get()?.selectedInlineCompletion.get()?.toSingleTextEdit(undefined)
+            () => this.model.get()?.selectedInlineCompletion.get()?.getSingleTextEdit()
         )));
         this._enabledInConfig = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
         this._isScreenReaderEnabled = observableFromEvent(this, this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
@@ -184,7 +184,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             if (!model) {
                 return;
             }
-            if (model.state.get()?.inlineCompletion?.request.isExplicitRequest && model.inlineEditAvailable.get()) {
+            if (model.state.get()?.inlineCompletion?.isFromExplicitRequest && model.inlineEditAvailable.get()) {
                 return;
             }
             transaction(tx => {
@@ -226,7 +226,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             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);
+            await this._accessibilitySignalService.playSignal(state.kind === 'ghostText' ? AccessibilitySignal.inlineSuggestion : AccessibilitySignal.nextEditSuggestion);
             if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
                 if (state.kind === 'ghostText') {
                     this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
@@ -245,7 +245,9 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         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) => m?.inlineEditState?.read(reader)?.cursorAtInlineEdit))));
+        this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.cursorAtInlineEdit, ( this.model.map(
+            (m, reader) => m?.inlineEditState?.read(reader)?.cursorAtInlineEdit.read(reader)
+        ))));
         this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.tabShouldAcceptInlineEdit, ( this.model.map((m, r) => !!m?.tabShouldAcceptInlineEdit.read(r)))));
         this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.tabShouldJumpToInlineEdit, ( this.model.map((m, r) => !!m?.tabShouldJumpToInlineEdit.read(r)))));
         this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.inlineEditVisible, reader => this.model.read(reader)?.inlineEditState.read(reader) !== undefined));
@@ -254,7 +256,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.suppressSuggestions, reader => {
             const model = this.model.read(reader);
             const state = model?.inlineCompletionState.read(reader);
-            return state?.primaryGhostText && state?.inlineCompletion ? state.inlineCompletion.source.inlineCompletions.suppressSuggestions : undefined;
+            return state?.primaryGhostText && state?.inlineCompletion ? state.inlineCompletion.source.inlineSuggestions.suppressSuggestions : undefined;
         }));
         this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.inlineSuggestionVisible, reader => {
             const model = this.model.read(reader);
@@ -272,7 +274,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1265,
+                1263,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));
@@ -303,6 +305,9 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             m.jump();
         }
     }
+    testOnlyDisableUi() {
+        this._view.dispose();
+    }
 };
 InlineCompletionsController = InlineCompletionsController_1 = ( __decorate([
     ( __param(1, IInstantiationService)),

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(1266, 'There are inline completions here');
+        return localize(1264, '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(1267, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1265, "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.js

@@ -34,9 +34,9 @@ import { PositionAffinity } from '../../../../common/model.js';
 import { showPreviousInlineSuggestionActionId, showNextInlineSuggestionActionId } from '../controller/commandIds.js';
 import * as inlineCompletionsHintsWidget from './inlineCompletionsHintsWidget.css';
 import { n } from '../../../../../base/browser/domImpl/n.js';
+import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent, derivedObservableWithCache } from '../../../../../base/common/observableInternal/utils.js';
 import { derived, derivedWithStore } from '../../../../../base/common/observableInternal/derived.js';
-import { autorunWithStore, autorun } from '../../../../../base/common/observableInternal/autorun.js';
 
 var InlineSuggestionHintsContentWidget_1;
 registerCss(inlineCompletionsHintsWidget);
@@ -97,8 +97,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
 InlineCompletionsHintsWidget = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineCompletionsHintsWidget));
-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.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1266, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1267, 'Icon for show previous parameter hint.')));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static { InlineSuggestionHintsContentWidget_1 = this; }
     static { this.hot = createHotClass(InlineSuggestionHintsContentWidget_1); }
@@ -116,7 +116,7 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
         const kb = this.keybindingService.lookupKeybinding(commandId, this._contextKeyService);
         let tooltip = label;
         if (kb) {
-            tooltip = ( localize(1270, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1268, '{0} ({1})', label, kb.getLabel()));
         }
         action.tooltip = tooltip;
         return action;
@@ -164,9 +164,9 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             this._warningMessageNode.element,
             h('div@toolBar'),
         ]);
-        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1271, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1269, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1272, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1270, '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/inlineCompletions.contribution.js

@@ -4,7 +4,7 @@ import { registerAction2 } from '../../../../platform/actions/common/actions.js'
 import { wrapInHotClass1 } from '../../../../platform/observable/common/wrapInHotClass.js';
 import { registerEditorContribution, EditorContributionInstantiation, registerEditorAction, registerEditorCommand } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
-import { TriggerInlineSuggestionAction, ExplicitTriggerInlineEditAction, TriggerInlineEditAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptInlineCompletion, ToggleInlineCompletionShowCollapsed, HideInlineCompletion, AcceptNextInlineEditPart, JumpToNextInlineEdit, ToggleAlwaysShowInlineSuggestionToolbar, DevExtractReproSample } from './controller/commands.js';
+import { TriggerInlineSuggestionAction, ExplicitTriggerInlineEditAction, TriggerInlineEditAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptInlineCompletion, ToggleInlineCompletionShowCollapsed, HideInlineCompletion, JumpToNextInlineEdit, ToggleAlwaysShowInlineSuggestionToolbar, DevExtractReproSample } from './controller/commands.js';
 import { InlineCompletionsController } from './controller/inlineCompletionsController.js';
 import { InlineCompletionsHoverParticipant } from './hintsWidget/hoverParticipant.js';
 import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
@@ -22,7 +22,6 @@ registerEditorAction(AcceptNextLineOfInlineCompletion);
 registerEditorAction(AcceptInlineCompletion);
 registerEditorAction(ToggleInlineCompletionShowCollapsed);
 registerEditorAction(HideInlineCompletion);
-registerEditorAction(AcceptNextInlineEditPart);
 registerEditorAction(JumpToNextInlineEdit);
 registerAction2(ToggleAlwaysShowInlineSuggestionToolbar);
 registerEditorAction(DevExtractReproSample);

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

@@ -17,13 +17,13 @@ declare class InlineCompletionsAccessibleViewContentProvider extends Disposable
     private readonly _model;
     private readonly _onDidChangeContent;
     readonly onDidChangeContent: Event<void>;
-    constructor(_editor: ICodeEditor, _model: InlineCompletionsModel);
-    readonly id = AccessibleViewProviderId.InlineCompletions;
-    readonly verbositySettingKey = "accessibility.verbosity.inlineCompletions";
     readonly options: {
         language: string | undefined;
-        type: AccessibleViewType;
+        type: AccessibleViewType.View;
     };
+    constructor(_editor: ICodeEditor, _model: InlineCompletionsModel);
+    readonly id = AccessibleViewProviderId.InlineCompletions;
+    readonly verbositySettingKey = "accessibility.verbosity.inlineCompletions";
     provideContent(): string;
     provideNextContent(): string | undefined;
     providePreviousContent(): string | undefined;

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

@@ -9,7 +9,6 @@ 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() {
@@ -61,7 +60,7 @@ class InlineCompletionsAccessibleViewContentProvider extends Disposable {
         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 lineEdit.humanReadablePatch(text.getLines());
         }
     }
     provideNextContent() {

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

@@ -1,9 +1,19 @@
 import { Disposable } from "../../../../../base/common/lifecycle.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { ICodeEditor } from "../../../../browser/editorBrowser.js";
+export interface ITextModelChangeRecorderMetadata {
+    source?: string;
+    extensionId?: string;
+    nes?: boolean;
+    type?: "word" | "line";
+}
 export declare class TextModelChangeRecorder extends Disposable {
     private readonly _editor;
     private readonly _instantiationService;
+    private static _nextMetadataId;
+    private static _metaDataMap;
+    static editWithMetadata<T>(metadata: ITextModelChangeRecorderMetadata, cb: () => T): T;
+    private static _getCurrentMetadata;
     private readonly _structuredLogger;
     constructor(_editor: ICodeEditor, _instantiationService: IInstantiationService);
 }

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

@@ -7,7 +7,29 @@ import { CodeEditorWidget } from '../../../../browser/widget/codeEditor/codeEdit
 import { StructuredLogger } from '../structuredLogger.js';
 import { autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 
+var TextModelChangeRecorder_1;
 let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
+    static { TextModelChangeRecorder_1 = this; }
+    static { this._nextMetadataId = 0; }
+    static { this._metaDataMap = ( new Map()); }
+    static editWithMetadata(metadata, cb) {
+        const id = this._nextMetadataId++;
+        this._metaDataMap.set(id, metadata);
+        try {
+            const result = cb();
+            return result;
+        }
+        finally {
+            this._metaDataMap.delete(id);
+        }
+    }
+    static _getCurrentMetadata() {
+        const result = {};
+        for (const metadata of ( this._metaDataMap.values())) {
+            Object.assign(result, metadata);
+        }
+        return result;
+    }
     constructor(_editor, _instantiationService) {
         super();
         this._editor = _editor;
@@ -31,22 +53,29 @@ let TextModelChangeRecorder = class TextModelChangeRecorder extends Disposable {
                 if (!tm) {
                     return;
                 }
+                const metadata = TextModelChangeRecorder_1._getCurrentMetadata();
+                if (sources.length === 0 && metadata.source) {
+                    sources.push(metadata.source);
+                }
                 for (const source of sources) {
                     const data = {
+                        ...metadata,
                         sourceId: 'TextModel.setChangeReason',
                         source: source,
                         time: Date.now(),
                         modelUri: ( tm.uri.toString()),
                         modelVersion: tm.getVersionId(),
                     };
-                    this._structuredLogger.log(data);
+                    setTimeout(() => {
+                        this._structuredLogger.log(data);
+                    }, 0);
                 }
                 sources.length = 0;
             }));
         }));
     }
 };
-TextModelChangeRecorder = ( __decorate([
+TextModelChangeRecorder = TextModelChangeRecorder_1 = ( __decorate([
     ( __param(1, IInstantiationService))
 ], TextModelChangeRecorder));
 

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

@@ -1,6 +1,6 @@
 import { LineDecoration } from "../../../../common/viewLayout/lineDecorations.js";
 import { InlineDecoration } from "../../../../common/viewModel.js";
-import { ColumnRange } from "../utils.js";
+import { ColumnRange } from "../../../../common/core/columnRange.js";
 export declare class GhostText {
     readonly lineNumber: number;
     readonly parts: GhostTextPart[];