@codingame/monaco-vscode-api 6.0.2 → 7.0.0

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

@@ -76,7 +76,7 @@ function renderExpressionValue(expressionOrValue, container, options, hoverServi
     }
     if (options.hover) {
         const { store, commands, commandService } = options.hover instanceof DisposableStore ? { store: options.hover, commands: [], commandService: undefined } : options.hover;
-        store.add(hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), container, () => {
+        store.add(hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), container, () => {
             const container = $$1('div');
             const markdownHoverElement = $$1('div.hover-row');
             const hoverContentsElement = append(markdownHoverElement, $$1('div.hover-contents'));
@@ -96,13 +96,20 @@ function renderExpressionValue(expressionOrValue, container, options, hoverServi
         }));
     }
 }
-function renderVariable(store, commandService, hoverService, variable, data, showChanged, highlights, linkDetector) {
+function renderVariable(store, commandService, hoverService, variable, data, showChanged, highlights, linkDetector, displayType) {
     if (variable.available) {
+        data.type.textContent = '';
         let text = variable.name;
         if (variable.value && typeof variable.name === 'string') {
-            text += ':';
+            if (variable.type && displayType) {
+                text += ': ';
+                data.type.textContent = variable.type + ' =';
+            }
+            else {
+                text += ' =';
+            }
         }
-        data.label.set(text, highlights, variable.type ? variable.type : variable.name);
+        data.label.set(text, highlights, variable.type && !displayType ? variable.type : variable.name);
         data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
         data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
     }
@@ -164,7 +171,8 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const name = append(expression, $('span.name'));
         const lazyButton = append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localizeWithPath(_moduleId, 0, "Click to expand"))));
+        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localizeWithPath(_moduleId, 0, "Click to expand"))));
+        const type = append(expression, $('span.type'));
         const value = append(expression, $('span.value'));
         const label = templateDisposable.add(( (new HighlightedLabel(name))));
         const inputBoxContainer = append(expression, $('.inputBoxContainer'));
@@ -173,7 +181,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
             append(expression, $('.span.actionbar-spacer'));
             actionBar = templateDisposable.add(( (new ActionBar(expression))));
         }
