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

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

@@ -1,9 +1,10 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { List } from 'vscode/vscode/vs/base/browser/ui/list/listWidget';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IDebugService, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_IN_DEBUG_REPL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, REPL_VIEW_ID, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, EDITOR_CONTRIBUTION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { IDebugService, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_IN_DEBUG_REPL, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, REPL_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, EDITOR_CONTRIBUTION_ID, VIEWLET_ID as VIEWLET_ID$1 } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -13,13 +14,16 @@ import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/b
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { ResourceContextKey, ActiveEditorContext, PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ITextResourcePropertiesService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { isWeb, isWindows } from 'vscode/vscode/vs/base/common/platform';
+import { saveAllBeforeDebugStart } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
+import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
 import { showLoadedScriptMenu } from '../common/loadedScriptsPicker.js';
 import { showDebugSessionMenu } from './debugSessionPicker.js';
 import { TEXT_FILE_EDITOR_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
@@ -49,6 +53,7 @@ const SELECT_DEBUG_CONSOLE_ID = 'workbench.action.debug.selectDebugConsole';
 const SELECT_DEBUG_SESSION_ID = 'workbench.action.debug.selectDebugSession';
 const DEBUG_CONFIGURE_COMMAND_ID = 'workbench.action.debug.configure';
 const DEBUG_START_COMMAND_ID = 'workbench.action.debug.start';
+const DEBUG_RUN_COMMAND_ID = 'workbench.action.debug.run';
 const EDIT_EXPRESSION_COMMAND_ID = 'debug.renameWatchExpression';
 const SET_EXPRESSION_COMMAND_ID = 'debug.setWatchExpression';
 const REMOVE_EXPRESSION_COMMAND_ID = 'debug.removeWatchExpression';
@@ -59,115 +64,120 @@ const CALLSTACK_TOP_ID = 'workbench.action.debug.callStackTop';
 const CALLSTACK_BOTTOM_ID = 'workbench.action.debug.callStackBottom';
 const CALLSTACK_UP_ID = 'workbench.action.debug.callStackUp';
 const CALLSTACK_DOWN_ID = 'workbench.action.debug.callStackDown';
-const DEBUG_COMMAND_CATEGORY = { original: 'Debug', value: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugCommands', 'debug', 'Debug')) };
-const RESTART_LABEL = { value: ( localizeWithPath(
+const DEBUG_COMMAND_CATEGORY = ( localize2WithPath('vs/workbench/contrib/debug/browser/debugCommands', 'debug', 'Debug'));
+const RESTART_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'restartDebug',
     "Restart"
-)), original: 'Restart' };
-const STEP_OVER_LABEL = { value: ( localizeWithPath(
+));
+const STEP_OVER_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'stepOverDebug',
     "Step Over"
-)), original: 'Step Over' };
-const STEP_INTO_LABEL = { value: ( localizeWithPath(
+));
+const STEP_INTO_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'stepIntoDebug',
     "Step Into"
-)), original: 'Step Into' };
-const STEP_INTO_TARGET_LABEL = { value: ( localizeWithPath(
+));
+const STEP_INTO_TARGET_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'stepIntoTargetDebug',
     "Step Into Target"
-)), original: 'Step Into Target' };
-const STEP_OUT_LABEL = { value: ( localizeWithPath(
+));
+const STEP_OUT_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'stepOutDebug',
     "Step Out"
-)), original: 'Step Out' };
-const PAUSE_LABEL = { value: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugCommands', 'pauseDebug', "Pause")), original: 'Pause' };
-const DISCONNECT_LABEL = { value: ( localizeWithPath(
+));
+const PAUSE_LABEL = ( localize2WithPath('vs/workbench/contrib/debug/browser/debugCommands', 'pauseDebug', "Pause"));
+const DISCONNECT_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'disconnect',
     "Disconnect"
-)), original: 'Disconnect' };
-const DISCONNECT_AND_SUSPEND_LABEL = { value: ( localizeWithPath(
+));
+const DISCONNECT_AND_SUSPEND_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'disconnectSuspend',
     "Disconnect and Suspend"
-)), original: 'Disconnect and Suspend' };
-const STOP_LABEL = { value: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugCommands', 'stop', "Stop")), original: 'Stop' };
-const CONTINUE_LABEL = { value: ( localizeWithPath(
+));
+const STOP_LABEL = ( localize2WithPath('vs/workbench/contrib/debug/browser/debugCommands', 'stop', "Stop"));
+const CONTINUE_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'continueDebug',
     "Continue"
-)), original: 'Continue' };
-const FOCUS_SESSION_LABEL = { value: ( localizeWithPath(
+));
+const FOCUS_SESSION_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'focusSession',
     "Focus Session"
-)), original: 'Focus Session' };
-const SELECT_AND_START_LABEL = { value: ( localizeWithPath(
+));
+const SELECT_AND_START_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'selectAndStartDebugging',
     "Select and Start Debugging"
-)), original: 'Select and Start Debugging' };
+));
 const DEBUG_CONFIGURE_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'openLaunchJson',
     "Open '{0}'",
     'launch.json'
 ));
