@codingame/monaco-vscode-api 19.1.3 → 20.0.0

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(1218, "Replace with Previous Value")),
+            label: ( localize2(1228, "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(1219, "Replace with Next Value")),
+            label: ( localize2(1229, "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(1220, "Convert Indentation to Spaces")),
+            label: ( localize2(1230, "Convert Indentation to Spaces")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1221, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1231, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -54,10 +54,10 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize2(1222, "Convert Indentation to Tabs")),
+            label: ( localize2(1232, "Convert Indentation to Tabs")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1223, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1233, "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(1224, "Configured Tab Size"))
+                ? ( localize(1234, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1225, "Default Tab Size"))
+                    ? ( localize(1235, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1226, "Current Tab Size"))
+                        ? ( localize(1236, "Current Tab Size"))
                         : undefined)
         })));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1227, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1237, "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(1228, "Indent Using Tabs")),
+            label: ( localize2(1238, "Indent Using Tabs")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1229, "Use indentation with tabs.")),
+                description: ( localize2(1239, "Use indentation with tabs.")),
             }
         });
     }
@@ -148,10 +148,10 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize2(1230, "Indent Using Spaces")),
+            label: ( localize2(1240, "Indent Using Spaces")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1231, "Use indentation with spaces.")),
+                description: ( localize2(1241, "Use indentation with spaces.")),
             }
         });
     }
@@ -161,10 +161,10 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize2(1232, "Change Tab Display Size")),
+            label: ( localize2(1242, "Change Tab Display Size")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1233, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1243, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -174,10 +174,10 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize2(1234, "Detect Indentation from Content")),
+            label: ( localize2(1244, "Detect Indentation from Content")),
             precondition: undefined,
             metadata: {
-                description: ( localize2(1235, "Detect the indentation from content.")),
+                description: ( localize2(1245, "Detect the indentation from content.")),
             }
         });
     }
