@codingame/monaco-vscode-chat-service-override 13.1.7 → 14.0.0

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

@@ -1,27 +1,35 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { AsyncIterableObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 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 { 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 { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { Action2, registerAction2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IActionViewItemService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/actionViewItemService.service';
+import { MenuEntryActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { Action2, MenuId, MenuItemAction, registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 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 { 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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-api/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-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
 const shellLangIds = [
@@ -59,12 +67,44 @@ class ChatCodeBlockAction extends Action2 {
         return this.runWithContext(accessor, context);
     }
 }
+const APPLY_IN_EDITOR_ID = 'workbench.action.chat.applyInEditor';
+let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable {
+    static { this.ID = 'chat.codeBlockActionRendering'; }
+    constructor(actionViewItemService, instantiationService, labelService) {
+        super();
+        const disposable = actionViewItemService.register(MenuId.ChatCodeBlock, APPLY_IN_EDITOR_ID, (action, options) => {
+            if (!(action instanceof MenuItemAction)) {
+                return undefined;
+            }
+            return instantiationService.createInstance(class extends MenuEntryActionViewItem {
+                getTooltip() {
+                    const context = this._context;
+                    if (isCodeBlockActionContext(context) && context.codemapperUri) {
+                        const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
+                        return localize(4270, "Apply to {0}", label);
+                    }
+                    return super.getTooltip();
+                }
+                setActionContext(newContext) {
+                    super.setActionContext(newContext);
+                    this.updateTooltip();
+                }
+            }, action, undefined);
+        });
+        markAsSingleton(disposable);
+    }
+};
+CodeBlockActionRendering = ( __decorate([
+    ( __param(0, IActionViewItemService)),
+    ( __param(1, IInstantiationService)),
+    ( __param(2, ILabelService))
+], CodeBlockActionRendering));
 function registerChatCodeBlockActions() {
     registerAction2(class CopyCodeBlockAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4205, "Copy")),
+                title: ( localize2(4271, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -148,8 +188,8 @@ function registerChatCodeBlockActions() {
     registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
         constructor() {
             super({
-                id: 'workbench.action.chat.applyInEditor',
-                title: ( localize2(4206, "Apply in Editor")),
+                id: APPLY_IN_EDITOR_ID,
+                title: ( localize2(4272, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -181,11 +221,11 @@ function registerChatCodeBlockActions() {
             return this.operation.run(context);
         }
     });
-    registerAction2(class SmartApplyInEditorAction extends ChatCodeBlockAction {
+    registerAction2(class InsertAtCursorAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4207, "Insert At Cursor")),
+                title: ( localize2(4273, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -219,7 +259,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4208, "Insert into New File")),
+                title: ( localize2(4274, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -260,7 +300,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4209, "Insert into Terminal")),
+                title: ( localize2(4275, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -353,7 +393,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4210, "Next Code Block")),
+                title: ( localize2(4276, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -373,7 +413,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4211, "Previous Code Block")),
+                title: ( localize2(4277, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -430,7 +470,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4212, "Apply Edits")),
+                title: ( localize2(4278, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -443,16 +483,38 @@ function registerChatCodeCompareBlockActions() {
             });
         }
         async runWithContext(accessor, context) {
-            const instaService = accessor.get(IInstantiationService);
-            const editor = instaService.createInstance(DefaultChatTextEditor);
-            await editor.preview(context.element, context.edit);
+            const editorService = accessor.get(ICodeEditorService);
+            const item = context.edit;
+            const response = context.element;
+            if (item.state?.applied) {
+                return false;
+            }
+            if (!response.response.value.includes(item)) {
+                return false;
+            }
+            const firstEdit = item.edits[0]?.[0];
+            if (!firstEdit) {
+                return false;
+            }
+            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;
+                }
+            }
+            return false;
         }
     });
     registerAction2(class DiscardEditsCompareBlockAction extends ChatCompareCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4213, "Discard Edits")),
+                title: ( localize2(4279, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,
@@ -472,4 +534,4 @@ function registerChatCodeCompareBlockActions() {
     });
 }
 
-export { isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };
+export { CodeBlockActionRendering, isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };