@codingame/monaco-vscode-debug-service-override 11.1.1 → 12.0.0

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

@@ -1,6 +1,7 @@
+
 import { getDomNodePagePosition } from 'vscode/vscode/vs/base/browser/dom';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyChord, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
@@ -12,15 +13,16 @@ import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/acti
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+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 '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
+import { ChatContextKeys } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { openBreakpointSource } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from './disassemblyView.js';
-import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, 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';
+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';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
-import { DisassemblyViewInput } from '@codingame/monaco-vscode-debug-notebook-common/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
+import { DisassemblyViewInput } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
@@ -29,15 +31,15 @@ class ToggleBreakpointAction extends Action2 {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                ...( localize2(5922, "Debug: Toggle Breakpoint")),
-                mnemonicTitle: ( localize(5923, "Toggle &&Breakpoint")),
+                ...( localize2(5247, "Debug: Toggle Breakpoint")),
+                mnemonicTitle: ( localize(5248, "Toggle &&Breakpoint")),
             },
             f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             keybinding: {
-                when: ( (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))),
-                primary: 67 ,
-                weight: 100
+                when: ( ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
+                primary: KeyCode.F9,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: {
                 id: MenuId.MenubarDebugMenu,
@@ -70,18 +72,16 @@ class ToggleBreakpointAction extends Action2 {
         if (editor?.hasModel()) {
             const modelUri = editor.getModel().uri;
             const canSet = debugService.canSetBreakpointsIn(editor.getModel());
-            const lineNumbers = [...( (new Set(
-                 (editor.getSelections().map(s => s.getPosition().lineNumber))
-            )))];
-            await Promise.all(( (lineNumbers.map(async (line) => {
+            const lineNumbers = [...( new Set(( editor.getSelections().map(s => s.getPosition().lineNumber))))];
+            await Promise.all(( lineNumbers.map(async (line) => {
                 const bps = debugService.getModel().getBreakpoints({ lineNumber: line, uri: modelUri });
                 if (bps.length) {
-                    await Promise.all(( (bps.map(bp => debugService.removeBreakpoints(bp.getId())))));
+                    await Promise.all(( bps.map(bp => debugService.removeBreakpoints(bp.getId()))));
                 }
                 else if (canSet) {
                     await debugService.addBreakpoints(modelUri, [{ lineNumber: line }]);
                 }
-            }))));
+            })));
         }
     }
 }
@@ -89,12 +89,11 @@ class ConditionalBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.conditionalBreakpoint',
-            label: ( localize(5924, "Debug: Add Conditional Breakpoint...")),
-            alias: 'Debug: Add Conditional Breakpoint...',
+            label: ( localize2(5249, "Debug: Add Conditional Breakpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5925, "&&Conditional Breakpoint...")),
+                title: ( localize(5250, "&&Conditional Breakpoint...")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -105,7 +104,7 @@ class ConditionalBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, 0 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, BreakpointWidgetContext.CONDITION);
         }
     }
 }
