@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -29,7 +29,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowNextInlineSuggestionAction.ID,
-            label: ( localize2(1319, "Show Next Inline Suggestion")),
+            label: ( localize2(1328, "Show Next Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -52,7 +52,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: ShowPreviousInlineSuggestionAction.ID,
-            label: ( localize2(1320, "Show Previous Inline Suggestion")),
+            label: ( localize2(1329, "Show Previous Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -87,13 +87,13 @@ class TriggerInlineSuggestionAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.trigger",
-            label: ( localize2(1321, "Trigger Inline Suggestion")),
+            label: ( localize2(1330, "Trigger Inline Suggestion")),
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize(1322, "Triggers an inline suggestion in the editor.")),
+                description: ( localize(1331, "Triggers an inline suggestion in the editor.")),
                 args: [{
                     name: "args",
-                    description: ( localize(1323, "Options for triggering inline suggestions.")),
+                    description: ( localize(1332, "Options for triggering inline suggestions.")),
                     isOptional: true,
                     schema: argsValidator.getJSONSchema()
                 }]
@@ -120,7 +120,7 @@ class TriggerInlineSuggestionAction extends EditorAction {
             if (!controller?.model.get()?.state.get()) {
                 notificationService.notify({
                     severity: Severity$1.Info,
-                    message: ( localize(1324, "No inline suggestion is available."))
+                    message: ( localize(1333, "No inline suggestion is available."))
                 });
             }
         }
@@ -130,7 +130,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.acceptNextWord",
-            label: ( localize2(1325, "Accept Next Word Of Inline Suggestion")),
+            label: ( localize2(1334, "Accept Next Word Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -147,7 +147,7 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1326, "Accept Word")),
+                title: ( localize(1335, "Accept Word")),
                 group: "primary",
                 order: 2
             }]
@@ -162,7 +162,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.acceptNextLine",
-            label: ( localize2(1327, "Accept Next Line Of Inline Suggestion")),
+            label: ( localize2(1336, "Accept Next Line Of Inline Suggestion")),
             precondition: ( ContextKeyExpr.and(
                 EditorContextKeys.writable,
                 InlineCompletionContextKeys.inlineSuggestionVisible
@@ -172,7 +172,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1328, "Accept Line")),
+                title: ( localize(1337, "Accept Line")),
                 group: "secondary",
                 order: 2
             }]
@@ -187,19 +187,19 @@ class AcceptInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitId,
-            label: ( localize2(1329, "Accept Inline Suggestion")),
+            label: ( localize2(1338, "Accept Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
             )),
             menuOpts: [{
                 menuId: MenuId.InlineSuggestionToolbar,
-                title: ( localize(1330, "Accept")),
+                title: ( localize(1339, "Accept")),
                 group: "primary",
                 order: 2
             }, {
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1330, "Accept")),
+                title: ( localize(1339, "Accept")),
                 group: "primary",
                 order: 2
             }],