@@ -195,10 +195,10 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize2(1236, "Reindent Lines")),
+            label: ( localize2(1246, "Reindent Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1237, "Reindent the lines of the editor.")),
+                description: ( localize2(1247, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -220,10 +220,10 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize2(1238, "Reindent Selected Lines")),
+            label: ( localize2(1248, "Reindent Selected Lines")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1239, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1249, "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(1240, "Double-click to insert")))], false, 10001)));
+                executor.emitOne(( new MarkdownHover(this, anchor.range, [( new MarkdownString()).appendText(( localize(1250, "Double-click to insert")))], false, 10001)));
             }
             let partTooltip;
             if (typeof part.part.tooltip === 'string') {
@@ -90,44 +90,46 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
                 const kb = useMetaKey
                     ? isMacintosh
-                        ? ( localize(1241, "cmd + click"))
-                        : ( localize(1242, "ctrl + click"))
+                        ? ( localize(1251, "cmd + click"))
+                        : ( localize(1252, "ctrl + click"))
                     : isMacintosh
-                        ? ( localize(1243, "option + click"))
-                        : ( localize(1244, "alt + click"));
+                        ? ( localize(1253, "option + click"))
+                        : ( localize(1254, "alt + click"));
                 if (part.part.location && part.part.command) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1245, 'Go to Definition ({0}), right click for more', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1255, 'Go to Definition ({0}), right click for more', kb)));
                 }
                 else if (part.part.location) {
-                    linkHint = ( new MarkdownString()).appendText(( localize(1246, 'Go to Definition ({0})', kb)));
+                    linkHint = ( new MarkdownString()).appendText(( localize(1256, 'Go to Definition ({0})', kb)));
                 }
                 else if (part.part.command) {
-                    linkHint = ( new MarkdownString(`[${( localize(1247, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true }));
+                    linkHint = ( new MarkdownString(`[${( localize(1257, "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)));
                 }
             }
-            const iterable = await this._resolveInlayHintLabelPartHover(part, token);
+            const iterable = this._resolveInlayHintLabelPartHover(part, token);
             for await (const item of iterable) {
                 executor.emitOne(item);
             }
         }));
     }
-    async _resolveInlayHintLabelPartHover(part, token) {
+    async *_resolveInlayHintLabelPartHover(part, token) {
         if (!part.part.location) {
-            return AsyncIterableObject.EMPTY;
+            return;
         }
         const { uri, range } = part.part.location;
         const ref = await this._resolverService.createModelReference(uri);
         try {
             const model = ref.object.textEditorModel;
             if (!( this._languageFeaturesService.hoverProvider.has(model))) {
-                return AsyncIterableObject.EMPTY;
+                return;
+            }
+            for await (const item of getHoverProviderResultsAsAsyncIterable(this._languageFeaturesService.hoverProvider, model, ( new Position(range.startLineNumber, range.startColumn)), token)) {
+                if (!isEmptyMarkdownString(item.hover.contents)) {
+                    yield ( new MarkdownHover(this, part.item.anchor.range, item.hover.contents, false, 2 + item.ordinal));
+                }
             }
-            return ( getHoverProviderResultsAsAsyncIterable(this._languageFeaturesService.hoverProvider, model, ( new Position(range.startLineNumber, range.startColumn)), token)
-                .filter(item => !isEmptyMarkdownString(item.hover.contents))
-                .map(item => ( new MarkdownHover(this, part.item.anchor.range, item.hover.contents, false, 2 + item.ordinal))));
         }
         finally {
             ref.dispose();

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

@@ -4,34 +4,34 @@ import { EditorAction, EditorCommand, ServicesAccessor } from "../../../../brows
 export declare class ShowNextInlineSuggestionAction extends EditorAction {
     static ID: string;
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class ShowPreviousInlineSuggestionAction extends EditorAction {
     static ID: string;
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class TriggerInlineSuggestionAction extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class TriggerInlineEditAction extends EditorCommand {
     constructor();
-    runEditorCommand(accessor: ServicesAccessor | null, editor: ICodeEditor, args: {
+    runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, args: {
         triggerKind?: "automatic" | "explicit";
     }): Promise<void>;
 }
 export declare class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class AcceptInlineCompletion extends EditorAction {
     constructor();
@@ -39,7 +39,7 @@ export declare class AcceptInlineCompletion extends EditorAction {
 }
 export declare class JumpToNextInlineEdit extends EditorAction {
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor): Promise<void>;
+    run(accessor: ServicesAccessor, editor: ICodeEditor): Promise<void>;
 }
 export declare class HideInlineCompletion extends EditorAction {
     static ID: string;

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(1248, "Show Next Inline Suggestion")),
+            label: ( localize2(1258, "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(1249, "Show Previous Inline Suggestion")),
+            label: ( localize2(1259, "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(1250, "Trigger Inline Suggestion")),
+            label: ( localize2(1260, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable
         });
     }
@@ -82,7 +82,7 @@ class ExplicitTriggerInlineEditAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.triggerInlineEditExplicit',
-            label: ( localize2(1251, "Trigger Next Edit Suggestion")),
+            label: ( localize2(1261, "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(1252, "No inline edit is available."))
+                message: ( localize(1262, "No inline edit is available."))
             });
         }
     }
@@ -114,7 +114,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextWord',
-            label: ( localize2(1253, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1263, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -125,12 +125,13 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
                 kbExpr: ( ContextKeyExpr.and(
                     EditorContextKeys.writable,
                     InlineCompletionContextKeys.inlineSuggestionVisible,
+                    InlineCompletionContextKeys.cursorBeforeGhostText,
                     ( CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate())
                 )),
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1254, 'Accept Word')),
+                    title: ( localize(1264, 'Accept Word')),
                     group: 'primary',
                     order: 2,
                 }],
@@ -145,7 +146,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.acceptNextLine',
-            label: ( localize2(1255, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1265, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -155,7 +156,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1256, 'Accept Line')),
+                    title: ( localize(1266, 'Accept Line')),
                     group: 'secondary',
                     order: 2,
                 }],
@@ -170,19 +171,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1257, "Accept Inline Suggestion")),
+            label: ( localize2(1267, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
-                    title: ( localize(1258, "Accept")),
+                    title: ( localize(1268, "Accept")),
                     group: 'primary',
                     order: 2,
                 }, {
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1258, "Accept")),
+                    title: ( localize(1268, "Accept")),
                     group: 'primary',
                     order: 2,
                 }],
