@codingame/monaco-vscode-chat-service-override 7.0.11 → 7.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "7.0.11",
+  "version": "7.1.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@7.0.11"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.1.1"
   }
 }

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js

@@ -1,130 +1,123 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { AccessibleDiffViewerNext } from 'vscode/vscode/vs/editor/browser/widget/diffEditor/commands';
 import { INLINE_CHAT_ID } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp";
 class ChatAccessibilityHelp {
     constructor() {
-        this.priority = 105;
+        this.priority = 107;
         this.name = 'panelChat';
         this.type = AccessibleViewType.Help;
-        this.when = ( (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST)));
+        this.when = ( (ContextKeyExpr.and(
+             (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+             (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST))
+        )));
     }
     getProvider(accessor) {
         const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
         return getChatAccessibilityHelpProvider(accessor, codeEditor ?? undefined, 'panelChat');
     }
-    dispose() { }
 }
 function getAccessibilityHelpText(type) {
     const content = [];
     if (type === 'panelChat') {
-        content.push(( localizeWithPath(
-            _moduleId,
-            0,
+        content.push(( localize(
+            7221,
             'The chat view is comprised of an input box and a request/response list. The input box is used to make requests and the list is used to display responses.'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            1,
+        content.push(( localize(
+            7222,
             'In the input box, use up and down arrows to navigate your request history. Edit input and use enter or the submit button to run a new request.'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            2,
-            'In the input box, inspect the last response in the accessible view<keybinding:editor.action.accessibleView>'
+        content.push(( localize(
+            7223,
+            'In the input box, inspect the last response in the accessible view{0}.',
+            '<keybinding:editor.action.accessibleView>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            3,
+        content.push(( localize(
+            7224,
             'In the input box, navigate to the suggested follow up question (Shift+Tab) and press Enter to run it.'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            4,
+        content.push(( localize(
+            7225,
             'Chat responses will be announced as they come in. A response will indicate the number of code blocks, if any, and then the rest of the response.'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            5,
-            'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command<keybinding:chat.action.focus>.'
+        content.push(( localize(
+            7226,
+            'To focus the chat request/response list, which can be navigated with up and down arrows, invoke the Focus Chat command{0}.',
+            '<keybinding:chat.action.focus>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            6,
-            'To focus the input box for chat requests, invoke the Focus Chat Input command<keybinding:workbench.action.chat.focusInput>.'
+        content.push(( localize(
+            7227,
+            'To focus the input box for chat requests, invoke the Focus Chat Input command{0}.',
+            '<keybinding:workbench.action.chat.focusInput>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            7,
-            'To focus the next code block within a response, invoke the Chat: Next Code Block command<keybinding:workbench.action.chat.nextCodeBlock>.'
+        content.push(( localize(
+            7228,
+            'To focus the next code block within a response, invoke the Chat: Next Code Block command{0}.',
+            '<keybinding:workbench.action.chat.nextCodeBlock>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            8,
-            'To focus the next file tree within a response, invoke the Chat: Next File Tree command<keybinding:workbench.action.chat.nextFileTree>.'
+        content.push(( localize(
+            7229,
+            'To focus the next file tree within a response, invoke the Chat: Next File Tree command{0}.',
+            '<keybinding:workbench.action.chat.nextFileTree>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            9,
-            'To clear the request/response list, invoke the Chat Clear command<keybinding:workbench.action.chat.clear>.'
+        content.push(( localize(
+            7230,
+            'To clear the request/response list, invoke the Chat Clear command{0}.',
+            '<keybinding:workbench.action.chat.clear>'
         )));
     }
     else {
-        content.push(( localizeWithPath(
-            _moduleId,
-            10,
+        content.push(( localize(
+            7231,
             "Inline chat occurs within a code editor and takes into account the current selection. It is useful for making changes to the current editor. For example, fixing diagnostics, documenting or refactoring code. Keep in mind that AI generated code may be incorrect."
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            11,
-            "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat<keybinding:inlineChat.start>."
+        content.push(( localize(
+            7232,
+            "It can be activated via code actions or directly using the command: Inline Chat: Start Inline Chat{0}.",
+            '<keybinding:inlineChat.start>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            12,
-            'In the input box, use<keybinding:inlineChat.previousFromHistory> and<keybinding:inlineChat.nextFromHistory> to navigate your request history. Edit input and use enter or the submit button to run a new request.'
+        content.push(( localize(
+            7233,
+            'In the input box, use{0} and{1} to navigate your request history. Edit input and use enter or the submit button to run a new request.',
+            '<keybinding:inlineChat.previousFromHistory>',
+            '<keybinding:inlineChat.nextFromHistory>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            13,
-            'In the input box, inspect the response in the accessible viewview<keybinding:editor.action.accessibleView>'
+        content.push(( localize(
+            7234,
+            'In the input box, inspect the response in the accessible view{0}.',
+            '<keybinding:editor.action.accessibleView>'
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            14,
+        content.push(( localize(
+            7235,
             "Context menu actions may run a request prefixed with a /. Type / to discover such ready-made commands."
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            15,
+        content.push(( localize(
+            7236,
             "If a fix action is invoked, a response will indicate the problem with the current code. A diff editor will be rendered and can be reached by tabbing."
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            16,
-            "Once in the diff editor, enter review mode with<keybinding:{0}>. Use up and down arrows to navigate lines with the proposed changes.",
+        content.push(( localize(
+            7237,
+            "Once in the diff editor, enter review mode with{0}. Use up and down arrows to navigate lines with the proposed changes.",
             AccessibleDiffViewerNext.id
         )));
-        content.push(( localizeWithPath(
-            _moduleId,
-            17,
+        content.push(( localize(
+            7238,
             "Use tab to reach conditional parts like commands, status, message responses and more."
         )));
     }
-    content.push(( localizeWithPath(
-        _moduleId,
-        18,
+    content.push(( localize(
+        7239,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
-    return content.join('\n\n');
+    return content.join('\n');
 }
 function getChatAccessibilityHelpProvider(accessor, editor, type) {
     const widgetService = accessor.get(IChatWidgetService);
@@ -139,22 +132,24 @@ function getChatAccessibilityHelpProvider(accessor, editor, type) {
     const cachedPosition = inputEditor.getPosition();
     inputEditor.getSupportedActions();
     const helpText = getAccessibilityHelpText(type);
-    return {
-        id: type === 'panelChat' ? AccessibleViewProviderId.Chat : AccessibleViewProviderId.InlineChat,
-        verbositySettingKey: type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat,
-        provideContent: () => helpText,
-        onClose: () => {
-            if (type === 'panelChat' && cachedPosition) {
-                inputEditor.setPosition(cachedPosition);
-                inputEditor.focus();
-            }
-            else if (type === 'inlineChat') {
-                const ctrl = editor?.getContribution(INLINE_CHAT_ID);
-                ctrl?.focus();
-            }
-        },
-        options: { type: AccessibleViewType.Help }
-    };
+    return (
+         (new AccessibleContentProvider(
+            type === 'panelChat' ? AccessibleViewProviderId.Chat : AccessibleViewProviderId.InlineChat,
+            { type: AccessibleViewType.Help },
+            () => helpText,
+            () => {
+                if (type === 'panelChat' && cachedPosition) {
+                    inputEditor.setPosition(cachedPosition);
+                    inputEditor.focus();
+                }
+                else if (type === 'inlineChat') {
+                    const ctrl = editor?.getContribution(INLINE_CHAT_ID);
+                    ctrl?.focus();
+                }
+            },
+            type === 'panelChat' ? AccessibilityVerbositySettingId.Chat : AccessibilityVerbositySettingId.InlineChat
+        ))
+    );
 }
 
 export { ChatAccessibilityHelp, getAccessibilityHelpText, getChatAccessibilityHelpProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatClearActions.js

@@ -1,6 +1,6 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -8,21 +8,20 @@ import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/cont
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { clearChatEditor } from './chatClear.js';
+import { clearChatEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatClear';
 import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
-const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatClearActions";
 const ACTION_ID_NEW_CHAT = `workbench.action.chat.newChat`;
 function registerNewChatActions() {
     registerAction2(class NewChatEditorAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2WithPath(_moduleId, 0, "New Chat")),
+                title: ( localize2(7240, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -43,7 +42,7 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2WithPath(_moduleId, 0, "New Chat")),
+                title: ( localize2(7240, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -73,7 +72,7 @@ function registerNewChatActions() {
             const accessibilitySignalService = accessor.get(IAccessibilitySignalService);
             if (isChatViewTitleActionContext(context)) {
                 announceChatCleared(accessibilitySignalService);
-                context.chatView.clear();
+                context.chatView.widget.clear();
                 context.chatView.widget.focusInput();
             }
             else {