@@ -228,7 +228,7 @@ class AcceptInlineCompletionAlternativeAction extends EditorAction {
     constructor() {
         super({
             id: inlineSuggestCommitAlternativeActionId,
-            label: ( localize2(1331, "Accept Inline Suggestion Alternative Action")),
+            label: ( localize2(1340, "Accept Inline Suggestion Alternative Action")),
             precondition: ( ContextKeyExpr.and(
                 InlineCompletionContextKeys.inlineSuggestionAlternativeActionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -258,11 +258,11 @@ class JumpToNextInlineEdit extends EditorAction {
     constructor() {
         super({
             id: jumpToNextInlineEditId,
-            label: ( localize2(1332, "Jump to next inline edit")),
+            label: ( localize2(1341, "Jump to next inline edit")),
             precondition: InlineCompletionContextKeys.inlineEditVisible,
             menuOpts: [{
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1333, "Jump")),
+                title: ( localize(1342, "Jump")),
                 group: "primary",
                 order: 1,
                 when: ( InlineCompletionContextKeys.cursorAtInlineEdit.toNegated())
@@ -288,7 +288,7 @@ class HideInlineCompletion extends EditorAction {
     constructor() {
         super({
             id: HideInlineCompletion.ID,
-            label: ( localize2(1334, "Hide Inline Suggestion")),
+            label: ( localize2(1343, "Hide Inline Suggestion")),
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineSuggestionVisible,
                 InlineCompletionContextKeys.inlineEditVisible
@@ -300,7 +300,7 @@ class HideInlineCompletion extends EditorAction {
             },
             menuOpts: [{
                 menuId: MenuId.InlineEditsActions,
-                title: ( localize(1335, "Reject")),
+                title: ( localize(1344, "Reject")),
                 group: "primary",
                 order: 3
             }]
@@ -321,7 +321,7 @@ class ToggleInlineCompletionShowCollapsed extends EditorAction {
     constructor() {
         super({
             id: ToggleInlineCompletionShowCollapsed.ID,
-            label: ( localize2(1336, "Toggle Inline Suggestions Show Collapsed")),
+            label: ( localize2(1345, "Toggle Inline Suggestions Show Collapsed")),
             precondition: ContextKeyExpr.true()
         });
     }
@@ -345,7 +345,7 @@ class ToggleAlwaysShowInlineSuggestionToolbar extends Action2 {
     constructor() {
         super({
             id: ToggleAlwaysShowInlineSuggestionToolbar.ID,
-            title: ( localize(1337, "Always Show Toolbar")),
+            title: ( localize(1346, "Always Show Toolbar")),
             f1: false,
             precondition: undefined,
             menu: [{
@@ -367,7 +367,7 @@ class DevExtractReproSample extends EditorAction {
     constructor() {
         super({
             id: "editor.action.inlineSuggest.dev.extractRepro",
-            label: ( localize(1338, "Developer: Extract Inline Suggest State")),
+            label: ( localize(1347, "Developer: Extract Inline Suggest State")),
             alias: "Developer: Inline Suggest Extract Repro",
             precondition: ( ContextKeyExpr.or(
                 InlineCompletionContextKeys.inlineEditVisible,

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

@@ -4,52 +4,52 @@ import { localize } from '../../../../../nls.js';
 
 class InlineCompletionContextKeys {
     static {
-        this.inlineSuggestionVisible = ( new RawContextKey("inlineSuggestionVisible", false, ( localize(1339, "Whether an inline suggestion is visible"))));
+        this.inlineSuggestionVisible = ( new RawContextKey("inlineSuggestionVisible", false, ( localize(1348, "Whether an inline suggestion is visible"))));
     }
     static {
         this.inlineSuggestionAlternativeActionVisible = ( new RawContextKey("inlineSuggestionAlternativeActionVisible", false, ( localize(
-            1340,
+            1349,
             "Whether an alternative action for the inline suggestion is visible."
         ))));
     }
     static {
-        this.inlineSuggestionHasIndentation = ( new RawContextKey("inlineSuggestionHasIndentation", false, ( localize(1341, "Whether the inline suggestion starts with whitespace"))));
+        this.inlineSuggestionHasIndentation = ( new RawContextKey("inlineSuggestionHasIndentation", false, ( localize(1350, "Whether the inline suggestion starts with whitespace"))));
     }
     static {
         this.inlineSuggestionHasIndentationLessThanTabSize = ( new RawContextKey("inlineSuggestionHasIndentationLessThanTabSize", true, ( localize(
-            1342,
+            1351,
             "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(
-            1343,
+            1352,
             "Whether suggestions should be suppressed for the current suggestion"
         ))));
     }
     static {
-        this.cursorBeforeGhostText = ( new RawContextKey("cursorBeforeGhostText", false, ( localize(1344, "Whether the cursor is at ghost text"))));
+        this.cursorBeforeGhostText = ( new RawContextKey("cursorBeforeGhostText", false, ( localize(1353, "Whether the cursor is at ghost text"))));
     }
     static {
-        this.cursorInIndentation = ( new RawContextKey("cursorInIndentation", false, ( localize(1345, "Whether the cursor is in indentation"))));
+        this.cursorInIndentation = ( new RawContextKey("cursorInIndentation", false, ( localize(1354, "Whether the cursor is in indentation"))));
     }
     static {
-        this.hasSelection = ( new RawContextKey("editor.hasSelection", false, ( localize(1346, "Whether the editor has a selection"))));
+        this.hasSelection = ( new RawContextKey("editor.hasSelection", false, ( localize(1355, "Whether the editor has a selection"))));
     }
     static {
-        this.cursorAtInlineEdit = ( new RawContextKey("cursorAtInlineEdit", false, ( localize(1347, "Whether the cursor is at an inline edit"))));
+        this.cursorAtInlineEdit = ( new RawContextKey("cursorAtInlineEdit", false, ( localize(1356, "Whether the cursor is at an inline edit"))));
     }
     static {
-        this.inlineEditVisible = ( new RawContextKey("inlineEditIsVisible", false, ( localize(1348, "Whether an inline edit is visible"))));
+        this.inlineEditVisible = ( new RawContextKey("inlineEditIsVisible", false, ( localize(1357, "Whether an inline edit is visible"))));
     }
     static {
-        this.tabShouldJumpToInlineEdit = ( new RawContextKey("tabShouldJumpToInlineEdit", false, ( localize(1349, "Whether tab should jump to an inline edit."))));
+        this.tabShouldJumpToInlineEdit = ( new RawContextKey("tabShouldJumpToInlineEdit", false, ( localize(1358, "Whether tab should jump to an inline edit."))));
     }
     static {
-        this.tabShouldAcceptInlineEdit = ( new RawContextKey("tabShouldAcceptInlineEdit", false, ( localize(1350, "Whether tab should accept the inline edit."))));
+        this.tabShouldAcceptInlineEdit = ( new RawContextKey("tabShouldAcceptInlineEdit", false, ( localize(1359, "Whether tab should accept the inline edit."))));
     }
     static {
-        this.inInlineEditsPreviewEditor = ( new RawContextKey("inInlineEditsPreviewEditor", true, ( localize(1351, "Whether the current code editor is showing an inline edits preview"))));
+        this.inInlineEditsPreviewEditor = ( new RawContextKey("inInlineEditsPreviewEditor", true, ( localize(1360, "Whether the current code editor is showing an inline edits preview"))));
     }
 }
 

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

@@ -1,6 +1,5 @@
 import { Disposable } from "../../../../../base/common/lifecycle.js";
 import { ITransaction } from "../../../../../base/common/observable.js";
-import { IAccessibilityService } from "../../../../../platform/accessibility/common/accessibility.service.js";
 import { IAccessibilitySignalService } from "../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
 import { IConfigurationService } from "../../../../../platform/configuration/common/configuration.service.js";
@@ -23,7 +22,6 @@ export declare class InlineCompletionsController extends Disposable {
     private readonly _languageFeaturesService;
     private readonly _accessibilitySignalService;
     private readonly _keybindingService;
-    private readonly _accessibilityService;
     private static readonly _instances;
     static hot: import("../../../../../base/common/observable.js").IObservable<typeof InlineCompletionsController>;
     static ID: string;
@@ -36,9 +34,6 @@ export declare class InlineCompletionsController extends Disposable {
     private readonly _positions;
     private readonly _suggestWidgetAdapter;
     private readonly _enabledInConfig;
-    private readonly _isScreenReaderEnabled;
-    private readonly _editorDictationInProgress;
-    private readonly _enabled;
     private readonly _debounceValue;
     private readonly _focusIsInMenu;
     private readonly _focusIsInEditorOrMenu;
@@ -47,7 +42,8 @@ export declare class InlineCompletionsController extends Disposable {
     private readonly _playAccessibilitySignal;
     private readonly _hideInlineEditOnSelectionChange;
     protected readonly _view: import("../../../../../base/common/observable.js").IObservableWithChange<InlineSuggestionsView, void>;
-    constructor(editor: ICodeEditor, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _commandService: ICommandService, _debounceService: ILanguageFeatureDebounceService, _languageFeaturesService: ILanguageFeaturesService, _accessibilitySignalService: IAccessibilitySignalService, _keybindingService: IKeybindingService, _accessibilityService: IAccessibilityService);
+    constructor(editor: ICodeEditor, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _configurationService: IConfigurationService, _commandService: ICommandService, _debounceService: ILanguageFeatureDebounceService, _languageFeaturesService: ILanguageFeaturesService, _accessibilitySignalService: IAccessibilitySignalService, _keybindingService: IKeybindingService);
+    private _isEditorDictationInProgress;
     playAccessibilitySignal(tx: ITransaction): void;
     private _provideScreenReaderUpdate;
     shouldShowHoverAt(range: Range): boolean;

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

@@ -9,7 +9,6 @@ import '../../../../../base/common/observableInternal/index.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 import { isUndefined } from '../../../../../base/common/types.js';
 import { localize } from '../../../../../nls.js';
-import { IAccessibilityService } from '../../../../../platform/accessibility/common/accessibility.service.js';
 import { AccessibilitySignal } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
@@ -36,11 +35,11 @@ import { InlineCompletionsModel } from '../model/inlineCompletionsModel.js';
 import { ObservableSuggestWidgetAdapter } from '../model/suggestWidgetAdapter.js';
 import { ObservableContextKeyService } from '../utils.js';
 import { InlineSuggestionsView } from '../view/inlineSuggestionsView.js';
-import { inlineSuggestCommitId } from './commandIds.js';
+import { inlineSuggestCommitId, jumpToNextInlineEditId } from './commandIds.js';
 import { setInlineCompletionsControllerGetter } from './common.js';
 import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
-import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
+import { derived, derivedDisposable } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/observables/observableSignal.js';
 import { observableFromEvent } from '../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorun } from '../../../../../base/common/observableInternal/reactions/autorun.js';
@@ -83,8 +82,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         _debounceService,
         _languageFeaturesService,
         _accessibilitySignalService,
-        _keybindingService,
-        _accessibilityService
+        _keybindingService
     ) {
         super();
         this.editor = editor;
@@ -96,11 +94,6 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this._languageFeaturesService = _languageFeaturesService;
         this._accessibilitySignalService = _accessibilitySignalService;
         this._keybindingService = _keybindingService;
-        this._accessibilityService = _accessibilityService;
-        this._enabled = derived(
-            this,
-            reader => this._enabledInConfig.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._editorDictationInProgress.read(reader))
-        );
         this._focusIsInMenu = observableValue(this, false);
         this._focusIsInEditorOrMenu = derived(this, reader => {
             const editorHasFocus = this._editorObs.isFocused.read(reader);
@@ -135,7 +128,8 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 this._editorObs.versionId,
                 this._positions,
                 this._debounceValue,
-                this._enabled,
+                this._enabledInConfig,
+                () => this._isEditorDictationInProgress(),
                 this.editor
             );
             return model;
@@ -162,16 +156,11 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             this.editor.onDidChangeConfiguration,
             () => this.editor.getOption(EditorOption.inlineSuggest).enabled
         );
-        this._isScreenReaderEnabled = observableFromEvent(
-            this,
-            this._accessibilityService.onDidChangeScreenReaderOptimized,
-            () => this._accessibilityService.isScreenReaderOptimized()
-        );
-        this._editorDictationInProgress = observableFromEvent(
-            this,
-            this._contextKeyService.onDidChangeContext,
-            () => this._contextKeyService.getContext(this.editor.getDomNode()).getValue("editorDictation.inProgress") === true
-        );
+        this._register(this._contextKeyService.onDidChangeContext(e => {
+            if (e.affectsSome(( new Set(["editorDictation.inProgress"]))) && this._isEditorDictationInProgress()) {
+                this.model.get()?.stop();
+            }
+        }));
         this._debounceValue = this._debounceService.for(
             this._languageFeaturesService.inlineCompletionsProvider,
             "InlineCompletionsDebounce",
@@ -227,12 +216,12 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             }));
         }));
         this._register(runOnChange(this._editorObs.onDidType, (_value, _changes) => {
-            if (this._enabled.get()) {
+            if (this._enabledInConfig.get() && !this._isEditorDictationInProgress()) {
                 this.model.get()?.trigger();
             }
         }));
         this._register(runOnChange(this._editorObs.onDidPaste, (_value, _changes) => {
-            if (this._enabled.get()) {
+            if (this._enabledInConfig.get() && !this._isEditorDictationInProgress()) {
                 this.model.get()?.trigger();
             }
         }));
@@ -252,7 +241,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             ...TriggerInlineEditCommandsRegistry.getRegisteredCommands()
         ]));
         this._register(this._commandService.onDidExecuteCommand(e => {
-            if (( triggerCommands.has(e.commandId)) && editor.hasTextFocus() && this._enabled.get()) {
+            if (( triggerCommands.has(e.commandId)) && editor.hasTextFocus() && this._enabledInConfig.get() && !this._isEditorDictationInProgress()) {
                 let noDelay = false;
                 if (e.commandId === inlineSuggestCommitId) {
                     noDelay = true;
@@ -358,7 +347,34 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 if (state.kind === "ghostText") {
                     this._provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
                 } else {
-                    this._provideScreenReaderUpdate("");
+                    const lineNumber = state.inlineSuggestion.targetRange.startLineNumber;
+                    const tabShouldAccept = model.tabShouldAcceptInlineEdit.get();
+                    const tabShouldJump = model.tabShouldJumpToInlineEdit.get();
+                    let content;
+                    if (tabShouldAccept) {
+                        const kb = this._keybindingService.lookupKeybinding(inlineSuggestCommitId)?.getAriaLabel();
+                        content = kb ? ( localize(
+                            1361,
+                            "Next edit suggestion available on line {0}, press {1} to accept",
+                            lineNumber,
+                            kb
+                        )) : ( localize(
+                            1362,
+                            "Next edit suggestion available on line {0}, accept it to apply",
+                            lineNumber
+                        ));
+                    } else if (tabShouldJump) {
+                        const kb = this._keybindingService.lookupKeybinding(jumpToNextInlineEditId)?.getAriaLabel();
+                        content = kb ? ( localize(
+                            1363,
+                            "Next edit suggestion available on line {0}, press {1} to jump",
+                            lineNumber,
+                            kb
+                        )) : ( localize(1364, "Next edit suggestion available on line {0}", lineNumber));
+                    } else {
+                        content = ( localize(1365, "Next edit suggestion available on line {0}", lineNumber));
+                    }
+                    this._provideScreenReaderUpdate(content);
                 }
             }
         }));
@@ -454,6 +470,9 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
             this._instantiationService.createInstance(TextModelChangeRecorder, this.editor)
         );
     }
+    _isEditorDictationInProgress() {
+        return this._contextKeyService.getContext(this.editor.getDomNode())?.getValue("editorDictation.inProgress") === true;
+    }
     playAccessibilitySignal(tx) {
         this._playAccessibilitySignal.trigger(tx);
     }
@@ -463,7 +482,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         let hint;
         if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localize(
-                1352,
+                1366,
                 "Inspect this in the accessible view ({0})",
                 accessibleViewKeybinding.getAriaLabel()
             ));
@@ -502,6 +521,6 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }
     }
 };
-InlineCompletionsController = InlineCompletionsController_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IContextKeyService)), ( __param(3, IConfigurationService)), ( __param(4, ICommandService)), ( __param(5, ILanguageFeatureDebounceService)), ( __param(6, ILanguageFeaturesService)), ( __param(7, IAccessibilitySignalService)), ( __param(8, IKeybindingService)), ( __param(9, IAccessibilityService))], InlineCompletionsController));
+InlineCompletionsController = InlineCompletionsController_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IContextKeyService)), ( __param(3, IConfigurationService)), ( __param(4, ICommandService)), ( __param(5, ILanguageFeatureDebounceService)), ( __param(6, ILanguageFeaturesService)), ( __param(7, IAccessibilitySignalService)), ( __param(8, IKeybindingService))], InlineCompletionsController));
 
 export { InlineCompletionsController };

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

@@ -139,7 +139,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return ( new RenderedHoverParts([renderedHoverPart]));
     }
     getAccessibleContent(hoverPart) {
-        return localize(1353, "There are inline completions here");
+        return localize(1367, "There are inline completions here");
     }
     renderScreenReaderText(context, part) {
         const disposables = ( new DisposableStore());
@@ -149,7 +149,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
             ["aria-live"]: "assertive"
         }));
         const render = code => {
-            const inlineSuggestionAvailable = ( localize(1354, "Suggestion:"));
+            const inlineSuggestionAvailable = ( localize(1368, "Suggestion:"));
             const renderedContents = disposables.add(this._markdownRendererService.render(( new MarkdownString()).appendText(inlineSuggestionAvailable).appendCodeblock("text", code), {
                 context: this._editor,
                 asyncRenderCallback: () => {

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

@@ -109,8 +109,8 @@ let InlineCompletionsHintsWidget = class InlineCompletionsHintsWidget extends Di
     }
 };
 InlineCompletionsHintsWidget = ( __decorate([( __param(2, IInstantiationService))], InlineCompletionsHintsWidget));
-const inlineSuggestionHintsNextIcon = registerIcon("inline-suggestion-hints-next", Codicon.chevronRight, ( localize(1355, "Icon for show next parameter hint.")));
-const inlineSuggestionHintsPreviousIcon = registerIcon("inline-suggestion-hints-previous", Codicon.chevronLeft, ( localize(1356, "Icon for show previous parameter hint.")));
+const inlineSuggestionHintsNextIcon = registerIcon("inline-suggestion-hints-next", Codicon.chevronRight, ( localize(1369, "Icon for show next parameter hint.")));
+const inlineSuggestionHintsPreviousIcon = registerIcon("inline-suggestion-hints-previous", Codicon.chevronLeft, ( localize(1370, "Icon for show previous parameter hint.")));
 let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidget extends Disposable {
     static {
         InlineSuggestionHintsContentWidget_1 = this;
@@ -193,10 +193,10 @@ let InlineSuggestionHintsContentWidget = class InlineSuggestionHintsContentWidge
             className: this.withBorder ? "monaco-hover monaco-hover-content" : ""
         }, [this._warningMessageNode.element, h("div@toolBar")]);
         this.previousAction = this._register(
-            this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1357, "Previous")), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon))
+            this.createCommandAction(showPreviousInlineSuggestionActionId, ( localize(1371, "Previous")), ThemeIcon.asClassName(inlineSuggestionHintsPreviousIcon))
         );
         this.availableSuggestionCountAction = this._register(( new Action("inlineSuggestionHints.availableSuggestionCount", "", undefined, false)));
-        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1358, "Next")), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
+        this.nextAction = this._register(this.createCommandAction(showNextInlineSuggestionActionId, ( localize(1372, "Next")), ThemeIcon.asClassName(inlineSuggestionHintsNextIcon)));
         this.inlineCompletionsActionsMenus = this._register(
             this._menuService.createMenu(MenuId.InlineCompletionsActions, this._contextKeyService)
         );

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

@@ -28,6 +28,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _positions;
     private readonly _debounceValue;
     private readonly _enabled;
+    private readonly _isSuppressed;
     private readonly _editor;
     private readonly _instantiationService;
     private readonly _commandService;
@@ -65,7 +66,7 @@ export declare class InlineCompletionsModel extends Disposable {
     private readonly _suppressInSnippetMode;
     private readonly _isInSnippetMode;
     get editor(): ICodeEditor;
-    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, defaultAccountService: IDefaultAccountService);
+    constructor(textModel: ITextModel, _selectedSuggestItem: IObservable<SuggestItemInfo | undefined>, _textModelVersionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _positions: IObservable<readonly Position[]>, _debounceValue: IFeatureDebounceInformation, _enabled: IObservable<boolean>, _isSuppressed: () => boolean, _editor: ICodeEditor, _instantiationService: IInstantiationService, _commandService: ICommandService, _languageConfigurationService: ILanguageConfigurationService, _accessibilityService: IAccessibilityService, _languageFeaturesService: ILanguageFeaturesService, _codeEditorService: ICodeEditorService, _inlineCompletionsService: IInlineCompletionsService, defaultAccountService: IDefaultAccountService);
     private _lastShownInlineCompletionInfo;
     private _lastAcceptedInlineCompletionInfo;
     private readonly _didUndoInlineEdits;
@@ -111,7 +112,7 @@ export declare class InlineCompletionsModel extends Disposable {
         cursorAtInlineEdit: IObservable<boolean>;
         nextEditUri: URI | undefined;
     } | undefined>;
-    readonly status: IObservableWithChange<"loading" | "ghostText" | "inlineEdit" | "noSuggestion", void>;
+    readonly status: IObservableWithChange<"ghostText" | "inlineEdit" | "loading" | "noSuggestion", void>;
     readonly inlineCompletionState: IObservableWithChange<{
         kind: "ghostText";
         edits: readonly TextReplacement[];

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

@@ -12,6 +12,7 @@ import { IAccessibilityService } from '../../../../../platform/accessibility/com
 import { ICommandService } from '../../../../../platform/commands/common/commands.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { observableCodeEditor } from '../../../../browser/observableCodeEditor.js';
+import product from '../../../../../platform/product/common/product.js';
 import { EditorOption } from '../../../../common/config/editorOptions.js';
 import { CursorColumns } from '../../../../common/core/cursorColumns.js';
 import { LineRange } from '../../../../common/core/ranges/lineRange.js';
@@ -67,6 +68,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         _positions,
         _debounceValue,
         _enabled,
+        _isSuppressed,
         _editor,
         _instantiationService,
         _commandService,
@@ -84,6 +86,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         this._positions = _positions;
         this._debounceValue = _debounceValue;
         this._enabled = _enabled;
+        this._isSuppressed = _isSuppressed;
         this._editor = _editor;
         this._instantiationService = _instantiationService;
         this._commandService = _commandService;
@@ -181,7 +184,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             this._onlyRequestInlineEditsSignal.read(reader);
             this._forceUpdateExplicitlySignal.read(reader);
             this._fetchSpecificProviderSignal.read(reader);
-            const shouldUpdate = ((this._enabled.read(reader) && this._selectedSuggestItem.read(reader)) || this._isActive.read(reader)) && (!this._inlineCompletionsService.isSnoozing() || changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit);
+            const shouldUpdate = !this._isSuppressed() && ((this._enabled.read(reader) && this._selectedSuggestItem.read(reader)) || this._isActive.read(reader)) && (!this._inlineCompletionsService.isSnoozing() || changeSummary.inlineCompletionTriggerKind === InlineCompletionTriggerKind.Explicit);
             if (!shouldUpdate) {
                 this._source.cancelUpdate();
                 return undefined;
@@ -613,7 +616,8 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
             this.textModel,
             this._textModelVersionId,
             this._debounceValue,
-            this.primaryPosition
+            this.primaryPosition,
+            product.defaultChatAgent?.completionsEnablementSetting
         ));
         this.lastTriggerKind = ( this._source.inlineCompletions.map(this, v => v?.request?.context.triggerKind));
         this._editorObs = observableCodeEditor(this._editor);
@@ -1044,7 +1048,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
                 const selections = ( getEndPositionsAfterApplying(edits).map(p => Selection.fromPositions(p)));
                 editor.edit(
                     TextEdit.fromParallelReplacementsUnsorted(edits),
-                    this._getMetadata(completion, type)
+                    this._getMetadata(completion, this.textModel.getLanguageId(), type)
                 );
                 editor.setSelections(selections, "inlineCompletionPartialAccept");
                 editor.revealPositionInCenterIfOutsideViewport(editor.getPosition(), ScrollType.Smooth);
@@ -1145,7 +1149,7 @@ let InlineCompletionsModel = class InlineCompletionsModel extends Disposable {
         });
     }
 };
