@codingame/monaco-vscode-debug-service-override 16.1.1 → 17.0.0

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

@@ -30,9 +30,9 @@ var TaskRunResult;
     TaskRunResult[TaskRunResult["Success"] = 1] = "Success";
 })(TaskRunResult || (TaskRunResult = {}));
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
-const ABORT_LABEL = ( localize(5771, "Abort"));
-const DEBUG_ANYWAY_LABEL = ( localize(5772, "&&Debug Anyway"));
-const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5773, "Debug Anyway"));
+const ABORT_LABEL = ( localize(5858, "Abort"));
+const DEBUG_ANYWAY_LABEL = ( localize(5859, "&&Debug Anyway"));
+const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5860, "Debug Anyway"));
 let DebugTaskRunner = class DebugTaskRunner {
     constructor(taskService, markerService, configurationService, viewsService, dialogService, storageService, commandService, progressService) {
         this.taskService = taskService;
@@ -74,17 +74,17 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( localize(5774, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
+                ? ( localize(5861, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localize(5775, "Error exists after running preLaunchTask '{0}'.", taskLabel))
+                    ? ( localize(5862, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localize(
-                5776,
+                5863,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localize(5777, "The preLaunchTask '{0}' terminated.", taskLabel));
+                        : ( localize(5864, "The preLaunchTask '{0}' terminated.", taskLabel));
             let DebugChoice;
             (function (DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 1] = "DebugAnyway";
@@ -100,7 +100,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( localize(5778, "&&Show Errors")),
+                        label: ( localize(5865, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
@@ -109,7 +109,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localize(5779, "Remember my choice in user settings")),
+                    label: ( localize(5866, "Remember my choice in user settings")),
                 }
             });
             const debugAnyway = result === DebugChoice.DebugAnyway;
@@ -145,7 +145,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     message: err.message,
                     buttons: [
                         {
-                            label: ( localize(5772, "&&Debug Anyway")),
+                            label: ( localize(5859, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -157,7 +157,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localize(5780, "Remember my choice for this task"))
+                        label: ( localize(5867, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
@@ -178,7 +178,7 @@ let DebugTaskRunner = class DebugTaskRunner {
         }
         if (!root) {
             return Promise.reject(( new Error(( localize(
-                5781,
+                5868,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
             )))));
@@ -186,8 +186,8 @@ let DebugTaskRunner = class DebugTaskRunner {
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localize(5782, "Could not find the task '{0}'.", taskId))
-                : ( localize(5783, "Could not find the specified task."));
+                ? ( localize(5869, "Could not find the task '{0}'.", taskId))
+                : ( localize(5870, "Could not find the specified task."));
             return Promise.reject(createErrorWithActions(errorMessage, [( new Action(
                 DEBUG_CONFIGURE_COMMAND_ID,
                 DEBUG_CONFIGURE_LABEL,
@@ -245,7 +245,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 store.add(disposableTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = ( localize(
-                            5784,
+                            5871,
                             "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.",
                             typeof taskId === 'string' ? taskId : JSON.stringify(taskId)
                         ));
@@ -256,14 +256,14 @@ let DebugTaskRunner = class DebugTaskRunner {
                 if (!hideSlowPreLaunchWarning) {
                     store.add(disposableTimeout(() => {
                         const message = ( localize(
-                            5785,
+                            5872,
                             "Waiting for preLaunchTask '{0}'...",
                             task.configurationProperties.name
                         ));
                         const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
                         const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
                         if (canConfigure) {
-                            buttons.splice(1, 0, ( localize(5786, "Configure Task")));
+                            buttons.splice(1, 0, ( localize(5873, "Configure Task")));
                         }
                         this.progressService.withProgress({ location: ProgressLocation.Notification, title: message, buttons }, () => result.catch(() => { }), (choice) => {
                             if (choice === undefined) ;

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

@@ -1,7 +1,7 @@
 import { IActionViewItem } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar";
 import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
-import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
+import { IDropdownWithPrimaryActionViewItemOptions } from "@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem";
 import { MenuItemAction } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";

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

@@ -15,7 +15,7 @@ import { DisposableStore, MutableDisposable, markAsSingleton, dispose } from '@c
 import { platform, Platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { DropdownWithPrimaryActionViewItem } from '@codingame/monaco-vscode-b4efa70b-52b9-5670-ab5c-f10b10b6834e-common/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
 import { createActionViewItem, getFlatActionBarActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
@@ -41,14 +41,14 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/sear
 import { Themable } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { getWindowControlsStyle, WindowControlsStyle } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
-import { LayoutSettings, Parts, EditorTabsMode } from '@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/layout/browser/layoutService';
+import { LayoutSettings, Parts, EditorTabsMode } from '@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { State, VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
-import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugColors';
+import { debugToolBarBackground, debugToolBarBorder } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugColors';
 import { FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, CONTINUE_ID, CONTINUE_LABEL, PAUSE_ID, PAUSE_LABEL, STOP_LABEL, DISCONNECT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STEP_BACK_ID, REVERSE_CONTINUE_ID, FOCUS_SESSION_LABEL, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_AND_SUSPEND_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import * as debugToolBar from './media/debugToolBar.css';
 
 registerCss(debugToolBar);
@@ -312,7 +312,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor, options)
     if (!secondary.length) {
         return undefined;
     }
-    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(5787, "More...")), 'codicon-chevron-down', true)));
+    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localize(5874, "More...")), 'codicon-chevron-down', true)));
     const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', options);
     return item;
 }
@@ -370,8 +370,8 @@ registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, debugStepOver, undef
 registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, debugStepInto, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, debugStepOut, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, debugRestart);
-registerDebugToolBarItem(STEP_BACK_ID, ( localize(5788, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(5789, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(STEP_BACK_ID, ( localize(5875, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(5876, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
 registerDebugToolBarItem(FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, 100, Codicon.listTree, ( ContextKeyExpr.and(CONTEXT_MULTI_SESSION_DEBUG, ( CONTEXT_TOOLBAR_COMMAND_CENTER.negate()))));
 MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
     group: 'navigation',

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

@@ -23,7 +23,7 @@ import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/w
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { DEBUG_START_COMMAND_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_LABEL, DEBUG_CONFIGURE_COMMAND_ID, SELECT_AND_START_ID } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
-import { debugConfigure } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { debugConfigure } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { WelcomeView } from './welcomeView.js';
 import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, State, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUG_UX, CONTEXT_DEBUGGERS_AVAILABLE, EDITOR_CONTRIBUTION_ID, REPL_VIEW_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
@@ -171,10 +171,10 @@ registerAction2(class extends Action2 {
             title: {
                 value: DEBUG_CONFIGURE_LABEL,
                 original: 'Open \'launch.json\'',
-                mnemonicTitle: ( localize(5790, "Open &&Configurations"))
+                mnemonicTitle: ( localize(5877, "Open &&Configurations"))
             },
             metadata: {
-                description: ( localize2(5791, 'Opens the file used to configure how your program is debugged'))
+                description: ( localize2(5878, 'Opens the file used to configure how your program is debugged'))
             },
             f1: true,
             icon: debugConfigure,
@@ -214,7 +214,7 @@ registerAction2(class extends Action2 {
                 const picked = await quickInputService.pick(picks, {
                     activeItem: picks[0],
                     placeHolder: ( localize(
-                        5792,
+                        5879,
                         "Select a workspace folder to create a launch.json file in or add it to the workspace config file"
                     ))
                 });
@@ -238,7 +238,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.toggleReplIgnoreFocus',
-            title: ( localize(5793, "Debug Console")),
+            title: ( localize(5880, "Debug Console")),
             toggled: ( ContextKeyExpr.has(`view.${REPL_VIEW_ID}.visible`)),
             menu: [{
                     id: ViewsSubMenu,
@@ -263,7 +263,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     command: {
         id: SELECT_AND_START_ID,
-        title: ( localize(5794, "Start Additional Session")),
+        title: ( localize(5881, "Start Additional Session")),
     }
 });
 

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

@@ -6,16 +6,30 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { EditorPane } from "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IDebugSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug";
 import { IDebugService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
+import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
+import { IMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service";
+export interface IDisassembledInstructionEntry {
+    allowBreakpoint: boolean;
+    isBreakpointSet: boolean;
+    isBreakpointEnabled: boolean;
+    instructionReference: string;
+    instructionReferenceOffset: number;
+    instructionOffset: number;
+    showSourceLocation?: boolean;
+    instruction: DebugProtocol.DisassembledInstruction;
+    address: bigint;
+}
 export declare class DisassemblyView extends EditorPane {
     private readonly _configurationService;
     private readonly _instantiationService;
     private readonly _debugService;
+    private readonly _contextMenuService;
     private static readonly NUM_INSTRUCTIONS_TO_LOAD;
     private _fontInfo;
     private _disassembledInstructions;
@@ -25,7 +39,8 @@ export declare class DisassemblyView extends EditorPane {
     private _enableSourceCodeRender;
     private _loadingLock;
     private readonly _referenceToMemoryAddress;
-    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _debugService: IDebugService);
+    private menu;
+    constructor(group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService, _configurationService: IConfigurationService, _instantiationService: IInstantiationService, _debugService: IDebugService, _contextMenuService: IContextMenuService, menuService: IMenuService, contextKeyService: IContextKeyService);
     get fontInfo(): BareFontInfo;
     private createFontInfo;
     get currentInstructionAddresses(): (bigint | undefined)[];
@@ -41,6 +56,11 @@ export declare class DisassemblyView extends EditorPane {
         offset: number;
         address: bigint;
     } | undefined;
+    getAddressAndOffset(element: IDisassembledInstructionEntry): {
+        reference: string;
+        offset: number;
+        address: bigint;
+    };
     protected createEditor(parent: HTMLElement): void;
     layout(dimension: Dimension): void;
     goToInstructionAndOffset(instructionReference: string, offset: number, focus?: boolean): Promise<void>;
@@ -54,6 +74,7 @@ export declare class DisassemblyView extends EditorPane {
     private getIndexFromAddress;
     private reloadDisassembly;
     private clear;
+    private onContextMenu;
 }
 export declare class DisassemblyViewContribution implements IWorkbenchContribution {
     private readonly _onDidActiveEditorChangeListener;

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

@@ -36,15 +36,22 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quic
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { EditorPane } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { EditorPane } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { topStackFrameColor, focusedStackFrameColor } from '@codingame/monaco-vscode-b99aef83-0d60-5e8c-a62e-9908b6256f35-common/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
-import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
+import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from '@codingame/monaco-vscode-fc42f049-7883-579d-bb0b-2aa1010a19a8-common/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { DISASSEMBLY_VIEW_ID, State, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { InstructionBreakpoint } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getUriFromSource } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/common/debugSource';
 import { sourcesEqual, isUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
+import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
+import { COPY_ADDRESS_ID, COPY_ADDRESS_LABEL } from '@codingame/monaco-vscode-88aa9a78-75f5-5aaa-89e9-bbdd580b3b5c-common/vscode/vs/workbench/contrib/debug/browser/debugCommands';
+import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { getFlatContextMenuActions } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 
 var DisassemblyView_1, BreakpointRenderer_1, InstructionRenderer_1;
 const disassemblyNotAvailable = {
@@ -57,21 +64,24 @@ const disassemblyNotAvailable = {
     address: 0n,
     instruction: {
         address: '-1',
-        instruction: ( localize(5795, "Disassembly not available."))
+        instruction: ( localize(5882, "Disassembly not available."))
     },
 };
 let DisassemblyView = class DisassemblyView extends EditorPane {
     static { DisassemblyView_1 = this; }
     static { this.NUM_INSTRUCTIONS_TO_LOAD = 50; }
-    constructor(group, telemetryService, themeService, storageService, _configurationService, _instantiationService, _debugService) {
+    constructor(group, telemetryService, themeService, storageService, _configurationService, _instantiationService, _debugService, _contextMenuService, menuService, contextKeyService) {
         super(DISASSEMBLY_VIEW_ID, group, telemetryService, themeService, storageService);
         this._configurationService = _configurationService;
         this._instantiationService = _instantiationService;
         this._debugService = _debugService;
+        this._contextMenuService = _contextMenuService;
         this._instructionBpList = [];
         this._enableSourceCodeRender = true;
         this._loadingLock = false;
         this._referenceToMemoryAddress = ( new Map());
+        this.menu = menuService.createMenu(MenuId.DebugDisassemblyContext, contextKeyService);
+        this._register(this.menu);
         this._disassembledInstructions = undefined;
         this._onDidChangeStackFrame = this._register(( new Emitter({ leakWarningThreshold: 1000 })));
         this._previousDebuggingState = _debugService.state;
@@ -133,6 +143,9 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         if (!element) {
             return undefined;
         }
+        return this.getAddressAndOffset(element);
+    }
+    getAddressAndOffset(element) {
         const reference = element.instructionReference;
         const offset = Number(element.address - this.getReferenceAddress(reference));
         return { reference, offset, address: element.address };
@@ -169,7 +182,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                 project(row) { return row; }
             },
             {
-                label: ( localize(5796, "instructions")),
+                label: ( localize(5883, "instructions")),
                 tooltip: '',
                 weight: 0.3,
                 templateId: InstructionRenderer.TEMPLATE_ID,
@@ -213,6 +226,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                 this.scrollDown_LoadDisassembledInstructions(DisassemblyView_1.NUM_INSTRUCTIONS_TO_LOAD).then(() => { this._loadingLock = false; });
             }
         }));
+        this._register(this._disassembledInstructions.onContextMenu(e => this.onContextMenu(e)));
         this._register(this._debugService.getViewModel().onDidFocusStackFrame(({ stackFrame }) => {
             if (this._disassembledInstructions && stackFrame?.instructionPointerReference) {
                 this.goToInstructionAndOffset(stackFrame.instructionPointerReference, 0);
@@ -480,6 +494,14 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         this._referenceToMemoryAddress.clear();
         this._disassembledInstructions?.splice(0, this._disassembledInstructions.length, [disassemblyNotAvailable]);
     }
+    onContextMenu(e) {
+        const actions = getFlatContextMenuActions(this.menu.getActions({ shouldForwardArgs: true }));
+        this._contextMenuService.showContextMenu({
+            getAnchor: () => e.anchor,
+            getActions: () => actions,
+            getActionsContext: () => e.element
+        });
+    }
 };
 DisassemblyView = DisassemblyView_1 = ( __decorate([
     ( __param(1, ITelemetryService)),
@@ -487,7 +509,10 @@ DisassemblyView = DisassemblyView_1 = ( __decorate([
     ( __param(3, IStorageService)),
     ( __param(4, IConfigurationService)),
     ( __param(5, IInstantiationService)),
-    ( __param(6, IDebugService))
+    ( __param(6, IDebugService)),
+    ( __param(7, IContextMenuService)),
+    ( __param(8, IMenuService)),
+    ( __param(9, IContextKeyService))
 ], DisassemblyView));
 let BreakpointRenderer = class BreakpointRenderer {
     static { BreakpointRenderer_1 = this; }
@@ -704,7 +729,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
             };
             this.editorService.openEditor({
                 resource: sourceURI,
-                description: ( localize(5797, "from disassembly")),
+                description: ( localize(5884, "from disassembly")),
                 options: {
                     preserveFocus: false,
                     selection: selection,
@@ -739,18 +764,18 @@ InstructionRenderer = InstructionRenderer_1 = ( __decorate([
 ], InstructionRenderer));
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5798, "Disassembly View");
+        return localize(5885, "Disassembly View");
     }
     getAriaLabel(element) {
         let label = '';
         const instruction = element.instruction;
         if (instruction.address !== '-1') {
-            label += `${( localize(5799, "Address"))}: ${instruction.address}`;
+            label += `${( localize(5886, "Address"))}: ${instruction.address}`;
         }
         if (instruction.instructionBytes) {
-            label += `, ${( localize(5800, "Bytes"))}: ${instruction.instructionBytes}`;
+            label += `, ${( localize(5887, "Bytes"))}: ${instruction.instructionBytes}`;
         }
-        label += `, ${( localize(5801, "Instruction"))}: ${instruction.instruction}`;
+        label += `, ${( localize(5888, "Instruction"))}: ${instruction.instruction}`;
         return label;
     }
 }
@@ -789,5 +814,17 @@ DisassemblyViewContribution = ( __decorate([
     ( __param(1, IDebugService)),
     ( __param(2, IContextKeyService))
 ], DisassemblyViewContribution));
+CommandsRegistry.registerCommand({
+    metadata: {
+        description: COPY_ADDRESS_LABEL,
+    },
+    id: COPY_ADDRESS_ID,
+    handler: async (accessor, entry) => {
+        if (entry?.instruction?.address) {
+            const clipboardService = accessor.get(IClipboardService);
+            clipboardService.writeText(entry.instruction.address);
+        }
+    }
+});
 
 export { DisassemblyView, DisassemblyViewContribution };

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

@@ -5,7 +5,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
-import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
+import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 export declare class BrowserExtensionHostDebugService extends ExtensionHostDebugChannelClient implements IExtensionHostDebugService {

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

@@ -12,7 +12,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { isFolderToOpen, isWorkspaceToOpen } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, hasWorkspaceFileExtension } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
+import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 

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

@@ -26,7 +26,7 @@ import { WorkbenchCompressibleObjectTree } from '@codingame/monaco-vscode-api/vs
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { ResourceLabels } from '@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common/vscode/vs/workbench/browser/labels';
+import { ResourceLabels } from '@codingame/monaco-vscode-bed2b49f-41ae-5ed2-b61a-1105500a3f8a-common/vscode/vs/workbench/browser/labels';
 import { ViewPane, ViewAction } from '@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -563,7 +563,7 @@ class LoadedScriptsRenderer {
             options.fileKind = FileKind.ROOT_FOLDER;
         }
         else if (element instanceof SessionTreeItem) {
-            options.title = ( localize(5813, "Debug Session"));
+            options.title = ( localize(5900, "Debug Session"));
             options.hideIcon = true;
         }
         else if (element instanceof BaseTreeItem) {
@@ -585,20 +585,20 @@ class LoadedScriptsRenderer {
 }
 class LoadedSciptsAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(5814, "Debug Loaded Scripts");
+        return localize(5901, "Debug Loaded Scripts");
     }
     getAriaLabel(element) {
         if (element instanceof RootFolderTreeItem) {
-            return localize(5815, "Workspace folder {0}, loaded script, debug", element.getLabel());
+            return localize(5902, "Workspace folder {0}, loaded script, debug", element.getLabel());
         }
         if (element instanceof SessionTreeItem) {
-            return localize(5816, "Session {0}, loaded script, debug", element.getLabel());
+            return localize(5903, "Session {0}, loaded script, debug", element.getLabel());
         }
         if (element.hasChildren()) {
-            return localize(5817, "Folder {0}, loaded script, debug", element.getLabel());
+            return localize(5904, "Folder {0}, loaded script, debug", element.getLabel());
         }
         else {
-            return localize(5818, "{0}, loaded script, debug", element.getLabel());
+            return localize(5905, "{0}, loaded script, debug", element.getLabel());
         }
     }
 }
@@ -625,7 +625,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             id: 'loadedScripts.collapse',
             viewId: LOADED_SCRIPTS_VIEW_ID,
-            title: ( localize(5819, "Collapse All")),
+            title: ( localize(5906, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {

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

@@ -194,7 +194,7 @@ let RawDebugSession = class RawDebugSession {
     }
     async start() {
         if (!this.debugAdapter) {
-            return Promise.reject(( new Error(( localize(5820, "No debug adapter, can not start debug session.")))));
+            return Promise.reject(( new Error(( localize(5907, "No debug adapter, can not start debug session.")))));
         }
         await this.debugAdapter.startSession();
         this.startTime = ( new Date()).getTime();
@@ -518,10 +518,10 @@ let RawDebugSession = class RawDebugSession {
                     const { confirmed } = await this.dialogSerivce.confirm({
                         type: Severity.Warning,
                         message: ( localize(
-                            5821,
+                            5908,
                             "The debugger needs to open a new tab or window for the debuggee but the browser prevented this. You must give permission to continue."
                         )),
-                        primaryButton: ( localize(5822, "&&Continue"))
+                        primaryButton: ( localize(5909, "&&Continue"))
                     });
                     if (confirmed) {
                         result = await this.launchVsCode(request.arguments);
@@ -621,7 +621,7 @@ let RawDebugSession = class RawDebugSession {
                     completeDispatch(undefined);
                 }
                 else {
-                    errorDispatch(( new Error(( localize(5823, "No debugger available found. Can not send '{0}'.", command)))));
+                    errorDispatch(( new Error(( localize(5910, "No debugger available found. Can not send '{0}'.", command)))));
                 }
                 return;
             }
@@ -654,7 +654,7 @@ let RawDebugSession = class RawDebugSession {
         const userMessage = error ? formatPII(error.format, false, error.variables) : errorMessage;
         const url = error?.url;
         if (error && url) {
-            const label = error.urlLabel ? error.urlLabel : ( localize(5824, "More Info"));
+            const label = error.urlLabel ? error.urlLabel : ( localize(5911, "More Info"));
             const uri = ( URI.parse(url));
             const actionId = uri.scheme === Schemas.command ? 'debug.moreInfo.command' : 'debug.moreInfo';
             return createErrorWithActions(userMessage, [toAction({ id: actionId, label, run: () => this.openerService.open(uri, { allowCommands: true }) })]);