@codingame/monaco-vscode-debug-service-override 2.2.1 → 3.0.0

package/debug.js

@@ -8,6 +8,7 @@ import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/servic
 import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug';
 import { BrowserExtensionHostDebugService } from './vscode/src/vs/workbench/contrib/debug/browser/extensionHostDebugService.js';
 import { IDebugVisualizerService, DebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers';
+import './tools/debugAssets.js';
 import './vscode/src/vs/workbench/contrib/debug/browser/debug.contribution.js';
 
 const original = DebugService.prototype['showError'];

package/package.json

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

package/tools/debugAssets.js

@@ -0,0 +1,4 @@
+import pngAssets from '../vscode/src/vs/workbench/contrib/debug/browser/media/all.png.js';
+import { registerAssets } from 'vscode/assets';
+
+registerAssets(pngAssets);

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

@@ -448,10 +448,10 @@ let SessionsRenderer = class SessionsRenderer {
         const templateDisposable = ( new DisposableStore());
         const stopActionViewItemDisposables = templateDisposable.add(( new DisposableStore()));
         const actionBar = templateDisposable.add(( new ActionBar(session, {
-            actionViewItemProvider: action => {
+            actionViewItemProvider: (action, options) => {
                 if ((action.id === STOP_ID || action.id === DISCONNECT_ID) && action instanceof MenuItemAction) {
                     stopActionViewItemDisposables.clear();
-                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, stopActionViewItemDisposables, accessor));
+                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, stopActionViewItemDisposables, accessor, options));
                     if (item) {
                         return item;
                     }

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

@@ -1,3 +1,4 @@
+import { FileAccess } from 'vscode/vscode/vs/base/common/network';
 import { isWeb, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import './media/debug.contribution.css.js';
 import './media/debugHover.css.js';
@@ -19,7 +20,7 @@ import { BreakpointsView } from 'vscode/vscode/vs/workbench/contrib/debug/browse
 import { CallStackEditorContribution } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { CallStackView } from './callStackView.js';
 import { registerColors } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugColors';
-import { DEBUG_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_DEBUG_CONSOLE_ID, TERMINATE_THREAD_ID, STEP_OVER_LABEL, STEP_OVER_ID, STEP_INTO_LABEL, STEP_INTO_ID, STEP_INTO_TARGET_LABEL, STEP_INTO_TARGET_ID, STEP_OUT_LABEL, STEP_OUT_ID, PAUSE_LABEL, PAUSE_ID, STOP_LABEL, STOP_ID, CONTINUE_LABEL, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, TOGGLE_INLINE_BREAKPOINT_ID, SELECT_AND_START_LABEL, CALLSTACK_TOP_LABEL, CALLSTACK_TOP_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_UP_LABEL, CALLSTACK_UP_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_DOWN_ID, RESTART_LABEL, RESTART_SESSION_ID, DISCONNECT_LABEL, DISCONNECT_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_AND_SUSPEND_ID, RESTART_FRAME_ID, COPY_STACK_TRACE_ID, EDIT_EXPRESSION_COMMAND_ID, SET_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID, DEBUG_COMMAND_CATEGORY, NEXT_DEBUG_CONSOLE_LABEL, NEXT_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, PREV_DEBUG_CONSOLE_ID, OPEN_LOADED_SCRIPTS_LABEL, SHOW_LOADED_SCRIPTS_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_LABEL, SELECT_DEBUG_SESSION_ID } from './debugCommands.js';
+import { DEBUG_QUICK_ACCESS_PREFIX, SELECT_AND_START_ID, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, SELECT_DEBUG_CONSOLE_ID, TERMINATE_THREAD_ID, STEP_OVER_LABEL, STEP_OVER_ID, STEP_INTO_LABEL, STEP_INTO_ID, STEP_INTO_TARGET_LABEL, STEP_INTO_TARGET_ID, STEP_OUT_LABEL, STEP_OUT_ID, PAUSE_LABEL, PAUSE_ID, DISCONNECT_LABEL, DISCONNECT_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_AND_SUSPEND_ID, STOP_LABEL, STOP_ID, CONTINUE_LABEL, CONTINUE_ID, FOCUS_REPL_ID, JUMP_TO_CURSOR_ID, TOGGLE_INLINE_BREAKPOINT_ID, DEBUG_START_LABEL, DEBUG_START_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_RUN_COMMAND_ID, SELECT_AND_START_LABEL, CALLSTACK_TOP_LABEL, CALLSTACK_TOP_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_BOTTOM_ID, CALLSTACK_UP_LABEL, CALLSTACK_UP_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_DOWN_ID, RESTART_LABEL, RESTART_SESSION_ID, RESTART_FRAME_ID, COPY_STACK_TRACE_ID, EDIT_EXPRESSION_COMMAND_ID, SET_EXPRESSION_COMMAND_ID, REMOVE_EXPRESSION_COMMAND_ID, ADD_CONFIGURATION_ID, DEBUG_COMMAND_CATEGORY, NEXT_DEBUG_CONSOLE_LABEL, NEXT_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, PREV_DEBUG_CONSOLE_ID, OPEN_LOADED_SCRIPTS_LABEL, SHOW_LOADED_SCRIPTS_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_LABEL, SELECT_DEBUG_SESSION_ID } from './debugCommands.js';
 import { DebugConsoleQuickAccess } from './debugConsoleQuickAccess.js';
 import { RunToCursorAction, SelectionToReplAction, SelectionToWatchExpressionsAction } from './debugEditorActions.js';
 import { DebugEditorContribution } from './debugEditorContribution.js';
@@ -37,10 +38,11 @@ import { StatusBarColorProvider } from './statusbarColorProvider.js';
 import { VIEW_MEMORY_ID, SET_VARIABLE_ID, COPY_VALUE_ID, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_IS_READ_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, VariablesView } from './variablesView.js';
 import { WatchExpressionsView, ADD_WATCH_LABEL, ADD_WATCH_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID } from './watchExpressionsView.js';
 import { WelcomeView } from './welcomeView.js';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_VARIABLE_VALUE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { DebugLifecycle } from '../common/debugLifecycle.js';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
+import { COPY_NOTEBOOK_VARIABLE_VALUE_LABEL, COPY_NOTEBOOK_VARIABLE_VALUE_ID } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 
 const debugCategory = ( localizeWithPath(
@@ -108,6 +110,7 @@ const registerDebugCommandPaletteItem = (id, title, when, precondition) => {
         }
     });
 };
+registerDebugCommandPaletteItem(RESTART_SESSION_ID, RESTART_LABEL);
 registerDebugCommandPaletteItem(TERMINATE_THREAD_ID, ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'terminateThread',
@@ -118,6 +121,8 @@ registerDebugCommandPaletteItem(STEP_INTO_ID, STEP_INTO_LABEL, CONTEXT_IN_DEBUG_
 registerDebugCommandPaletteItem(STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.and(CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')))));
 registerDebugCommandPaletteItem(STEP_OUT_ID, STEP_OUT_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugCommandPaletteItem(PAUSE_ID, PAUSE_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.and(( CONTEXT_DEBUG_STATE.isEqualTo('running')), ( CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated()))));
+registerDebugCommandPaletteItem(DISCONNECT_ID, DISCONNECT_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.or(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)));
+registerDebugCommandPaletteItem(DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.or(CONTEXT_FOCUSED_SESSION_IS_ATTACH, ( ContextKeyExpr.and(CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)))));
 registerDebugCommandPaletteItem(STOP_ID, STOP_LABEL, CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.or(( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)));
 registerDebugCommandPaletteItem(CONTINUE_ID, CONTINUE_LABEL, CONTEXT_IN_DEBUG_MODE, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugCommandPaletteItem(FOCUS_REPL_ID, ( localize2WithPath(
@@ -143,6 +148,8 @@ registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, ( localize2WithPath
     'inlineBreakpoint',
     "Inline Breakpoint"
 )));
+registerDebugCommandPaletteItem(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 ))))));
+registerDebugCommandPaletteItem(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 ))))));
 registerDebugCommandPaletteItem(SELECT_AND_START_ID, SELECT_AND_START_LABEL, ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 ))))));
 registerDebugCommandPaletteItem(NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL);
 registerDebugCommandPaletteItem(PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL);
