@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -11,14 +11,16 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { basenameOrAuthority, dirname } from '../../../../base/common/resources.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { createAndFillInActionBarActions, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { registerAction2, MenuId, IMenuService, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ILabelService } from '../../../../platform/label/common/label.js';
@@ -27,15 +29,13 @@ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
 import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.js';
-import { debugBreakpointUnsupported, logBreakpoint, conditionalBreakpoint, dataBreakpoint, functionBreakpoint, breakpoint, watchExpressionsAddFuncBreakpoint, breakpointsActivate, breakpointsRemoveAll } from './debugIcons.js';
+import { breakpoint, dataBreakpoint, functionBreakpoint, logBreakpoint, conditionalBreakpoint, debugBreakpointUnsupported, watchExpressionsAddFuncBreakpoint, breakpointsActivate, breakpointsRemoveAll } from './debugIcons.js';
 import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DEBUG_SCHEME, DebuggerString, IDebugService, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
-import { DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, Breakpoint, ExceptionBreakpoint } from '../common/debugModel.js';
+import { Breakpoint, DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, ExceptionBreakpoint } from '../common/debugModel.js';
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
-import { IHoverService } from '../../../services/hover/browser/hover.js';
 var BreakpointsRenderer_1, FunctionBreakpointsRenderer_1, DataBreakpointsRenderer_1, InstructionBreakpointsRenderer_1;
 const $ = $$1;
 function createCheckbox(disposables) {
@@ -397,7 +397,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         }
         data.filePath.textContent = this.labelService.getUriLabel(dirname(breakpoint.uri), { relative: true });
         data.checkbox.checked = breakpoint.enabled;
-        const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService);
+        const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.breakpoint.title = breakpoint.message || message || '';
         const debugActive = this.debugService.state === 3  || this.debugService.state === 2 ;
@@ -510,7 +510,7 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
     renderElement(functionBreakpoint, _index, data) {
         data.context = functionBreakpoint;
         data.name.textContent = functionBreakpoint.name;
-        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService);
+        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.icon.title = message ? message : '';
         data.checkbox.checked = functionBreakpoint.enabled;
@@ -586,7 +586,7 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
     renderElement(dataBreakpoint, _index, data) {
         data.context = dataBreakpoint;
         data.name.textContent = dataBreakpoint.description;
-        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService);
+        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.icon.title = message ? message : '';
         data.checkbox.checked = dataBreakpoint.enabled;
@@ -668,7 +668,7 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         data.name.textContent = '0x' + ( breakpoint.address.toString(16));
         data.name.title = `Decimal address: breakpoint.address.toString()`;
         data.checkbox.checked = breakpoint.enabled;
-        const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService);
+        const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.breakpoint.title = breakpoint.message || message || '';
         const debugActive = this.debugService.state === 3  || this.debugService.state === 2 ;
@@ -760,7 +760,7 @@ class FunctionBreakpointInputRenderer {
     renderElement(functionBreakpoint, _index, data) {
         data.breakpoint = functionBreakpoint;
         data.type = this.view.inputBoxData?.type || 'name';
-        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService);
+        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.icon.title = message ? message : '';
         data.checkbox.checked = functionBreakpoint.enabled;
@@ -881,7 +881,7 @@ class DataBreakpointInputRenderer {
     renderElement(dataBreakpoint, _index, data) {
         data.breakpoint = dataBreakpoint;
         data.type = this.view.inputBoxData?.type || 'condition';
-        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService);
+        const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.icon.title = message ? message : '';
         data.checkbox.checked = dataBreakpoint.enabled;
@@ -1021,7 +1021,7 @@ class BreakpointsAccessibilityProvider {
         if (element instanceof ExceptionBreakpoint) {
             return ( element.toString());
         }
-        const { message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), element, this.labelService);
+        const { message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), element, this.labelService, this.debugService.getModel());
         const toString = ( element.toString());
         return message ? `${toString}, ${message}` : toString;
     }
@@ -1052,7 +1052,7 @@ function openBreakpointSource(breakpoint, sideBySide, preserveFocus, pinned, deb
         }
     }, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 }
