@codingame/monaco-vscode-chat-service-override 7.1.0 → 7.1.1

package/vscode/src/vs/workbench/contrib/chat/common/voiceChatService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { rtrim } from 'vscode/vscode/vs/base/common/strings';
@@ -11,7 +11,6 @@ import { SpeechToTextStatus } from 'vscode/vscode/vs/workbench/contrib/speech/co
 import { ISpeechService } from 'vscode/vscode/vs/workbench/contrib/speech/common/speechService.service';
 
 var VoiceChatService_1;
-const _moduleId = "vs/workbench/contrib/chat/common/voiceChatService";
 var PhraseTextType;
 ( ((function(PhraseTextType) {
     PhraseTextType[PhraseTextType["AGENT"] = 1] = "AGENT";
@@ -21,19 +20,19 @@ var PhraseTextType;
 const VoiceChatInProgress = ( (new RawContextKey(
     'voiceChatInProgress',
     false,
-    { type: 'boolean', description: ( localizeWithPath(_moduleId, 0, "A speech-to-text session is in progress for chat.")) }
+    { type: 'boolean', description: ( localize(7289, "A speech-to-text session is in progress for chat.")) }
 )));
 let VoiceChatService = class VoiceChatService extends Disposable {
     static { VoiceChatService_1 = this; }
     static { this.AGENT_PREFIX = chatAgentLeader; }
     static { this.COMMAND_PREFIX = chatSubcommandLeader; }
     static { this.PHRASES_LOWER = {
-        [VoiceChatService_1.AGENT_PREFIX]: 'at',
-        [VoiceChatService_1.COMMAND_PREFIX]: 'slash'
+        [this.AGENT_PREFIX]: 'at',
+        [this.COMMAND_PREFIX]: 'slash'
     }; }
     static { this.PHRASES_UPPER = {
-        [VoiceChatService_1.AGENT_PREFIX]: 'At',
-        [VoiceChatService_1.COMMAND_PREFIX]: 'Slash'
+        [this.AGENT_PREFIX]: 'At',
+        [this.COMMAND_PREFIX]: 'Slash'
     }; }
     static { this.CHAT_AGENT_ALIAS = ( (new Map([['vscode', 'code']]))); }
     constructor(speechService, chatAgentService, contextKeyService) {

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

@@ -15,20 +15,20 @@ import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { SubmitAction, CancelAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { InlineChatAccessibilityHelp } from './inlineChatAccessibilityHelp.js';
 
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChat.contribution";
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager);
 const sendActionMenuItem = {
     group: '0_main',
     order: 0,
     command: {
         id: SubmitAction.ID,
-        title: ( localizeWithPath(_moduleId, 0, "Send")),
+        title: ( localize(3121, "Send")),
     },
     when: ( (ContextKeyExpr.and(
         CONTEXT_CHAT_INPUT_HAS_TEXT,
@@ -43,8 +43,8 @@ const cancelActionMenuItem = {
     order: 0,
     command: {
         id: CancelAction.ID,
-        title: ( localizeWithPath(_moduleId, 1, "Stop Request")),
-        shortTitle: ( localizeWithPath(_moduleId, 2, "Stop")),
+        title: ( localize(3122, "Stop Request")),
+        shortTitle: ( localize(3123, "Stop")),
     },
     when: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))),
 };
@@ -69,6 +69,7 @@ const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
 AccessibleViewRegistry.register(( (new InlineChatAccessibleView())));
+AccessibleViewRegistry.register(( (new InlineChatAccessibilityHelp())));
 let MenuCopier = class MenuCopier {
     static { this.Id = 'inlineChat.menuCopier'; }
     constructor(configService) {

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

@@ -0,0 +1,24 @@
+import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
+import { AccessibleViewType } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { getChatAccessibilityHelpProvider } from '../../chat/browser/actions/chatAccessibilityHelp.js';
+import { CONTEXT_CHAT_INPUT_HAS_FOCUS } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+
+class InlineChatAccessibilityHelp {
+    constructor() {
+        this.priority = 106;
+        this.name = 'inlineChat';
+        this.type = AccessibleViewType.Help;
+        this.when = ( ContextKeyExpr.or(CTX_INLINE_CHAT_RESPONSE_FOCUSED, CONTEXT_CHAT_INPUT_HAS_FOCUS));
+    }
+    getProvider(accessor) {
+        const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
+        if (!codeEditor) {
+            return;
+        }
+        return getChatAccessibilityHelpProvider(accessor, codeEditor, 'inlineChat');
+    }
+}
+
+export { InlineChatAccessibilityHelp };

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

@@ -2,10 +2,10 @@ import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineC
 import { CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_RESPONSE_FOCUSED } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
-import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { AccessibleViewType, AccessibleContentProvider, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
+import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 
 class InlineChatAccessibleView {
     constructor() {
@@ -28,17 +28,14 @@ class InlineChatAccessibleView {
         if (!responseContent) {
             return;
         }
-        return {
-            id: AccessibleViewProviderId.InlineChat,
-            verbositySettingKey: AccessibilityVerbositySettingId.InlineChat,
-            provideContent() { return renderMarkdownAsPlaintext(( new MarkdownString(responseContent)), true); },
-            onClose() {
-                controller.focus();
-            },
-            options: { type: AccessibleViewType.View }
-        };
+        return ( new AccessibleContentProvider(
+            AccessibleViewProviderId.InlineChat,
+            { type: AccessibleViewType.View },
+            () => renderMarkdownAsPlaintext(( new MarkdownString(responseContent)), true),
+            () => controller.focus(),
+            AccessibilityVerbositySettingId.InlineChat
+        ));
     }
-    dispose() { }
 }
 
 export { InlineChatAccessibleView };

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Queue, raceCancellation } from 'vscode/vscode/vs/base/common/async';
 import { DisposableStore, MutableDisposable, dispose, combinedDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { SaveReason } from 'vscode/vscode/vs/workbench/common/editor';
 import { IInlineChatSessionService } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.service';
@@ -22,7 +22,6 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 
-const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChatSavingServiceImpl";
 let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
     constructor(_fileConfigService, _editorGroupService, _textFileService, _editorService, _inlineChatSessionService, _configService, _workingCopyFileService, _logService) {
         this._fileConfigService = _fileConfigService;
@@ -104,14 +103,9 @@ let InlineChatSavingServiceImpl = class InlineChatSavingServiceImpl {
         }
         progress.report({
             message: sessions.size === 1
-                ? ( localizeWithPath(
-                _moduleId,
-                0,
-                "Waiting for Inline Chat changes to be Accepted or Discarded..."
-            ))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
+                ? ( localize(3104, "Waiting for Inline Chat changes to be Accepted or Discarded..."))
+                : ( localize(
+                3105,
                 "Waiting for Inline Chat changes in {0} editors to be Accepted or Discarded...",
                 sessions.size
             ))

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

@@ -1,17 +0,0 @@
-import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-
-async function clearChatEditor(accessor) {
-    const editorService = accessor.get(IEditorService);
-    const editorGroupsService = accessor.get(IEditorGroupsService);
-    const chatEditorInput = editorService.activeEditor;
-    if (chatEditorInput instanceof ChatEditorInput) {
-        await editorService.replaceEditors([{
-                editor: chatEditorInput,
-                replacement: { resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } }
-            }], editorGroupsService.activeGroup);
-    }
-}
-
-export { clearChatEditor };