@codingame/monaco-vscode-debug-service-override 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js

@@ -59,7 +59,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             -1,
             contextViewService,
             defaultSelectBoxStyles,
-            { ariaLabel: ( localize(10246, 'Debug Launch Configurations')) }
+            { ariaLabel: ( localize(10278, 'Debug Launch Configurations')) }
         )));
         this.selectBox.setFocusable(false);
         this.toDispose.push(this.selectBox);
@@ -217,7 +217,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             });
         });
         if (this.debugOptions.length === 0) {
-            this.debugOptions.push({ label: ( localize(10247, "No Configurations")), handler: async () => false });
+            this.debugOptions.push({ label: ( localize(10279, "No Configurations")), handler: async () => false });
         }
         this.debugOptions.push({ label: StartDebugActionViewItem_1.SEPARATOR, handler: () => Promise.resolve(false) });
         disabledIdxs.push(this.debugOptions.length - 1);
@@ -235,7 +235,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             });
         });
         manager.getLaunches().filter(l => !l.hidden).forEach(l => {
-            const label = inWorkspace ? ( localize(10248, "Add Config ({0})...", l.name)) : ( localize(10249, "Add Configuration..."));
+            const label = inWorkspace ? ( localize(10280, "Add Config ({0})...", l.name)) : ( localize(10281, "Add Configuration..."));
             this.debugOptions.push({
                 label, handler: async () => {
                     await this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( (l.uri.toString())));
@@ -255,11 +255,11 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
             keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this.contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
-            ariaLabel = ( localize(10250, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(10282, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
         else {
             ariaLabel = ( localize(
-                10251,
+                10283,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -279,7 +279,7 @@ StartDebugActionViewItem = StartDebugActionViewItem_1 = ( (__decorate([
 ], StartDebugActionViewItem)));
 let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
     constructor(action, session, debugService, contextViewService, configurationService) {
-        super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10252, 'Debug Session')) });
+        super(null, action, [], -1, contextViewService, defaultSelectBoxStyles, { ariaLabel: ( localize(10284, 'Debug Session')) });
         this.debugService = debugService;
         this.configurationService = configurationService;
         this._register(this.debugService.getViewModel().onDidFocusSession(() => {

package/vscode/src/vs/workbench/contrib/debug/browser/debugAdapterManager.js

@@ -1,11 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { localize } from 'vscode/vscode/vs/nls';
+import { MenuId, MenuItemAction } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -19,6 +22,7 @@ import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, INTERNA
 import { Debugger } from '../common/debugger.js';
 import { debuggersExtPoint, breakpointsExtPoint, launchSchema, presentationSchema } from '../common/debugSchemas.js';
 import { TaskDefinitionRegistry } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskDefinitionRegistry';
+import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
@@ -27,7 +31,7 @@ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle
 
 const jsonRegistry = ( (Registry.as(Extensions.JSONContribution)));
 let AdapterManager = class AdapterManager extends Disposable {
-    constructor(delegate, editorService, configurationService, quickInputService, instantiationService, commandService, extensionService, contextKeyService, languageService, dialogService, lifecycleService) {
+    constructor(delegate, editorService, configurationService, quickInputService, instantiationService, commandService, extensionService, contextKeyService, languageService, dialogService, lifecycleService, tasksService, menuService) {
         super();
         this.editorService = editorService;
         this.configurationService = configurationService;
@@ -39,11 +43,14 @@ let AdapterManager = class AdapterManager extends Disposable {
         this.languageService = languageService;
         this.dialogService = dialogService;
         this.lifecycleService = lifecycleService;
+        this.tasksService = tasksService;
+        this.menuService = menuService;
         this.debugAdapterFactories = ( (new Map()));
         this._onDidRegisterDebugger = ( (new Emitter()));
         this._onDidDebuggersExtPointRead = ( (new Emitter()));
         this.breakpointContributions = [];
         this.debuggerWhenKeys = ( (new Set()));
+        this.taskLabels = [];
         this.usedDebugTypes = ( (new Set()));
         this.adapterDescriptorFactories = [];
         this.debuggers = [];
@@ -61,18 +68,24 @@ let AdapterManager = class AdapterManager extends Disposable {
         this._register(this.onDidDebuggersExtPointRead(() => {
             this.debugExtensionsAvailable.set(this.debuggers.length > 0);
         }));
+        const updateTaskScheduler = this._register(( (new RunOnceScheduler(() => this.updateTaskLabels(), 5000))));
+        this._register(Event.any(tasksService.onDidChangeTaskConfig, tasksService.onDidChangeTaskProviders)(() => {
+            updateTaskScheduler.cancel();
+            updateTaskScheduler.schedule();
+        }));
         this.lifecycleService.when(LifecyclePhase.Eventually)
             .then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0));
         this._register(delegate.onDidNewSession(s => {
             this.usedDebugTypes.add(s.configuration.type);
         }));
+        updateTaskScheduler.schedule();
     }
     registerListeners() {
         debuggersExtPoint.setHandler((extensions, delta) => {
             delta.added.forEach(added => {
                 added.value.forEach(rawAdapter => {
                     if (!rawAdapter.type || (typeof rawAdapter.type !== 'string')) {
-                        added.collector.error(( localize(5738, "Debugger 'type' can not be omitted and must be of type 'string'.")));
+                        added.collector.error(( localize(5678, "Debugger 'type' can not be omitted and must be of type 'string'.")));
                     }
                     if (rawAdapter.type !== '*') {
                         const existing = this.getDebugger(rawAdapter.type);
@@ -107,6 +120,12 @@ let AdapterManager = class AdapterManager extends Disposable {
             ))));
         });
     }
+    updateTaskLabels() {
+        this.tasksService.getKnownTasks().then(tasks => {
+            this.taskLabels = ( (tasks.map(task => task._label)));
+            this.updateDebugAdapterSchema();
+        });
+    }
     updateDebugAdapterSchema() {
         const items = launchSchema.properties['configurations'].items;
         const taskSchema = TaskDefinitionRegistry.getJsonSchema();
@@ -116,7 +135,7 @@ let AdapterManager = class AdapterManager extends Disposable {
                     'name': {
                         type: 'string',
                         description: ( localize(
-                            5739,
+                            5679,
                             "Name of configuration; appears in the launch configuration dropdown menu."
                         )),
                         default: 'Launch'
@@ -124,7 +143,7 @@ let AdapterManager = class AdapterManager extends Disposable {
                     'debugServer': {
                         type: 'number',
                         description: ( localize(
-                            5740,
+                            5680,
                             "For debug extension development only: if a port is specified VS Code tries to connect to a debug adapter running in server mode"
                         )),
                         default: 4711
@@ -135,7 +154,8 @@ let AdapterManager = class AdapterManager extends Disposable {
                             }],
                         default: '',
                         defaultSnippets: [{ body: { task: '', type: '' } }],
-                        description: ( localize(5741, "Task to run before debug session starts."))
+                        description: ( localize(5681, "Task to run before debug session starts.")),
+                        examples: this.taskLabels,
                     },
                     'postDebugTask': {
                         anyOf: [taskSchema, {
@@ -143,14 +163,15 @@ let AdapterManager = class AdapterManager extends Disposable {
                             }],
                         default: '',
                         defaultSnippets: [{ body: { task: '', type: '' } }],
-                        description: ( localize(5742, "Task to run after debug session ends."))
+                        description: ( localize(5682, "Task to run after debug session ends.")),
+                        examples: this.taskLabels,
                     },
                     'presentation': presentationSchema,
                     'internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
                     'suppressMultipleSessionWarning': {
                         type: 'boolean',
                         description: ( localize(
-                            5743,
+                            5683,
                             "Disable the warning when trying to start the same debug configuration more than once."
                         )),
                         default: true
@@ -306,11 +327,11 @@ let AdapterManager = class AdapterManager extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity$1.Warning,
                 message: ( localize(
-                    5744,
+                    5684,
                     "You don't have an extension for debugging {0}. Should we find a {0} extension in the Marketplace?",
                     languageLabel
                 )),
-                primaryButton: ( localize(5745, "&&Find {0} extension", languageLabel))
+                primaryButton: ( localize(5685, "&&Find {0} extension", languageLabel))
             });
             if (confirmed) {
                 await this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
@@ -336,7 +357,7 @@ let AdapterManager = class AdapterManager extends Disposable {
         });
         const picks = [];
         if (suggestedCandidates.length > 0) {
-            picks.push({ type: 'separator', label: ( localize(5746, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
+            picks.push({ type: 'separator', label: ( localize(5686, "Suggested")) }, ...( (suggestedCandidates.map(c => ({ label: c.label, debugger: c })))));
         }
         if (otherCandidates.length > 0) {
             if (picks.length > 0) {
@@ -344,13 +365,23 @@ let AdapterManager = class AdapterManager extends Disposable {
             }
             picks.push(...( (otherCandidates.map(c => ({ label: c.label, debugger: c })))));
         }
-        picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5747, "Install an extension for {0}...", languageLabel)) : ( localize(5748, "Install extension...")) });
-        const placeHolder = ( localize(5749, "Select debugger"));
+        picks.push({ type: 'separator', label: '' }, { label: languageLabel ? ( localize(5687, "Install an extension for {0}...", languageLabel)) : ( localize(5688, "Install extension...")) });
+        const contributed = this.menuService.getMenuActions(MenuId.DebugCreateConfiguration, this.contextKeyService);
+        for (const [, action] of contributed) {
+            for (const item of action) {
+                picks.push(item);
+            }
+        }
+        const placeHolder = ( localize(5689, "Select debugger"));
         return this.quickInputService.pick(picks, { activeItem: picks[0], placeHolder })
-            .then(picked => {
-            if (picked && picked.debugger) {
+            .then(async (picked) => {
+            if (picked && 'debugger' in picked && picked.debugger) {
                 return picked.debugger;
             }
+            else if (picked instanceof MenuItemAction) {
+                picked.run();
+                return;
+            }
             if (picked) {
                 this.commandService.executeCommand('debug.installAdditionalDebuggers', languageLabel);
             }
@@ -390,7 +421,9 @@ AdapterManager = ( (__decorate([
     ( (__param(7, IContextKeyService))),
     ( (__param(8, ILanguageService))),
     ( (__param(9, IDialogService))),
-    ( (__param(10, ILifecycleService)))
+    ( (__param(10, ILifecycleService))),
+    ( (__param(11, ITaskService))),
+    ( (__param(12, IMenuService)))
 ], AdapterManager)));
 
 export { AdapterManager };

package/vscode/src/vs/workbench/contrib/debug/browser/debugConfigurationManager.js

@@ -16,6 +16,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
@@ -42,7 +43,7 @@ const DEBUG_SELECTED_ROOT = 'debug.selectedroot';
 const DEBUG_SELECTED_TYPE = 'debug.selectedtype';
 const DEBUG_RECENT_DYNAMIC_CONFIGURATIONS = 'debug.recentdynamicconfigurations';
 let ConfigurationManager = class ConfigurationManager {
-    constructor(adapterManager, contextService, configurationService, quickInputService, instantiationService, storageService, extensionService, historyService, uriIdentityService, contextKeyService) {
+    constructor(adapterManager, contextService, configurationService, quickInputService, instantiationService, storageService, extensionService, historyService, uriIdentityService, contextKeyService, logService) {
         this.adapterManager = adapterManager;
         this.contextService = contextService;
         this.configurationService = configurationService;
@@ -52,6 +53,7 @@ let ConfigurationManager = class ConfigurationManager {
         this.extensionService = extensionService;
         this.historyService = historyService;
         this.uriIdentityService = uriIdentityService;
+        this.logService = logService;
         this.getSelectedConfig = () => Promise.resolve(undefined);
         this.selectedDynamic = false;
         this._onDidSelectConfigurationName = ( (new Emitter()));
@@ -191,7 +193,7 @@ let ConfigurationManager = class ConfigurationManager {
                                     config,
                                     buttons: [{
                                             iconClass: ThemeIcon.asClassName(debugConfigure),
-                                            tooltip: ( localize(5784, "Edit Debug Configuration in launch.json"))
+                                            tooltip: ( localize(5724, "Edit Debug Configuration in launch.json"))
                                         }],
                                     launch
                                 }))))));
@@ -200,7 +202,7 @@ let ConfigurationManager = class ConfigurationManager {
                         const disposables = ( (new DisposableStore()));
                         const input = disposables.add(this.quickInputService.createQuickPick());
                         input.busy = true;
-                        input.placeholder = ( localize(5785, "Select Launch Configuration"));
+                        input.placeholder = ( localize(5725, "Select Launch Configuration"));
                         const chosenPromise = ( (new Promise(resolve => {
                             disposables.add(input.onDidAccept(() => resolve(input.activeItems[0])));
                             disposables.add(input.onDidTriggerItemButton(async (context) => {
@@ -213,7 +215,15 @@ let ConfigurationManager = class ConfigurationManager {
                             }));
                             disposables.add(input.onDidHide(() => resolve(undefined)));
                         })));
-                        const nestedPicks = await Promise.all(picks);
+                        let nestedPicks;
+                        try {
+                            nestedPicks = await Promise.all(picks);
+                        }
+                        catch (err) {
+                            this.logService.error(err);
+                            disposables.dispose();
+                            return;
+                        }
                         const items = nestedPicks.flat();
                         input.items = items;
                         input.busy = false;
@@ -414,7 +424,8 @@ ConfigurationManager = ( (__decorate([
     ( (__param(6, IExtensionService))),
     ( (__param(7, IHistoryService))),
     ( (__param(8, IUriIdentityService))),
-    ( (__param(9, IContextKeyService)))
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, ILogService)))
 ], ConfigurationManager)));
 class AbstractLaunch {
     constructor(configurationManager, adapterManager) {
@@ -522,7 +533,7 @@ let Launch = class Launch extends AbstractLaunch {
             }
             catch (error) {
                 throw ( (new Error(localize(
-                    5786,
+                    5726,
                     "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).",
                     error.message
                 ))));
@@ -579,7 +590,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
         return this.contextService.getWorkspace().configuration;
     }
     get name() {
-        return ( localize(5787, "workspace"));
+        return ( localize(5727, "workspace"));
     }
     getConfig() {
         return this.configurationService.inspect('launch').workspaceValue;
@@ -623,7 +634,7 @@ let UserLaunch = class UserLaunch extends AbstractLaunch {
         return this.preferencesService.userSettingsResource;
     }
     get name() {
-        return ( localize(5788, "user settings"));
+        return ( localize(5728, "user settings"));
     }
     get hidden() {
         return true;

package/vscode/src/vs/workbench/contrib/debug/browser/debugConsoleQuickAccess.js

@@ -26,7 +26,7 @@ let DebugConsoleQuickAccess = class DebugConsoleQuickAccess extends PickerQuickA
         if (debugConsolePicks.length > 0) {
             debugConsolePicks.push({ type: 'separator' });
         }
-        const createTerminalLabel = ( localize(5946, "Start a New Debug Session"));
+        const createTerminalLabel = ( localize(5889, "Start a New Debug Session"));
         debugConsolePicks.push({
             label: `$(plus) ${createTerminalLabel}`,
             ariaLabel: createTerminalLabel,

package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorActions.js

@@ -15,6 +15,7 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from './disassemblyView.js';
 import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, REPL_VIEW_ID, WATCH_VIEW_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -29,8 +30,8 @@ class ToggleBreakpointAction extends Action2 {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                ...( localize2(5947, "Debug: Toggle Breakpoint")),
-                mnemonicTitle: ( localize(5948, "Toggle &&Breakpoint")),
+                ...( localize2(5890, "Debug: Toggle Breakpoint")),
+                mnemonicTitle: ( localize(5891, "Toggle &&Breakpoint")),
             },
             f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -89,12 +90,12 @@ class ConditionalBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.conditionalBreakpoint',
-            label: ( localize(5949, "Debug: Add Conditional Breakpoint...")),
+            label: ( localize(5892, "Debug: Add Conditional Breakpoint...")),
             alias: 'Debug: Add Conditional Breakpoint...',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5950, "&&Conditional Breakpoint...")),
+                title: ( localize(5893, "&&Conditional Breakpoint...")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -113,13 +114,13 @@ class LogPointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.addLogPoint',
-            label: ( localize(5951, "Debug: Add Logpoint...")),
+            label: ( localize(5894, "Debug: Add Logpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Add Logpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5952, "&&Logpoint...")),
+                    title: ( localize(5895, "&&Logpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -139,13 +140,13 @@ class TriggerByBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.triggerByBreakpoint',
-            label: ( localize(5953, "Debug: Add Triggered Breakpoint...")),
+            label: ( localize(5896, "Debug: Add Triggered Breakpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Triggered Breakpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5954, "&&Triggered Breakpoint...")),
+                    title: ( localize(5897, "&&Triggered Breakpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -165,12 +166,12 @@ class EditBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.editBreakpoint',
-            label: ( localize(5955, "Debug: Edit Breakpoint")),
+            label: ( localize(5898, "Debug: Edit Breakpoint")),
             alias: 'Debug: Edit Existing Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5956, "&&Edit Breakpoint")),
+                title: ( localize(5899, "&&Edit Breakpoint")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -205,8 +206,8 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                ...( localize2(5957, "Open Disassembly View")),
-                mnemonicTitle: ( localize(5958, "&&DisassemblyView")),
+                ...( localize2(5900, "Open Disassembly View")),
+                mnemonicTitle: ( localize(5901, "&&DisassemblyView")),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -257,11 +258,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                ...( localize2(5959, "Toggle Source Code in Disassembly View")),
-                mnemonicTitle: ( localize(5960, "&&ToggleSource")),
+                ...( localize2(5902, "Toggle Source Code in Disassembly View")),
+                mnemonicTitle: ( localize(5903, "&&ToggleSource")),
             },
             metadata: {
-                description: ( localize2(5961, 'Shows or hides source code in disassembly'))
+                description: ( localize2(5904, 'Shows or hides source code in disassembly'))
             },
             f1: true,
         });
@@ -276,7 +277,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
 }
 class RunToCursorAction extends EditorAction {
     static { this.ID = 'editor.debug.action.runToCursor'; }
-    static { this.LABEL = ( localize2(5962, "Run to Cursor")); }
+    static { this.LABEL = ( localize2(5905, "Run to Cursor")); }
     constructor() {
         super({
             id: RunToCursorAction.ID,
@@ -285,7 +286,8 @@ class RunToCursorAction extends EditorAction {
             precondition: ( (ContextKeyExpr.and(
                 CONTEXT_DEBUGGERS_AVAILABLE,
                  (PanelFocusContext.toNegated()),
-                 (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))
+                 (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
+                 (CONTEXT_IN_CHAT_SESSION.negate())
             ))),
             contextMenuOpts: {
                 group: 'debug',
@@ -313,13 +315,17 @@ class RunToCursorAction extends EditorAction {
 }
 class SelectionToReplAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToRepl'; }
-    static { this.LABEL = ( localize2(5963, "Evaluate in Debug Console")); }
+    static { this.LABEL = ( localize2(5906, "Evaluate in Debug Console")); }
     constructor() {
         super({
             id: SelectionToReplAction.ID,
             label: SelectionToReplAction.LABEL.value,
             alias: 'Debug: Evaluate in Console',
-            precondition: ( (ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus))),
+            precondition: ( (ContextKeyExpr.and(
+                CONTEXT_IN_DEBUG_MODE,
+                EditorContextKeys.editorTextFocus,
+                 (CONTEXT_IN_CHAT_SESSION.negate())
+            ))),
             contextMenuOpts: {
                 group: 'debug',
                 order: 0
@@ -348,13 +354,17 @@ class SelectionToReplAction extends EditorAction {
 }
 class SelectionToWatchExpressionsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToWatch'; }
-    static { this.LABEL = ( localize2(5964, "Add to Watch")); }
+    static { this.LABEL = ( localize2(5907, "Add to Watch")); }
     constructor() {
         super({
             id: SelectionToWatchExpressionsAction.ID,
             label: SelectionToWatchExpressionsAction.LABEL.value,
             alias: 'Debug: Add to Watch',
-            precondition: ( (ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus))),
+            precondition: ( (ContextKeyExpr.and(
+                CONTEXT_IN_DEBUG_MODE,
+                EditorContextKeys.editorTextFocus,
+                 (CONTEXT_IN_CHAT_SESSION.negate())
+            ))),
             contextMenuOpts: {
                 group: 'debug',
                 order: 1
@@ -393,7 +403,7 @@ class ShowDebugHoverAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.showDebugHover',
-            label: ( localize(5965, "Debug: Show Hover")),
+            label: ( localize(5908, "Debug: Show Hover")),
             alias: 'Debug: Show Hover',
             precondition: CONTEXT_IN_DEBUG_MODE,
             kbOpts: {
@@ -411,10 +421,10 @@ class ShowDebugHoverAction extends EditorAction {
         return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
     }
 }
-const NO_TARGETS_MESSAGE = ( localize(5966, "Step targets are not available here"));
+const NO_TARGETS_MESSAGE = ( localize(5909, "Step targets are not available here"));
 class StepIntoTargetsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.stepIntoTargets'; }
-    static { this.LABEL = ( localize(5967, "Step Into Target")); }
+    static { this.LABEL = ( localize(5910, "Step Into Target")); }
     constructor() {
         super({
             id: StepIntoTargetsAction.ID,
@@ -526,7 +536,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(true, {
             id: 'editor.debug.action.goToNextBreakpoint',
-            label: ( localize(5968, "Debug: Go to Next Breakpoint")),
+            label: ( localize(5911, "Debug: Go to Next Breakpoint")),
             alias: 'Debug: Go to Next Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -536,7 +546,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(false, {
             id: 'editor.debug.action.goToPreviousBreakpoint',
-            label: ( localize(5969, "Debug: Go to Previous Breakpoint")),
+            label: ( localize(5912, "Debug: Go to Previous Breakpoint")),
             alias: 'Debug: Go to Previous Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -546,7 +556,7 @@ class CloseExceptionWidgetAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.closeExceptionWidget',
-            label: ( localize(5970, "Close Exception Widget")),
+            label: ( localize(5913, "Close Exception Widget")),
             alias: 'Close Exception Widget',
             precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
             kbOpts: {

package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js

@@ -31,7 +31,7 @@ import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
 import { ILanguageFeatureDebounceService } from 'vscode/vscode/vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
+import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
 import { HoverStartMode, HoverStartSource } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverOperation';
 import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
@@ -318,7 +318,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         if (this.defaultHoverLockout.value || this.editorHoverOptions?.enabled === false) {
             return;
         }
-        const hoverController = this.editor.getContribution(HoverController.ID);
+        const hoverController = this.editor.getContribution(ContentHoverController.ID);
         hoverController?.hideContentHover();
         this.editor.updateOptions({ hover: { enabled: false } });
         this.defaultHoverLockout.value = {
@@ -330,7 +330,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         };
     }
     showEditorHover(position, focus) {
-        const hoverController = this.editor.getContribution(HoverController.ID);
+        const hoverController = this.editor.getContribution(ContentHoverController.ID);
         const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
         this.defaultHoverLockout.clear();
         hoverController?.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Mouse, focus);