@@ -190,7 +191,7 @@ class AcceptInlineCompletion extends EditorAction {
                 {
                     primary: KeyCode.Tab,
                     weight: 200,
-                    kbExpr: ( ContextKeyExpr.or(( ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible, ( EditorContextKeys.tabMovesFocus.toNegated()), ( Context.Visible.toNegated()), ( EditorContextKeys.hoverFocused.toNegated()), InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize)), ( ContextKeyExpr.and(InlineCompletionContextKeys.inlineEditVisible, ( EditorContextKeys.tabMovesFocus.toNegated()), ( Context.Visible.toNegated()), ( EditorContextKeys.hoverFocused.toNegated()), InlineCompletionContextKeys.tabShouldAcceptInlineEdit)))),
+                    kbExpr: ( ContextKeyExpr.or(( ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible, ( EditorContextKeys.tabMovesFocus.toNegated()), ( Context.Visible.toNegated()), ( EditorContextKeys.hoverFocused.toNegated()), ( InlineCompletionContextKeys.hasSelection.toNegated()), InlineCompletionContextKeys.inlineSuggestionHasIndentationLessThanTabSize)), ( ContextKeyExpr.and(InlineCompletionContextKeys.inlineEditVisible, ( EditorContextKeys.tabMovesFocus.toNegated()), ( Context.Visible.toNegated()), ( EditorContextKeys.hoverFocused.toNegated()), InlineCompletionContextKeys.tabShouldAcceptInlineEdit)))),
                 }
             ],
         });
@@ -213,11 +214,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1259, "Jump to next inline edit")),
+            label: ( localize2(1269, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1260, "Jump")),
+                    title: ( localize(1270, "Jump")),
                     group: 'primary',
                     order: 1,
                     when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated()),
@@ -241,7 +242,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1261, "Hide Inline Suggestion")),
+            label: ( localize2(1271, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -252,7 +253,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                     menuId: MenuId.InlineEditsActions,
-                    title: ( localize(1262, "Reject")),
+                    title: ( localize(1272, "Reject")),
                     group: 'primary',
                     order: 3,
                 }]
@@ -271,7 +272,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1263, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1273, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true(),
         });
     }
@@ -293,7 +294,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1264, "Always Show Toolbar")),
+            title: ( localize(1274, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -315,7 +316,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.inlineSuggest.dev.extractRepro',
-            label: ( localize(1265, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1275, "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.d.ts

@@ -4,6 +4,7 @@ export declare abstract class InlineCompletionContextKeys {
     static readonly inlineSuggestionHasIndentation: RawContextKey<boolean>;
     static readonly inlineSuggestionHasIndentationLessThanTabSize: RawContextKey<boolean>;
     static readonly suppressSuggestions: RawContextKey<boolean | undefined>;
+    static readonly cursorBeforeGhostText: RawContextKey<boolean | undefined>;
     static readonly cursorInIndentation: RawContextKey<boolean | undefined>;
     static readonly hasSelection: RawContextKey<boolean | undefined>;
     static readonly cursorAtInlineEdit: RawContextKey<boolean | undefined>;

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

@@ -3,23 +3,24 @@ import { RawContextKey } from '../../../../../platform/contextkey/common/context
 import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
-    static { this.inlineSuggestionVisible = ( new RawContextKey('inlineSuggestionVisible', false, ( localize(1266, "Whether an inline suggestion is visible")))); }
-    static { this.inlineSuggestionHasIndentation = ( new RawContextKey('inlineSuggestionHasIndentation', false, ( localize(1267, "Whether the inline suggestion starts with whitespace")))); }
+    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.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey('inlineSuggestionHasIndentationLessThanTabSize', true, ( localize(
-     1268,
+     1278,
      "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(
-     1269,
+     1279,
      "Whether suggestions should be suppressed for the current suggestion"
     )))); }
-    static { this.cursorInIndentation = ( new RawContextKey('cursorInIndentation', false, ( localize(1270, "Whether the cursor is in indentation")))); }
-    static { this.hasSelection = ( new RawContextKey('editor.hasSelection', false, ( localize(1271, "Whether the editor has a selection")))); }
-    static { this.cursorAtInlineEdit = ( new RawContextKey('cursorAtInlineEdit', false, ( localize(1272, "Whether the cursor is at an inline edit")))); }
-    static { this.inlineEditVisible = ( new RawContextKey('inlineEditIsVisible', false, ( localize(1273, "Whether an inline edit is visible")))); }
-    static { this.tabShouldJumpToInlineEdit = ( new RawContextKey('tabShouldJumpToInlineEdit', false, ( localize(1274, "Whether tab should jump to an inline edit.")))); }
-    static { this.tabShouldAcceptInlineEdit = ( new RawContextKey('tabShouldAcceptInlineEdit', false, ( localize(1275, "Whether tab should accept the inline edit.")))); }
-    static { this.inInlineEditsPreviewEditor = ( new RawContextKey('inInlineEditsPreviewEditor', true, ( localize(1276, "Whether the current code editor is showing an inline edits preview")))); }
+    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")))); }
 }
 
 export { InlineCompletionContextKeys };

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

@@ -267,6 +267,27 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             const state = model?.inlineCompletionState.read(reader);
             return !!state?.inlineCompletion && state?.primaryGhostText !== undefined && !state?.primaryGhostText.isEmpty();
         }));