-const DEBUG_START_LABEL = { value: ( localizeWithPath(
+const DEBUG_START_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'startDebug',
     "Start Debugging"
-)), original: 'Start Debugging' };
-const NEXT_DEBUG_CONSOLE_LABEL = { value: ( localizeWithPath(
+));
+const DEBUG_RUN_LABEL = ( localize2WithPath(
+    'vs/workbench/contrib/debug/browser/debugCommands',
+    'startWithoutDebugging',
+    "Start Without Debugging"
+));
+const NEXT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'nextDebugConsole',
     "Focus Next Debug Console"
-)), original: 'Focus Next Debug Console' };
-const PREV_DEBUG_CONSOLE_LABEL = { value: ( localizeWithPath(
+));
+const PREV_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'prevDebugConsole',
     "Focus Previous Debug Console"
-)), original: 'Focus Previous Debug Console' };
-const OPEN_LOADED_SCRIPTS_LABEL = { value: ( localizeWithPath(
+));
+const OPEN_LOADED_SCRIPTS_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'openLoadedScript',
     "Open Loaded Script..."
-)), original: 'Open Loaded Script...' };
-const CALLSTACK_TOP_LABEL = { value: ( localizeWithPath(
+));
+const CALLSTACK_TOP_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'callStackTop',
     "Navigate to Top of Call Stack"
-)), original: 'Navigate to Top of Call Stack' };
-const CALLSTACK_BOTTOM_LABEL = { value: ( localizeWithPath(
+));
+const CALLSTACK_BOTTOM_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'callStackBottom',
     "Navigate to Bottom of Call Stack"
-)), original: 'Navigate to Bottom of Call Stack' };
-const CALLSTACK_UP_LABEL = { value: ( localizeWithPath(
+));
+const CALLSTACK_UP_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'callStackUp',
     "Navigate Up Call Stack"
-)), original: 'Navigate Up Call Stack' };
-const CALLSTACK_DOWN_LABEL = { value: ( localizeWithPath(
+));
+const CALLSTACK_DOWN_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'callStackDown',
     "Navigate Down Call Stack"
-)), original: 'Navigate Down Call Stack' };
-const SELECT_DEBUG_CONSOLE_LABEL = { value: ( localizeWithPath(
+));
+const SELECT_DEBUG_CONSOLE_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'selectDebugConsole',
     "Select Debug Console"
-)), original: 'Select Debug Console' };
-const SELECT_DEBUG_SESSION_LABEL = { value: ( localizeWithPath(
+));
+const SELECT_DEBUG_SESSION_LABEL = ( localize2WithPath(
     'vs/workbench/contrib/debug/browser/debugCommands',
     'selectDebugSession',
     "Select Debug Session"
-)), original: 'Select Debug Session' };
+));
 const DEBUG_QUICK_ACCESS_PREFIX = 'debug ';
 const DEBUG_CONSOLE_QUICK_ACCESS_PREFIX = 'debug consoles ';
 function isThreadContext(obj) {
@@ -275,7 +285,7 @@ async function navigateCallStack(debugService, down) {
             nextVisibleFrame = findNextVisibleFrame(false, callStack, index);
         }
         if (nextVisibleFrame) {
-            debugService.focusStackFrame(nextVisibleFrame);
+            debugService.focusStackFrame(nextVisibleFrame, undefined, undefined, { preserveFocus: false });
         }
     }
 }
