@codingame/monaco-vscode-chat-service-override 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.3",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js

@@ -7,7 +7,10 @@ import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { InlineChatNotebookContribution } from './inlineChatNotebook.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { InlineChatAccessibleViewContribution } from './inlineChatAccessibleView.js';
+import { StartSessionAction, HoldToSpeak } from './inlineChatActions2.js';
 
+registerAction2(StartSessionAction);
+registerAction2(HoldToSpeak);
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, 0 );
 registerEditorContribution(INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID, InlineAccessibilityHelpContribution, 3 );
 registerAction2(CloseAction);

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js

@@ -23,7 +23,12 @@ import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/prefere
 
 CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 CommandsRegistry.registerCommandAlias('interactive.acceptChanges', ACTION_ACCEPT_CHANGES);
-registerIcon('start-inline-chat', Codicon.sparkle, ( localizeWithPath(
+const LOCALIZED_START_INLINE_CHAT_STRING = ( localizeWithPath(
+    'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
+    'run',
+    'Start Inline Chat'
+));
+const START_INLINE_CHAT = registerIcon('start-inline-chat', Codicon.sparkle, ( localizeWithPath(
     'vs/workbench/contrib/inlineChat/browser/inlineChatActions',
     'startInlineChat',
     'Icon which spawns the inline chat from the editor toolbar.'
@@ -736,4 +741,4 @@ class InlineAccessibilityHelpContribution extends Disposable {
     }
 }
 
-export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, MakeRequestAction, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, StopRequestAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };
+export { AbstractInlineChatAction, AcceptChanges, ArrowOutDownAction, ArrowOutUpAction, CancelSessionAction, CloseAction, ConfigureInlineChatAction, ContractMessageAction, CopyRecordings, DiscardAction, DiscardHunkAction, DiscardToClipboardAction, DiscardUndoToNewFileAction, ExpandMessageAction, FeebackHelpfulCommand, FeebackUnhelpfulCommand, FocusInlineChat, InlineAccessibilityHelpContribution, LOCALIZED_START_INLINE_CHAT_STRING, MakeRequestAction, NextFromHistory, PreviousFromHistory, ReRunRequestAction, ReportIssueForBugCommand, START_INLINE_CHAT, StopRequestAction, ToggleDiffForChange, UnstashSessionAction, ViewInChatAction };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions2.js

@@ -0,0 +1,94 @@
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { EditorAction2 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { InlineChatController, InlineChatRunOptions } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { LOCALIZED_START_INLINE_CHAT_STRING, AbstractInlineChatAction, START_INLINE_CHAT } from './inlineChatActions.js';
+import { disposableTimeout } from 'vscode/vscode/vs/base/common/async';
+import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { CTX_INLINE_CHAT_HAS_PROVIDER, CTX_INLINE_CHAT_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ISpeechService, HasSpeechProvider } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+
+class StartSessionAction extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'inlineChat.start',
+            title: { value: LOCALIZED_START_INLINE_CHAT_STRING, original: 'Start Inline Chat' },
+            category: AbstractInlineChatAction.category,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_PROVIDER, EditorContextKeys.writable)),
+            keybinding: {
+                when: EditorContextKeys.focus,
+                weight: 200 ,
+                primary: 2048  | 39 ,
+                secondary: [KeyChord(2048  | 41 , 39 )],
+            },
+            icon: START_INLINE_CHAT
+        });
+    }
+    runEditorCommand(accessor, editor, ..._args) {
+        const configService = accessor.get(IConfigurationService);
+        const speechService = accessor.get(ISpeechService);
+        if (configService.getValue("inlineChat.holdToSpeech" )
+            && speechService.hasSpeechProvider
+        ) {
+            holdForSpeech(accessor, InlineChatController.get(editor), this.desc.id);
+        }
+        let options;
+        const arg = _args[0];
+        if (arg && InlineChatRunOptions.isInteractiveEditorOptions(arg)) {
+            options = arg;
+        }
+        InlineChatController.get(editor)?.run({ ...options });
+    }
+}
+class HoldToSpeak extends AbstractInlineChatAction {
+    constructor() {
+        super({
+            id: 'inlineChat.holdForSpeech',
+            precondition: ( ContextKeyExpr.and(HasSpeechProvider, CTX_INLINE_CHAT_VISIBLE)),
+            title: ( localize2WithPath(
+                'vs/workbench/contrib/inlineChat/browser/inlineChatActions2',
+                'holdForSpeech',
+                "Hold for Speech"
+            )),
+            keybinding: {
+                when: EditorContextKeys.textInputFocus,
+                weight: 200 ,
+                primary: 2048  | 39 ,
+            },
+        });
+    }
+    runInlineChatCommand(accessor, ctrl, editor, ...args) {
+        holdForSpeech(accessor, ctrl, this.desc.id);
+    }
+}
+function holdForSpeech(accessor, ctrl, commandId) {
+    const keybindingService = accessor.get(IKeybindingService);
+    const commandService = accessor.get(ICommandService);
+    if (!ctrl) {
+        return;
+    }
+    const holdMode = keybindingService.enableKeybindingHoldMode(commandId);
+    if (!holdMode) {
+        return;
+    }
+    let listening = false;
+    const handle = disposableTimeout(() => {
+        commandService.executeCommand('workbench.action.chat.startVoiceChat', { voice: { disableTimeout: true } });
+        listening = true;
+    }, 250);
+    holdMode.finally(() => {
+        if (listening) {
+            commandService.executeCommand('workbench.action.chat.stopListening').finally(() => {
+                ctrl.acceptInput();
+            });
+        }
+        handle.dispose();
+    });
+}
+
+export { HoldToSpeak, StartSessionAction };