@@ -113,13 +112,12 @@ class LogPointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.addLogPoint',
-            label: ( localize(5926, "Debug: Add Logpoint...")),
+            label: ( localize2(5251, "Debug: Add Logpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
-            alias: 'Debug: Add Logpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5927, "&&Logpoint...")),
+                    title: ( localize(5252, "&&Logpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -131,7 +129,7 @@ class LogPointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 2 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.LOG_MESSAGE);
         }
     }
 }
@@ -139,13 +137,13 @@ class TriggerByBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.triggerByBreakpoint',
-            label: ( localize(5928, "Debug: Add Triggered Breakpoint...")),
+            label: ( localize(5253, "Debug: Add Triggered Breakpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Triggered Breakpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5929, "&&Triggered Breakpoint...")),
+                    title: ( localize(5254, "&&Triggered Breakpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -157,7 +155,7 @@ class TriggerByBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 3 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.TRIGGER_POINT);
         }
     }
 }
@@ -165,12 +163,12 @@ class EditBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.editBreakpoint',
-            label: ( localize(5930, "Debug: Edit Breakpoint")),
+            label: ( localize(5255, "Debug: Edit Breakpoint")),
             alias: 'Debug: Edit Existing Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5931, "&&Edit Breakpoint")),
+                title: ( localize(5256, "&&Edit Breakpoint")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -188,12 +186,12 @@ class EditBreakpointAction extends EditorAction {
         if (lineBreakpoints.length === 0) {
             return;
         }
-        const breakpointDistances = ( (lineBreakpoints.map(b => {
+        const breakpointDistances = ( lineBreakpoints.map(b => {
             if (!b.column) {
                 return position.column;
             }
             return Math.abs(b.column - position.column);
-        })));
+        }));
         const closestBreakpointIndex = breakpointDistances.indexOf(Math.min(...breakpointDistances));
         const closestBreakpoint = lineBreakpoints[closestBreakpointIndex];
         editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(closestBreakpoint.lineNumber, closestBreakpoint.column);
@@ -205,8 +203,8 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                ...( localize2(5932, "Open Disassembly View")),
-                mnemonicTitle: ( localize(5933, "&&DisassemblyView")),
+                ...( localize2(5257, "Open Disassembly View")),
+                mnemonicTitle: ( localize(5258, "&&DisassemblyView")),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -214,33 +212,17 @@ class OpenDisassemblyViewAction extends Action2 {
                     id: MenuId.EditorContext,
                     group: 'debug',
                     order: 5,
-                    when: ( (ContextKeyExpr.and(
-                        CONTEXT_IN_DEBUG_MODE,
-                         (PanelFocusContext.toNegated()),
-                         (CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
-                        EditorContextKeys.editorTextFocus,
-                        CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED,
-                        CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST
-                    )))
+                    when: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ( PanelFocusContext.toNegated()), ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')), EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST))
                 },
                 {
                     id: MenuId.DebugCallStackContext,
                     group: 'z_commands',
                     order: 50,
-                    when: ( (ContextKeyExpr.and(
-                        CONTEXT_IN_DEBUG_MODE,
-                         (CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
-                         (CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame')),
-                        CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED
-                    )))
+                    when: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')), ( CONTEXT_CALLSTACK_ITEM_TYPE.isEqualTo('stackFrame')), CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED))
                 },
                 {
                     id: MenuId.CommandPalette,
-                    when: ( (ContextKeyExpr.and(
-                        CONTEXT_IN_DEBUG_MODE,
-                         (CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
-                        CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED
-                    )))
+                    when: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')), CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED))
                 }
             ]
         });
@@ -257,11 +239,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                ...( localize2(5934, "Toggle Source Code in Disassembly View")),
-                mnemonicTitle: ( localize(5935, "&&ToggleSource")),
+                ...( localize2(5259, "Toggle Source Code in Disassembly View")),
+                mnemonicTitle: ( localize(5260, "&&ToggleSource")),
             },
             metadata: {
-                description: ( localize2(5936, 'Shows or hides source code in disassembly'))
+                description: ( localize2(5261, 'Shows or hides source code in disassembly'))
             },
             f1: true,
         });
@@ -276,18 +258,13 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
 }
 class RunToCursorAction extends EditorAction {
     static { this.ID = 'editor.debug.action.runToCursor'; }
-    static { this.LABEL = ( localize2(5937, "Run to Cursor")); }
+    static { this.LABEL = ( localize2(5262, "Run to Cursor")); }
     constructor() {
         super({
             id: RunToCursorAction.ID,
             label: RunToCursorAction.LABEL.value,
             alias: 'Debug: Run to Cursor',
-            precondition: ( (ContextKeyExpr.and(
-                CONTEXT_DEBUGGERS_AVAILABLE,
-                 (PanelFocusContext.toNegated()),
-                 (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)),
-                 (CONTEXT_IN_CHAT_SESSION.negate())
-            ))),
+            precondition: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( PanelFocusContext.toNegated()), ( ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS)), ( ChatContextKeys.inChatSession.negate()))),
             contextMenuOpts: {
                 group: 'debug',
                 order: 2,
@@ -314,17 +291,13 @@ class RunToCursorAction extends EditorAction {
 }
 class SelectionToReplAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToRepl'; }
-    static { this.LABEL = ( localize2(5938, "Evaluate in Debug Console")); }
+    static { this.LABEL = ( localize2(5263, "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,
-                 (CONTEXT_IN_CHAT_SESSION.negate())
-            ))),
+            precondition: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus, ( ChatContextKeys.inChatSession.negate()))),
             contextMenuOpts: {
                 group: 'debug',
                 order: 0
@@ -353,17 +326,13 @@ class SelectionToReplAction extends EditorAction {
 }
 class SelectionToWatchExpressionsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToWatch'; }
-    static { this.LABEL = ( localize2(5939, "Add to Watch")); }
+    static { this.LABEL = ( localize2(5264, "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,
-                 (CONTEXT_IN_CHAT_SESSION.negate())
-            ))),
+            precondition: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, EditorContextKeys.editorTextFocus, ( ChatContextKeys.inChatSession.negate()))),
             contextMenuOpts: {
                 group: 'debug',
                 order: 1
@@ -402,13 +371,12 @@ class ShowDebugHoverAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.showDebugHover',
-            label: ( localize(5940, "Debug: Show Hover")),
-            alias: 'Debug: Show Hover',
+            label: ( localize2(5265, "Debug: Show Hover")),
             precondition: CONTEXT_IN_DEBUG_MODE,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 39 ),