@@ -744,6 +754,31 @@ CommandsRegistry.registerCommand({
         showDebugSessionMenu(accessor, SELECT_AND_START_ID);
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: DEBUG_START_COMMAND_ID,
+    weight: 200 ,
+    primary: 63 ,
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.isEqualTo('inactive')))),
+    handler: async (accessor, debugStartOptions) => {
+        const debugService = accessor.get(IDebugService);
+        await saveAllBeforeDebugStart(accessor.get(IConfigurationService), accessor.get(IEditorService));
+        const { launch, name, getConfig } = debugService.getConfigurationManager().selectedConfiguration;
+        const config = await getConfig();
+        const configOrName = config ? Object.assign(deepClone(config), debugStartOptions?.config) : name;
+        await debugService.startDebugging(launch, configOrName, { noDebug: debugStartOptions?.noDebug, startedByUser: true }, false);
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: DEBUG_RUN_COMMAND_ID,
+    weight: 200 ,
+    primary: 2048  | 63 ,
+    mac: { primary: 256  | 63  },
+    when: ( ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, ( CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 ))))),
+    handler: async (accessor) => {
+        const commandService = accessor.get(ICommandService);
+        await commandService.executeCommand(DEBUG_START_COMMAND_ID, { noDebug: true });
+    }
+});
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.toggleBreakpoint',
     weight: 200  + 5,
@@ -885,15 +920,31 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'debug.installAdditionalDebuggers',
+    weight: 200 ,
+    when: undefined,
+    primary: undefined,
+    handler: async (accessor, query) => {
+        const paneCompositeService = accessor.get(IPaneCompositePartService);
+        const viewlet = (await paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true))?.getViewPaneContainer();
+        let searchFor = `@category:debuggers`;
+        if (typeof query === 'string') {
+            searchFor += ` ${query}`;
+        }
+        viewlet.search(searchFor);
+        viewlet.focus();
+    }
+});
 registerAction2(class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: ADD_CONFIGURATION_ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/debug/browser/debugCommands',
                 'addConfiguration',
                 "Add Configuration..."
-            )), original: 'Add Configuration...' },
+            )),
             category: DEBUG_COMMAND_CATEGORY,
             f1: true,
             menu: {
@@ -973,5 +1024,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         return undefined;
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'debug.openView',
+    weight: 200 ,
+    when: ( CONTEXT_DEBUGGERS_AVAILABLE.toNegated()),
+    primary: 63 ,
+    secondary: [2048  | 63 ],
+    handler: async (accessor) => {
+        const paneCompositeService = accessor.get(IPaneCompositePartService);
+        await paneCompositeService.openPaneComposite(VIEWLET_ID$1, 0 , true);
+    }
+});
 
-export { ADD_CONFIGURATION_ID, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_STACK_TRACE_ID, DEBUG_COMMAND_CATEGORY, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID };
+export { ADD_CONFIGURATION_ID, CALLSTACK_BOTTOM_ID, CALLSTACK_BOTTOM_LABEL, CALLSTACK_DOWN_ID, CALLSTACK_DOWN_LABEL, CALLSTACK_TOP_ID, CALLSTACK_TOP_LABEL, CALLSTACK_UP_ID, CALLSTACK_UP_LABEL, CONTINUE_ID, CONTINUE_LABEL, COPY_STACK_TRACE_ID, DEBUG_COMMAND_CATEGORY, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, DEBUG_CONSOLE_QUICK_ACCESS_PREFIX, DEBUG_QUICK_ACCESS_PREFIX, DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL, DISCONNECT_ID, DISCONNECT_LABEL, EDIT_EXPRESSION_COMMAND_ID, FOCUS_REPL_ID, FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, JUMP_TO_CURSOR_ID, NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL, OPEN_LOADED_SCRIPTS_LABEL, PAUSE_ID, PAUSE_LABEL, PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL, REMOVE_EXPRESSION_COMMAND_ID, RESTART_FRAME_ID, RESTART_LABEL, RESTART_SESSION_ID, REVERSE_CONTINUE_ID, SELECT_AND_START_ID, SELECT_AND_START_LABEL, SELECT_DEBUG_CONSOLE_ID, SELECT_DEBUG_CONSOLE_LABEL, SELECT_DEBUG_SESSION_ID, SELECT_DEBUG_SESSION_LABEL, SET_EXPRESSION_COMMAND_ID, SHOW_LOADED_SCRIPTS_ID, STEP_BACK_ID, STEP_INTO_ID, STEP_INTO_LABEL, STEP_INTO_TARGET_ID, STEP_INTO_TARGET_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STOP_ID, STOP_LABEL, TERMINATE_THREAD_ID, TOGGLE_INLINE_BREAKPOINT_ID };

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

