@codingame/monaco-vscode-chat-service-override 10.1.3 → 11.0.0

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

@@ -1,4 +1,3 @@
-import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
@@ -12,17 +11,15 @@ import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/term
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { accessibleViewInCodeBlock } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
-import { ICodeMapperService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatCodeMapperService.service';
 import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_EDIT_APPLIED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IChatEditingService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { DefaultChatTextEditor } from 'vscode/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { DefaultChatTextEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
-import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatConstants';
 
 const shellLangIds = [
     'fish',
@@ -64,7 +61,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(7302, "Copy")),
+                title: ( localize2(7522, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -149,7 +146,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyInEditor',
-                title: ( localize2(7303, "Apply in Editor")),
+                title: ( localize2(7523, "Apply in Editor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -184,7 +181,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyAll',
-                title: ( localize2(7304, "Apply All Edits")),
+                title: ( localize2(7524, "Apply All Edits")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -193,41 +190,25 @@ function registerChatCodeBlockActions() {
         }
         async run(accessor, ...args) {
             const chatWidgetService = accessor.get(IChatWidgetService);
-            const codemapperService = accessor.get(ICodeMapperService);
             const chatEditingService = accessor.get(IChatEditingService);
             const widget = chatWidgetService.lastFocusedWidget;
-            if (!widget) {
+            if (!widget || !widget.viewModel) {
                 return;
             }
-            const items = widget.viewModel?.getItems() ?? [];
-            const item = widget.getFocus() ?? items[items.length - 1];
-            if (!isResponseVM(item)) {
-                return;
-            }
-            const codeblocks = widget.getCodeBlockInfosForResponse(item);
-            const request = [];
-            for (const codeblock of codeblocks) {
-                if (codeblock.codemapperUri && codeblock.uri) {
-                    const code = codeblock.getContent();
-                    request.push({ resource: codeblock.codemapperUri, code });
-                }
+            const applyEditsId = args[0];
+            const chatModel = widget.viewModel.model;
+            const request = chatModel.getRequests().find(request => request.response?.result?.metadata?.applyEditsId === applyEditsId);
+            if (request && request.response) {
+                await chatEditingService.startOrContinueEditingSession(widget.viewModel.sessionId, { silent: true });
+                await chatEditingService.triggerEditComputation(request.response);
             }
-            await chatEditingService.startOrContinueEditingSession(item.sessionId, async (stream) => {
-                const response = {
-                    textEdit: (resource, textEdits) => {
-                        stream.textEdits(resource, textEdits);
-                    }
-                };
-                const tokenSource = ( (new CancellationTokenSource()));
-                await codemapperService.mapCode({ codeBlocks: request, conversation: [] }, response, tokenSource.token);
-            }, { silent: true });
         }
     });
     registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(7305, "Insert At Cursor")),
+                title: ( localize2(7525, "Insert At Cursor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -258,7 +239,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(7306, "Insert into New File")),
+                title: ( localize2(7526, "Insert into New File")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -299,7 +280,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(7307, "Insert into Terminal")),
+                title: ( localize2(7527, "Insert into Terminal")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -399,7 +380,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(7308, "Next Code Block")),
+                title: ( localize2(7528, "Next Code Block")),
                 keybinding: {
                     primary: 2048  | 512  | 12 ,
                     mac: { primary: 2048  | 512  | 12 , },
@@ -419,7 +400,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(7309, "Previous Code Block")),
+                title: ( localize2(7529, "Previous Code Block")),
                 keybinding: {
                     primary: 2048  | 512  | 11 ,
                     mac: { primary: 2048  | 512  | 11 , },
@@ -476,7 +457,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(7310, "Apply Edits")),
+                title: ( localize2(7530, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.check,
@@ -506,7 +487,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(7311, "Discard Edits")),
+                title: ( localize2(7531, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,