@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,8 +1,9 @@
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { List } from '../../../../base/browser/ui/list/listWidget.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
-import { 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, VIEWLET_ID as VIEWLET_ID$1, isFrameDeemphasized, EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
+import { 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, State, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_EXPRESSION_SELECTED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, VIEWLET_ID as VIEWLET_ID$1, isFrameDeemphasized, EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { IDebugService } from '../common/debug.service.js';
 import { Expression, Variable, Breakpoint, FunctionBreakpoint, DataBreakpoint } from '../common/debugModel.js';
 import { VIEWLET_ID } from '../../extensions/common/extensions.js';
@@ -22,6 +23,7 @@ import { ITextResourcePropertiesService } from '../../../../editor/common/servic
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
+import { ViewContainerLocation } from '../../../common/views.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { isWeb, isWindows } from '../../../../base/common/platform.js';
@@ -375,28 +377,28 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: NEXT_DEBUG_CONSOLE_ID,
-    weight: 200  + 1,
+    weight: KeybindingWeight.WorkbenchContrib + 1,
     when: CONTEXT_IN_DEBUG_REPL,
-    primary: 2048  | 12 ,
-    mac: { primary: 1024  | 2048  | 94  },
+    primary: KeyMod$1.CtrlCmd | KeyCode.PageDown,
+    mac: { primary: KeyMod$1.Shift | KeyMod$1.CtrlCmd | KeyCode.BracketRight },
     handler: async (accessor, _, context) => {
         changeDebugConsoleFocus(accessor, true);
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: PREV_DEBUG_CONSOLE_ID,
-    weight: 200  + 1,
+    weight: KeybindingWeight.WorkbenchContrib + 1,
     when: CONTEXT_IN_DEBUG_REPL,
-    primary: 2048  | 11 ,
-    mac: { primary: 1024  | 2048  | 92  },
+    primary: KeyMod$1.CtrlCmd | KeyCode.PageUp,
+    mac: { primary: KeyMod$1.Shift | KeyMod$1.CtrlCmd | KeyCode.BracketLeft },
     handler: async (accessor, _, context) => {
         changeDebugConsoleFocus(accessor, false);
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: RESTART_SESSION_ID,
-    weight: 200 ,
-    primary: 1024  | 2048  | 63 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.Shift | KeyMod$1.CtrlCmd | KeyCode.F5,
     when: CONTEXT_IN_DEBUG_MODE,
     handler: async (accessor, _, context) => {
         const debugService = accessor.get(IDebugService);
@@ -424,8 +426,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STEP_OVER_ID,
-    weight: 200 ,
-    primary: 68 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.F10,
     when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
     handler: async (accessor, _, context) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -437,10 +439,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
-const STEP_INTO_KEYBINDING = (isWeb && isWindows) ? ((512  | 69) ) : 69 ;
+const STEP_INTO_KEYBINDING = (isWeb && isWindows) ? (KeyMod$1.Alt | KeyCode.F11) : KeyCode.F11;
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STEP_INTO_ID,
-    weight: 200  + 10,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
     primary: STEP_INTO_KEYBINDING,
     when: ( (CONTEXT_DEBUG_STATE.notEqualsTo('inactive'))),
     handler: async (accessor, _, context) => {
@@ -455,8 +457,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STEP_OUT_ID,
-    weight: 200 ,
-    primary: 1024  | 69 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.Shift | KeyCode.F11,
     when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
     handler: async (accessor, _, context) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -470,8 +472,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: PAUSE_ID,
-    weight: 200  + 2,
-    primary: 64 ,
+    weight: KeybindingWeight.WorkbenchContrib + 2,
+    primary: KeyCode.F6,
     when: ( (CONTEXT_DEBUG_STATE.isEqualTo('running'))),
     handler: async (accessor, _, context) => {
         await getThreadAndRun(accessor, context, thread => thread.pause());
@@ -479,13 +481,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STEP_INTO_TARGET_ID,
-    primary: STEP_INTO_KEYBINDING | 2048 ,
+    primary: STEP_INTO_KEYBINDING | KeyMod$1.CtrlCmd,
     when: ( (ContextKeyExpr.and(
         CONTEXT_STEP_INTO_TARGETS_SUPPORTED,
         CONTEXT_IN_DEBUG_MODE,
          (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))
     ))),
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     handler: async (accessor, _, context) => {
         const quickInputService = accessor.get(IQuickInputService);
         const debugService = accessor.get(IDebugService);
@@ -554,8 +556,8 @@ async function stopHandler(accessor, _, context, disconnect, suspend) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: DISCONNECT_ID,
-    weight: 200 ,
-    primary: 1024  | 63 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.Shift | KeyCode.F5,
     when: ( (ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_IN_DEBUG_MODE))),
     handler: (accessor, _, context) => stopHandler(accessor, _, context, true)
 });
@@ -565,8 +567,8 @@ CommandsRegistry.registerCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: STOP_ID,
-    weight: 200 ,
-    primary: 1024  | 63 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.Shift | KeyCode.F5,
     when: ( (ContextKeyExpr.and(
          (CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()),
         CONTEXT_IN_DEBUG_MODE
@@ -591,8 +593,8 @@ CommandsRegistry.registerCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: CONTINUE_ID,
-    weight: 200  + 10,
-    primary: 63 ,
+    weight: KeybindingWeight.WorkbenchContrib + 10,
+    primary: KeyCode.F5,
     when: ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))),
     handler: async (accessor, _, context) => {
         await getThreadAndRun(accessor, context, thread => thread.continue());
@@ -623,8 +625,8 @@ CommandsRegistry.registerCommand({
     handler: async (accessor, session) => {
         const debugService = accessor.get(IDebugService);
         const editorService = accessor.get(IEditorService);
-        const stoppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === 2 );
-        if (stoppedChildSession && session.state !== 2 ) {
+        const stoppedChildSession = debugService.getModel().getSessions().find(s => s.parentSession === session && s.state === State.Stopped);
+        if (stoppedChildSession && session.state !== State.Stopped) {
             session = stoppedChildSession;
         }
         await debugService.focusStackFrame(undefined, undefined, session, { explicit: true });
@@ -671,8 +673,8 @@ CommandsRegistry.registerCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: DEBUG_START_COMMAND_ID,
-    weight: 200 ,
-    primary: 63 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.F5,
     when: ( (ContextKeyExpr.and(
         CONTEXT_DEBUGGERS_AVAILABLE,
          (CONTEXT_DEBUG_STATE.isEqualTo('inactive'))
@@ -688,12 +690,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: DEBUG_RUN_COMMAND_ID,
-    weight: 200 ,
-    primary: 2048  | 63 ,
-    mac: { primary: 256  | 63  },
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.CtrlCmd | KeyCode.F5,
+    mac: { primary: KeyMod$1.WinCtrl | KeyCode.F5 },
     when: ( (ContextKeyExpr.and(
         CONTEXT_DEBUGGERS_AVAILABLE,
-         (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))
+         (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))
     ))),
     handler: async (accessor) => {
         const commandService = accessor.get(ICommandService);
@@ -702,12 +704,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.toggleBreakpoint',
-    weight: 200  + 5,
+    weight: KeybindingWeight.WorkbenchContrib + 5,
     when: ( (ContextKeyExpr.and(
         CONTEXT_BREAKPOINTS_FOCUSED,
          (InputFocusedContext.toNegated())
     ))),
-    primary: 10 ,
+    primary: KeyCode.Space,
     handler: (accessor) => {
         const listService = accessor.get(IListService);
         const debugService = accessor.get(IDebugService);
@@ -722,7 +724,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.enableOrDisableBreakpoint',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     primary: undefined,
     when: EditorContextKeys.editorTextFocus,
     handler: (accessor) => {
@@ -745,10 +747,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: EDIT_EXPRESSION_COMMAND_ID,
-    weight: 200  + 5,
+    weight: KeybindingWeight.WorkbenchContrib + 5,
     when: CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
-    primary: 60 ,
-    mac: { primary: 3  },
+    primary: KeyCode.F2,
+    mac: { primary: KeyCode.Enter },
     handler: (accessor, expression) => {
         const debugService = accessor.get(IDebugService);
         if (!(expression instanceof Expression)) {
@@ -777,10 +779,10 @@ CommandsRegistry.registerCommand({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.setVariable',
-    weight: 200  + 5,
+    weight: KeybindingWeight.WorkbenchContrib + 5,
     when: CONTEXT_VARIABLES_FOCUSED,
-    primary: 60 ,
-    mac: { primary: 3  },
+    primary: KeyCode.F2,
+    mac: { primary: KeyCode.Enter },
     handler: (accessor) => {
         const listService = accessor.get(IListService);
         const debugService = accessor.get(IDebugService);
@@ -795,13 +797,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: REMOVE_EXPRESSION_COMMAND_ID,
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(
         CONTEXT_WATCH_EXPRESSIONS_FOCUSED,
          (CONTEXT_EXPRESSION_SELECTED.toNegated())
     ))),
-    primary: 20 ,
-    mac: { primary: 2048  | 1  },
+    primary: KeyCode.Delete,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyCode.Backspace },
     handler: (accessor, expression) => {
         const debugService = accessor.get(IDebugService);
         if (expression instanceof Expression) {
@@ -824,13 +826,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.removeBreakpoint',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(
         CONTEXT_BREAKPOINTS_FOCUSED,
          (CONTEXT_BREAKPOINT_INPUT_FOCUSED.toNegated())
     ))),
-    primary: 20 ,
-    mac: { primary: 2048  | 1  },
+    primary: KeyCode.Delete,
+    mac: { primary: KeyMod$1.CtrlCmd | KeyCode.Backspace },
     handler: (accessor) => {
         const listService = accessor.get(IListService);
         const debugService = accessor.get(IDebugService);
@@ -852,12 +854,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.installAdditionalDebuggers',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: undefined,
     primary: undefined,
     handler: async (accessor, query) => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        const viewlet = (await paneCompositeService.openPaneComposite(VIEWLET_ID, 0 , true))?.getViewPaneContainer();
+        const viewlet = (await paneCompositeService.openPaneComposite(VIEWLET_ID, ViewContainerLocation.Sidebar, true))?.getViewPaneContainer();
         let searchFor = `@category:debuggers`;
         if (typeof query === 'string') {
             searchFor += ` ${query}`;
@@ -915,8 +917,8 @@ const inlineBreakpointHandler = (accessor) => {
     }
 };
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    weight: 200 ,
-    primary: 1024  | 67 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.Shift | KeyCode.F9,
     when: EditorContextKeys.editorTextFocus,
     id: TOGGLE_INLINE_BREAKPOINT_ID,
     handler: inlineBreakpointHandler
@@ -937,10 +939,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorContext, {
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.openBreakpointToSide',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: CONTEXT_BREAKPOINTS_FOCUSED,
-    primary: 2048  | 3 ,
-    secondary: [512  | 3 ],
+    primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
+    secondary: [KeyMod$1.Alt | KeyCode.Enter],
     handler: (accessor) => {
         const listService = accessor.get(IListService);
         const list = listService.lastFocusedList;
@@ -955,13 +957,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'debug.openView',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (CONTEXT_DEBUGGERS_AVAILABLE.toNegated())),
-    primary: 63 ,
-    secondary: [2048  | 63 ],
+    primary: KeyCode.F5,
+    secondary: [KeyMod$1.CtrlCmd | KeyCode.F5],
     handler: async (accessor) => {
         const paneCompositeService = accessor.get(IPaneCompositePartService);
-        await paneCompositeService.openPaneComposite(VIEWLET_ID$1, 0 , true);
+        await paneCompositeService.openPaneComposite(VIEWLET_ID$1, ViewContainerLocation.Sidebar, true);
     }
 });
 export { ADD_CONFIGURATION_ID, ADD_TO_WATCH_ID, ADD_TO_WATCH_LABEL, 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_EVALUATE_PATH_ID, COPY_EVALUATE_PATH_LABEL, COPY_STACK_TRACE_ID, COPY_VALUE_ID, COPY_VALUE_LABEL, 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/common/debug.js

@@ -443,18 +443,36 @@ const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
     default: 'openOnFirstSessionStart',
     description: ( localizeWithPath(_moduleId, 62, "Controls when the internal Debug Console should open."))
 };
+var State;
+( ((function(State) {
+    State[State["Inactive"] = 0] = "Inactive";
+    State[State["Initializing"] = 1] = "Initializing";
+    State[State["Stopped"] = 2] = "Stopped";
+    State[State["Running"] = 3] = "Running";
+})(State || (State = {}))));
 function getStateLabel(state) {
     switch (state) {
-        case 1 : return 'initializing';
-        case 2 : return 'stopped';
-        case 3 : return 'running';
+        case State.Initializing: return 'initializing';
+        case State.Stopped: return 'stopped';
+        case State.Running: return 'running';
         default: return 'inactive';
     }
 }
+var MemoryRangeType;
+( ((function(MemoryRangeType) {
+    MemoryRangeType[MemoryRangeType["Valid"] = 0] = "Valid";
+    MemoryRangeType[MemoryRangeType["Unreadable"] = 1] = "Unreadable";
+    MemoryRangeType[MemoryRangeType["Error"] = 2] = "Error";
+})(MemoryRangeType || (MemoryRangeType = {}))));
 const DEBUG_MEMORY_SCHEME = 'vscode-debug-memory';
 function isFrameDeemphasized(frame) {
     return frame.source.presentationHint === 'deemphasize' || frame.presentationHint === 'deemphasize' || frame.presentationHint === 'subtle';
 }
+var DataBreakpointSetType;
+( ((function(DataBreakpointSetType) {
+    DataBreakpointSetType[DataBreakpointSetType["Variable"] = 0] = "Variable";
+    DataBreakpointSetType[DataBreakpointSetType["Address"] = 1] = "Address";
+})(DataBreakpointSetType || (DataBreakpointSetType = {}))));
 var DebugConfigurationProviderTriggerKind;
 ( ((function(DebugConfigurationProviderTriggerKind) {
     DebugConfigurationProviderTriggerKind[DebugConfigurationProviderTriggerKind["Initial"] = 1] = "Initial";
@@ -466,6 +484,24 @@ var DebuggerString;
 ( ((function(DebuggerString) {
     DebuggerString["UnverifiedBreakpoints"] = "unverifiedBreakpoints";
 })(DebuggerString || (DebuggerString = {}))));
+var BreakpointWidgetContext;
+( ((function(BreakpointWidgetContext) {
+    BreakpointWidgetContext[BreakpointWidgetContext["CONDITION"] = 0] = "CONDITION";
+    BreakpointWidgetContext[BreakpointWidgetContext["HIT_COUNT"] = 1] = "HIT_COUNT";
+    BreakpointWidgetContext[BreakpointWidgetContext["LOG_MESSAGE"] = 2] = "LOG_MESSAGE";
+    BreakpointWidgetContext[BreakpointWidgetContext["TRIGGER_POINT"] = 3] = "TRIGGER_POINT";
+})(BreakpointWidgetContext || (BreakpointWidgetContext = {}))));
+var DebugVisualizationType;
+( ((function(DebugVisualizationType) {
+    DebugVisualizationType[DebugVisualizationType["Command"] = 0] = "Command";
+    DebugVisualizationType[DebugVisualizationType["Tree"] = 1] = "Tree";
+})(DebugVisualizationType || (DebugVisualizationType = {}))));
+var DebugTreeItemCollapsibleState;
+( ((function(DebugTreeItemCollapsibleState) {
+    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["None"] = 0] = "None";
+    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["Collapsed"] = 1] = "Collapsed";
+    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["Expanded"] = 2] = "Expanded";
+})(DebugTreeItemCollapsibleState || (DebugTreeItemCollapsibleState = {}))));
 var IDebugVisualization;
 ( ((function(IDebugVisualization) {
     IDebugVisualization.deserialize = (v) => ({
@@ -477,4 +513,4 @@ var IDebugVisualization;
     });
     IDebugVisualization.serialize = (visualizer) => visualizer;
 })(IDebugVisualization || (IDebugVisualization = {}))));
-export { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_CONFIGURATION_TYPE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_BREAKPOINT_WIDGET, CONTEXT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_REPL, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_MULTI_SESSION_REPL, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_MEMORY_SCHEME, DEBUG_PANEL_ID, DEBUG_SCHEME, DISASSEMBLY_VIEW_ID, DebugConfigurationProviderTriggerKind, DebuggerString, EDITOR_CONTRIBUTION_ID, IDebugVisualization, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel, isFrameDeemphasized };
+export { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_CONFIGURATION_TYPE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_BREAKPOINT_WIDGET, CONTEXT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_REPL, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_MULTI_SESSION_REPL, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_MEMORY_SCHEME, DEBUG_PANEL_ID, DEBUG_SCHEME, DISASSEMBLY_VIEW_ID, DataBreakpointSetType, DebugConfigurationProviderTriggerKind, DebugTreeItemCollapsibleState, DebugVisualizationType, DebuggerString, EDITOR_CONTRIBUTION_ID, IDebugVisualization, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, MemoryRangeType, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel, isFrameDeemphasized };

package/vscode/src/vs/workbench/contrib/debug/common/debug.service.d.ts

@@ -4,7 +4,7 @@ import { ServiceIdentifier } from '../../../../platform/instantiation/common/ins
 import { Event } from '../../../../base/common/event.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ITextModel } from '../../../../editor/common/model.js';
-import { IDataBreakpointOptions, IInstructionBreakpointOptions } from './debugModel.js';
+import { IFunctionBreakpointOptions, IDataBreakpointOptions, IInstructionBreakpointOptions } from './debugModel.js';
 import { State, IDebugSessionOptions, IDebugSession, IConfigurationManager, IAdapterManager, IStackFrame, IThread, IBreakpointData, IBreakpoint, IBreakpointUpdateData, IEnablement, IExceptionBreakpoint, ILaunch, IConfig, IDebugModel, IViewModel } from './debug.js';
 
 declare const IDebugService: ServiceIdentifier<IDebugService>;
@@ -86,7 +86,7 @@ interface IDebugService {
     /**
     * Adds a new function breakpoint for the given name.
     */
-    addFunctionBreakpoint(name?: string, id?: string, mode?: string): void;
+    addFunctionBreakpoint(opts?: IFunctionBreakpointOptions, id?: string): void;
     /**
     * Updates an already existing function breakpoint.
     * Notifies debug adapter of breakpoint changes.

package/vscode/src/vs/workbench/contrib/debug/common/debugModel.d.ts

@@ -11,6 +11,9 @@ interface IBaseBreakpointOptions {
     mode?: string;
     modeLabel?: string;
 }
+interface IFunctionBreakpointOptions extends IBaseBreakpointOptions {
+    name: string;
+}
 interface IDataBreakpointOptions extends IBaseBreakpointOptions {
     description: string;
     src: DataBreakpointSource;
@@ -29,4 +32,4 @@ interface IInstructionBreakpointOptions extends IBaseBreakpointOptions {
     address: bigint;
 }
 
-export type { IBaseBreakpointOptions, IDataBreakpointOptions, IInstructionBreakpointOptions };
+export type { IBaseBreakpointOptions, IDataBreakpointOptions, IFunctionBreakpointOptions, IInstructionBreakpointOptions };

package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js

@@ -19,7 +19,7 @@ import { Range } from '../../../../editor/common/core/range.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
-import { DEBUG_MEMORY_SCHEME } from './debug.js';
+import { DebugTreeItemCollapsibleState, DEBUG_MEMORY_SCHEME, DataBreakpointSetType, isFrameDeemphasized, State, MemoryRangeType } from './debug.js';
 import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
 import { DisassemblyViewInput } from './disassemblyViewInput.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
@@ -254,7 +254,7 @@ class VisualizedExpression {
         return this.treeItem.description || '';
     }
     get hasChildren() {
-        return this.treeItem.collapsibleState !== 0 ;
+        return this.treeItem.collapsibleState !== DebugTreeItemCollapsibleState.None;
     }
     constructor(visualizer, treeId, treeItem, original) {
         this.visualizer = visualizer;
@@ -493,9 +493,8 @@ class Thread {
     }
     getTopStackFrame() {
         const callStack = this.getCallStack();
-        const firstAvailableStackFrame = callStack.find(sf => !!(sf &&
-            ((this.stoppedDetails?.reason === 'instruction breakpoint' || (this.stoppedDetails?.reason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
-            (sf.source && sf.source.available && sf.source.presentationHint !== 'deemphasize')));
+        const firstAvailableStackFrame = callStack.find(sf => !!(((this.stoppedDetails?.reason === 'instruction breakpoint' || (this.stoppedDetails?.reason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
+            (sf.source && sf.source.available && !isFrameDeemphasized(sf))));
         return firstAvailableStackFrame;
     }
     get stateLabel() {
@@ -622,14 +621,14 @@ class MemoryRegion extends Disposable {
         const offset = fromOffset;
         const result = await this.session.readMemory(this.memoryReference, offset, length);
         if (result === undefined || !result.body?.data) {
-            return [{ type: 1 , offset, length }];
+            return [{ type: MemoryRangeType.Unreadable, offset, length }];
         }
         let data;
         try {
             data = decodeBase64(result.body.data);
         }
         catch {
-            return [{ type: 2 , offset, length, error: 'Invalid base64 data from debug adapter' }];
+            return [{ type: MemoryRangeType.Error, offset, length, error: 'Invalid base64 data from debug adapter' }];
         }
         const unreadable = result.body.unreadableBytes || 0;
         const dataLength = length - unreadable;
@@ -642,11 +641,11 @@ class MemoryRegion extends Disposable {
             data = data.slice(0, dataLength);
         }
         if (!unreadable) {
-            return [{ type: 0 , offset, length, data }];
+            return [{ type: MemoryRangeType.Valid, offset, length, data }];
         }
         return [
-            { type: 0 , offset, length: dataLength, data },
-            { type: 1 , offset: offset + dataLength, length: unreadable },
+            { type: MemoryRangeType.Valid, offset, length: dataLength, data },
+            { type: MemoryRangeType.Unreadable, offset: offset + dataLength, length: unreadable },
         ];
     }
     async write(offset, data) {
@@ -933,7 +932,7 @@ class DataBreakpoint extends BaseBreakpoint {
         this.sessionDataIdForAddr = ( (new WeakMap()));
         this.description = opts.description;
         if ('dataId' in opts) {
-            opts.src = { type: 0 , dataId: opts.dataId };
+            opts.src = { type: DataBreakpointSetType.Variable, dataId: opts.dataId };
         }
         this.src = opts.src;
         this.canPersist = opts.canPersist;
@@ -945,7 +944,7 @@ class DataBreakpoint extends BaseBreakpoint {
     }
     async toDAP(session) {
         let dataId;
-        if (this.src.type === 0 ) {
+        if (this.src.type === DataBreakpointSetType.Variable) {
             dataId = this.src.dataId;
         }
         else {
@@ -1120,14 +1119,14 @@ let DebugModel = class DebugModel extends Disposable {
         return undefined;
     }
     getSessions(includeInactive = false) {
-        return this.sessions.filter(s => includeInactive || s.state !== 0 );
+        return this.sessions.filter(s => includeInactive || s.state !== State.Inactive);
     }
     addSession(session) {
         this.sessions = this.sessions.filter(s => {
             if (s.getId() === session.getId()) {
                 return false;
             }
-            if (s.state === 0  && s.configuration.name === session.configuration.name) {
+            if (s.state === State.Inactive && s.configuration.name === session.configuration.name) {
                 return false;
             }
             return true;
@@ -1511,8 +1510,8 @@ let DebugModel = class DebugModel extends Disposable {
         }
         this._onDidChangeBreakpoints.fire({ changed: changed, sessionOnly: false });
     }
-    addFunctionBreakpoint(functionName, id, mode) {
-        const newFunctionBreakpoint = ( (new FunctionBreakpoint({ name: functionName, mode }, id)));
+    addFunctionBreakpoint(opts, id) {
+        const newFunctionBreakpoint = ( (new FunctionBreakpoint(opts, id)));
         this.functionBreakpoints.push(newFunctionBreakpoint);
         this._onDidChangeBreakpoints.fire({ added: [newFunctionBreakpoint], sessionOnly: false });
         return newFunctionBreakpoint;

package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js

@@ -6,6 +6,7 @@ import { DEBUG_SCHEME } from './debug.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { isUri } from './debugUtils.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
 const _moduleId = "vs/workbench/contrib/debug/common/debugSource";
 const UNKNOWN_SOURCE_LABEL = ( localizeWithPath(_moduleId, 0, "Unknown Source"));
 class Source {
@@ -46,7 +47,7 @@ class Source {
                 preserveFocus,
                 selection,
                 revealIfOpened: true,
-                selectionRevealType: 1 ,
+                selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
                 pinned
             }
         }, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);