@@ -7,7 +7,7 @@ import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -27,12 +27,11 @@ class ToggleBreakpointAction extends Action2 {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'toggleBreakpointAction',
                     "Debug: Toggle Breakpoint"
                 )),
-                original: 'Debug: Toggle Breakpoint',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] },
@@ -66,7 +65,7 @@ class ToggleBreakpointAction extends Action2 {
                     debugService.removeInstructionBreakpoints(toRemove.instructionReference, toRemove.offset);
                 }
                 else {
-                    debugService.addInstructionBreakpoint(location.reference, location.offset, location.address);
+                    debugService.addInstructionBreakpoint({ instructionReference: location.reference, offset: location.offset, address: location.address, canPersist: false });
                 }
             }
             return;
@@ -241,17 +240,16 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'openDisassemblyView',
                     "Open Disassembly View"
                 )),
-                original: 'Open Disassembly View',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'miDisassemblyView', comment: ['&& denotes a mnemonic'] },
                     "&&DisassemblyView"
-                ))
+                )),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -286,17 +284,16 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'toggleDisassemblyViewSourceCode',
                     "Toggle Source Code in Disassembly View"
                 )),
-                original: 'Toggle Source Code in Disassembly View',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'mitogglesource', comment: ['&& denotes a mnemonic'] },
                     "&&ToggleSource"
-                ))
+                )),
             },
             f1: true,
         });

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

@@ -17,11 +17,11 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { editorHoverBackground, asCssVariable, editorHoverBorder, editorHoverForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
-import { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
+import { renderExpressionValue, AbstractExpressionDataSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { LinkDetector } from './linkDetector.js';
-import { VariablesRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
+import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Variable, Expression, VisualizedExpression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var DebugHoverWidget_1;
@@ -83,9 +83,12 @@ let DebugHoverWidget = class DebugHoverWidget {
             'Hold {0} key to switch to editor language hover',
             isMacintosh ? 'Option' : 'Alt'
         ));
-        const dataSource = ( new DebugHoverDataSource());
+        const dataSource = this.instantiationService.createInstance(DebugHoverDataSource);
         const linkeDetector = this.instantiationService.createInstance(LinkDetector);
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, ( new DebugHoverDelegate()), [this.instantiationService.createInstance(VariablesRenderer, linkeDetector)], dataSource, {
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, ( new DebugHoverDelegate()), [
+            this.instantiationService.createInstance(VariablesRenderer, linkeDetector),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, linkeDetector),
+        ], dataSource, {
             accessibilityProvider: ( new DebugHoverAccessibilityProvider()),
             mouseSupport: false,
             horizontalScrolling: true,
@@ -95,6 +98,7 @@ let DebugHoverWidget = class DebugHoverWidget {
                 listBackground: editorHoverBackground
             }
         });
+        this.toDispose.push(VisualizedVariableRenderer.rendererOnVisualizationRange(this.debugService.getViewModel(), this.tree));
         this.valueContainer = $('.value');
         this.valueContainer.tabIndex = 0;
         this.valueContainer.setAttribute('role', 'tooltip');
@@ -322,11 +326,11 @@ class DebugHoverAccessibilityProvider {
         ));
     }
 }