@@ -293,6 +300,30 @@ registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_EXPRESSION_COMMAND_ID
     "Remove Expression"
 )), 20, ( CONTEXT_WATCH_ITEM_TYPE.isEqualTo('expression')), undefined, 'inline', watchExpressionRemove);
 registerDebugViewMenuItem(MenuId.DebugWatchContext, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, 20, undefined, undefined, 'z_commands');
+registerDebugViewMenuItem(MenuId.NotebookVariablesContext, COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL, 20, CONTEXT_VARIABLE_VALUE);
+if (isMacintosh) {
+    const registerTouchBarEntry = (id, title, order, when, iconUri) => {
+        MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
+            command: {
+                id,
+                title,
+                icon: { dark: iconUri }
+            },
+            when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when)),
+            group: '9_debug',
+            order
+        });
+    };
+    registerTouchBarEntry(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, 0, ( CONTEXT_IN_DEBUG_MODE.toNegated()), ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png')));
+    registerTouchBarEntry(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, 1, ( CONTEXT_IN_DEBUG_MODE.toNegated()), ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/run-with-debugging-tb.png')));
+    registerTouchBarEntry(CONTINUE_ID, CONTINUE_LABEL, 0, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')), ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/continue-tb.png')));
+    registerTouchBarEntry(PAUSE_ID, PAUSE_LABEL, 1, ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, ( ContextKeyExpr.and(( CONTEXT_DEBUG_STATE.isEqualTo('running')), ( CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated()))))), ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/pause-tb.png')));
+    registerTouchBarEntry(STEP_OVER_ID, STEP_OVER_LABEL, 2, CONTEXT_IN_DEBUG_MODE, ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepover-tb.png')));
+    registerTouchBarEntry(STEP_INTO_ID, STEP_INTO_LABEL, 3, CONTEXT_IN_DEBUG_MODE, ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepinto-tb.png')));
+    registerTouchBarEntry(STEP_OUT_ID, STEP_OUT_LABEL, 4, CONTEXT_IN_DEBUG_MODE, ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stepout-tb.png')));
+    registerTouchBarEntry(RESTART_SESSION_ID, RESTART_LABEL, 5, CONTEXT_IN_DEBUG_MODE, ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/restart-tb.png')));
+    registerTouchBarEntry(STOP_ID, STOP_LABEL, 6, CONTEXT_IN_DEBUG_MODE, ( FileAccess.asFileUri('vs/workbench/contrib/debug/browser/media/stop-tb.png')));
+}
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { submenu: MenuId.EditorTitleRun, rememberDefaultAction: true, title: ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debug.contribution',
     'run',
@@ -301,8 +332,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { submenu: MenuId.EditorTitleRun
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     submenu: MenuId.MenubarDebugMenu,
     title: {
-        value: 'Run',
-        original: 'Run',
+        ...( localize2WithPath('vs/workbench/contrib/debug/browser/debug.contribution', 'runMenu', "Run")),
         mnemonicTitle: ( localizeWithPath(
             'vs/workbench/contrib/debug/browser/debug.contribution',
             { key: 'mRun', comment: ['&& denotes a mnemonic'] },
@@ -311,6 +341,129 @@ MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
     },
     order: 6
 });
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '1_debug',
+    command: {
+        id: DEBUG_START_COMMAND_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miStartDebugging', comment: ['&& denotes a mnemonic'] },
+            "&&Start Debugging"
+        ))
+    },
+    order: 1,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '1_debug',
+    command: {
+        id: DEBUG_RUN_COMMAND_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miRun', comment: ['&& denotes a mnemonic'] },
+            "Run &&Without Debugging"
+        ))
+    },
+    order: 2,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '1_debug',
+    command: {
+        id: STOP_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miStopDebugging', comment: ['&& denotes a mnemonic'] },
+            "&&Stop Debugging"
+        )),
+        precondition: CONTEXT_IN_DEBUG_MODE
+    },
+    order: 3,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '1_debug',
+    command: {
+        id: RESTART_SESSION_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miRestart Debugging', comment: ['&& denotes a mnemonic'] },
+            "&&Restart Debugging"
+        )),
+        precondition: CONTEXT_IN_DEBUG_MODE
+    },
+    order: 4,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '2_configuration',
+    command: {
+        id: ADD_CONFIGURATION_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miAddConfiguration', comment: ['&& denotes a mnemonic'] },
+            "A&&dd Configuration..."
+        ))
+    },
+    order: 2,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '3_step',
+    command: {
+        id: STEP_OVER_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miStepOver', comment: ['&& denotes a mnemonic'] },
+            "Step &&Over"
+        )),
+        precondition: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
+    },
+    order: 1,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '3_step',
+    command: {
+        id: STEP_INTO_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miStepInto', comment: ['&& denotes a mnemonic'] },
+            "Step &&Into"
+        )),
+        precondition: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
+    },
+    order: 2,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '3_step',
+    command: {
+        id: STEP_OUT_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miStepOut', comment: ['&& denotes a mnemonic'] },
+            "Step O&&ut"
+        )),
+        precondition: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
+    },
+    order: 3,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '3_step',
+    command: {
+        id: CONTINUE_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miContinue', comment: ['&& denotes a mnemonic'] },
+            "&&Continue"
+        )),
+        precondition: ( CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
+    },
+    order: 4,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
 MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
     group: '1_breakpoints',
     command: {
@@ -324,6 +477,29 @@ MenuRegistry.appendMenuItem(MenuId.MenubarNewBreakpointMenu, {
     order: 2,
     when: CONTEXT_DEBUGGERS_AVAILABLE
 });
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: '4_new_breakpoint',
+    title: ( localizeWithPath(
+        'vs/workbench/contrib/debug/browser/debug.contribution',
+        { key: 'miNewBreakpoint', comment: ['&& denotes a mnemonic'] },
+        "&&New Breakpoint"
+    )),
+    submenu: MenuId.MenubarNewBreakpointMenu,
+    order: 2,
+    when: CONTEXT_DEBUGGERS_AVAILABLE
+});
+MenuRegistry.appendMenuItem(MenuId.MenubarDebugMenu, {
+    group: 'z_install',
+    command: {
+        id: 'debug.installAdditionalDebuggers',
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debug.contribution',
+            { key: 'miInstallAdditionalDebuggers', comment: ['&& denotes a mnemonic'] },
+            "&&Install Additional Debuggers..."
+        ))
+    },
+    order: 1
+});
 const VIEW_CONTAINER = ( Registry.as(Extensions$2.ViewContainersRegistry)).registerViewContainer({
     id: DEBUG_PANEL_ID,
     title: ( localize2WithPath(

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

@@ -22,8 +22,8 @@ const $ = $$1;
 let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseActionViewItem {
     static { StartDebugActionViewItem_1 = this; }
     static { this.SEPARATOR = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500'; }
-    constructor(context, action, debugService, configurationService, commandService, contextService, contextViewService, keybindingService) {
-        super(context, action);
+    constructor(context, action, options, debugService, configurationService, commandService, contextService, contextViewService, keybindingService) {
+        super(context, action, options);
         this.context = context;
         this.debugService = debugService;
         this.configurationService = configurationService;
@@ -245,12 +245,12 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
     }
 };
 StartDebugActionViewItem = StartDebugActionViewItem_1 = ( __decorate([
-    ( __param(2, IDebugService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, IWorkspaceContextService)),
-    ( __param(6, IContextViewService)),
-    ( __param(7, IKeybindingService))
+    ( __param(3, IDebugService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, ICommandService)),
+    ( __param(6, IWorkspaceContextService)),
+    ( __param(7, IContextViewService)),
+    ( __param(8, IKeybindingService))
 ], StartDebugActionViewItem));
 let FocusSessionActionViewItem = class FocusSessionActionViewItem extends SelectActionViewItem {
     constructor(action, session, debugService, contextViewService, configurationService) {