+        const firstGhostTextPos = derived(this, reader => {
+            const model = this.model.read(reader);
+            const state = model?.inlineCompletionState.read(reader);
+            const primaryGhostText = state?.primaryGhostText;
+            if (!primaryGhostText) {
+                return undefined;
+            }
+            const firstPartPos = ( new Position(primaryGhostText.lineNumber, primaryGhostText.parts[0].column));
+            return firstPartPos;
+        });
+        this._register(contextKeySvcObs.bind(InlineCompletionContextKeys.cursorBeforeGhostText, reader => {
+            const firstPartPos = firstGhostTextPos.read(reader);
+            if (!firstPartPos) {
+                return false;
+            }
+            const cursorPos = this._editorObs.cursorPosition.read(reader);
+            if (!cursorPos) {
+                return false;
+            }
+            return firstPartPos.equals(cursorPos);
+        }));
         this._register(this._instantiationService.createInstance(TextModelChangeRecorder, this.editor));
     }
     playAccessibilitySignal(tx) {
@@ -278,7 +299,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1277,
+                1288,
                 "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(1278, 'There are inline completions here');
+        return localize(1289, '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(1279, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1290, "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

@@ -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(1280, 'Icon for show next parameter hint.')));
-const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1281, 'Icon for show previous parameter hint.')));
+const inlineSuggestionHintsNextIcon = registerIcon('inline-suggestion-hints-next', Codicon.chevronRight, ( localize(1291, 'Icon for show next parameter hint.')));
+const inlineSuggestionHintsPreviousIcon = registerIcon('inline-suggestion-hints-previous', Codicon.chevronLeft, ( localize(1292, '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(1282, '{0} ({1})', label, kb.getLabel()));
+            tooltip = ( localize(1293, '{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(1283, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
+        this.previousAction = this._register(this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1294, 'Previous')), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon)));
         this.availableSuggestionCountAction = this._register(( new Action('inlineSuggestionHints.availableSuggestionCount', '', undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1284, 'Next')), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1295, '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/model/ghostText.d.ts

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

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

@@ -34,6 +34,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _accessibilityService;
     private readonly _languageFeaturesService;
     private readonly _codeEditorService;
+    private readonly _inlineCompletionsService;
     private readonly _source;
     private readonly _isActive;
     private readonly _onlyRequestInlineEditsSignal;
@@ -43,10 +44,12 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _selectedInlineCompletionId;
     readonly primaryPosition: IObservableWithChange<Position, void>;
     private _isAcceptingPartially;
+    private readonly _appearedInsideViewport;
     get isAcceptingPartially(): boolean;
     private readonly _onDidAccept;
     readonly onDidAccept: import("../../../../../base/common/event.js").Event<void>;
     private readonly _editorObs;
+    private readonly _typing;
     private readonly _suggestPreviewEnabled;
     private readonly _suggestPreviewMode;
     private readonly _inlineSuggestMode;
@@ -54,7 +57,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _inlineEditsEnabled;
     private readonly _inlineEditsShowCollapsedEnabled;
     private readonly _triggerCommandOnProviderChange;
-    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, _languageFeaturesService: ILanguageFeaturesService, _codeEditorService: ICodeEditorService, inlineCompletionsService: IInlineCompletionsService);
+    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, _languageFeaturesService: ILanguageFeaturesService, _codeEditorService: ICodeEditorService, _inlineCompletionsService: IInlineCompletionsService);
     private _lastShownInlineCompletionInfo;
     private _lastAcceptedInlineCompletionInfo;
     private readonly _didUndoInlineEdits;
@@ -148,5 +151,5 @@ export declare enum VersionIdChangeReason {
     AcceptWord = 2,
     Other = 3
 }
-export declare function getSecondaryEdits(textModel: ITextModel, positions: readonly Position[], primaryEdit: TextReplacement): TextReplacement[];
+export declare function getSecondaryEdits(textModel: ITextModel, positions: readonly Position[], primaryTextRepl: TextReplacement): (TextReplacement | undefined)[];
 export {};