@codingame/monaco-vscode-notebook-service-override 16.1.0 → 17.0.0

package/index.js

@@ -30,8 +30,8 @@ import { NotebookDocumentWorkbenchService } from '@codingame/monaco-vscode-api/v
 import { INotebookDocumentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/notebook/common/notebookDocumentService.service';
 import { INotebookOriginalCellModelFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory.service';
 import { INotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory.service';
-import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
-import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
+import { OriginalNotebookCellModelFactory } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalCellModelFactory';
+import { NotebookOriginalModelReferenceFactory } from '@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/workbench/contrib/notebook/browser/diff/inlineDiff/notebookOriginalModelRefFactory';
 import './vscode/src/vs/workbench/contrib/notebook/browser/notebook.contribution.js';
 
 function getServiceOverride() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "16.1.0",
+  "version": "17.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - notebook service-override",
   "keywords": [],
@@ -15,29 +15,31 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "16.1.0",
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.1.0",
-    "@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common": "16.1.0",
-    "@codingame/monaco-vscode-2bd6777a-3bff-5b83-ad25-0e029e81ffe9-common": "16.1.0",
-    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "16.1.0",
-    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "16.1.0",
-    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "16.1.0",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.1.0",
-    "@codingame/monaco-vscode-68b3311c-eb96-5711-8f72-f5f4b2e31932-common": "16.1.0",
-    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "16.1.0",
-    "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common": "16.1.0",
-    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "16.1.0",
-    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "16.1.0",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "16.1.0",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "16.1.0",
-    "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common": "16.1.0",
-    "@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common": "16.1.0",
-    "@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common": "16.1.0",
-    "@codingame/monaco-vscode-a3f28a41-ba19-5a7e-8f5a-d6c1403b507d-common": "16.1.0",
-    "@codingame/monaco-vscode-api": "16.1.0",
-    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "16.1.0",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "16.1.0",
-    "@codingame/monaco-vscode-fc28fb90-97de-5e74-89a9-4cfe44128227-common": "16.1.0",
+    "@codingame/monaco-vscode-0cd5242b-7b61-5f66-ac25-ffa40baf8e8f-common": "17.0.0",
+    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "17.0.0",
+    "@codingame/monaco-vscode-324f9a6e-6231-5bfc-af17-e147abd2dfd2-common": "17.0.0",
+    "@codingame/monaco-vscode-3a00040f-b81b-50bc-88da-35f611c0bd1e-common": "17.0.0",
+    "@codingame/monaco-vscode-407531d3-fdae-5387-8c41-49ba0e9574b5-common": "17.0.0",
+    "@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common": "17.0.0",
+    "@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common": "17.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "17.0.0",
+    "@codingame/monaco-vscode-6f9bc782-77e0-5716-93bd-b05210c768c5-common": "17.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "17.0.0",
+    "@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common": "17.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "17.0.0",
+    "@codingame/monaco-vscode-9ee79c1a-3f03-568b-8eac-b02513a98b68-common": "17.0.0",
+    "@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common": "17.0.0",
+    "@codingame/monaco-vscode-api": "17.0.0",
+    "@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common": "17.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "17.0.0",
+    "@codingame/monaco-vscode-bed2b49f-41ae-5ed2-b61a-1105500a3f8a-common": "17.0.0",
+    "@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common": "17.0.0",
+    "@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common": "17.0.0",
+    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "17.0.0",
+    "@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common": "17.0.0",
+    "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common": "17.0.0",
+    "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common": "17.0.0",
+    "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": "17.0.0",
     "marked": "14.0.0"
   },
   "main": "index.js",

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.d.ts

@@ -1,38 +1,21 @@
-import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICodeEditor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IEditorContribution } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IInlineChatSessionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
-import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
-export interface IEmptyTextEditorHintOptions {
-    readonly clickable?: boolean;
-}
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare const emptyTextEditorHintSetting = "workbench.editor.empty.hint";
-export declare class EmptyTextEditorHintContribution implements IEditorContribution {
+export declare class EmptyTextEditorHintContribution extends Disposable implements IEditorContribution {
     protected readonly editor: ICodeEditor;
-    private readonly editorGroupsService;
-    private readonly commandService;
-    protected readonly configurationService: IConfigurationService;
-    protected readonly hoverService: IHoverService;
-    private readonly keybindingService;
+    private readonly configurationService;
     private readonly inlineChatSessionService;
     private readonly chatAgentService;
-    private readonly telemetryService;
-    protected readonly productService: IProductService;
-    private readonly contextMenuService;
+    private readonly instantiationService;
     static readonly ID = "editor.contrib.emptyTextEditorHint";
-    protected toDispose: IDisposable[];
     private textHintContentWidget;
-    constructor(editor: ICodeEditor, editorGroupsService: IEditorGroupsService, commandService: ICommandService, configurationService: IConfigurationService, hoverService: IHoverService, keybindingService: IKeybindingService, inlineChatSessionService: IInlineChatSessionService, chatAgentService: IChatAgentService, telemetryService: ITelemetryService, productService: IProductService, contextMenuService: IContextMenuService);
-    protected _getOptions(): IEmptyTextEditorHintOptions;
-    protected _shouldRenderHint(): boolean;
+    constructor(editor: ICodeEditor, configurationService: IConfigurationService, inlineChatSessionService: IInlineChatSessionService, chatAgentService: IChatAgentService, instantiationService: IInstantiationService);
+    protected shouldRenderHint(): boolean;
     protected update(): void;
     dispose(): void;
 }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.js

@@ -2,8 +2,8 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import * as emptyTextEditorHint from './emptyTextEditorHint.css';
-import { $ as $$1, getActiveWindow, addDisposableListener, EventType } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { getActiveWindow, $, addDisposableListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ContentWidgetPositionPreference } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ChangeLanguageAction } from '@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common/vscode/vs/workbench/browser/parts/editor/editorStatus';
@@ -20,68 +20,55 @@ import { renderFormattedText } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { ApplyFileSnippetAction } from '@codingame/monaco-vscode-4e719823-8b6e-554d-b01a-5670b53fbb19-common/vscode/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
 import { IInlineChatSessionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
-import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { KeybindingLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
-import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { status } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/aria/aria';
 import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/search/common/search';
-import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { StandardMouseEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/mouseEvent';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
+var EmptyTextEditorHintContentWidget_1;
 registerCss(emptyTextEditorHint);
-const $ = $$1;
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
-let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
+let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution extends Disposable {
     static { this.ID = 'editor.contrib.emptyTextEditorHint'; }
-    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService, contextMenuService) {
+    constructor(editor, configurationService, inlineChatSessionService, chatAgentService, instantiationService) {
+        super();
         this.editor = editor;
-        this.editorGroupsService = editorGroupsService;
-        this.commandService = commandService;
         this.configurationService = configurationService;
-        this.hoverService = hoverService;
-        this.keybindingService = keybindingService;
         this.inlineChatSessionService = inlineChatSessionService;
         this.chatAgentService = chatAgentService;
-        this.telemetryService = telemetryService;
-        this.productService = productService;
-        this.contextMenuService = contextMenuService;
-        this.toDispose = [];
-        this.toDispose.push(this.editor.onDidChangeModel(() => this.update()));
-        this.toDispose.push(this.editor.onDidChangeModelLanguage(() => this.update()));
-        this.toDispose.push(this.editor.onDidChangeModelContent(() => this.update()));
-        this.toDispose.push(this.chatAgentService.onDidChangeAgents(() => this.update()));
-        this.toDispose.push(this.editor.onDidChangeModelDecorations(() => this.update()));
-        this.toDispose.push(this.editor.onDidChangeConfiguration((e) => {
+        this.instantiationService = instantiationService;
+        this._register(this.editor.onDidChangeModel(() => this.update()));
+        this._register(this.editor.onDidChangeModelLanguage(() => this.update()));
+        this._register(this.editor.onDidChangeModelContent(() => this.update()));
+        this._register(this.chatAgentService.onDidChangeAgents(() => this.update()));
+        this._register(this.editor.onDidChangeModelDecorations(() => this.update()));
+        this._register(this.editor.onDidChangeConfiguration((e) => {
             if (e.hasChanged(EditorOption.readOnly)) {
                 this.update();
             }
         }));
-        this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(emptyTextEditorHintSetting)) {
                 this.update();
             }
         }));
-        this.toDispose.push(inlineChatSessionService.onWillStartSession(editor => {
+        this._register(inlineChatSessionService.onWillStartSession(editor => {
             if (this.editor === editor) {
                 this.textHintContentWidget?.dispose();
             }
         }));
-        this.toDispose.push(inlineChatSessionService.onDidEndSession(e => {
+        this._register(inlineChatSessionService.onDidEndSession(e => {
             if (this.editor === e.editor) {
                 this.update();
             }
         }));
     }
-    _getOptions() {
-        return { clickable: true };
-    }
-    _shouldRenderHint() {
+    shouldRenderHint() {
         const configValue = this.configurationService.getValue(emptyTextEditorHintSetting);
         if (configValue === 'hidden') {
             return false;
@@ -112,21 +99,9 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         return hasEditorAgents || shouldRenderDefaultHint;
     }
     update() {
-        const shouldRenderHint = this._shouldRenderHint();
+        const shouldRenderHint = this.shouldRenderHint();
         if (shouldRenderHint && !this.textHintContentWidget) {
-            this.textHintContentWidget = ( new EmptyTextEditorHintContentWidget(
-                this.editor,
-                this._getOptions(),
-                this.editorGroupsService,
-                this.commandService,
-                this.configurationService,
-                this.hoverService,
-                this.keybindingService,
-                this.chatAgentService,
-                this.telemetryService,
-                this.productService,
-                this.contextMenuService
-            ));
+            this.textHintContentWidget = this.instantiationService.createInstance(EmptyTextEditorHintContentWidget, this.editor);
         }
         else if (!shouldRenderHint && this.textHintContentWidget) {
             this.textHintContentWidget.dispose();
@@ -134,46 +109,38 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         }
     }
     dispose() {
-        dispose(this.toDispose);
+        super.dispose();
         this.textHintContentWidget?.dispose();
     }
 };
 EmptyTextEditorHintContribution = ( __decorate([
-    ( __param(1, IEditorGroupsService)),
-    ( __param(2, ICommandService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IHoverService)),
-    ( __param(5, IKeybindingService)),
-    ( __param(6, IInlineChatSessionService)),
-    ( __param(7, IChatAgentService)),
-    ( __param(8, ITelemetryService)),
-    ( __param(9, IProductService)),
-    ( __param(10, IContextMenuService))
+    ( __param(1, IConfigurationService)),
+    ( __param(2, IInlineChatSessionService)),
+    ( __param(3, IChatAgentService)),
+    ( __param(4, IInstantiationService))
 ], EmptyTextEditorHintContribution));
-class EmptyTextEditorHintContentWidget {
+let EmptyTextEditorHintContentWidget = class EmptyTextEditorHintContentWidget extends Disposable {
+    static { EmptyTextEditorHintContentWidget_1 = this; }
     static { this.ID = 'editor.widget.emptyHint'; }
-    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, chatAgentService, telemetryService, productService, contextMenuService) {
+    constructor(editor, editorGroupsService, commandService, configurationService, keybindingService, chatAgentService, telemetryService, contextMenuService) {
+        super();
         this.editor = editor;
-        this.options = options;
         this.editorGroupsService = editorGroupsService;
         this.commandService = commandService;
         this.configurationService = configurationService;
-        this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.chatAgentService = chatAgentService;
         this.telemetryService = telemetryService;
-        this.productService = productService;
         this.contextMenuService = contextMenuService;
         this.isVisible = false;
         this.ariaLabel = '';
-        this.toDispose = ( new DisposableStore());
-        this.toDispose.add(this.editor.onDidChangeConfiguration((e) => {
+        this._register(this.editor.onDidChangeConfiguration((e) => {
             if (this.domNode && e.hasChanged(EditorOption.fontInfo)) {
                 this.editor.applyFontInfo(this.domNode);
             }
         }));
         const onDidFocusEditorText = Event.debounce(this.editor.onDidFocusEditorText, () => undefined, 500);
-        this.toDispose.add(onDidFocusEditorText(() => {
+        this._register(onDidFocusEditorText(() => {
             if (this.editor.hasTextFocus() && this.isVisible && this.ariaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.EmptyEditorHint)) {
                 status(this.ariaLabel);
             }
@@ -181,9 +148,9 @@ class EmptyTextEditorHintContentWidget {
         this.editor.addContentWidget(this);
     }
     getId() {
-        return EmptyTextEditorHintContentWidget.ID;
+        return EmptyTextEditorHintContentWidget_1.ID;
     }
-    _disableHint(e) {
+    disableHint(e) {
         const disableHint = () => {
             this.configurationService.updateValue(emptyTextEditorHintSetting, 'hidden');
             this.dispose();
@@ -198,8 +165,8 @@ class EmptyTextEditorHintContentWidget {
             getActions: () => {
                 return [{
                         id: 'workench.action.disableEmptyEditorHint',
-                        label: ( localize(5052, "Disable Empty Editor Hint")),
-                        tooltip: ( localize(5052, "Disable Empty Editor Hint")),
+                        label: ( localize(5138, "Disable Empty Editor Hint")),
+                        tooltip: ( localize(5138, "Disable Empty Editor Hint")),
                         enabled: true,
                         class: undefined,
                         run: () => {
@@ -210,101 +177,36 @@ class EmptyTextEditorHintContentWidget {
             }
         });
     }
-    _getHintInlineChat(providers) {
-        const providerName = (providers.length === 1 ? providers[0].fullName : undefined) ?? this.productService.nameShort;
-        const inlineChatId = 'inlineChat.start';
-        let ariaLabel = `Ask ${providerName} something or start typing to dismiss.`;
-        const handleClick = () => {
-            this.telemetryService.publicLog2('workbenchActionExecuted', {
-                id: 'inlineChat.hintAction',
-                from: 'hint'
-            });
-            this.commandService.executeCommand(inlineChatId, { from: 'hint' });
-        };
-        const hintHandler = {
-            disposables: this.toDispose,
-            callback: (index, _event) => {
-                switch (index) {
-                    case '0':
-                        handleClick();
-                        break;
-                }
-            }
-        };
-        const hintElement = $('empty-hint-text');
-        hintElement.style.display = 'block';
-        const keybindingHint = this.keybindingService.lookupKeybinding(inlineChatId);
-        const keybindingHintLabel = keybindingHint?.getLabel();
-        if (keybindingHint && keybindingHintLabel) {
-            const actionPart = ( localize(
-                5053,
-                'Press {0} to ask {1} to do something. ',
-                keybindingHintLabel,
-                providerName
-            ));
-            const [before, after] = ( actionPart.split(keybindingHintLabel).map((fragment) => {
-                if (this.options.clickable) {
-                    const hintPart = $('a', undefined, fragment);
-                    hintPart.style.fontStyle = 'italic';
-                    hintPart.style.cursor = 'pointer';
-                    this.toDispose.add(addDisposableListener(hintPart, EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
-                    this.toDispose.add(addDisposableListener(hintPart, EventType.CLICK, handleClick));
-                    return hintPart;
-                }
-                else {
-                    const hintPart = $('span', undefined, fragment);
-                    hintPart.style.fontStyle = 'italic';
-                    return hintPart;
-                }
-            }));
-            hintElement.appendChild(before);
-            const label = hintHandler.disposables.add(( new KeybindingLabel(hintElement, OS)));
-            label.set(keybindingHint);
-            label.element.style.width = 'min-content';
-            label.element.style.display = 'inline';
-            if (this.options.clickable) {
-                label.element.style.cursor = 'pointer';
-                this.toDispose.add(addDisposableListener(label.element, EventType.CONTEXT_MENU, (e) => this._disableHint(e)));
-                this.toDispose.add(addDisposableListener(label.element, EventType.CLICK, handleClick));
-            }
-            hintElement.appendChild(after);
-            const typeToDismiss = ( localize(5054, 'Start typing to dismiss.'));
-            const textHint2 = $('span', undefined, typeToDismiss);
-            textHint2.style.fontStyle = 'italic';
-            hintElement.appendChild(textHint2);
-            ariaLabel = actionPart.concat(typeToDismiss);
-        }
-        else {
-            const hintMsg = ( localize(
-                5055,
-                '[[Ask {0} to do something]] or start typing to dismiss.',
-                providerName
-            ));
-            const rendered = renderFormattedText(hintMsg, { actionHandler: hintHandler });
-            hintElement.appendChild(rendered);
-        }
-        return { ariaLabel, hintElement };
-    }
-    _getHintDefault() {
+    getHint() {
+        const hasInlineChatProvider = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Editor)).length > 0;
         const hintHandler = {
-            disposables: this.toDispose,
+            disposables: this._store,
             callback: (index, event) => {
                 switch (index) {
                     case '0':
-                        languageOnClickOrTap(event.browserEvent);
+                        hasInlineChatProvider ? askSomething(event.browserEvent) : languageOnClickOrTap(event.browserEvent);
                         break;
                     case '1':
-                        snippetOnClickOrTap(event.browserEvent);
+                        hasInlineChatProvider ? languageOnClickOrTap(event.browserEvent) : snippetOnClickOrTap(event.browserEvent);
                         break;
                     case '2':
-                        chooseEditorOnClickOrTap(event.browserEvent);
+                        hasInlineChatProvider ? snippetOnClickOrTap(event.browserEvent) : chooseEditorOnClickOrTap(event.browserEvent);
                         break;
                     case '3':
-                        this._disableHint();
+                        this.disableHint();
                         break;
                 }
             }
         };
+        const askSomethingCommandId = 'inlineChat.start';
+        const askSomething = async (e) => {
+            e.stopPropagation();
+            this.telemetryService.publicLog2('workbenchActionExecuted', {
+                id: askSomethingCommandId,
+                from: 'hint'
+            });
+            await this.commandService.executeCommand(askSomethingCommandId, { from: 'hint' });
+        };
         const languageOnClickOrTap = async (e) => {
             e.stopPropagation();
             this.editor.focus();
@@ -335,27 +237,39 @@ class EmptyTextEditorHintContentWidget {
                 this.editorGroupsService.activeGroup.closeEditor(activeEditorInput, { preserveFocus: true });
             }
         };
-        const hintMsg = ( localize(
-            5056,
-            '[[Select a language]], or [[fill with template]], or [[open a different editor]] to get started.\nStart typing to dismiss or [[don\'t show]] this again.'
-        ));
+        const keybindingsLookup = hasInlineChatProvider ? [askSomethingCommandId, ChangeLanguageAction.ID, ApplyFileSnippetAction.Id] : [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
+        const keybindingLabels = ( keybindingsLookup.map(id => this.keybindingService.lookupKeybinding(id)?.getLabel()));
+        const hintMsg = (hasInlineChatProvider ? ( localize(
+            5139,
+            '[[Open chat]] ({0}), or [[select a language]] ({1}), or [[fill with template]] ({2}) to get started.\nStart typing to dismiss or [[don\'t show]] this again.',
+            keybindingLabels.at(0) ?? '',
+            keybindingLabels.at(1) ?? '',
+            keybindingLabels.at(2) ?? ''
+        )) : ( localize(
+            5140,
+            '[[Select a language]] ({0}), or [[fill with template]] ({1}), or [[open a different editor]] ({2}) to get started.\nStart typing to dismiss or [[don\'t show]] this again.',
+            keybindingLabels.at(0) ?? '',
+            keybindingLabels.at(1) ?? '',
+            keybindingLabels.at(2) ?? ''
+        ))).replaceAll('()', '');
         const hintElement = renderFormattedText(hintMsg, {
             actionHandler: hintHandler,
             renderCodeSegments: false,
         });
         hintElement.style.fontStyle = 'italic';
-        const keybindingsLookup = [ChangeLanguageAction.ID, ApplyFileSnippetAction.Id, 'welcome.showNewFileEntries'];
-        const keybindingLabels = ( keybindingsLookup.map((id) => this.keybindingService.lookupKeybinding(id)?.getLabel() ?? id));
-        const ariaLabel = ( localize(
-            5057,
+        const ariaLabel = hasInlineChatProvider ?
+            ( localize(
+            5141,
+            'Execute {0} to ask a question, execute {1} to select a language, or execute {2} to fill with template and get started. Start typing to dismiss.',
+            ...keybindingLabels
+        )) :
+            ( localize(
+            5142,
             'Execute {0} to select a language, execute {1} to fill with template, or execute {2} to open a different editor and get started. Start typing to dismiss.',
             ...keybindingLabels
         ));
         for (const anchor of hintElement.querySelectorAll('a')) {
             anchor.style.cursor = 'pointer';
-            const id = keybindingsLookup.shift();
-            const title = id && this.keybindingService.lookupKeybinding(id)?.getLabel();
-            hintHandler.disposables.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), anchor, title ?? ''));
         }
         return { hintElement, ariaLabel };
     }
@@ -364,15 +278,14 @@ class EmptyTextEditorHintContentWidget {
             this.domNode = $('.empty-editor-hint');
             this.domNode.style.width = 'max-content';
             this.domNode.style.paddingLeft = '4px';
-            const inlineChatProviders = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Editor));
-            const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
+            const { hintElement, ariaLabel } = this.getHint();
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localize(
-                5058,
+                5143,
                 ' Toggle {0} in settings to disable this hint.',
                 AccessibilityVerbositySettingId.EmptyEditorHint
             )));
-            this.toDispose.add(addDisposableListener(this.domNode, 'click', () => {
+            this._register(addDisposableListener(this.domNode, 'click', () => {
                 this.editor.focus();
             }));
             this.editor.applyFontInfo(this.domNode);
@@ -386,10 +299,19 @@ class EmptyTextEditorHintContentWidget {
         };
     }
     dispose() {
+        super.dispose();
         this.editor.removeContentWidget(this);
-        dispose(this.toDispose);
     }
-}
+};
+EmptyTextEditorHintContentWidget = EmptyTextEditorHintContentWidget_1 = ( __decorate([
+    ( __param(1, IEditorGroupsService)),
+    ( __param(2, ICommandService)),
+    ( __param(3, IConfigurationService)),
+    ( __param(4, IKeybindingService)),
+    ( __param(5, IChatAgentService)),
+    ( __param(6, ITelemetryService)),
+    ( __param(7, IContextMenuService))
+], EmptyTextEditorHintContentWidget));
 registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, EditorContributionInstantiation.Eager);
 
 export { EmptyTextEditorHintContribution, emptyTextEditorHintSetting };