@codingame/monaco-vscode-chat-service-override 36.2.7 → 37.0.0

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

@@ -0,0 +1,237 @@
+
+import { isAncestorOfActiveElement, isAncestor, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
+import { getSelectionSearchString, StartFindAction, NextMatchFindAction, PreviousMatchFindAction } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/find/browser/findController';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatFindCommandId } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/widget/chatFind/chatFindCommandIds';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+
+function resolveFocusedChatWidget(widgets, lastFocusedWidget, isFocusAncestor) {
+    return widgets.find(w => w.getFindController() && isFocusAncestor(w.domNode)) ?? lastFocusedWidget;
+}
+function getFocusedFindWidget(accessor) {
+    const widgetService = accessor.get(IChatWidgetService);
+    return resolveFocusedChatWidget(
+        widgetService.getAllWidgets(),
+        widgetService.lastFocusedWidget,
+        isAncestorOfActiveElement
+    );
+}
+function getFocusedFindController(accessor) {
+    return getFocusedFindWidget(accessor)?.getFindController();
+}
+function getSeedSearchText(targetWindow, codeEditor) {
+    const domSelection = targetWindow.getSelection()?.toString();
+    if (domSelection && domSelection.trim().length > 0) {
+        return domSelection;
+    }
+    const editorSelection = codeEditor && getSelectionSearchString(codeEditor, "single", false);
+    return editorSelection ?? undefined;
+}
+function findOwningChatWidget(accessor, codeEditor) {
+    const editorDomNode = codeEditor.getDomNode();
+    if (!editorDomNode) {
+        return undefined;
+    }
+    return accessor.get(IChatWidgetService).getAllWidgets().find(
+        widget => widget.getFindController() && isAncestor(editorDomNode, widget.domNode)
+    );
+}
+function registerChatFindActions() {
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.Find,
+                title: ( localize2(5676, "Find in Chat")),
+                category: CHAT_CATEGORY,
+                f1: true,
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.findSupported)),
+                keybinding: {
+                    when: ( ContextKeyExpr.and(
+                        ChatContextKeys.findSupported,
+                        ChatContextKeys.inChatSession,
+                        ( EditorContextKeys.focus.toNegated())
+                    )),
+                    primary: KeyMod.CtrlCmd | KeyCode.KeyF,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }
+            });
+        }
+        run(accessor) {
+            const widget = getFocusedFindWidget(accessor);
+            const controller = widget?.getFindController();
+            if (!widget || !controller) {
+                return;
+            }
+            controller.show(getSeedSearchText(getWindow(widget.domNode)));
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.FindHide,
+                title: ( localize2(5677, "Hide Find in Chat")),
+                keybinding: {
+                    when: ( ContextKeyExpr.and(
+                        ChatContextKeys.inChatSession,
+                        ChatContextKeys.findWidgetVisible,
+                        ( ContextKeyExpr.or(ChatContextKeys.findWidgetFocused, ChatContextKeys.findInputFocused))
+                    )),
+                    primary: KeyCode.Escape,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.hide();
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.FindNext,
+                title: ( localize2(5678, "Find Next in Chat")),
+                keybinding: [{
+                    when: ( ContextKeyExpr.and(
+                        ChatContextKeys.findSupported,
+                        ChatContextKeys.inChatSession,
+                        ( EditorContextKeys.focus.toNegated())
+                    )),
+                    primary: KeyCode.F3,
+                    mac: {
+                        primary: KeyMod.CtrlCmd | KeyCode.KeyG,
+                        secondary: [KeyCode.F3]
+                    },
+                    weight: KeybindingWeight.WorkbenchContrib
+                }, {
+                    when: ChatContextKeys.findInputFocused,
+                    primary: KeyCode.Enter,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }]
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.next();
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.FindPrevious,
+                title: ( localize2(5679, "Find Previous in Chat")),
+                keybinding: [{
+                    when: ( ContextKeyExpr.and(
+                        ChatContextKeys.findSupported,
+                        ChatContextKeys.inChatSession,
+                        ( EditorContextKeys.focus.toNegated())
+                    )),
+                    primary: KeyMod.Shift | KeyCode.F3,
+                    mac: {
+                        primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG,
+                        secondary: [KeyMod.Shift | KeyCode.F3]
+                    },
+                    weight: KeybindingWeight.WorkbenchContrib
+                }, {
+                    when: ChatContextKeys.findInputFocused,
+                    primary: KeyMod.Shift | KeyCode.Enter,
+                    weight: KeybindingWeight.WorkbenchContrib
+                }]
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.previous();
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.ToggleFindCaseSensitive,
+                title: ( localize2(5680, "Toggle Find Case Sensitive in Chat")),
+                keybinding: {
+                    when: ChatContextKeys.findWidgetVisible,
+                    primary: KeyMod.Alt | KeyCode.KeyC,
+                    mac: {
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyC
+                    },
+                    weight: KeybindingWeight.WorkbenchContrib
+                }
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.toggleCaseSensitive();
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.ToggleFindRegex,
+                title: ( localize2(5681, "Toggle Find Using Regex in Chat")),
+                keybinding: {
+                    when: ChatContextKeys.findWidgetVisible,
+                    primary: KeyMod.Alt | KeyCode.KeyR,
+                    mac: {
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyR
+                    },
+                    weight: KeybindingWeight.WorkbenchContrib
+                }
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.toggleRegex();
+        }
+    });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: ChatFindCommandId.ToggleFindWholeWord,
+                title: ( localize2(5682, "Toggle Find Using Whole Word in Chat")),
+                keybinding: {
+                    when: ChatContextKeys.findWidgetVisible,
+                    primary: KeyMod.Alt | KeyCode.KeyW,
+                    mac: {
+                        primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyW
+                    },
+                    weight: KeybindingWeight.WorkbenchContrib
+                }
+            });
+        }
+        run(accessor) {
+            getFocusedFindController(accessor)?.toggleWholeWord();
+        }
+    });
+    StartFindAction.addImplementation(100, (accessor, codeEditor) => {
+        const widget = findOwningChatWidget(accessor, codeEditor);
+        const controller = widget?.getFindController();
+        if (!widget || !controller) {
+            return false;
+        }
+        controller.show(getSeedSearchText(getWindow(widget.domNode), codeEditor), true);
+        return true;
+    });
+    NextMatchFindAction.addImplementation(100, (accessor, codeEditor) => {
+        const widget = findOwningChatWidget(accessor, codeEditor);
+        const controller = widget?.getFindController();
+        if (!controller || !controller.visible) {
+            return false;
+        }
+        controller.next();
+        return true;
+    });
+    PreviousMatchFindAction.addImplementation(100, (accessor, codeEditor) => {
+        const widget = findOwningChatWidget(accessor, codeEditor);
+        const controller = widget?.getFindController();
+        if (!controller || !controller.visible) {
+            return false;
+        }
+        controller.previous();
+        return true;
+    });
+}
+
+export { getFocusedFindController, registerChatFindActions, resolveFocusedChatWidget };

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