-class DebugHoverDataSource {
+class DebugHoverDataSource extends AbstractExpressionDataSource {
     hasChildren(element) {
         return element.hasChildren;
     }
-    getChildren(element) {
+    doGetChildren(element) {
         return element.getChildren();
     }
 }
@@ -335,6 +339,9 @@ class DebugHoverDelegate {
         return 18;
     }
     getTemplateId(element) {
+        if (element instanceof VisualizedExpression) {
+            return VisualizedVariableRenderer.ID;
+        }
         return VariablesRenderer.ID;
     }
 }

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

@@ -1,10 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { VIEWLET_ID, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { VIEWLET_ID, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 
 let DebugProgressContribution = class DebugProgressContribution {
     constructor(debugService, progressService, viewsService) {
@@ -31,7 +30,6 @@ let DebugProgressContribution = class DebugProgressContribution {
                         location: 15 ,
                         title: progressStartEvent.body.title,
                         cancellable: progressStartEvent.body.cancellable,
-                        priority: NotificationPriority.SILENT,
                         source,
                         delay: 500
                     }, progressStep => {

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

@@ -952,8 +952,8 @@ let DebugService = class DebugService {
         this.model.setBreakpointsActivated(activated);
         return this.sendAllBreakpoints();
     }
-    addFunctionBreakpoint(name, id) {
-        this.model.addFunctionBreakpoint(name || '', id);
+    addFunctionBreakpoint(name, id, mode) {
+        this.model.addFunctionBreakpoint(name || '', id, mode);
     }
     async updateFunctionBreakpoint(id, update) {
         this.model.updateFunctionBreakpoint(id, update);
@@ -965,8 +965,8 @@ let DebugService = class DebugService {
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendFunctionBreakpoints();
     }
-    async addDataBreakpoint(label, dataId, canPersist, accessTypes, accessType) {
-        this.model.addDataBreakpoint(label, dataId, canPersist, accessTypes, accessType);
+    async addDataBreakpoint(description, dataId, canPersist, accessTypes, accessType, mode) {
+        this.model.addDataBreakpoint({ description, dataId, canPersist, accessTypes, accessType, mode });
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendDataBreakpoints();
         this.debugStorage.storeBreakpoints(this.model);
@@ -981,8 +981,8 @@ let DebugService = class DebugService {
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendDataBreakpoints();
     }
-    async addInstructionBreakpoint(instructionReference, offset, address, condition, hitCondition) {
-        this.model.addInstructionBreakpoint(instructionReference, offset, address, condition, hitCondition);
+    async addInstructionBreakpoint(opts) {
+        this.model.addInstructionBreakpoint(opts);
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendInstructionBreakpoints();
         this.debugStorage.storeBreakpoints(this.model);
@@ -996,8 +996,8 @@ let DebugService = class DebugService {
         this.model.setExceptionBreakpointFallbackSession(sessionId);
         this.debugStorage.storeBreakpoints(this.model);
     }
-    setExceptionBreakpointsForSession(session, data) {
-        this.model.setExceptionBreakpointsForSession(session.getId(), data);
+    setExceptionBreakpointsForSession(session, filters) {
+        this.model.setExceptionBreakpointsForSession(session.getId(), filters);
         this.debugStorage.storeBreakpoints(this.model);
     }
     async setExceptionBreakpointCondition(exceptionBreakpoint, condition) {

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

@@ -259,6 +259,7 @@ let DebugSession = class DebugSession {
             this.initialized = true;
             this._onDidChangeState.fire();
             this.debugService.setExceptionBreakpointsForSession(this, (this.raw && this.raw.capabilities.exceptionBreakpointFilters) || []);
+            this.debugService.getModel().registerBreakpointModes(this.configuration.type, this.raw.capabilities.breakpointModes || []);
         }
         catch (err) {
             this.initialized = true;
@@ -347,9 +348,7 @@ let DebugSession = class DebugSession {
         const response = await this.raw.setBreakpoints({
             source: rawSource,
             lines: ( breakpointsToSend.map(bp => bp.sessionAgnosticData.lineNumber)),
-            breakpoints: ( breakpointsToSend.map(
-                bp => ({ line: bp.sessionAgnosticData.lineNumber, column: bp.sessionAgnosticData.column, condition: bp.condition, hitCondition: bp.hitCondition, logMessage: bp.logMessage })
-            )),
+            breakpoints: ( breakpointsToSend.map(bp => bp.toDAP())),
             sourceModified
         });
         if (response && response.body) {
@@ -365,7 +364,7 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'function breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setFunctionBreakpoints({ breakpoints: fbpts });
+            const response = await this.raw.setFunctionBreakpoints({ breakpoints: ( fbpts.map(bp => bp.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < fbpts.length; i++) {
@@ -414,7 +413,7 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'data breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setDataBreakpoints({ breakpoints: dataBreakpoints });
+            const response = await this.raw.setDataBreakpoints({ breakpoints: ( dataBreakpoints.map(bp => bp.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < dataBreakpoints.length; i++) {
@@ -429,7 +428,7 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'instruction breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setInstructionBreakpoints({ breakpoints: ( instructionBreakpoints.map(ib => ib.toJSON())) });
+            const response = await this.raw.setInstructionBreakpoints({ breakpoints: ( instructionBreakpoints.map(ib => ib.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < instructionBreakpoints.length; i++) {