@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js

@@ -1,10 +1,14 @@
 import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { MultiCommand } from '../../../../editor/browser/editorExtensions.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { registerAction2, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { AccessibilityCommandId } from '../common/accessibilityCommands.js';
 import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewVerbosityEnabled } from './accessibilityConfiguration.js';
-import { IAccessibleViewService } from './accessibleView.service.js';
+import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
 const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibleViewActions";
@@ -21,11 +25,11 @@ const commandPalette = {
 class AccessibleViewNextAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewNext" ,
+            id: AccessibilityCommandId.ShowNext,
             precondition: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
             keybinding: {
-                primary: 512  | 94 ,
-                weight: 200
+                primary: KeyMod$1.Alt | KeyCode.BracketRight,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             menu: [
                 commandPalette,
@@ -46,20 +50,20 @@ registerAction2(AccessibleViewNextAction);
 class AccessibleViewNextCodeBlockAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewNextCodeBlock" ,
-            precondition: ( (ContextKeyExpr.and(accessibleViewContainsCodeBlocks,  (ContextKeyExpr.equals(
-                accessibleViewCurrentProviderId.key,
-                "panelChat"
-            ))))),
+            id: AccessibilityCommandId.NextCodeBlock,
+            precondition: ( (ContextKeyExpr.and(
+                accessibleViewContainsCodeBlocks,
+                 (ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Chat))
+            ))),
             keybinding: {
-                primary: 2048  | 512  | 12 ,
-                mac: { primary: 2048  | 512  | 12 , },
-                weight: 200 ,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.PageDown,
+                mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.PageDown, },
+                weight: KeybindingWeight.WorkbenchContrib,
             },
             icon: Codicon.arrowRight,
             menu: {
                 ...accessibleViewMenu,
-                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
+                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks))),
             },
             title: ( localizeWithPath(_moduleId, 1, "Accessible View: Next Code Block"))
         });
@@ -72,20 +76,20 @@ registerAction2(AccessibleViewNextCodeBlockAction);
 class AccessibleViewPreviousCodeBlockAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewPreviousCodeBlock" ,
-            precondition: ( (ContextKeyExpr.and(accessibleViewContainsCodeBlocks,  (ContextKeyExpr.equals(
-                accessibleViewCurrentProviderId.key,
-                "panelChat"
-            ))))),
+            id: AccessibilityCommandId.PreviousCodeBlock,
+            precondition: ( (ContextKeyExpr.and(
+                accessibleViewContainsCodeBlocks,
+                 (ContextKeyExpr.equals(accessibleViewCurrentProviderId.key, AccessibleViewProviderId.Chat))
+            ))),
             keybinding: {
-                primary: 2048  | 512  | 11 ,
-                mac: { primary: 2048  | 512  | 11 , },
-                weight: 200 ,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.PageUp,
+                mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.PageUp, },
+                weight: KeybindingWeight.WorkbenchContrib,
             },
             icon: Codicon.arrowLeft,
             menu: {
                 ...accessibleViewMenu,
-                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
+                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewContainsCodeBlocks))),
             },
             title: ( localizeWithPath(_moduleId, 2, "Accessible View: Previous Code Block"))
         });
@@ -98,11 +102,11 @@ registerAction2(AccessibleViewPreviousCodeBlockAction);
 class AccessibleViewPreviousAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewPrevious" ,