-                weight: 100
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -420,21 +388,16 @@ class ShowDebugHoverAction extends EditorAction {
         return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
     }
 }
-const NO_TARGETS_MESSAGE = ( localize(5941, "Step targets are not available here"));
+const NO_TARGETS_MESSAGE = ( localize(5266, "Step targets are not available here"));
 class StepIntoTargetsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.stepIntoTargets'; }
-    static { this.LABEL = ( localize(5942, "Step Into Target")); }
+    static { this.LABEL = ( localize(5267, "Step Into Target")); }
     constructor() {
         super({
             id: StepIntoTargetsAction.ID,
             label: StepIntoTargetsAction.LABEL,
             alias: 'Debug: Step Into Target',
-            precondition: ( (ContextKeyExpr.and(
-                CONTEXT_STEP_INTO_TARGETS_SUPPORTED,
-                CONTEXT_IN_DEBUG_MODE,
-                 (CONTEXT_DEBUG_STATE.isEqualTo('stopped')),
-                EditorContextKeys.editorTextFocus
-            ))),
+            precondition: ( ContextKeyExpr.and(CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')), EditorContextKeys.editorTextFocus)),
             contextMenuOpts: {
                 group: 'debug',
                 order: 1.5
@@ -465,8 +428,8 @@ class StepIntoTargetsAction extends EditorAction {
             for (const target of targets) {
                 if (target.line) {
                     positionalTargets.push({
-                        start: ( (new Position(target.line, target.column || 1))),
-                        end: target.endLine ? ( (new Position(target.endLine, target.endColumn || 1))) : undefined,
+                        start: ( new Position(target.line, target.column || 1)),
+                        end: target.endLine ? ( new Position(target.endLine, target.endColumn || 1)) : undefined,
                         target
                     });
                 }
@@ -487,15 +450,13 @@ class StepIntoTargetsAction extends EditorAction {
         contextMenuService.showContextMenu({
             getAnchor: () => ({ x, y }),
             getActions: () => {
-                return (
-                     (targets.map(t => ( (new Action(
-                        `stepIntoTarget:${t.id}`,
-                        t.label,
-                        undefined,
-                        true,
-                        () => session.stepIn(frame.thread.threadId, t.id)
-                    )))))
-                );
+                return ( targets.map(t => ( new Action(
+                    `stepIntoTarget:${t.id}`,
+                    t.label,
+                    undefined,
+                    true,
+                    () => session.stepIn(frame.thread.threadId, t.id)
+                ))));
             }
         });
     }
@@ -519,8 +480,8 @@ class GoToBreakpointAction extends EditorAction {
             if (!moveBreakpoint) {
                 moveBreakpoint =
                     this.isNext
-                        ? allEnabledBreakpoints.filter(bp => ( (bp.uri.toString())) > ( (currentUri.toString()))).shift()
-                        : allEnabledBreakpoints.filter(bp => ( (bp.uri.toString())) < ( (currentUri.toString()))).pop();
+                        ? allEnabledBreakpoints.filter(bp => ( bp.uri.toString()) > ( currentUri.toString())).shift()
+                        : allEnabledBreakpoints.filter(bp => ( bp.uri.toString()) < ( currentUri.toString())).pop();
             }
             if (!moveBreakpoint && allEnabledBreakpoints.length) {
                 moveBreakpoint = this.isNext ? allEnabledBreakpoints[0] : allEnabledBreakpoints[allEnabledBreakpoints.length - 1];
@@ -535,8 +496,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(true, {
             id: 'editor.debug.action.goToNextBreakpoint',
-            label: ( localize(5943, "Debug: Go to Next Breakpoint")),
-            alias: 'Debug: Go to Next Breakpoint',
+            label: ( localize2(5268, "Debug: Go to Next Breakpoint")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
     }
@@ -545,8 +505,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(false, {
             id: 'editor.debug.action.goToPreviousBreakpoint',
-            label: ( localize(5944, "Debug: Go to Previous Breakpoint")),
-            alias: 'Debug: Go to Previous Breakpoint',
+            label: ( localize2(5269, "Debug: Go to Previous Breakpoint")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
     }
@@ -555,12 +514,11 @@ class CloseExceptionWidgetAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.closeExceptionWidget',
-            label: ( localize(5945, "Close Exception Widget")),
-            alias: 'Close Exception Widget',
+            label: ( localize2(5270, "Close Exception Widget")),
             precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
             kbOpts: {
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }

package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.d.ts

@@ -0,0 +1,64 @@
+import { IMouseEvent } from "vscode/vscode/vs/base/browser/mouseEvent";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+import { Position } from "vscode/vscode/vs/editor/common/core/position";
+import { ILanguageFeatureDebounceService } from "vscode/vscode/vs/editor/common/services/languageFeatureDebounce";
+import { ILanguageFeaturesService } from "vscode/vscode/vs/editor/common/services/languageFeatures";
+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";
+import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IUriIdentityService } from "vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { IDebugEditorContribution } from "vscode/vscode/vs/workbench/contrib/debug/common/debug";
+import { IDebugService } from "vscode/vscode/vs/workbench/contrib/debug/common/debug.service";
+import { IHostService } from "vscode/vscode/vs/workbench/services/host/browser/host.service";
+export declare const debugInlineForeground: string;
+export declare const debugInlineBackground: string;
+export declare class DebugEditorContribution implements IDebugEditorContribution {
+    private editor;
+    private readonly debugService;
+    private readonly instantiationService;
+    private readonly commandService;
+    private readonly configurationService;
+    private readonly hostService;
+    private readonly uriIdentityService;
+    private readonly languageFeaturesService;
+    private toDispose;
+    private hoverWidget;
+    private hoverPosition?;
+    private mouseDown;
+    private exceptionWidgetVisible;
+    private gutterIsHovered;
+    private exceptionWidget;
+    private configurationWidget;
+    private readonly altListener;
+    private altPressed;
+    private oldDecorations;
+    private readonly displayedStore;
+    private editorHoverOptions;
+    private readonly debounceInfo;
+    private readonly defaultHoverLockout;
+    constructor(editor: ICodeEditor, debugService: IDebugService, instantiationService: IInstantiationService, commandService: ICommandService, configurationService: IConfigurationService, hostService: IHostService, uriIdentityService: IUriIdentityService, contextKeyService: IContextKeyService, languageFeaturesService: ILanguageFeaturesService, featureDebounceService: ILanguageFeatureDebounceService);
+    private registerListeners;
+    private _wordToLineNumbersMap;
+    private updateHoverConfiguration;
+    private addDocumentListeners;
+    private applyDocumentListeners;
+    showHover(position: Position, focus: boolean, mouseEvent?: IMouseEvent): Promise<void>;
+    private preventDefaultEditorHover;
+    private showEditorHover;
+    private onFocusStackFrame;
+    private get hoverDelay();
+    private get showHoverScheduler();
+    private hideHoverWidget;
+    private onEditorMouseDown;
+    private onEditorMouseMove;
+    private onKeyDown;
+    private toggleExceptionWidget;
+    private showExceptionWidget;
+    closeExceptionWidget(): void;
+    addLaunchConfiguration(): Promise<void>;
+    private get removeInlineValuesScheduler();
+    private get updateInlineValuesScheduler();
+    private updateInlineValueDecorations;
+    dispose(): void;
+}