-InlineCompletionsModel = ( __decorate([( __param(7, IInstantiationService)), ( __param(8, ICommandService)), ( __param(9, ILanguageConfigurationService)), ( __param(10, IAccessibilityService)), ( __param(11, ILanguageFeaturesService)), ( __param(12, ICodeEditorService)), ( __param(13, IInlineCompletionsService)), ( __param(14, IDefaultAccountService))], InlineCompletionsModel));
+InlineCompletionsModel = ( __decorate([( __param(8, IInstantiationService)), ( __param(9, ICommandService)), ( __param(10, ILanguageConfigurationService)), ( __param(11, IAccessibilityService)), ( __param(12, ILanguageFeaturesService)), ( __param(13, ICodeEditorService)), ( __param(14, IInlineCompletionsService)), ( __param(15, IDefaultAccountService))], InlineCompletionsModel));
 var VersionIdChangeReason;
 (function(VersionIdChangeReason) {
     VersionIdChangeReason[VersionIdChangeReason["Undo"] = 0] = "Undo";

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

@@ -34,8 +34,9 @@ export declare class InlineCompletionsSource extends Disposable {
     readonly inlineCompletions: IObservable<InlineCompletionsState>;
     readonly suggestWidgetInlineCompletions: IObservable<InlineCompletionsState>;
     private readonly _renameProcessor;
+    private readonly _dataChannelTelemetryService;
     private _completionsEnabled;
-    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _textModelService: ITextModelService);
+    constructor(_textModel: ITextModel, _versionId: IObservableWithChange<number | null, IModelContentChangedEvent | undefined>, _debounceValue: IFeatureDebounceInformation, _cursorPosition: IObservable<Position>, completionsEnablementSetting: string | undefined, _languageConfigurationService: ILanguageConfigurationService, _logService: ILogService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _contextKeyService: IContextKeyService, _textModelService: ITextModelService);
     private _updateCompletionsEnablement;
     readonly clearOperationOnTextModelChange: IObservableWithChange<undefined, void>;
     private _log;