@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -1,9 +1,10 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { localize2WithPath } from '../../../../../nls.js';
 import { Action2, MenuId, registerAction2 } from '../../../../../platform/actions/common/actions.js';
+import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { CHAT_CATEGORY } from './chatActions.js';
 import { IChatWidgetService } from '../chat.js';
-import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_REQUEST_IN_PROGRESS } from '../../common/chatContextKeys.js';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT } from '../../common/chatContextKeys.js';
 import { IChatService } from '../../common/chatService.js';
 class SubmitAction extends Action2 {
     static { this.ID = 'workbench.action.chat.submit'; }
@@ -18,7 +19,7 @@ class SubmitAction extends Action2 {
             f1: false,
             category: CHAT_CATEGORY,
             icon: Codicon.send,
-            precondition: CONTEXT_CHAT_INPUT_HAS_TEXT,
+            precondition: ( ContextKeyExpr.and(CONTEXT_CHAT_INPUT_HAS_TEXT, ( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()))),
             menu: {
                 id: MenuId.ChatExecute,
                 when: ( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()),
@@ -33,37 +34,74 @@ class SubmitAction extends Action2 {
         widget?.acceptInput(context?.inputValue);
     }
 }
-function registerChatExecuteActions() {
-    registerAction2(SubmitAction);
-    registerAction2(class CancelAction extends Action2 {
-        constructor() {
-            super({
-                id: 'workbench.action.chat.cancel',
-                title: ( localize2WithPath(
-                    'vs/workbench/contrib/chat/browser/actions/chatExecuteActions',
-                    'interactive.cancel.label',
-                    "Cancel"
-                )),
-                f1: false,
-                category: CHAT_CATEGORY,
-                icon: Codicon.debugStop,
-                menu: {
-                    id: MenuId.ChatExecute,
-                    when: CONTEXT_CHAT_REQUEST_IN_PROGRESS,
-                    group: 'navigation',
-                }
-            });
-        }
-        run(accessor, ...args) {
-            const context = args[0];
-            if (!context.widget) {
-                return;
+class SendToNewChatAction extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.chat.sendToNewChat',
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/chat/browser/actions/chatExecuteActions',
+                'chat.newChat.label',
+                "Send to New Chat"
+            )),
+            precondition: ( ContextKeyExpr.and(( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()), CONTEXT_CHAT_INPUT_HAS_TEXT)),
+            category: CHAT_CATEGORY,
+            f1: false,
+            menu: {
+                id: MenuId.ChatExecuteSecondary,
+                group: 'group_2'
+            },
+            keybinding: {
+                weight: 200 ,
+                primary: 2048  | 1024  | 3 ,
+                when: CONTEXT_IN_CHAT_INPUT,
             }
-            const chatService = accessor.get(IChatService);
-            if (context.widget.viewModel) {
-                chatService.cancelCurrentRequestForSession(context.widget.viewModel.sessionId);
+        });
+    }
+    async run(accessor, ...args) {
+        const context = args[0];
+        const widgetService = accessor.get(IChatWidgetService);
+        const widget = context?.widget ?? widgetService.lastFocusedWidget;
+        if (!widget) {
+            return;
+        }
+        widget.clear();
+        widget.acceptInput(context?.inputValue);
+    }
+}
+class CancelAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.cancel'; }
+    constructor() {
+        super({
+            id: CancelAction.ID,
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/chat/browser/actions/chatExecuteActions',
+                'interactive.cancel.label',
+                "Cancel"
+            )),
+            f1: false,
+            category: CHAT_CATEGORY,
+            icon: Codicon.debugStop,
+            menu: {
+                id: MenuId.ChatExecute,
+                when: CONTEXT_CHAT_REQUEST_IN_PROGRESS,
+                group: 'navigation',
             }
+        });
+    }
+    run(accessor, ...args) {
+        const context = args[0];
+        if (!context.widget) {
+            return;
+        }
+        const chatService = accessor.get(IChatService);
+        if (context.widget.viewModel) {
+            chatService.cancelCurrentRequestForSession(context.widget.viewModel.sessionId);
         }
-    });
+    }
+}
+function registerChatExecuteActions() {
+    registerAction2(SubmitAction);
+    registerAction2(CancelAction);
+    registerAction2(SendToNewChatAction);
 }
-export { SubmitAction, registerChatExecuteActions };
+export { CancelAction, SubmitAction, registerChatExecuteActions };

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

@@ -190,7 +190,10 @@ function getQuickChatActionForProvider(id, label) {
         }
         run(accessor, query) {
             const quickChatService = accessor.get(IQuickChatService);
-            quickChatService.toggle(id, query ? { query } : undefined);
+            quickChatService.toggle(id, query ? {
+                query,
+                selection: ( new Selection(1, query.length + 1, 1, query.length + 1))
+            } : undefined);
         }
     };
 }

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

@@ -1,5 +1,8 @@
+import { localizeWithPath } from '../../../../nls.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const IChatWidgetService = ( createDecorator('chatWidgetService'));
 const IQuickChatService = ( createDecorator('quickChatService'));
 const IChatAccessibilityService = ( createDecorator('chatAccessibilityService'));
-export { IChatAccessibilityService, IChatWidgetService, IQuickChatService };
+const IChatCodeBlockContextProviderService = ( createDecorator('chatCodeBlockContextProviderService'));
+const GeneratingPhrase = ( localizeWithPath('vs/workbench/contrib/chat/browser/chat', 'generating', "Generating"));
+export { GeneratingPhrase, IChatAccessibilityService, IChatCodeBlockContextProviderService, IChatWidgetService, IQuickChatService };

package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js

@@ -0,0 +1,118 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import marked_1 from '../../../../../../../external/vscode-marked/lib/marked.esm.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.js';
+import { isRequestVM, isResponseVM, isWelcomeVM } from '../common/chatViewModel.js';
+let ChatAccessibilityProvider = class ChatAccessibilityProvider {
+    constructor(_accessibleViewService) {
+        this._accessibleViewService = _accessibleViewService;
+    }
+    getWidgetRole() {
+        return 'list';
+    }
+    getRole(element) {
+        return 'listitem';
+    }
+    getWidgetAriaLabel() {
+        return ( localizeWithPath(
+            'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+            'chat',
+            "Chat"
+        ));
+    }
+    getAriaLabel(element) {
+        if (isRequestVM(element)) {
+            return element.messageText;
+        }
+        if (isResponseVM(element)) {
+            return this._getLabelWithCodeBlockCount(element);
+        }
+        if (isWelcomeVM(element)) {
+            return ( element.content.map(c => 'value' in c ? c.value : ( c.map(followup => followup.message)).join('\n'))).join('\n');
+        }
+        return '';
+    }
+    _getLabelWithCodeBlockCount(element) {
+        const accessibleViewHint = this._accessibleViewService.getOpenAriaHint("accessibility.verbosity.panelChat" );
+        let label = '';
+        const fileTreeCount = element.response.value.filter((v) => !('value' in v))?.length ?? 0;
+        let fileTreeCountHint = '';
+        switch (fileTreeCount) {
+            case 0:
+                break;
+            case 1:
+                fileTreeCountHint = ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'singleFileTreeHint',
+                    "1 file tree"
+                ));
+                break;
+            default:
+                fileTreeCountHint = ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'multiFileTreeHint',
+                    "{0} file trees",
+                    fileTreeCount
+                ));
+                break;
+        }
+        const codeBlockCount = marked_1.lexer(element.response.asString()).filter(token => token.type === 'code')?.length ?? 0;
+        switch (codeBlockCount) {
+            case 0:
+                label = accessibleViewHint ? ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'noCodeBlocksHint',
+                    "{0} {1} {2}",
+                    fileTreeCountHint,
+                    element.response.asString(),
+                    accessibleViewHint
+                )) : ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'noCodeBlocks',
+                    "{0} {1}",
+                    fileTreeCountHint,
+                    element.response.asString()
+                ));
+                break;
+            case 1:
+                label = accessibleViewHint ? ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'singleCodeBlockHint',
+                    "{0} 1 code block: {1} {2}",
+                    fileTreeCountHint,
+                    element.response.asString(),
+                    accessibleViewHint
+                )) : ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'singleCodeBlock',
+                    "{0} 1 code block: {1}",
+                    fileTreeCountHint,
+                    element.response.asString()
+                ));
+                break;
+            default:
+                label = accessibleViewHint ? ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'multiCodeBlockHint',
+                    "{0} {1} code blocks: {2}",
+                    fileTreeCountHint,
+                    codeBlockCount,
+                    element.response.asString(),
+                    accessibleViewHint
+                )) : ( localizeWithPath(
+                    'vs/workbench/contrib/chat/browser/chatAccessibilityProvider',
+                    'multiCodeBlock',
+                    "{0} {1} code blocks",
+                    fileTreeCountHint,
+                    codeBlockCount,
+                    element.response.asString()
+                ));
+                break;
+        }
+        return label;
+    }
+};
+ChatAccessibilityProvider = ( __decorate([
+    ( __param(0, IAccessibleViewService))
+], ChatAccessibilityProvider));
+export { ChatAccessibilityProvider };

package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js

@@ -9,8 +9,9 @@ import { IChatAgentService } from '../common/chatAgents.js';
 import { chatAgentLeader, chatSubcommandLeader } from '../common/chatParserTypes.js';
 const $ = $$1;
 let ChatFollowups = class ChatFollowups extends Disposable {
-    constructor(container, followups, options, clickHandler, contextService, chatAgentService) {
+    constructor(container, followups, location, options, clickHandler, contextService, chatAgentService) {
         super();
+        this.location = location;
         this.options = options;
         this.clickHandler = clickHandler;
         this.contextService = contextService;
@@ -22,12 +23,16 @@ let ChatFollowups = class ChatFollowups extends Disposable {
         if (followup.kind === 'command' && followup.when && !this.contextService.contextMatchesRules(ContextKeyExpr.deserialize(followup.when))) {
             return;
         }
-        if (!this.chatAgentService.getDefaultAgent()) {
+        if (!this.chatAgentService.getDefaultAgent(this.location)) {
             return;
         }
         let tooltipPrefix = '';
-        if ('agentId' in followup && followup.agentId && followup.agentId !== this.chatAgentService.getDefaultAgent()?.id) {
-            tooltipPrefix += `${chatAgentLeader}${followup.agentId} `;
+        if ('agentId' in followup && followup.agentId && followup.agentId !== this.chatAgentService.getDefaultAgent(this.location)?.id) {
+            const agent = this.chatAgentService.getAgent(followup.agentId);
+            if (!agent) {
+                return;
+            }
+            tooltipPrefix += `${chatAgentLeader}${agent.name} `;
             if ('subCommand' in followup && followup.subCommand) {
                 tooltipPrefix += `${chatSubcommandLeader}${followup.subCommand} `;
             }
@@ -62,7 +67,7 @@ let ChatFollowups = class ChatFollowups extends Disposable {
     }
 };
 ChatFollowups = ( __decorate([
-    ( __param(4, IContextKeyService)),
-    ( __param(5, IChatAgentService))
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IChatAgentService))
 ], ChatFollowups));
 export { ChatFollowups };