-function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1, labelService) {
+function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1, labelService, debugModel) {
     const debugActive = state === 3  || state === 2 ;
     const breakpointIcon = breakpoint$1 instanceof DataBreakpoint ? dataBreakpoint : breakpoint$1 instanceof FunctionBreakpoint ? functionBreakpoint : breakpoint$1.logMessage ? logBreakpoint : breakpoint;
     if (!breakpoint$1.enabled || !breakpointsActivated) {
@@ -1072,6 +1072,11 @@ function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1,
     const appendMessage = (text) => {
         return ('message' in breakpoint$1 && breakpoint$1.message) ? text.concat(', ' + breakpoint$1.message) : text;
     };
+    if (debugActive && breakpoint$1 instanceof Breakpoint && breakpoint$1.pending) {
+        return {
+            icon: breakpoint.pending
+        };
+    }
     if (debugActive && !breakpoint$1.verified) {
         return {
             icon: breakpointIcon.unverified,
@@ -1188,17 +1193,20 @@ function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1,
             message: appendMessage(messages.join('\n'))
         };
     }
-    if (breakpoint$1.logMessage || breakpoint$1.condition || breakpoint$1.hitCondition) {
+    let triggeringBreakpoint;
+    if (breakpoint$1 instanceof Breakpoint && breakpoint$1.triggeredBy) {
+        triggeringBreakpoint = debugModel.getBreakpoints().find(bp => bp.getId() === breakpoint$1.triggeredBy);
+    }
+    if (breakpoint$1.logMessage || breakpoint$1.condition || breakpoint$1.hitCondition || triggeringBreakpoint) {
         const messages = [];
+        let icon = breakpoint$1.logMessage ? logBreakpoint.regular : conditionalBreakpoint.regular;
         if (!breakpoint$1.supported) {
-            return {
-                icon: debugBreakpointUnsupported,
-                message: ( localizeWithPath(
-                    'vs/workbench/contrib/debug/browser/breakpointsView',
-                    'breakpointUnsupported',
-                    "Breakpoints of this type are not supported by the debugger"
-                )),
-            };
+            icon = debugBreakpointUnsupported;
+            messages.push(( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'breakpointUnsupported',
+                "Breakpoints of this type are not supported by the debugger"
+            )));
         }
         if (breakpoint$1.logMessage) {
             messages.push(( localizeWithPath(
@@ -1224,8 +1232,16 @@ function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1,
                 breakpoint$1.hitCondition
             )));
         }
+        if (triggeringBreakpoint) {
+            messages.push(( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/breakpointsView',
+                'triggeredBy',
+                "Hit after breakpoint: {0}",
+                `${labelService.getUriLabel(triggeringBreakpoint.uri, { relative: true })}: ${triggeringBreakpoint.lineNumber}`
+            )));
+        }
         return {
-            icon: breakpoint$1.logMessage ? logBreakpoint.regular : conditionalBreakpoint.regular,
+            icon,
             message: appendMessage(messages.join('\n'))
         };
     }
@@ -1280,11 +1296,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.debug.viewlet.action.toggleBreakpointsActivatedAction',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'activateBreakpoints',
-                "Toggle Activate Breakpoints"
-            )), original: 'Toggle Activate Breakpoints' },
+                'Toggle Activate Breakpoints'
+            )),
             f1: true,
             icon: breakpointsActivate,
             menu: {
@@ -1462,11 +1478,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.debug.viewlet.action.reapplyBreakpointsAction',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'reapplyAllBreakpoints',
-                "Reapply All Breakpoints"
-            )), original: 'Reapply All Breakpoints' },
+                'Reapply All Breakpoints'
+            )),
             f1: true,
             precondition: CONTEXT_IN_DEBUG_MODE,
             menu: [{
@@ -1496,6 +1512,7 @@ registerAction2(class extends ViewAction {
             precondition: CONTEXT_BREAKPOINT_SUPPORTS_CONDITION,
             menu: [{
                     id: MenuId.DebugBreakpointsContext,
+                    when: ( CONTEXT_BREAKPOINT_ITEM_TYPE.notEqualsTo('functionBreakpoint')),
                     group: 'navigation',
                     order: 10
                 }, {
@@ -1551,11 +1568,11 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(
                 'vs/workbench/contrib/debug/browser/breakpointsView',
                 'editBreakpoint',
-                "Edit Function Breakpoint..."
+                "Edit Function Condition..."
             )),
             menu: [{
                     id: MenuId.DebugBreakpointsContext,
-                    group: '1_breakpoints',
+                    group: 'navigation',
                     order: 10,
                     when: ( CONTEXT_BREAKPOINT_ITEM_TYPE.isEqualTo('functionBreakpoint'))
                 }]

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

@@ -51,7 +51,12 @@ const breakpoint = {
         'vs/workbench/contrib/debug/browser/debugIcons',
         'debugBreakpointUnverified',
         'Icon for unverified breakpoints.'
-    )))
+    ))),
+    pending: registerIcon('debug-breakpoint-pending', Codicon.debugBreakpointPending, ( localizeWithPath(
+        'vs/workbench/contrib/debug/browser/debugIcons',
+        'debugBreakpointPendingOnTrigger',
+        'Icon for breakpoints waiting on another breakpoint.'
+    ))),
 };
 const functionBreakpoint = {
     regular: registerIcon('debug-breakpoint-function', Codicon.debugBreakpointFunction, ( localizeWithPath(

package/vscode/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .zone-widget .zone-widget-container.breakpoint-widget{border-color:#007acc;display:flex}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container{display:flex;flex-direction:column;flex-shrink:0;justify-content:center;padding:0 10px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container .monaco-select-box{min-height:18px;min-width:100px;padding:2px 20px 2px 8px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container:after{right:14px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer{flex:1}";
+var css = ".monaco-editor .zone-widget .zone-widget-container.breakpoint-widget{border-color:#007acc;display:flex}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container{display:flex;flex-direction:column;flex-shrink:0;justify-content:center;padding:0 10px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .monaco-select-box{min-height:18px;min-width:100px;padding:2px 20px 2px 8px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .breakpoint-select-container:after{right:14px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .inputContainer{flex:1}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container{align-items:center;display:flex;flex-grow:1;gap:10px;width:0}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container .monaco-button{flex-grow:0;line-height:14px;padding-left:8px;padding-right:8px;width:auto}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container .select-box-container{display:flex;flex-direction:column;justify-content:center;width:300px}.monaco-editor .zone-widget .zone-widget-container.breakpoint-widget .select-breakpoint-container:after{right:14px}";
 n(css,{});
 export { css, css as default };

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

@@ -32,6 +32,7 @@ interface IRawStoppedDetails {
     text?: string;
     totalFrames?: number;
     allThreadsStopped?: boolean;
+    preserveFocusHint?: boolean;
     framesErrorMessage?: string;
     hitBreakpointIds?: number[];
 }
@@ -47,15 +48,17 @@ interface IReplElementSource {
     readonly lineNumber: number;
     readonly column: number;
 }
-interface IExpressionContainer extends ITreeElement {
+interface IExpressionValue {
+    readonly value: string;
+    readonly type?: string;
+    valueChanged?: boolean;
+}
+interface IExpressionContainer extends ITreeElement, IExpressionValue {
     readonly hasChildren: boolean;
     evaluateLazy(): Promise<void>;
     getChildren(): Promise<IExpression[]>;
     readonly reference?: number;
     readonly memoryReference?: string;
-    readonly value: string;
-    readonly type?: string;
-    valueChanged?: boolean;
     readonly presentationHint?: DebugProtocol.VariablePresentationHint | undefined;
 }
 interface IExpression extends IExpressionContainer {
@@ -361,6 +364,7 @@ interface IBreakpointData {
     readonly condition?: string;
     readonly logMessage?: string;
     readonly hitCondition?: string;
+    readonly triggeredBy?: string;
 }
 interface IBreakpointUpdateData {
     readonly condition?: string;
@@ -368,6 +372,7 @@ interface IBreakpointUpdateData {
     readonly logMessage?: string;
     readonly lineNumber?: number;
     readonly column?: number;
+    readonly triggeredBy?: string;
 }
 interface IBaseBreakpoint extends IEnablement {
     readonly condition?: string;
@@ -393,6 +398,14 @@ interface IBreakpoint extends IBaseBreakpoint {
         lineNumber: number;
         column: number | undefined;
     };
+    /** An ID of the breakpoint that triggers this breakpoint. */
+    readonly triggeredBy?: string;
+    /** Pending on the trigger breakpoint, which means this breakpoint is not yet sent to DA */
+    readonly pending: boolean;
+    /** Marks that a session did trigger the breakpoint. */
+    setSessionDidTrigger(sessionId: string): void;
+    /** Gets whether the `triggeredBy` condition has been met in the given sesison ID. */
+    getSessionDidTrigger(sessionId: string): boolean;
 }
 interface IFunctionBreakpoint extends IBaseBreakpoint {
     readonly name: string;
@@ -472,6 +485,7 @@ interface IDebugModel extends ITreeElement {
         lineNumber?: number;
         column?: number;
         enabledOnly?: boolean;
+        triggeredOnly?: boolean;
     }): ReadonlyArray<IBreakpoint>;
     areBreakpointsActivated(): boolean;
     getFunctionBreakpoints(): ReadonlyArray<IFunctionBreakpoint>;
@@ -638,6 +652,10 @@ interface IConfigurationManager {
      * Allows to register on change of selected debug configuration.
      */
     onDidSelectConfiguration: Event<void>;
+    /**
+     * Allows to register on change of selected debug configuration.
+     */
+    onDidChangeConfigurationProviders: Event<void>;
     hasDebugConfigurationProvider(debugType: string, triggerKind?: DebugConfigurationProviderTriggerKind): boolean;
     getDynamicProviders(): Promise<{
         label: string;
@@ -729,17 +747,25 @@ interface IDebugService {
      */
     onDidChangeState: Event<State>;
     /**
-     * Allows to register on new session events.
+     * Allows to register on sessions about to be created (not yet fully initialised).
+     * This is fired exactly one time for any given session.
      */
-    onDidNewSession: Event<IDebugSession>;
+    onWillNewSession: Event<IDebugSession>;
     /**
-     * Allows to register on sessions about to be created (not yet fully initialised)
+     * Fired when a new debug session is started. This may fire multiple times
+     * for a single session due to restarts.
      */
-    onWillNewSession: Event<IDebugSession>;
+    onDidNewSession: Event<IDebugSession>;
     /**
      * Allows to register on end session events.
+     *
+     * Contains a boolean indicating whether the session will restart. If restart
+     * is true, the session should not considered to be dead yet.
      */
-    onDidEndSession: Event<IDebugSession>;
+    onDidEndSession: Event<{
+        session: IDebugSession;
+        restart: boolean;
+    }>;
     /**
      * Gets the configuration manager.
      */
@@ -836,6 +862,10 @@ interface IDebugService {
      * If session is not passed, sends all breakpoints to each session.
      */
     sendAllBreakpoints(session?: IDebugSession): Promise<any>;
+    /**
+     * Sends breakpoints of the given source to the passed session.
+     */
+    sendBreakpoints(modelUri: URI, sourceModified?: boolean, session?: IDebugSession): Promise<any>;
     /**
      * Adds a new watch expression and evaluates it against the debug adapter.
      */
@@ -887,4 +917,4 @@ interface IDebugService {
     runTo(uri: URI, lineNumber: number, column?: number): Promise<void>;
 }
 
-export { type AdapterEndEvent, DebugConfigurationProviderTriggerKind, DebuggerString, type IAdapterDescriptor, type IAdapterManager, type IBaseBreakpoint, type IBreakpoint, type IBreakpointData, type IBreakpointUpdateData, type IBreakpointsChangeEvent, type ICompound, type IConfig, type IConfigPresentation, type IConfigurationManager, type IDataBreakpoint, type IDataBreakpointInfoResponse, type IDebugAdapter, type IDebugAdapterDescriptorFactory, type IDebugAdapterExecutable, type IDebugAdapterExecutableOptions, type IDebugAdapterFactory, type IDebugAdapterImpl, type IDebugAdapterInlineImpl, type IDebugAdapterNamedPipeServer, type IDebugAdapterServer, type IDebugConfigurationProvider, type IDebugModel, IDebugService, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugger, type IDebuggerMetadata, type IEnablement, type IErrorMemoryRange, type IEvaluate, type IExceptionBreakpoint, type IExceptionInfo, type IExpression, type IExpressionContainer, type IFunctionBreakpoint, type IInstructionBreakpoint, type ILaunch, type IMemoryInvalidationEvent, type IMemoryRange, type IMemoryRegion, type INewReplElementData, type IRawModelUpdate, type IRawStoppedDetails, type IReplElement, type IReplElementSource, type IScope, type IStackFrame, type IThread, type ITreeElement, type IUnreadableMemoryRange, type IValidMemoryRange, type IViewModel, type LoadedSourceEvent, type MemoryRange, MemoryRangeType, State };
+export { type AdapterEndEvent, DebugConfigurationProviderTriggerKind, DebuggerString, type IAdapterDescriptor, type IAdapterManager, type IBaseBreakpoint, type IBreakpoint, type IBreakpointData, type IBreakpointUpdateData, type IBreakpointsChangeEvent, type ICompound, type IConfig, type IConfigPresentation, type IConfigurationManager, type IDataBreakpoint, type IDataBreakpointInfoResponse, type IDebugAdapter, type IDebugAdapterDescriptorFactory, type IDebugAdapterExecutable, type IDebugAdapterExecutableOptions, type IDebugAdapterFactory, type IDebugAdapterImpl, type IDebugAdapterInlineImpl, type IDebugAdapterNamedPipeServer, type IDebugAdapterServer, type IDebugConfigurationProvider, type IDebugModel, IDebugService, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugger, type IDebuggerMetadata, type IEnablement, type IErrorMemoryRange, type IEvaluate, type IExceptionBreakpoint, type IExceptionInfo, type IExpression, type IExpressionContainer, type IExpressionValue, type IFunctionBreakpoint, type IInstructionBreakpoint, type ILaunch, type IMemoryInvalidationEvent, type IMemoryRange, type IMemoryRegion, type INewReplElementData, type IRawModelUpdate, type IRawStoppedDetails, type IReplElement, type IReplElementSource, type IScope, type IStackFrame, type IThread, type ITreeElement, type IUnreadableMemoryRange, type IValidMemoryRange, type IViewModel, type LoadedSourceEvent, type MemoryRange, MemoryRangeType, State };

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

@@ -1,3 +1,4 @@
+import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
@@ -372,6 +373,21 @@ const CONTEXT_VARIABLE_IS_READONLY = ( new RawContextKey(
         "True when the focused variable is read-only."
     )) }
 ));
+const CONTEXT_VARIABLE_VALUE = ( new RawContextKey('variableValue', false, { type: 'string', description: ( localizeWithPath(
+    'vs/workbench/contrib/debug/common/debug',
+    'variableValue',
+    "Value of the variable, present for debug visualization clauses."
+)) }));
+const CONTEXT_VARIABLE_TYPE = ( new RawContextKey('variableType', false, { type: 'string', description: ( localizeWithPath(
+    'vs/workbench/contrib/debug/common/debug',
+    'variableType',
+    "Type of the variable, present for debug visualization clauses."
+)) }));
+const CONTEXT_VARIABLE_NAME = ( new RawContextKey('variableName', false, { type: 'string', description: ( localizeWithPath(
+    'vs/workbench/contrib/debug/common/debug',
+    'variableName',
+    "Name of the variable, present for debug visualization clauses."
+)) }));
 const CONTEXT_EXCEPTION_WIDGET_VISIBLE = ( new RawContextKey(
     'exceptionWidgetVisible',
     false,
@@ -466,4 +482,15 @@ var DebuggerString;
     DebuggerString["UnverifiedBreakpoints"] = "unverifiedBreakpoints";
 })(DebuggerString || (DebuggerString = {})));
 const IDebugService = ( createDecorator('debugService'));
-export { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_INPUT_FOCUSED, 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_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_IS_READONLY, 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, IDebugService, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel };
+var IDebugVisualization;
+( (function(IDebugVisualization) {
+    IDebugVisualization.deserialize = (v) => ({
+        id: v.id,
+        name: v.name,
+        iconPath: v.iconPath && { light: URI.revive(v.iconPath.light), dark: URI.revive(v.iconPath.dark) },
+        iconClass: v.iconClass,
+        visualization: v.visualization,
+    });
+    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_INPUT_FOCUSED, 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_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_IS_READONLY, 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, IDebugService, IDebugVisualization, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel };

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

@@ -0,0 +1,14 @@
+import { CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_DEBUG_TYPE } from './debug.js';
+function getContextForVariable(parentContext, variable, additionalContext = []) {
+    const session = variable.getSession();
+    const contextKeys = [
+        [CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT.key, variable.variableMenuContext || ''],
+        [CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT.key, !!variable.evaluateName],
+        [CONTEXT_CAN_VIEW_MEMORY.key, !!session?.capabilities.supportsReadMemoryRequest && variable.memoryReference !== undefined],
+        [CONTEXT_VARIABLE_IS_READONLY.key, !!variable.presentationHint?.attributes?.includes('readOnly') || variable.presentationHint?.lazy],
+        [CONTEXT_DEBUG_TYPE.key, session?.configuration.type],
+        ...additionalContext,
+    ];
+    return parentContext.createOverlay(contextKeys);
+}
+export { getContextForVariable };

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

@@ -1,10 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { distinct } from '../../../../base/common/arrays.js';
+import { findLastIdx } from '../../../../base/common/arraysFind.js';
 import { RunOnceScheduler, DeferredPromise } from '../../../../base/common/async.js';
 import { decodeBase64, VSBuffer, encodeBase64 } from '../../../../base/common/buffer.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { stringHash } from '../../../../base/common/hash.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { stringHash } from '../../../../base/common/hash.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
@@ -13,13 +14,12 @@ import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { ILogService } from '../../../../platform/log/common/log.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { DEBUG_MEMORY_SCHEME } from './debug.js';
 import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
 import { DisassemblyViewInput } from './disassemblyViewInput.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { findLastIdx } from '../../../../base/common/arraysFind.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 class ExpressionContainer {
     static { this.allValues = ( new Map()); }
@@ -277,6 +277,9 @@ class Variable extends ExpressionContainer {
         this.value = value || '';
         this.type = type;
     }
+    getThreadId() {
+        return this.threadId;
+    }
     async setVariable(value, stackFrame) {
         if (!this.session) {
             return;
@@ -318,6 +321,7 @@ class Variable extends ExpressionContainer {
 class Scope extends ExpressionContainer {
     constructor(stackFrame, id, name, reference, expensive, namedVariables, indexedVariables, range) {
         super(stackFrame.thread.session, stackFrame.thread.threadId, reference, `scope:${name}:${id}`, namedVariables, indexedVariables);
+        this.stackFrame = stackFrame;
         this.name = name;
         this.expensive = expensive;
         this.range = range;
@@ -714,7 +718,7 @@ class BaseBreakpoint extends Enablement {
     }
 }
 class Breakpoint extends BaseBreakpoint {
-    constructor(_uri, _lineNumber, _column, enabled, condition, hitCondition, logMessage, _adapterData, textFileService, uriIdentityService, logService, id = generateUuid()) {
+    constructor(_uri, _lineNumber, _column, enabled, condition, hitCondition, logMessage, _adapterData, textFileService, uriIdentityService, logService, id = generateUuid(), triggeredBy = undefined) {
         super(enabled, hitCondition, condition, logMessage, id);
         this._uri = _uri;
         this._lineNumber = _lineNumber;
@@ -723,6 +727,7 @@ class Breakpoint extends BaseBreakpoint {
         this.textFileService = textFileService;
         this.uriIdentityService = uriIdentityService;
         this.logService = logService;
+        this.triggeredBy = triggeredBy;
     }
     get originalUri() {
         return this._uri;
@@ -736,6 +741,12 @@ class Breakpoint extends BaseBreakpoint {
         }
         return true;
     }
+    get pending() {
+        if (this.data) {
+            return false;
+        }
+        return this.triggeredBy !== undefined;
+    }
     get uri() {
         return this.verified && this.data && this.data.source ? getUriFromSource(this.data.source, this.data.source.path, this.data.sessionId, this.uriIdentityService, this.logService) : this._uri;
     }
@@ -794,27 +805,39 @@ class Breakpoint extends BaseBreakpoint {
         result.lineNumber = this._lineNumber;
         result.column = this._column;
         result.adapterData = this.adapterData;
+        result.triggeredBy = this.triggeredBy;
         return result;
     }
     toString() {
         return `${basenameOrAuthority(this.uri)} ${this.lineNumber}`;
     }
+    setSessionDidTrigger(sessionId) {
+        this.sessionsDidTrigger ??= ( new Set());
+        this.sessionsDidTrigger.add(sessionId);
+    }
+    getSessionDidTrigger(sessionId) {
+        return !!this.sessionsDidTrigger?.has(sessionId);
+    }
     update(data) {
-        if (!isUndefinedOrNull(data.lineNumber)) {
+        if (data.hasOwnProperty('lineNumber') && !isUndefinedOrNull(data.lineNumber)) {
             this._lineNumber = data.lineNumber;
         }
-        if (!isUndefinedOrNull(data.column)) {
+        if (data.hasOwnProperty('column')) {
             this._column = data.column;
         }
-        if (!isUndefinedOrNull(data.condition)) {
+        if (data.hasOwnProperty('condition')) {
             this.condition = data.condition;
         }
-        if (!isUndefinedOrNull(data.hitCondition)) {
+        if (data.hasOwnProperty('hitCondition')) {
             this.hitCondition = data.hitCondition;
         }
-        if (!isUndefinedOrNull(data.logMessage)) {
+        if (data.hasOwnProperty('logMessage')) {
             this.logMessage = data.logMessage;
         }
+        if (data.hasOwnProperty('triggeredBy')) {
+            this.triggeredBy = data.triggeredBy;
+            this.sessionsDidTrigger = undefined;
+        }
     }
 }
 class FunctionBreakpoint extends BaseBreakpoint {
@@ -1108,6 +1131,9 @@ let DebugModel = class DebugModel extends Disposable {
                 if (filter.enabledOnly && (!this.breakpointsActivated || !bp.enabled)) {
                     return false;
                 }
+                if (filter.triggeredOnly && bp.triggeredBy === undefined) {
+                    return false;
+                }
                 return true;
             });
         }
@@ -1171,20 +1197,23 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints.fire(undefined);
     }
     addBreakpoints(uri, rawData, fireEvent = true) {
-        const newBreakpoints = ( rawData.map(rawBp => ( new Breakpoint(
-            uri,
-            rawBp.lineNumber,
-            rawBp.column,
-            rawBp.enabled === false ? false : true,
-            rawBp.condition,
-            rawBp.hitCondition,
-            rawBp.logMessage,
-            undefined,
-            this.textFileService,
-            this.uriIdentityService,
-            this.logService,
-            rawBp.id
-        ))));
+        const newBreakpoints = ( rawData.map(rawBp => {
+            return ( new Breakpoint(
+                uri,
+                rawBp.lineNumber,
+                rawBp.column,
+                rawBp.enabled === false ? false : true,
+                rawBp.condition,
+                rawBp.hitCondition,
+                rawBp.logMessage,
+                undefined,
+                this.textFileService,
+                this.uriIdentityService,
+                this.logService,
+                rawBp.id,
+                rawBp.triggeredBy
+            ));
+        }));
         this.breakpoints = this.breakpoints.concat(newBreakpoints);
         this.breakpointsActivated = true;
         this.sortAndDeDup();

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

@@ -98,7 +98,7 @@ function getUriFromSource(raw, path, sessionId, uriIdentityService, logService)
         if (typeof raw.sourceReference === 'number' && raw.sourceReference > 0) {
             return ( URI.from({
                 scheme: DEBUG_SCHEME,
-                path,
+                path: path?.replace(/^\/+/g, '/'),
                 query: `session=${sessionId}&ref=${raw.sourceReference}`
             }));
         }