@@ -10,14 +10,14 @@ import { ChatViewPaneTarget } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
-import { isExportableSessionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
+import { isExportableSessionData, extractExportableSessionData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 
 const defaultFileName = "chat.json";
 const filters = [{
-    name: ( localize(5292, "Chat Session")),
+    name: ( localize(5687, "Chat Session")),
     extensions: ["json"]
 }];
 function registerChatExportActions() {
@@ -26,7 +26,7 @@ function registerChatExportActions() {
             super({
                 id: "workbench.action.chat.export",
                 category: CHAT_CATEGORY,
-                title: ( localize2(5293, "Export Chat...")),
+                title: ( localize2(5688, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true
             });
@@ -63,7 +63,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.import",
-                title: ( localize2(5294, "Import Chat...")),
+                title: ( localize2(5689, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -93,11 +93,12 @@ function registerChatExportActions() {
                 if (!isExportableSessionData(data)) {
                     throw ( new Error("Invalid chat session data"));
                 }
+                const importedData = extractExportableSessionData(data);
                 let sessionResource;
                 let resolvedTarget;
                 let options;
                 if (opts?.target === "chatViewPane") {
-                    const modelRef = chatService.loadSessionFromData(data, "ChatImportExport#importToChatView");
+                    const modelRef = chatService.loadSessionFromData(importedData, "ChatImportExport#importToChatView");
                     try {
                         sessionResource = modelRef.object.sessionResource;
                         resolvedTarget = ChatViewPaneTarget;
@@ -113,7 +114,7 @@ function registerChatExportActions() {
                     resolvedTarget = ACTIVE_GROUP;
                     options = {
                         target: {
-                            data
+                            data: importedData
                         },
                         pinned: true
                     };

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

@@ -21,7 +21,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(5295, "Manage Language Model Access...")),
+            title: ( localize2(5690, "Manage Language Model Access...")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -91,9 +91,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: "info",
-                message: ( localize(5296, "No language models requiring authentication found.")),
+                message: ( localize(5691, "No language models requiring authentication found.")),
                 detail: ( localize(
-                    5297,
+                    5692,
                     "There are currently no language models that require authentication."
                 ))
             });
@@ -108,10 +108,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: "separator",
                 id: ownerId,
-                label: ( localize(5298, "{0}", extension.displayName || extension.name)),
+                label: ( localize(5693, "{0}", extension.displayName || extension.name)),
                 buttons: [{
                     iconClass: ThemeIcon.asClassName(Codicon.info),
-                    tooltip: ( localize(5299, "Open Extension"))
+                    tooltip: ( localize(5694, "Open Extension"))
                 }]
             });
             let addedTrustedSeparator = false;
@@ -120,7 +120,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: "separator",
-                            label: ( localize(5300, "Trusted by Microsoft"))
+                            label: ( localize(5695, "Trusted by Microsoft"))
                         });
                         addedTrustedSeparator = true;
                     }
@@ -133,15 +133,15 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                             iconClass: ThemeIcon.asClassName(Codicon.info),
-                            tooltip: ( localize(5299, "Open Extension"))
+                            tooltip: ( localize(5694, "Open Extension"))
                         }]
                     });
                 }
             } else {
                 items.push({
-                    label: ( localize(5301, "No extensions have access")),
+                    label: ( localize(5696, "No extensions have access")),
                     description: ( localize(
-                        5302,
+                        5697,
                         "No extensions are currently allowed to use models from {0}",
                         ownerId
                     )),
@@ -164,8 +164,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(5303, "Manage Language Model Access")),
-            placeHolder: ( localize(5304, "Choose which extensions can access language models"))
+            title: ( localize(5698, "Manage Language Model Access")),
+            placeHolder: ( localize(5699, "Choose which extensions can access language models"))
         });
         if (!result) {
             return;
@@ -188,7 +188,7 @@ class ConfigureLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.addLanguageModelsProviderGroup",
-            title: ( localize(5305, "Add Language Models Group"))
+            title: ( localize(5700, "Add Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {
@@ -208,7 +208,7 @@ class MigrateLanguageModelsGroupAction extends Action2 {
     constructor() {
         super({
             id: "lm.migrateLanguageModelsProviderGroup",
-            title: ( localize(5306, "Migrate Language Models Group"))
+            title: ( localize(5701, "Migrate Language Models Group"))
         });
     }
     async run(accessor, languageModelsProviderGroup) {

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

@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInEditor",
-                title: ( localize2(5307, "Move Chat into Editor Area")),
+                title: ( localize2(5703, "Move Chat into Editor Area")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -53,7 +53,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInNewWindow",
-                title: ( localize2(5308, "Move Chat into New Window")),
+                title: ( localize2(5704, "Move Chat into New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -78,7 +78,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: "workbench.action.chat.openInSidebar",
-                title: ( localize2(5309, "Move Chat into Side Bar")),
+                title: ( localize2(5705, "Move Chat into Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -101,9 +101,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(5310, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(5311, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(5312, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(5706, "Move Chat into Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(5707, "Move Chat into Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(5708, "Move Chat into Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, sessionResource) {
@@ -140,7 +140,7 @@ async function executeMoveToAction(accessor, moveTo, sessionResource) {
         return;
     }
     const resourceToOpen = widget.viewModel.sessionResource;
-    const modelInputState = existingWidget.getViewState();
+    const modelInputState = existingWidget.getInputState();
     await widget.clear();
     const options = {
         pinned: true,
@@ -161,15 +161,15 @@ async function moveToSidebar(accessor) {
     const chatEditorInput = chatEditor?.input;
     let view;
     if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionResource) {
-        const previousViewState = chatEditor.widget.getViewState();
+        const previousInputState = chatEditor.widget.getInputState();
         await editorService.closeEditor({
             editor: chatEditor.input,
             groupId: editorGroupService.activeGroup.id
         });
         view = await viewsService.openView(ChatViewId);
         const newModel = await view.loadSession(chatEditorInput.sessionResource);
-        if (previousViewState && newModel && !newModel.inputModel.state.get()) {
-            newModel.inputModel.setState(previousViewState);
+        if (previousInputState && newModel && !newModel.inputModel.state.get()) {
+            newModel.inputModel.setState(previousInputState);
         }
     } else {
         view = await viewsService.openView(ChatViewId);

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

@@ -1,3 +1,5 @@
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 export interface INewEditSessionActionContext {
     /**
      * An initial prompt to write to the chat.
@@ -14,4 +16,8 @@ export interface INewEditSessionActionContext {
      */
     isPartialQuery?: boolean;
 }
+export declare class NewChatAction extends Action2 {
+    constructor();
+    run(accessor: ServicesAccessor, ...args: unknown[]): Promise<void>;
+}
 export declare function registerNewChatActions(): void;