@codingame/monaco-vscode-chat-service-override 14.0.6 → 15.0.0

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

@@ -5,7 +5,7 @@ import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { Disposable, markAsSingleton } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
 import { CopyAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/clipboard/browser/clipboard';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
@@ -20,16 +20,16 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { TerminalLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { accessibleViewInCodeBlock } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { InlineChatController } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits } from '@codingame/monaco-vscode-29bc1406-2925-5b8f-b25e-d04a7772d896-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
 const shellLangIds = [
@@ -81,7 +81,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                     const context = this._context;
                     if (isCodeBlockActionContext(context) && context.codemapperUri) {
                         const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
-                        return localize(4271, "Apply to {0}", label);
+                        return localize(4302, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -104,7 +104,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4272, "Copy")),
+                title: ( localize2(4303, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -189,7 +189,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4273, "Apply in Editor")),
+                title: ( localize2(4304, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -225,7 +225,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4274, "Insert At Cursor")),
+                title: ( localize2(4305, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -259,7 +259,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4275, "Insert into New File")),
+                title: ( localize2(4306, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -300,7 +300,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4276, "Insert into Terminal")),
+                title: ( localize2(4307, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -376,8 +376,9 @@ function registerChatCodeBlockActions() {
         const curCodeBlockInfo = editorUri ? widget.getCodeBlockInfoForEditor(editorUri) : undefined;
         const focused = !widget.inputEditor.hasWidgetFocus() && widget.getFocus();
         const focusedResponse = isResponseVM(focused) ? focused : undefined;
-        const currentResponse = curCodeBlockInfo ?
-            curCodeBlockInfo.element :
+        const elementId = curCodeBlockInfo?.elementId;
+        const element = elementId ? widget.viewModel?.getItems().find(item => item.id === elementId) : undefined;
+        const currentResponse = element ??
             (focusedResponse ?? widget.viewModel?.getItems().reverse().find((item) => isResponseVM(item)));
         if (!currentResponse || !isResponseVM(currentResponse)) {
             return;
@@ -393,7 +394,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4277, "Next Code Block")),
+                title: ( localize2(4308, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -413,7 +414,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4278, "Previous Code Block")),
+                title: ( localize2(4309, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -448,8 +449,9 @@ function getContextFromEditor(editor, accessor) {
         }
         return;
     }
+    const element = widget?.viewModel?.getItems().find(item => item.id === codeBlockInfo.elementId);
     return {
-        element: codeBlockInfo.element,
+        element,
         codeBlockIndex: codeBlockInfo.codeBlockIndex,
         code: editor.getValue(),
         languageId: editor.getModel().getLanguageId(),
@@ -470,7 +472,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4279, "Apply Edits")),
+                title: ( localize2(4310, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -483,6 +485,7 @@ function registerChatCodeCompareBlockActions() {
             });
         }
         async runWithContext(accessor, context) {
+            const instaService = accessor.get(IInstantiationService);
             const editorService = accessor.get(ICodeEditorService);
             const item = context.edit;
             const response = context.element;
@@ -499,13 +502,10 @@ function registerChatCodeCompareBlockActions() {
             const textEdits = AsyncIterableObject.fromArray(item.edits);
             const editorToApply = await editorService.openCodeEditor({ resource: item.uri }, null);
             if (editorToApply) {
-                const inlineChatController = InlineChatController.get(editorToApply);
-                if (inlineChatController) {
-                    editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
-                    inlineChatController.reviewEdits(textEdits, CancellationToken.None);
-                    response.setEditApplied(item, 1);
-                    return true;
-                }
+                editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
+                instaService.invokeFunction(reviewEdits, editorToApply, textEdits, CancellationToken.None);
+                response.setEditApplied(item, 1);
+                return true;
             }
             return false;
         }
@@ -514,7 +514,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4280, "Discard Edits")),
+                title: ( localize2(4311, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.d.ts

@@ -8,5 +8,7 @@ export declare class AttachContextAction extends Action2 {
     private _getFileContextId;
     private _attachContext;
     run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
+    private _showDiagnosticsPick;
     private _show;
+    private _showFolders;
 }