@codingame/monaco-vscode-notebook-service-override 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-notebook-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -29,6 +29,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './emptyTextEditorHint.css.js';
 import { $ as $$1, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { dispose, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ChangeLanguageAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorStatus';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -9,24 +10,27 @@ import { PLAINTEXT_LANGUAGE_ID } from 'vscode/vscode/vs/editor/common/languages/
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { renderFormattedText } from 'vscode/vscode/vs/base/browser/formattedTextRenderer';
 import { ApplyFileSnippetAction } from 'vscode/vscode/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
-import { IInlineChatService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { KeybindingLabel } from 'vscode/vscode/vs/base/browser/ui/keybindingLabel/keybindingLabel';
 import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { status } from 'vscode/vscode/vs/base/browser/ui/aria/aria';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/configuration';
 import { OUTPUT_MODE_ID, LOG_MODE_ID } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { SEARCH_RESULT_LANGUAGE_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
+import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 
 const _moduleId = "vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint";
 const $ = $$1;
@@ -41,14 +45,14 @@ const $ = $$1;
     {
         key: 'accessibility.verbosity.untitledHint',
         migrateFn: (value, _accessor) => ([
-            ["accessibility.verbosity.emptyEditorHint" , { value }],
+            [AccessibilityVerbositySettingId.EmptyEditorHint, { value }],
             ['accessibility.verbosity.untitledHint', { value: undefined }]
         ])
     }]);
 const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
 let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
     static { this.ID = 'editor.contrib.emptyTextEditorHint'; }
-    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, inlineChatService, telemetryService, productService) {
+    constructor(editor, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatSessionService, chatAgentService, telemetryService, productService) {
         this.editor = editor;
         this.editorGroupsService = editorGroupsService;
         this.commandService = commandService;
@@ -56,17 +60,17 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         this.hoverService = hoverService;
         this.keybindingService = keybindingService;
         this.inlineChatSessionService = inlineChatSessionService;
-        this.inlineChatService = inlineChatService;
+        this.chatAgentService = chatAgentService;
         this.telemetryService = telemetryService;
         this.productService = productService;
         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.inlineChatService.onDidChangeProviders(() => 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) => {
-            if (e.hasChanged(91 )) {
+            if (e.hasChanged(EditorOption.readOnly)) {
                 this.update();
             }
         }));
@@ -94,7 +98,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         if (configValue === 'hidden') {
             return false;
         }
-        if (this.editor.getOption(91 )) {
+        if (this.editor.getOption(EditorOption.readOnly)) {
             return false;
         }
         const model = this.editor.getModel();
@@ -115,9 +119,9 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
         if (hasConflictingDecorations) {
             return false;
         }
-        const inlineChatProviders = [...this.inlineChatService.getAllProvider()];
-        const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && !inlineChatProviders.length;
-        return inlineChatProviders.length > 0 || shouldRenderDefaultHint;
+        const hasEditorAgents = Boolean(this.chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
+        const shouldRenderDefaultHint = model?.uri.scheme === Schemas.untitled && languageId === PLAINTEXT_LANGUAGE_ID && hasEditorAgents;
+        return hasEditorAgents || shouldRenderDefaultHint;
     }
     update() {
         const shouldRenderHint = this._shouldRenderHint();
@@ -130,7 +134,7 @@ let EmptyTextEditorHintContribution = class EmptyTextEditorHintContribution {
                 this.configurationService,
                 this.hoverService,
                 this.keybindingService,
-                this.inlineChatService,
+                this.chatAgentService,
                 this.telemetryService,
                 this.productService
             )));
@@ -152,13 +156,13 @@ EmptyTextEditorHintContribution = ( (__decorate([
     ( (__param(4, IHoverService))),
     ( (__param(5, IKeybindingService))),
     ( (__param(6, IInlineChatSessionService))),
-    ( (__param(7, IInlineChatService))),
+    ( (__param(7, IChatAgentService))),
     ( (__param(8, ITelemetryService))),
     ( (__param(9, IProductService)))
 ], EmptyTextEditorHintContribution)));
 class EmptyTextEditorHintContentWidget {
     static { this.ID = 'editor.widget.emptyHint'; }
-    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, inlineChatService, telemetryService, productService) {
+    constructor(editor, options, editorGroupsService, commandService, configurationService, hoverService, keybindingService, chatAgentService, telemetryService, productService) {
         this.editor = editor;
         this.options = options;
         this.editorGroupsService = editorGroupsService;
@@ -166,20 +170,20 @@ class EmptyTextEditorHintContentWidget {
         this.configurationService = configurationService;
         this.hoverService = hoverService;
         this.keybindingService = keybindingService;
-        this.inlineChatService = inlineChatService;
+        this.chatAgentService = chatAgentService;
         this.telemetryService = telemetryService;
         this.productService = productService;
         this.isVisible = false;
         this.ariaLabel = '';
         this.toDispose = ( (new DisposableStore()));
         this.toDispose.add(this.editor.onDidChangeConfiguration((e) => {
-            if (this.domNode && e.hasChanged(50 )) {
+            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(() => {
-            if (this.editor.hasTextFocus() && this.isVisible && this.ariaLabel && this.configurationService.getValue("accessibility.verbosity.emptyEditorHint" )) {
+            if (this.editor.hasTextFocus() && this.isVisible && this.ariaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.EmptyEditorHint)) {
                 status(this.ariaLabel);
             }
         }));
@@ -189,7 +193,7 @@ class EmptyTextEditorHintContentWidget {
         return EmptyTextEditorHintContentWidget.ID;
     }
     _getHintInlineChat(providers) {
-        const providerName = (providers.length === 1 ? providers[0].label : undefined) ?? this.productService.nameShort;
+        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 = () => {
@@ -349,14 +353,14 @@ class EmptyTextEditorHintContentWidget {
             this.domNode = $('.empty-editor-hint');
             this.domNode.style.width = 'max-content';
             this.domNode.style.paddingLeft = '4px';
-            const inlineChatProviders = [...this.inlineChatService.getAllProvider()];
+            const inlineChatProviders = this.chatAgentService.getActivatedAgents().filter(candidate => candidate.locations.includes(ChatAgentLocation.Editor));
             const { hintElement, ariaLabel } = !inlineChatProviders.length ? this._getHintDefault() : this._getHintInlineChat(inlineChatProviders);
             this.domNode.append(hintElement);
             this.ariaLabel = ariaLabel.concat(( localizeWithPath(
                 _moduleId,
                 5,
                 ' Toggle {0} in settings to disable this hint.',
-                "accessibility.verbosity.emptyEditorHint"
+                AccessibilityVerbositySettingId.EmptyEditorHint
             )));
             this.toDispose.add(addDisposableListener(this.domNode, 'click', () => {
                 this.editor.focus();
@@ -368,7 +372,7 @@ class EmptyTextEditorHintContentWidget {
     getPosition() {
         return {
             position: { lineNumber: 1, column: 1 },
-            preference: [0 ]
+            preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
     dispose() {
@@ -376,6 +380,6 @@ class EmptyTextEditorHintContentWidget {
         dispose(this.toDispose);
     }
 }
-registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, 0 );
+registerEditorContribution(EmptyTextEditorHintContribution.ID, EmptyTextEditorHintContribution, EditorContributionInstantiation.Eager);
 
 export { EmptyTextEditorHintContribution, emptyTextEditorHintSetting };