+            id: AccessibilityCommandId.ShowPrevious,
             precondition: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
             keybinding: {
-                primary: 512  | 92 ,
-                weight: 200
+                primary: KeyMod$1.Alt | KeyCode.BracketLeft,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             icon: Codicon.arrowUp,
             menu: [
@@ -123,15 +127,15 @@ registerAction2(AccessibleViewPreviousAction);
 class AccessibleViewGoToSymbolAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewGoToSymbol" ,
+            id: AccessibilityCommandId.GoToSymbol,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)),
                 accessibleViewGoToSymbolSupported
             ))),
             keybinding: {
-                primary: 2048  | 1024  | 45 ,
-                secondary: [2048  | 1024  | 89 ],
-                weight: 200  + 10
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyO,
+                secondary: [KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Period],
+                weight: KeybindingWeight.WorkbenchContrib + 10
             },
             icon: Codicon.symbolField,
             menu: [
@@ -157,14 +161,14 @@ function registerCommand(command) {
     return command;
 }
 const AccessibilityHelpAction = registerCommand(( (new MultiCommand({
-    id: "editor.action.accessibilityHelp" ,
+    id: AccessibilityCommandId.OpenAccessibilityHelp,
     precondition: undefined,
     kbOpts: {
-        primary: 512  | 59 ,
-        weight: 200 ,
+        primary: KeyMod$1.Alt | KeyCode.F1,
+        weight: KeybindingWeight.WorkbenchContrib,
         linux: {
-            primary: 512  | 1024  | 59 ,
-            secondary: [512  | 59 ]
+            primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.F1,
+            secondary: [KeyMod$1.Alt | KeyCode.F1]
         },
         kbExpr: ( (accessibilityHelpIsShown.toNegated()))
     },
@@ -176,14 +180,14 @@ const AccessibilityHelpAction = registerCommand(( (new MultiCommand({
         }],
 }))));
 const AccessibleViewAction = registerCommand(( (new MultiCommand({
-    id: "editor.action.accessibleView" ,
+    id: AccessibilityCommandId.OpenAccessibleView,
     precondition: undefined,
     kbOpts: {
-        primary: 512  | 60 ,
-        weight: 200 ,
+        primary: KeyMod$1.Alt | KeyCode.F2,
+        weight: KeybindingWeight.WorkbenchContrib,
         linux: {
-            primary: 512  | 1024  | 60 ,
-            secondary: [512  | 60 ]
+            primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.F2,
+            secondary: [KeyMod$1.Alt | KeyCode.F2]
         }
     },
     menuOpts: [{
@@ -196,14 +200,14 @@ const AccessibleViewAction = registerCommand(( (new MultiCommand({
 class AccessibleViewDisableHintAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewDisableHint" ,
+            id: AccessibilityCommandId.DisableVerbosityHint,
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.or(accessibleViewIsShown, accessibilityHelpIsShown)),
                 accessibleViewVerbosityEnabled
             ))),
             keybinding: {
-                primary: 512  | 64 ,
-                weight: 200
+                primary: KeyMod$1.Alt | KeyCode.F6,
+                weight: KeybindingWeight.WorkbenchContrib
             },
             icon: Codicon.bellSlash,
             menu: [
@@ -225,18 +229,52 @@ class AccessibleViewDisableHintAction extends Action2 {
     }
 }
 registerAction2(AccessibleViewDisableHintAction);
+class AccessibilityHelpConfigureKeybindingsAction extends Action2 {
+    constructor() {
+        super({
+            id: AccessibilityCommandId.AccessibilityHelpConfigureKeybindings,
+            precondition: ( (ContextKeyExpr.and(accessibilityHelpIsShown))),
+            keybinding: {
+                primary: KeyMod$1.Alt | KeyCode.KeyK,
+                weight: KeybindingWeight.WorkbenchContrib
+            },
+            title: ( localizeWithPath(_moduleId, 8, "Accessibility Help Configure Keybindings"))
+        });
+    }
+    async run(accessor) {
+        await accessor.get(IAccessibleViewService).configureKeybindings();
+    }
+}
+registerAction2(AccessibilityHelpConfigureKeybindingsAction);
+class AccessibilityHelpOpenHelpLinkAction extends Action2 {
+    constructor() {
+        super({
+            id: AccessibilityCommandId.AccessibilityHelpOpenHelpLink,
+            precondition: ( (ContextKeyExpr.and(accessibilityHelpIsShown))),
+            keybinding: {
+                primary: KeyMod$1.Alt | KeyCode.KeyH,
+                weight: KeybindingWeight.WorkbenchContrib
+            },
+            title: ( localizeWithPath(_moduleId, 9, "Accessibility Help Open Help Link"))
+        });
+    }
+    run(accessor) {
+        accessor.get(IAccessibleViewService).openHelpLink();
+    }
+}
+registerAction2(AccessibilityHelpOpenHelpLinkAction);
 class AccessibleViewAcceptInlineCompletionAction extends Action2 {
     constructor() {
         super({
-            id: "editor.action.accessibleViewAcceptInlineCompletion" ,
+            id: AccessibilityCommandId.AccessibleViewAcceptInlineCompletion,
             precondition: ( (ContextKeyExpr.and(accessibleViewIsShown,  (ContextKeyExpr.equals(
                 accessibleViewCurrentProviderId.key,
-                "inlineCompletions"
+                AccessibleViewProviderId.InlineCompletions
             ))))),
             keybinding: {
-                primary: 2048  | 90 ,
-                mac: { primary: 256  | 90  },
-                weight: 200
+                primary: KeyMod$1.CtrlCmd | KeyCode.Slash,
+                mac: { primary: KeyMod$1.WinCtrl | KeyCode.Slash },
+                weight: KeybindingWeight.WorkbenchContrib
             },
             icon: Codicon.check,
             menu: [
@@ -247,11 +285,11 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     order: 0,
                     when: ( (ContextKeyExpr.and(accessibleViewIsShown,  (ContextKeyExpr.equals(
                         accessibleViewCurrentProviderId.key,
-                        "inlineCompletions"
+                        AccessibleViewProviderId.InlineCompletions
                     )))))
                 }
             ],
-            title: ( localizeWithPath(_moduleId, 8, "Accept Inline Completion"))
+            title: ( localizeWithPath(_moduleId, 10, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js

@@ -1,24 +1,24 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
-import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { descriptionForCommand } from './accessibleViewContributions.js';
-import { IAccessibleViewService } from './accessibleView.service.js';
 import { AccessibilityHelpAction } from './accessibleViewActions.js';
 import { CONTEXT_CHAT_ENABLED } from '../../chat/common/chatContextKeys.js';
 import { CommentAccessibilityHelpNLS } from '../../comments/browser/commentsAccessibility.js';
 import { CommentContextKeys } from '../../comments/common/commentContextKeys.js';
 import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.js';
+import { AccessibleViewProviderId, AccessibleViewType } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
+import { AccessibilityVerbositySettingId } from './accessibilityConfiguration.js';
 class EditorAccessibilityHelpContribution extends Disposable {
     constructor() {
         super();
-        this._register(AccessibilityHelpAction.addImplementation(95, 'editor', async (accessor) => {
+        this._register(AccessibilityHelpAction.addImplementation(90, 'editor', async (accessor) => {
             const codeEditorService = accessor.get(ICodeEditorService);
             const accessibleViewService = accessor.get(IAccessibleViewService);
             const instantiationService = accessor.get(IInstantiationService);
@@ -29,7 +29,7 @@ class EditorAccessibilityHelpContribution extends Disposable {
                 codeEditor = codeEditorService.getActiveCodeEditor();
             }
             accessibleViewService.show(instantiationService.createInstance(EditorAccessibilityHelpProvider, codeEditor));
-        }, EditorContextKeys.focus));
+        }));
     }
 }
 let EditorAccessibilityHelpProvider = class EditorAccessibilityHelpProvider {
@@ -40,15 +40,15 @@ let EditorAccessibilityHelpProvider = class EditorAccessibilityHelpProvider {
         this._editor = _editor;
         this._keybindingService = _keybindingService;
         this._contextKeyService = _contextKeyService;
-        this.id = "editor" ;
-        this.options = { type: "help" , readMoreUrl: 'https://go.microsoft.com/fwlink/?linkid=851010' };
-        this.verbositySettingKey = "accessibility.verbosity.editor" ;
+        this.id = AccessibleViewProviderId.Editor;
+        this.options = { type: AccessibleViewType.Help, readMoreUrl: 'https://go.microsoft.com/fwlink/?linkid=851010' };
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Editor;
     }
     provideContent() {
         const options = this._editor.getOptions();
         const content = [];
-        if (options.get(61 )) {
-            if (options.get(91 )) {
+        if (options.get(EditorOption.inDiffEditor)) {
+            if (options.get(EditorOption.readOnly)) {
                 content.push(AccessibilityHelpNLS.readonlyDiffEditor);
             }
             else {
@@ -56,7 +56,7 @@ let EditorAccessibilityHelpProvider = class EditorAccessibilityHelpProvider {
             }
         }
         else {
-            if (options.get(91 )) {
+            if (options.get(EditorOption.readOnly)) {
                 content.push(AccessibilityHelpNLS.readonlyEditor);
             }
             else {
@@ -73,14 +73,14 @@ let EditorAccessibilityHelpProvider = class EditorAccessibilityHelpProvider {
         if (commentCommandInfo) {
             content.push(commentCommandInfo);
         }
-        if (options.get(115 ).enabled) {
-            content.push(descriptionForCommand('editor.action.focusStickyScroll', AccessibilityHelpNLS.stickScrollKb, AccessibilityHelpNLS.stickScrollNoKb, this._keybindingService));
+        if (options.get(EditorOption.stickyScroll).enabled) {
+            content.push(AccessibilityHelpNLS.stickScroll);
         }
-        if (options.get(144 )) {
-            content.push(descriptionForCommand(ToggleTabFocusModeAction.ID, AccessibilityHelpNLS.tabFocusModeOnMsg, AccessibilityHelpNLS.tabFocusModeOnMsgNoKb, this._keybindingService));
+        if (options.get(EditorOption.tabFocusMode)) {
+            content.push(AccessibilityHelpNLS.tabFocusModeOnMsg);
         }
         else {
-            content.push(descriptionForCommand(ToggleTabFocusModeAction.ID, AccessibilityHelpNLS.tabFocusModeOffMsg, AccessibilityHelpNLS.tabFocusModeOffMsgNoKb, this._keybindingService));
+            content.push(AccessibilityHelpNLS.tabFocusModeOffMsg);
         }
         return content.join('\n\n');
     }
@@ -92,23 +92,13 @@ EditorAccessibilityHelpProvider = ( __decorate([
 function getCommentCommandInfo(keybindingService, contextKeyService, editor) {
     const editorContext = contextKeyService.getContext(editor.getDomNode());
     if (editorContext.getValue(CommentContextKeys.activeEditorHasCommentingRange.key)) {
-        const commentCommandInfo = [];
-        commentCommandInfo.push(CommentAccessibilityHelpNLS.intro);
-        commentCommandInfo.push(descriptionForCommand("workbench.action.addComment" , CommentAccessibilityHelpNLS.addComment, CommentAccessibilityHelpNLS.addCommentNoKb, keybindingService));
-        commentCommandInfo.push(descriptionForCommand("editor.action.nextCommentThreadAction" , CommentAccessibilityHelpNLS.nextCommentThreadKb, CommentAccessibilityHelpNLS.nextCommentThreadNoKb, keybindingService));
-        commentCommandInfo.push(descriptionForCommand("editor.action.previousCommentThreadAction" , CommentAccessibilityHelpNLS.previousCommentThreadKb, CommentAccessibilityHelpNLS.previousCommentThreadNoKb, keybindingService));
-        commentCommandInfo.push(descriptionForCommand("editor.action.nextCommentingRange" , CommentAccessibilityHelpNLS.nextRange, CommentAccessibilityHelpNLS.nextRangeNoKb, keybindingService));
-        commentCommandInfo.push(descriptionForCommand("editor.action.previousCommentingRange" , CommentAccessibilityHelpNLS.previousRange, CommentAccessibilityHelpNLS.previousRangeNoKb, keybindingService));
-        return commentCommandInfo.join('\n');
+        return [CommentAccessibilityHelpNLS.intro, CommentAccessibilityHelpNLS.addComment, CommentAccessibilityHelpNLS.nextCommentThread, CommentAccessibilityHelpNLS.previousCommentThread, CommentAccessibilityHelpNLS.nextRange, CommentAccessibilityHelpNLS.previousRange].join('\n');
     }
     return;
 }
 function getChatCommandInfo(keybindingService, contextKeyService) {
     if (CONTEXT_CHAT_ENABLED.getValue(contextKeyService)) {
-        const commentCommandInfo = [];
-        commentCommandInfo.push(descriptionForCommand('workbench.action.quickchat.toggle', AccessibilityHelpNLS.quickChat, AccessibilityHelpNLS.quickChatNoKb, keybindingService));
-        commentCommandInfo.push(descriptionForCommand('inlineChat.start', AccessibilityHelpNLS.startInlineChat, AccessibilityHelpNLS.startInlineChatNoKb, keybindingService));
-        return commentCommandInfo.join('\n');
+        return [AccessibilityHelpNLS.quickChat, AccessibilityHelpNLS.startInlineChat].join('\n');
     }
     return;
 }

package/vscode/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.js

@@ -0,0 +1,15 @@
+var AccessibilityCommandId;
+( (function(AccessibilityCommandId) {
+    AccessibilityCommandId["OpenAccessibleView"] = "editor.action.accessibleView";
+    AccessibilityCommandId["OpenAccessibilityHelp"] = "editor.action.accessibilityHelp";
+    AccessibilityCommandId["DisableVerbosityHint"] = "editor.action.accessibleViewDisableHint";
+    AccessibilityCommandId["GoToSymbol"] = "editor.action.accessibleViewGoToSymbol";
+    AccessibilityCommandId["ShowNext"] = "editor.action.accessibleViewNext";
+    AccessibilityCommandId["ShowPrevious"] = "editor.action.accessibleViewPrevious";
+    AccessibilityCommandId["AccessibleViewAcceptInlineCompletion"] = "editor.action.accessibleViewAcceptInlineCompletion";
+    AccessibilityCommandId["NextCodeBlock"] = "editor.action.accessibleViewNextCodeBlock";
+    AccessibilityCommandId["PreviousCodeBlock"] = "editor.action.accessibleViewPreviousCodeBlock";
+    AccessibilityCommandId["AccessibilityHelpConfigureKeybindings"] = "editor.action.accessibilityHelpConfigureKeybindings";
+    AccessibilityCommandId["AccessibilityHelpOpenHelpLink"] = "editor.action.accessibilityHelpOpenHelpLink";
+})(AccessibilityCommandId || (AccessibilityCommandId = {})));
+export { AccessibilityCommandId };

package/vscode/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.js

@@ -9,6 +9,11 @@ import { CommandsRegistry } from '../../../../platform/commands/common/commands.
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+var CallHierarchyDirection;
+( (function(CallHierarchyDirection) {
+    CallHierarchyDirection["CallsTo"] = "incomingCalls";
+    CallHierarchyDirection["CallsFrom"] = "outgoingCalls";
+})(CallHierarchyDirection || (CallHierarchyDirection = {})));
 const CallHierarchyProviderRegistry = ( new LanguageFeatureRegistry());
 class CallHierarchyModel {
     static async create(model, position, token) {
@@ -123,4 +128,4 @@ CommandsRegistry.registerCommand('_executeProvideOutgoingCalls', async (_accesso
     }
     return model.resolveOutgoingCalls(item, CancellationToken.None);
 });
-export { CallHierarchyModel, CallHierarchyProviderRegistry };
+export { CallHierarchyDirection, CallHierarchyModel, CallHierarchyProviderRegistry };

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

@@ -1,25 +1,24 @@
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../../base/common/keyCodes.js';
+import { DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
-import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
 import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { IsWindowsContext, IsLinuxContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.service.js';
-import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { ViewAction } from '../../../../browser/parts/views/viewPane.js';
-import { Extensions } from '../../../../common/contributions.js';
-import { AccessibilityHelpAction } from '../../../accessibility/browser/accessibleViewActions.js';
-import { runAccessibilityHelpAction } from './chatAccessibilityHelp.js';
 import { showChatView, CHAT_VIEW_ID } from '../chat.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { ChatAgentLocation } from '../../common/chatAgents.js';
-import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from '../../common/chatContextKeys.js';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_SESSION } from '../../common/chatContextKeys.js';
 import { IChatService } from '../../common/chatService.service.js';
+import { isRequestVM } from '../../common/chatViewModel.js';
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.service.js';
+import { ACTIVE_GROUP } from '../../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.service.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatActions";
@@ -37,20 +36,26 @@ class OpenChatGlobalAction extends Action2 {
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 512  | 39 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyI,
                 mac: {
-                    primary: 2048  | 256  | 39
+                    primary: KeyMod$1.CtrlCmd | KeyMod$1.WinCtrl | KeyCode.KeyI
                 }
             }
         });
     }
     async run(accessor, opts) {
         opts = typeof opts === 'string' ? { query: opts } : opts;
+        const chatService = accessor.get(IChatService);
         const chatWidget = await showChatView(accessor.get(IViewsService));
         if (!chatWidget) {
             return;
         }
+        if (opts?.previousRequests?.length && chatWidget.viewModel) {
+            for (const { request, response } of opts.previousRequests) {
+                chatService.addCompleteRequest(chatWidget.viewModel.sessionId, request, undefined, 0, { message: response });
+            }
+        }
         if (opts?.query) {
             if (opts.isPartialQuery) {
                 chatWidget.setInput(opts.query);
@@ -84,34 +89,58 @@ class ChatHistoryAction extends ViewAction {
         const chatService = accessor.get(IChatService);
         const quickInputService = accessor.get(IQuickInputService);
         const viewsService = accessor.get(IViewsService);
+        const editorService = accessor.get(IEditorService);
         const items = chatService.getHistory();
-        const picks = ( (items.map(i => ({
+        const openInEditorButton = {
+            iconClass: ThemeIcon.asClassName(Codicon.file),
+            tooltip: ( localizeWithPath(_moduleId, 3, "Open in Editor")),
+        };
+        const deleteButton = {
+            iconClass: ThemeIcon.asClassName(Codicon.x),
+            tooltip: ( localizeWithPath(_moduleId, 4, "Delete")),
+        };
+        const picks = ( (items.map((i) => ({
             label: i.title,
             chat: i,
-            buttons: [{
-                    iconClass: ThemeIcon.asClassName(Codicon.x),
-                    tooltip: ( localizeWithPath(_moduleId, 3, "Delete")),
-                }]
+            buttons: [
+                openInEditorButton,
+                deleteButton
+            ]
         }))));
-        const selection = await quickInputService.pick(picks, {
-            placeHolder: ( localizeWithPath(_moduleId, 4, "Switch to chat")),
-            onDidTriggerItemButton: context => {
+        const store = ( (new DisposableStore()));
+        const picker = store.add(quickInputService.createQuickPick());
+        picker.placeholder = ( localizeWithPath(_moduleId, 5, "Switch to chat"));
+        picker.items = picks;
+        store.add(picker.onDidTriggerItemButton(context => {
+            if (context.button === openInEditorButton) {
+                editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId: context.item.chat.sessionId }, pinned: true } }, ACTIVE_GROUP);
+                picker.hide();
+            }
+            else if (context.button === deleteButton) {
                 chatService.removeHistoryEntry(context.item.chat.sessionId);
-                context.removeItem();
+                picker.items = picks.filter(i => i !== context.item);
             }
-        });
-        if (selection) {
-            const sessionId = selection.chat.sessionId;
-            const view = await viewsService.openView(CHAT_VIEW_ID);
-            view.loadSession(sessionId);
-        }
+        }));
+        store.add(picker.onDidAccept(async () => {
+            try {
+                const item = picker.selectedItems[0];
+                const sessionId = item.chat.sessionId;
+                const view = await viewsService.openView(CHAT_VIEW_ID);
+                view.loadSession(sessionId);
+            }
+            finally {
+                picker.hide();
+            }
+        }));
+        store.add(picker.onDidHide(() => store.dispose()));
+        picker.show();
     }
 }
 class OpenChatEditorAction extends Action2 {
     constructor() {
         super({
             id: `workbench.action.openChat`,
-            title: ( localize2WithPath(_moduleId, 5, "Open Editor")),
+            title: ( localize2WithPath(_moduleId, 6, "Open Editor")),
             f1: true,
             category: CHAT_CATEGORY,
             precondition: CONTEXT_CHAT_ENABLED
@@ -130,7 +159,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.clearInputHistory',
-                title: ( localize2WithPath(_moduleId, 6, "Clear Input History")),
+                title: ( localize2WithPath(_moduleId, 7, "Clear Input History")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 category: CHAT_CATEGORY,
                 f1: true,
@@ -145,7 +174,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.clearHistory',
-                title: ( localize2WithPath(_moduleId, 7, "Clear All Workspace Chats")),
+                title: ( localize2WithPath(_moduleId, 8, "Clear All Workspace Chats")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 category: CHAT_CATEGORY,
                 f1: true,
@@ -160,7 +189,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'chat.action.focus',
-                title: ( localize2WithPath(_moduleId, 8, 'Focus Chat List')),
+                title: ( localize2WithPath(_moduleId, 9, 'Focus Chat List')),
                 precondition: ( (ContextKeyExpr.and(
                     CONTEXT_IN_CHAT_INPUT,
                      (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))
@@ -169,13 +198,13 @@ function registerChatActions() {
                 keybinding: [
                     {
                         when: CONTEXT_CHAT_INPUT_CURSOR_AT_TOP,
-                        primary: 2048  | 16 ,
-                        weight: 100 ,
+                        primary: KeyMod$1.CtrlCmd | KeyCode.UpArrow,
+                        weight: KeybindingWeight.EditorContrib,
                     },
                     {
                         when: ( (ContextKeyExpr.or(IsWindowsContext, IsLinuxContext))),
-                        primary: 2048  | 16 ,
-                        weight: 100 ,
+                        primary: KeyMod$1.CtrlCmd | KeyCode.UpArrow,
+                        weight: KeybindingWeight.EditorContrib,
                     }
                 ]
             });
@@ -188,26 +217,15 @@ function registerChatActions() {
             }
         }
     });
-    class ChatAccessibilityHelpContribution extends Disposable {
-        constructor() {
-            super();
-            this._register(AccessibilityHelpAction.addImplementation(105, 'panelChat', async (accessor) => {
-                const codeEditor = accessor.get(ICodeEditorService).getActiveCodeEditor() || accessor.get(ICodeEditorService).getFocusedCodeEditor();
-                runAccessibilityHelpAction(accessor, codeEditor ?? undefined, 'panelChat');
-            }, ( (ContextKeyExpr.or(CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST)))));
-        }
-    }
-    const workbenchRegistry = ( (Registry.as(Extensions.Workbench)));
-    workbenchRegistry.registerWorkbenchContribution(ChatAccessibilityHelpContribution, 4 );
     registerAction2(class FocusChatInputAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.focusInput',
-                title: ( localize2WithPath(_moduleId, 9, "Focus Chat Input")),
+                title: ( localize2WithPath(_moduleId, 10, "Focus Chat Input")),
                 f1: false,
                 keybinding: {
-                    primary: 2048  | 18 ,
-                    weight: 200 ,
+                    primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
                     when: ( (ContextKeyExpr.and(CONTEXT_IN_CHAT_SESSION,  (CONTEXT_IN_CHAT_INPUT.negate()))))
                 }
             });
@@ -218,4 +236,12 @@ function registerChatActions() {
         }
     });
 }
-export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID, isChatViewTitleActionContext, registerChatActions };
+function stringifyItem(item, includeName = true) {
+    if (isRequestVM(item)) {
+        return (includeName ? `${item.username}: ` : '') + item.messageText;
+    }
+    else {
+        return (includeName ? `${item.username}: ` : '') + item.response.asString();
+    }
+}
+export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID, isChatViewTitleActionContext, registerChatActions, stringifyItem };