-        const template = { expression, name, value, label, inputBoxContainer, actionBar, elementDisposable: ( (new DisposableStore())), templateDisposable, lazyButton, currentElement: undefined };
+        const template = { expression, name, type, value, label, inputBoxContainer, actionBar, elementDisposable: ( (new DisposableStore())), templateDisposable, lazyButton, currentElement: undefined };
         templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
             if (template.currentElement) {
                 this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
@@ -182,7 +190,6 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         return template;
     }
     renderExpressionElement(element, node, data) {
-        data.elementDisposable.clear();
         data.currentElement = element;
         this.renderExpression(node.element, data, createMatches(node.filterData));
         if (data.actionBar) {

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

@@ -743,9 +743,9 @@ registerThemingParticipant((theme, collector) => {
 		`);
     }
 });
-const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', { dark: '#E51400', light: '#E51400', hcDark: '#E51400', hcLight: '#E51400' }, ( localizeWithPath(_moduleId, 31, 'Icon color for breakpoints.')));
-const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, ( localizeWithPath(_moduleId, 32, 'Icon color for disabled breakpoints.')));
-const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', { dark: '#848484', light: '#848484', hcDark: '#848484', hcLight: '#848484' }, ( localizeWithPath(_moduleId, 33, 'Icon color for unverified breakpoints.')));
+const debugIconBreakpointForeground = registerColor('debugIcon.breakpointForeground', '#E51400', ( localizeWithPath(_moduleId, 31, 'Icon color for breakpoints.')));
+const debugIconBreakpointDisabledForeground = registerColor('debugIcon.breakpointDisabledForeground', '#848484', ( localizeWithPath(_moduleId, 32, 'Icon color for disabled breakpoints.')));
+const debugIconBreakpointUnverifiedForeground = registerColor('debugIcon.breakpointUnverifiedForeground', '#848484', ( localizeWithPath(_moduleId, 33, 'Icon color for unverified breakpoints.')));
 const debugIconBreakpointCurrentStackframeForeground = registerColor('debugIcon.breakpointCurrentStackframeForeground', { dark: '#FFCC00', light: '#BE8700', hcDark: '#FFCC00', hcLight: '#BE8700' }, ( localizeWithPath(_moduleId, 34, 'Icon color for the current breakpoint stack frame.')));
-const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', { dark: '#89D185', light: '#89D185', hcDark: '#89D185', hcLight: '#89D185' }, ( localizeWithPath(_moduleId, 35, 'Icon color for all breakpoint stack frames.')));
+const debugIconBreakpointStackframeForeground = registerColor('debugIcon.breakpointStackframeForeground', '#89D185', ( localizeWithPath(_moduleId, 35, 'Icon color for all breakpoint stack frames.')));
 export { BreakpointEditorContribution, createBreakpointDecorations, debugIconBreakpointForeground };

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

@@ -243,7 +243,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         append(container, modeWrapper);
     }
     createTriggerBreakpointInput(container) {
-        const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint);
+        const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint && !bp.logMessage);
         const breakpointOptions = [
             { text: ( localizeWithPath(_moduleId, 9, 'None')), isDisabled: true },
             ...( (breakpoints.map(bp => ({
@@ -327,6 +327,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
             [IContextKeyService, scopedContextKeyService],
             [IPrivateBreakpointWidgetService, this]
         ))));
+        this.toDispose.push(scopedInstatiationService);
         const options = this.createEditorOptions();
         const codeEditorWidgetOptions = getSimpleCodeEditorWidgetOptions();
         this.input = scopedInstatiationService.createInstance(CodeEditorWidget, container, options, codeEditorWidgetOptions);
@@ -403,12 +404,12 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     close(success) {
         if (success) {
-            let condition = this.breakpoint?.condition;
-            let hitCondition = this.breakpoint?.hitCondition;
-            let logMessage = this.breakpoint?.logMessage;
-            let triggeredBy = this.breakpoint?.triggeredBy;
-            let mode = this.breakpoint?.mode;
-            let modeLabel = this.breakpoint?.modeLabel;
+            let condition = undefined;
+            let hitCondition = undefined;
+            let logMessage = undefined;
+            let triggeredBy = undefined;
+            let mode = undefined;
+            let modeLabel = undefined;
             this.rememberInput();
             if (this.conditionInput || this.context === BreakpointWidgetContext.CONDITION) {
                 condition = this.conditionInput;

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

@@ -40,13 +40,14 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { breakpoint, dataBreakpoint, functionBreakpoint, logBreakpoint, conditionalBreakpoint, debugBreakpointUnsupported, watchExpressionsAddFuncBreakpoint, watchExpressionsAddDataBreakpoint, breakpointsActivate, breakpointsRemoveAll } from './debugIcons.js';
-import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DataBreakpointSetType, State, DEBUG_SCHEME, DebuggerString, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
+import { DataBreakpointSetType, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, State, DEBUG_SCHEME, DebuggerString, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { IDebugService } from '../common/debug.service.js';
 import { Breakpoint, DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, ExceptionBreakpoint } from '../common/debugModel.js';
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 var BreakpointsRenderer_1, FunctionBreakpointsRenderer_1, DataBreakpointsRenderer_1, InstructionBreakpointsRenderer_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/breakpointsView";
@@ -432,7 +433,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         data.checkbox.checked = breakpoint.enabled;
         const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
         const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
         if (debugActive && !breakpoint.verified) {
             data.breakpoint.classList.add('disabled');
@@ -491,11 +492,11 @@ class ExceptionBreakpointsRenderer {
         data.context = exceptionBreakpoint;
         data.name.textContent = exceptionBreakpoint.label || `${exceptionBreakpoint.filter} exceptions`;
         const exceptionBreakpointtitle = exceptionBreakpoint.verified ? (exceptionBreakpoint.description || data.name.textContent) : exceptionBreakpoint.message || ( localizeWithPath(_moduleId, 0, "Unverified Exception Breakpoint"));
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, exceptionBreakpointtitle));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, exceptionBreakpointtitle));
         data.breakpoint.classList.toggle('disabled', !exceptionBreakpoint.verified);
         data.checkbox.checked = exceptionBreakpoint.enabled;
         data.condition.textContent = exceptionBreakpoint.condition || '';
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.condition, ( localizeWithPath(_moduleId, 1, "Expression condition: {0}", exceptionBreakpoint.condition))));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.condition, ( localizeWithPath(_moduleId, 1, "Expression condition: {0}", exceptionBreakpoint.condition))));
         if (exceptionBreakpoint.modeLabel) {
             data.badge.textContent = exceptionBreakpoint.modeLabel;
             data.badge.style.display = 'block';
@@ -554,9 +555,9 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
         data.name.textContent = functionBreakpoint.name;
         const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
         data.checkbox.checked = functionBreakpoint.enabled;
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
         if (functionBreakpoint.condition && functionBreakpoint.hitCondition) {
             data.condition.textContent = ( localizeWithPath(
                 _moduleId,
@@ -579,7 +580,7 @@ let FunctionBreakpointsRenderer = class FunctionBreakpointsRenderer {
         const session = this.debugService.getViewModel().focusedSession;
         data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsFunctionBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
         if (session && !session.capabilities.supportsFunctionBreakpoints) {
-            data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, ( localizeWithPath(_moduleId, 3, "Function breakpoints are not supported by this debug type"))));
+            data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, ( localizeWithPath(_moduleId, 3, "Function breakpoints are not supported by this debug type"))));
         }
         const primary = [];
         this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
@@ -639,9 +640,9 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         data.name.textContent = dataBreakpoint.description;
         const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
         data.checkbox.checked = dataBreakpoint.enabled;
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, message ? message : ''));
         if (dataBreakpoint.modeLabel) {
             data.badge.textContent = dataBreakpoint.modeLabel;
             data.badge.style.display = 'block';
@@ -652,7 +653,7 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         const session = this.debugService.getViewModel().focusedSession;
         data.breakpoint.classList.toggle('disabled', (session && !session.capabilities.supportsDataBreakpoints) || !this.debugService.getModel().areBreakpointsActivated());
         if (session && !session.capabilities.supportsDataBreakpoints) {
-            data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, ( localizeWithPath(_moduleId, 4, "Data breakpoints are not supported by this debug type"))));
+            data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, ( localizeWithPath(_moduleId, 4, "Data breakpoints are not supported by this debug type"))));
         }
         if (dataBreakpoint.accessType) {
             const accessType = dataBreakpoint.accessType === 'read' ? ( localizeWithPath(_moduleId, 5, "Read")) : dataBreakpoint.accessType === 'write' ? ( localizeWithPath(_moduleId, 6, "Write")) : ( localizeWithPath(_moduleId, 7, "Access"));
@@ -727,11 +728,11 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         data.context = breakpoint;
         data.breakpoint.classList.toggle('disabled', !this.debugService.getModel().areBreakpointsActivated());
         data.name.textContent = '0x' + ( (breakpoint.address.toString(16)));
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.name, `Decimal address: breakpoint.address.toString()`));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.name, `Decimal address: breakpoint.address.toString()`));
         data.checkbox.checked = breakpoint.enabled;
         const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
         const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
         if (debugActive && !breakpoint.verified) {
             data.breakpoint.classList.add('disabled');
@@ -832,7 +833,7 @@ class FunctionBreakpointInputRenderer {
         data.type = this.view.inputBoxData?.type || 'name';
         const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), functionBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ? message : ''));
         data.checkbox.checked = functionBreakpoint.enabled;
         data.checkbox.disabled = true;
         data.inputBox.value = functionBreakpoint.name || '';
@@ -938,7 +939,7 @@ class DataBreakpointInputRenderer {
         data.type = this.view.inputBoxData?.type || 'condition';
         const { icon, message } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), dataBreakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
-        data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.icon, message ?? ''));
+        data.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.icon, message ?? ''));
         data.checkbox.checked = dataBreakpoint.enabled;
         data.checkbox.disabled = true;
         data.inputBox.value = '';
@@ -1241,8 +1242,10 @@ registerAction2(class extends Action2 {
                 }]
         });
     }
-    run(accessor) {
+    async run(accessor) {
         const debugService = accessor.get(IDebugService);
+        const viewService = accessor.get(IViewsService);
+        await viewService.openView(BREAKPOINTS_VIEW_ID);
         debugService.addFunctionBreakpoint();
     }
 });
@@ -1466,7 +1469,7 @@ registerAction2(class extends Action2 {
             await debugService.removeDataBreakpoints(breakpoint.getId());
         }
         else if (breakpoint instanceof InstructionBreakpoint) {
-            await debugService.removeInstructionBreakpoints(breakpoint.instructionReference);
+            await debugService.removeInstructionBreakpoints(breakpoint.instructionReference, breakpoint.offset);
         }
     }
 });

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

@@ -22,12 +22,7 @@ const debugToolBarBackground = registerColor('debugToolBar.background', {
     hcDark: '#000000',
     hcLight: '#FFFFFF'
 }, ( localizeWithPath(_moduleId, 0, "Debug toolbar background color.")));
-const debugToolBarBorder = registerColor('debugToolBar.border', {
-    dark: null,
-    light: null,
-    hcDark: null,
-    hcLight: null
-}, ( localizeWithPath(_moduleId, 1, "Debug toolbar border color.")));
+const debugToolBarBorder = registerColor('debugToolBar.border', null, ( localizeWithPath(_moduleId, 1, "Debug toolbar border color.")));
 const debugIconStartForeground = registerColor('debugIcon.startForeground', {
     dark: '#89D185',
     light: '#388A34',
@@ -36,6 +31,7 @@ const debugIconStartForeground = registerColor('debugIcon.startForeground', {
 }, ( localizeWithPath(_moduleId, 2, "Debug toolbar icon for start debugging.")));
 function registerColors() {
     const debugTokenExpressionName = registerColor('debugTokenExpression.name', { dark: '#c586c0', light: '#9b46b0', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token names shown in the debug views (ie. the Variables or Watch view).');
+    const debugTokenExpressionType = registerColor('debugTokenExpression.type', { dark: '#4A90E2', light: '#4A90E2', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token types shown in the debug views (ie. the Variables or Watch view).');
     const debugTokenExpressionValue = registerColor('debugTokenExpression.value', { dark: '#cccccc99', light: '#6c6c6ccc', hcDark: foreground, hcLight: foreground }, 'Foreground color for the token values shown in the debug views (ie. the Variables or Watch view).');
     const debugTokenExpressionString = registerColor('debugTokenExpression.string', { dark: '#ce9178', light: '#a31515', hcDark: '#f48771', hcLight: '#a31515' }, 'Foreground color for strings in the debug views (ie. the Variables or Watch view).');
     const debugTokenExpressionBoolean = registerColor('debugTokenExpression.boolean', { dark: '#4e94ce', light: '#0000ff', hcDark: '#75bdfe', hcLight: '#0000ff' }, 'Foreground color for booleans in the debug views (ie. the Variables or Watch view).');
@@ -43,14 +39,14 @@ function registerColors() {
     const debugTokenExpressionError = registerColor('debugTokenExpression.error', { dark: '#f48771', light: '#e51400', hcDark: '#f48771', hcLight: '#e51400' }, 'Foreground color for expression errors in the debug views (ie. the Variables or Watch view) and for error logs shown in the debug console.');
     const debugViewExceptionLabelForeground = registerColor('debugView.exceptionLabelForeground', { dark: foreground, light: '#FFF', hcDark: foreground, hcLight: foreground }, 'Foreground color for a label shown in the CALL STACK view when the debugger breaks on an exception.');
     const debugViewExceptionLabelBackground = registerColor('debugView.exceptionLabelBackground', { dark: '#6C2022', light: '#A31515', hcDark: '#6C2022', hcLight: '#A31515' }, 'Background color for a label shown in the CALL STACK view when the debugger breaks on an exception.');
-    const debugViewStateLabelForeground = registerColor('debugView.stateLabelForeground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
-    const debugViewStateLabelBackground = registerColor('debugView.stateLabelBackground', { dark: '#88888844', light: '#88888844', hcDark: '#88888844', hcLight: '#88888844' }, 'Background color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
-    const debugViewValueChangedHighlight = registerColor('debugView.valueChangedHighlight', { dark: '#569CD6', light: '#569CD6', hcDark: '#569CD6', hcLight: '#569CD6' }, 'Color used to highlight value changes in the debug views (ie. in the Variables view).');
+    const debugViewStateLabelForeground = registerColor('debugView.stateLabelForeground', foreground, 'Foreground color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
+    const debugViewStateLabelBackground = registerColor('debugView.stateLabelBackground', '#88888844', 'Background color for a label in the CALL STACK view showing the current session\'s or thread\'s state.');
+    const debugViewValueChangedHighlight = registerColor('debugView.valueChangedHighlight', '#569CD6', 'Color used to highlight value changes in the debug views (ie. in the Variables view).');
     const debugConsoleInfoForeground = registerColor('debugConsole.infoForeground', { dark: editorInfoForeground, light: editorInfoForeground, hcDark: foreground, hcLight: foreground }, 'Foreground color for info messages in debug REPL console.');
     const debugConsoleWarningForeground = registerColor('debugConsole.warningForeground', { dark: editorWarningForeground, light: editorWarningForeground, hcDark: '#008000', hcLight: editorWarningForeground }, 'Foreground color for warning messages in debug REPL console.');
-    const debugConsoleErrorForeground = registerColor('debugConsole.errorForeground', { dark: errorForeground, light: errorForeground, hcDark: errorForeground, hcLight: errorForeground }, 'Foreground color for error messages in debug REPL console.');
-    const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for source filenames in debug REPL console.');
-    const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', { dark: foreground, light: foreground, hcDark: foreground, hcLight: foreground }, 'Foreground color for debug console input marker icon.');
+    const debugConsoleErrorForeground = registerColor('debugConsole.errorForeground', errorForeground, 'Foreground color for error messages in debug REPL console.');
+    const debugConsoleSourceForeground = registerColor('debugConsole.sourceForeground', foreground, 'Foreground color for source filenames in debug REPL console.');
+    const debugConsoleInputIconForeground = registerColor('debugConsoleInputIcon.foreground', foreground, 'Foreground color for debug console input marker icon.');
     const debugIconPauseForeground = registerColor('debugIcon.pauseForeground', {
         dark: '#75BEFF',
         light: '#007ACC',
@@ -192,6 +188,7 @@ function registerColors() {
 			}`);
         }
         const tokenNameColor = theme.getColor(debugTokenExpressionName);
+        const tokenTypeColor = theme.getColor(debugTokenExpressionType);
         const tokenValueColor = theme.getColor(debugTokenExpressionValue);
         const tokenStringColor = theme.getColor(debugTokenExpressionString);
         const tokenBooleanColor = theme.getColor(debugTokenExpressionBoolean);
@@ -202,6 +199,10 @@ function registerColors() {
 				color: ${tokenNameColor};
 			}
 
+			.monaco-workbench .monaco-list-row .expression .type {
+				color: ${tokenTypeColor};
+			}
+
 			.monaco-workbench .monaco-list-row .expression .value,
 			.monaco-workbench .debug-hover-widget .value {
 				color: ${tokenValueColor};

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

@@ -16,6 +16,7 @@ import { IEditorPane } from '../../../common/editor.js';
 import { DebugCompoundRoot } from './debugCompoundRoot.js';
 import { Source } from './debugSource.js';
 import { ITaskIdentifier } from '../../tasks/common/tasks.js';
+import { LiveTestResult } from '../../testing/common/testResult.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 
 interface IRawModelUpdate {
@@ -94,6 +95,10 @@ interface LoadedSourceEvent {
     source: Source;
 }
 type IDebugSessionReplMode = 'separate' | 'mergeWithParent';
+interface IDebugTestRunReference {
+    runId: string;
+    taskId: string;
+}
 interface IDebugSessionOptions {
     noDebug?: boolean;
     parentSession?: IDebugSession;
@@ -106,6 +111,11 @@ interface IDebugSessionOptions {
     suppressDebugToolbar?: boolean;
     suppressDebugStatusbar?: boolean;
     suppressDebugView?: boolean;
+    /**
+     * Set if the debug session is correlated with a test run. Stopping/restarting
+     * the session will instead stop/restart the test run.
+     */
+    testRun?: IDebugTestRunReference;
 }
 interface IDataBreakpointInfoResponse {
     dataId: string | null;
@@ -191,6 +201,11 @@ interface INewReplElementData {
      */
     source?: IReplElementSource;
 }
+interface IDebugEvaluatePosition {
+    line: number;
+    column: number;
+    source: DebugProtocol.Source;
+}
 interface IDebugSession extends ITreeElement {
     readonly configuration: IConfig;
     readonly unresolvedConfiguration: IConfig | undefined;
@@ -207,6 +222,8 @@ interface IDebugSession extends ITreeElement {
     readonly suppressDebugStatusbar: boolean;
     readonly suppressDebugView: boolean;
     readonly lifecycleManagedByParent: boolean;
+    /** Test run this debug session was spawned by */
+    readonly correlatedTestRun?: LiveTestResult;
     setSubId(subId: string | undefined): void;
     getMemory(memoryReference: string): IMemoryRegion;
     setName(name: string): void;
@@ -256,7 +273,7 @@ interface IDebugSession extends ITreeElement {
     exceptionInfo(threadId: number): Promise<IExceptionInfo | undefined>;
     scopes(frameId: number, threadId: number): Promise<DebugProtocol.ScopesResponse | undefined>;
     variables(variablesReference: number, threadId: number | undefined, filter: 'indexed' | 'named' | undefined, start: number | undefined, count: number | undefined): Promise<DebugProtocol.VariablesResponse | undefined>;
-    evaluate(expression: string, frameId?: number, context?: string): Promise<DebugProtocol.EvaluateResponse | undefined>;
+    evaluate(expression: string, frameId?: number, context?: string, location?: IDebugEvaluatePosition): Promise<DebugProtocol.EvaluateResponse | undefined>;
     customRequest(request: string, args: any): Promise<DebugProtocol.Response | undefined>;
     cancel(progressId: string): Promise<DebugProtocol.CancelResponse | undefined>;
     disassemble(memoryReference: string, offset: number, instructionOffset: number, instructionCount: number): Promise<DebugProtocol.DisassembledInstruction[] | undefined>;
@@ -777,4 +794,4 @@ interface ILaunch {
     }>;
 }
 
-export { type AdapterEndEvent, DataBreakpointSetType, type DataBreakpointSource, 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, 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 };
+export { type AdapterEndEvent, DataBreakpointSetType, type DataBreakpointSource, 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 IDebugEvaluatePosition, type IDebugModel, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugTestRunReference, 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

@@ -73,7 +73,7 @@ const CONTEXT_BREAKPOINTS_FOCUSED = ( (new RawContextKey('breakpointsFocused', t
 const CONTEXT_WATCH_EXPRESSIONS_FOCUSED = ( (new RawContextKey(
     'watchExpressionsFocused',
     true,
-    { type: 'boolean', description: ( localizeWithPath(_moduleId, 10, "True when the WATCH view is focused, false otherwsie.")) }
+    { type: 'boolean', description: ( localizeWithPath(_moduleId, 10, "True when the WATCH view is focused, false otherwise.")) }
 )));
 const CONTEXT_WATCH_EXPRESSIONS_EXIST = ( (new RawContextKey(
     'watchExpressionsExist',
@@ -84,7 +84,7 @@ const CONTEXT_WATCH_EXPRESSIONS_EXIST = ( (new RawContextKey(
         "True when at least one watch expression exists, false otherwise."
     )) }
 )));
-const CONTEXT_VARIABLES_FOCUSED = ( (new RawContextKey('variablesFocused', true, { type: 'boolean', description: ( localizeWithPath(_moduleId, 12, "True when the VARIABLES views is focused, false otherwsie")) })));
+const CONTEXT_VARIABLES_FOCUSED = ( (new RawContextKey('variablesFocused', true, { type: 'boolean', description: ( localizeWithPath(_moduleId, 12, "True when the VARIABLES views is focused, false otherwise")) })));
 const CONTEXT_EXPRESSION_SELECTED = ( (new RawContextKey(
     'expressionSelected',
     false,
@@ -226,7 +226,11 @@ const CONTEXT_RESTART_FRAME_SUPPORTED = ( (new RawContextKey(
 const CONTEXT_STACK_FRAME_SUPPORTS_RESTART = ( (new RawContextKey(
     'stackFrameSupportsRestart',
     false,
-    { type: 'boolean', description: ( localizeWithPath(_moduleId, 31, "True when the focused stack frame suppots 'restartFrame'.")) }
+    { type: 'boolean', description: ( localizeWithPath(
+        _moduleId,
+        31,
+        "True when the focused stack frame supports 'restartFrame'."
+    )) }
 )));
 const CONTEXT_JUMP_TO_CURSOR_SUPPORTED = ( (new RawContextKey(
     'jumpToCursorSupported',
@@ -466,7 +470,8 @@ var MemoryRangeType;
 })(MemoryRangeType || (MemoryRangeType = {}))));
 const DEBUG_MEMORY_SCHEME = 'vscode-debug-memory';
 function isFrameDeemphasized(frame) {
-    return frame.source.presentationHint === 'deemphasize' || frame.presentationHint === 'deemphasize' || frame.presentationHint === 'subtle';
+    const hint = frame.presentationHint ?? frame.source.presentationHint;
+    return hint === 'deemphasize' || hint === 'subtle';
 }
 var DataBreakpointSetType;
 ( ((function(DataBreakpointSetType) {

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

@@ -197,7 +197,7 @@ class ExpressionContainer {
     toString() {
         return this.value;
     }
-    async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false) {
+    async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false, location) {
         if (!session || (!stackFrame && context !== 'repl')) {
             this.value = context === 'repl' ? ( localizeWithPath(_moduleId, 1, "Please start a debug session to evaluate expressions")) : Expression.DEFAULT_VALUE;
             this.reference = 0;
@@ -205,7 +205,7 @@ class ExpressionContainer {
         }
         this.session = session;
         try {
-            const response = await session.evaluate(expression, stackFrame ? stackFrame.frameId : undefined, context);
+            const response = await session.evaluate(expression, stackFrame ? stackFrame.frameId : undefined, context, location);
             if (response && response.body) {
                 this.value = response.body.result || '';
                 this.reference = response.body.variablesReference;
@@ -284,8 +284,8 @@ class Expression extends ExpressionContainer {
             this.value = Expression.DEFAULT_VALUE;
         }
     }
-    async evaluate(session, stackFrame, context, keepLazyVars) {
-        this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars);
+    async evaluate(session, stackFrame, context, keepLazyVars, location) {
+        this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars, location);
     }
     toString() {
         return `${this.name}\n${this.value}`;
@@ -1197,7 +1197,12 @@ let DebugModel = class DebugModel extends Disposable {
             let topCallStack = Promise.resolve();
             const wholeCallStack = ( (new Promise((c, e) => {
                 topCallStack = thread.fetchCallStack(1).then(() => {
-                    if (!( (this.schedulers.has(thread.getId()))) && fetchFullStack) {
+                    if (!fetchFullStack) {
+                        c();
+                        this._onDidChangeCallStack.fire();
+                        return;
+                    }
+                    if (!( (this.schedulers.has(thread.getId())))) {
                         const deferred = ( (new DeferredPromise()));
                         this.schedulers.set(thread.getId(), {
                             completeDeferred: deferred,

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

@@ -214,10 +214,10 @@ class ReplModel {
     getReplElements() {
         return this.replElements;
     }
-    async addReplExpression(session, stackFrame, name) {
-        this.addReplElement(( (new ReplEvaluationInput(name))));
-        const result = ( (new ReplEvaluationResult(name)));
-        await result.evaluateExpression(name, session, stackFrame, 'repl');
+    async addReplExpression(session, stackFrame, expression) {
+        this.addReplElement(( (new ReplEvaluationInput(expression))));
+        const result = ( (new ReplEvaluationResult(expression)));
+        await result.evaluateExpression(expression, session, stackFrame, 'repl');
         this.addReplElement(result);
     }
     appendToRepl(session, { output, expression, sev, source }) {