@codingame/monaco-vscode-debug-service-override 4.5.2 → 5.0.0

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

@@ -70,6 +70,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
 import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var Repl_1, ReplOptions_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/repl";
@@ -87,16 +88,16 @@ let Repl = class Repl extends FilterViewPane {
     static { Repl_1 = this; }
     static { this.REFRESH_DELAY = 50; }
     static { this.URI = ( URI.parse(`${DEBUG_SCHEME}:replinput`)); }
-    constructor(options, debugService, instantiationService, storageService, themeService, modelService, contextKeyService, codeEditorService, viewDescriptorService, contextMenuService, configurationService, textResourcePropertiesService, editorService, keybindingService, openerService, telemetryService, menuService, languageFeaturesService, logService) {
+    constructor(options, debugService, instantiationService, storageService, themeService, modelService, contextKeyService, codeEditorService, viewDescriptorService, contextMenuService, configurationService, textResourcePropertiesService, editorService, keybindingService, openerService, telemetryService, hoverService, menuService, languageFeaturesService, logService) {
         const filterText = storageService.get(FILTER_VALUE_STORAGE_KEY, 1 , '');
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localizeWithPath(_moduleId, 0, "Filter (e.g. text, !exclude)")),
+                placeholder: ( localizeWithPath(_moduleId, 0, "Filter (e.g. text, !exclude, \\escape)")),
                 text: filterText,
                 history: JSON.parse(storageService.get(FILTER_HISTORY_STORAGE_KEY, 1 , '[]')),
             }
-        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+        }, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
         this.storageService = storageService;
         this.modelService = modelService;
@@ -117,7 +118,7 @@ let Repl = class Repl extends FilterViewPane {
         this.filter = ( (new ReplFilter()));
         this.filter.filterQuery = filterText;
         this.multiSessionRepl = CONTEXT_MULTI_SESSION_REPL.bindTo(contextKeyService);
-        this.replOptions = this._register(this.instantiationService.createInstance(ReplOptions, this.id, () => this.getBackgroundColor()));
+        this.replOptions = this._register(this.instantiationService.createInstance(ReplOptions, this.id, () => this.getLocationBasedColors().background));
         this._register(this.replOptions.onDidChange(() => this.onDidStyleChange()));
         codeEditorService.registerDecorationType('repl-decoration', DECORATION_KEY, {});
         this.multiSessionRepl.set(this.isMultiSessionView);
@@ -479,6 +480,7 @@ let Repl = class Repl extends FilterViewPane {
     render() {
         super.render();
         this._register(registerNavigableContainer({
+            name: 'repl',
             focusNotifiers: [this, this.filterWidget],
             focusNextWidget: () => {
                 const element = this.tree?.getHTMLElement();
@@ -517,8 +519,8 @@ let Repl = class Repl extends FilterViewPane {
             this.instantiationService.createInstance(ReplOutputElementRenderer, linkDetector),
             ( (new ReplEvaluationInputsRenderer())),
             this.instantiationService.createInstance(ReplGroupRenderer, linkDetector),
-            ( (new ReplEvaluationResultsRenderer(linkDetector))),
-            ( (new ReplRawObjectsRenderer(linkDetector))),
+            ( (new ReplEvaluationResultsRenderer(linkDetector, this.hoverService))),
+            ( (new ReplRawObjectsRenderer(linkDetector, this.hoverService))),
         ],
         (
         (new ReplDataSource())), {
@@ -531,9 +533,7 @@ let Repl = class Repl extends FilterViewPane {
             horizontalScrolling: !wordWrap,
             setRowLineHeight: false,
             supportDynamicHeights: wordWrap,
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            }
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this._register(tree.onDidChangeContentHeight(() => {
             if (tree.scrollHeight !== this.previousTreeScrollHeight) {
@@ -684,9 +684,10 @@ Repl = Repl_1 = ( (__decorate([
     ( (__param(13, IKeybindingService))),
     ( (__param(14, IOpenerService))),
     ( (__param(15, ITelemetryService))),
-    ( (__param(16, IMenuService))),
-    ( (__param(17, ILanguageFeaturesService))),
-    ( (__param(18, ILogService)))
+    ( (__param(16, IHoverService))),
+    ( (__param(17, IMenuService))),
+    ( (__param(18, ILanguageFeaturesService))),
+    ( (__param(19, ILogService)))
 ], Repl)));
 let ReplOptions = class ReplOptions extends Disposable {
     static { ReplOptions_1 = this; }
@@ -845,6 +846,9 @@ registerAction2(class extends ViewAction {
             id: 'workbench.debug.panel.action.clearReplAction',
             viewId: REPL_VIEW_ID,
             title: ( localize2WithPath(_moduleId, 8, 'Clear Console')),
+            metadata: {
+                description: ( localize2WithPath(_moduleId, 9, 'Clears all program output from your debug REPL'))
+            },
             f1: true,
             icon: debugConsoleClearAll,
             menu: [{
@@ -869,7 +873,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.collapseRepl',
-            title: ( localizeWithPath(_moduleId, 9, "Collapse All")),
+            title: ( localizeWithPath(_moduleId, 10, "Collapse All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -887,7 +891,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'debug.replPaste',
-            title: ( localizeWithPath(_moduleId, 10, "Paste")),
+            title: ( localizeWithPath(_moduleId, 11, "Paste")),
             viewId: REPL_VIEW_ID,
             precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(0 )))),
             menu: {
@@ -917,7 +921,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.debug.action.copyAll',
-            title: ( localizeWithPath(_moduleId, 11, "Copy All")),
+            title: ( localizeWithPath(_moduleId, 12, "Copy All")),
             viewId: REPL_VIEW_ID,
             menu: {
                 id: MenuId.DebugConsoleContext,
@@ -935,7 +939,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.replCopy',
-            title: ( localizeWithPath(_moduleId, 12, "Copy")),
+            title: ( localizeWithPath(_moduleId, 13, "Copy")),
             menu: {
                 id: MenuId.DebugConsoleContext,
                 group: '2_cutcopypaste',

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

@@ -14,7 +14,10 @@ class ReplFilter {
         if (query && query !== '') {
             const filters = ( splitGlobAware(query, ',').map(s => s.trim())).filter(s => !!s.length);
             for (const f of filters) {
-                if (f.startsWith('!')) {
+                if (f.startsWith('\\')) {
+                    this._parsedQueries.push({ type: 'include', query: f.slice(1) });
+                }
+                else if (f.startsWith('!')) {
                     this._parsedQueries.push({ type: 'exclude', query: f.slice(1) });
                 }
                 else {

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

@@ -20,8 +20,9 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/replViewer";
@@ -76,8 +77,9 @@ class ReplEvaluationResultsRenderer {
     get templateId() {
         return ReplEvaluationResultsRenderer.ID;
     }
-    constructor(linkDetector) {
+    constructor(linkDetector, hoverService) {
         this.linkDetector = linkDetector;
+        this.hoverService = hoverService;
     }
     renderTemplate(container) {
         const output = append(container, $('.evaluation-result.expression'));
@@ -87,10 +89,9 @@ class ReplEvaluationResultsRenderer {
     renderElement(element, index, templateData) {
         const expression = element.element;
         renderExpressionValue(expression, templateData.value, {
-            showHover: false,
             colorize: true,
             linkDetector: this.linkDetector
-        });
+        }, this.hoverService);
     }
     disposeTemplate(templateData) {
     }
@@ -98,9 +99,10 @@ class ReplEvaluationResultsRenderer {
 let ReplOutputElementRenderer = class ReplOutputElementRenderer {
     static { ReplOutputElementRenderer_1 = this; }
     static { this.ID = 'outputReplElement'; }
-    constructor(linkDetector, editorService, labelService, themeService) {
+    constructor(linkDetector, editorService, hoverService, labelService, themeService) {
         this.linkDetector = linkDetector;
         this.editorService = editorService;
+        this.hoverService = hoverService;
         this.labelService = labelService;
         this.themeService = themeService;
     }
@@ -140,7 +142,7 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         templateData.value.appendChild(handleANSIOutput(element.value, this.linkDetector, this.themeService, element.session.root));
         templateData.value.classList.add((element.severity === Severity$1.Warning) ? 'warn' : (element.severity === Severity$1.Error) ? 'error' : (element.severity === Severity$1.Ignore) ? 'ignore' : 'info');
         templateData.source.textContent = element.sourceData ? `${basename(element.sourceData.source.name)}:${element.sourceData.lineNumber}` : '';
-        templateData.toDispose.push(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.source, element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : ''));
+        templateData.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), templateData.source, element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : ''));
         templateData.getReplElementSource = () => element.sourceData;
     }
     setElementCount(element, templateData) {
@@ -161,8 +163,9 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
 };
 ReplOutputElementRenderer = ReplOutputElementRenderer_1 = ( (__decorate([
     ( (__param(1, IEditorService))),
-    ( (__param(2, ILabelService))),
-    ( (__param(3, IThemeService)))
+    ( (__param(2, IHoverService))),
+    ( (__param(3, ILabelService))),
+    ( (__param(4, IThemeService)))
 ], ReplOutputElementRenderer)));
 let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressionsRenderer {
     static { ReplVariablesRenderer_1 = this; }
@@ -170,9 +173,10 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
     get templateId() {
         return ReplVariablesRenderer_1.ID;
     }
-    constructor(linkDetector, debugService, contextViewService) {
-        super(debugService, contextViewService);
+    constructor(linkDetector, debugService, contextViewService, commandService, hoverService) {
+        super(debugService, contextViewService, hoverService);
         this.linkDetector = linkDetector;
+        this.commandService = commandService;
     }
     renderElement(node, _index, data) {
         const element = node.element;
@@ -182,11 +186,11 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
         const isReplVariable = expression instanceof ReplVariableElement;
         if (isReplVariable || !expression.name) {
             data.label.set('');
-            renderExpressionValue(isReplVariable ? expression.expression : expression, data.value, { showHover: false, colorize: true, linkDetector: this.linkDetector });
+            renderExpressionValue(isReplVariable ? expression.expression : expression, data.value, { colorize: true, linkDetector: this.linkDetector }, this.hoverService);
             data.expression.classList.remove('nested-variable');
         }
         else {
-            renderVariable(expression, data, true, highlights, this.linkDetector);
+            renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression, data, true, highlights, this.linkDetector);
             data.expression.classList.toggle('nested-variable', isNestedVariable(expression));
         }
     }
@@ -196,12 +200,15 @@ let ReplVariablesRenderer = class ReplVariablesRenderer extends AbstractExpressi
 };
 ReplVariablesRenderer = ReplVariablesRenderer_1 = ( (__decorate([
     ( (__param(1, IDebugService))),
-    ( (__param(2, IContextViewService)))
+    ( (__param(2, IContextViewService))),
+    ( (__param(3, ICommandService))),
+    ( (__param(4, IHoverService)))
 ], ReplVariablesRenderer)));
 class ReplRawObjectsRenderer {
     static { this.ID = 'rawObject'; }
-    constructor(linkDetector) {
+    constructor(linkDetector, hoverService) {
         this.linkDetector = linkDetector;
+        this.hoverService = hoverService;
     }
     get templateId() {
         return ReplRawObjectsRenderer.ID;
@@ -224,9 +231,8 @@ class ReplRawObjectsRenderer {
             templateData.name.textContent = '';
         }
         renderExpressionValue(element.value, templateData.value, {
-            showHover: false,
             linkDetector: this.linkDetector
-        });
+        }, this.hoverService);
     }
     disposeTemplate(templateData) {
         templateData.label.dispose();

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

@@ -15,10 +15,12 @@ import { MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/commo
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -29,6 +31,7 @@ import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeServi
 import { ViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { renderViewTree, AbstractExpressionDataSource, AbstractExpressionsRenderer, renderExpressionValue, renderVariable } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
+import { COPY_VALUE_LABEL, COPY_VALUE_ID, COPY_EVALUATE_PATH_LABEL, COPY_EVALUATE_PATH_ID, ADD_TO_WATCH_LABEL, ADD_TO_WATCH_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { LinkDetector } from './linkDetector.js';
 import { CONTEXT_VARIABLES_FOCUSED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, VARIABLES_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
@@ -47,8 +50,8 @@ let forgetScopes = true;
 let variableInternalContext;
 let dataBreakpointInfoResponse;
 let VariablesView = class VariablesView extends ViewPane {
-    constructor(options, contextMenuService, debugService, keybindingService, configurationService, instantiationService, viewDescriptorService, contextKeyService, openerService, themeService, telemetryService, menuService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, contextMenuService, debugService, keybindingService, configurationService, instantiationService, viewDescriptorService, contextKeyService, openerService, themeService, telemetryService, hoverService, menuService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
         this.menuService = menuService;
         this.needsRefresh = false;
@@ -90,9 +93,7 @@ let VariablesView = class VariablesView extends ViewPane {
             accessibilityProvider: ( (new VariablesAccessibilityProvider())),
             identityProvider: { getId: (element) => element.getId() },
             keyboardNavigationLabelProvider: { getKeyboardNavigationLabel: (e) => e.name },
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            }
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this._register(VisualizedVariableRenderer.rendererOnVisualizationRange(this.debugService.getViewModel(), this.tree));
         this.tree.setInput(this.debugService.getViewModel().focusedStackFrame ?? null);
@@ -192,7 +193,8 @@ VariablesView = ( (__decorate([
     ( (__param(8, IOpenerService))),
     ( (__param(9, IThemeService))),
     ( (__param(10, ITelemetryService))),
-    ( (__param(11, IMenuService)))
+    ( (__param(11, IHoverService))),
+    ( (__param(12, IMenuService)))
 ], VariablesView)));
 async function openContextMenuForVariableTreeElement(parentContextKeyService, menuService, contextMenuService, menuId, e) {
     const variable = e.element;
@@ -337,8 +339,8 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
             tree.updateChildren(parent, false, false);
         });
     }
-    constructor(linkDetector, debugService, contextViewService, menuService, contextKeyService) {
-        super(debugService, contextViewService);
+    constructor(linkDetector, debugService, contextViewService, hoverService, menuService, contextKeyService) {
+        super(debugService, contextViewService, hoverService);
         this.linkDetector = linkDetector;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
@@ -359,10 +361,10 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
         renderExpressionValue(viz, data.value, {
             showChanged: false,
             maxValueLength: 1024,
-            showHover: true,
+            hover: data.elementDisposable,
             colorize: true,
             linkDetector: this.linkDetector
-        });
+        }, this.hoverService);
     }
     getInputBoxOptions(expression) {
         const viz = expression;
@@ -404,25 +406,27 @@ let VisualizedVariableRenderer = class VisualizedVariableRenderer extends Abstra
 VisualizedVariableRenderer = VisualizedVariableRenderer_1 = ( (__decorate([
     ( (__param(1, IDebugService))),
     ( (__param(2, IContextViewService))),
-    ( (__param(3, IMenuService))),
-    ( (__param(4, IContextKeyService)))
+    ( (__param(3, IHoverService))),
+    ( (__param(4, IMenuService))),
+    ( (__param(5, IContextKeyService)))
 ], VisualizedVariableRenderer)));
 let VariablesRenderer = class VariablesRenderer extends AbstractExpressionsRenderer {
     static { VariablesRenderer_1 = this; }
     static { this.ID = 'variable'; }
-    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, debugService, contextViewService) {
-        super(debugService, contextViewService);
+    constructor(linkDetector, menuService, contextKeyService, visualization, contextMenuService, commandService, debugService, contextViewService, hoverService) {
+        super(debugService, contextViewService, hoverService);
         this.linkDetector = linkDetector;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.visualization = visualization;
         this.contextMenuService = contextMenuService;
+        this.commandService = commandService;
     }
     get templateId() {
         return VariablesRenderer_1.ID;
     }
     renderExpression(expression, data, highlights) {
-        renderVariable(expression, data, true, highlights, this.linkDetector);
+        renderVariable(data.elementDisposable, this.commandService, this.hoverService, expression, data, true, highlights, this.linkDetector);
     }
     renderElement(node, index, data) {
         super.renderExpressionElement(node.element, node, data);
@@ -508,8 +512,10 @@ VariablesRenderer = VariablesRenderer_1 = ( (__decorate([
     ( (__param(2, IContextKeyService))),
     ( (__param(3, IDebugVisualizerService))),
     ( (__param(4, IContextMenuService))),
-    ( (__param(5, IDebugService))),
-    ( (__param(6, IContextViewService)))
+    ( (__param(5, ICommandService))),
+    ( (__param(6, IDebugService))),
+    ( (__param(7, IContextViewService))),
+    ( (__param(8, IHoverService)))
 ], VariablesRenderer)));
 class VariablesAccessibilityProvider {
     getWidgetAriaLabel() {
@@ -533,8 +539,10 @@ CommandsRegistry.registerCommand({
         debugService.getViewModel().setSelectedExpression(variableInternalContext, false);
     }
 });
-const COPY_VALUE_ID = 'workbench.debug.viewlet.action.copyValue';
 CommandsRegistry.registerCommand({
+    metadata: {
+        description: COPY_VALUE_LABEL,
+    },
     id: COPY_VALUE_ID,
     handler: async (accessor, arg, ctx) => {
         const debugService = accessor.get(IDebugService);
@@ -661,16 +669,20 @@ CommandsRegistry.registerCommand({
         }
     }
 });
-const COPY_EVALUATE_PATH_ID = 'debug.copyEvaluatePath';
 CommandsRegistry.registerCommand({
+    metadata: {
+        description: COPY_EVALUATE_PATH_LABEL,
+    },
     id: COPY_EVALUATE_PATH_ID,
     handler: async (accessor, context) => {
         const clipboardService = accessor.get(IClipboardService);
         await clipboardService.writeText(context.variable.evaluateName);
     }
 });
-const ADD_TO_WATCH_ID = 'debug.addToWatchExpressions';
 CommandsRegistry.registerCommand({
+    metadata: {
+        description: ADD_TO_WATCH_LABEL,
+    },
     id: ADD_TO_WATCH_ID,
     handler: async (accessor, context) => {
         const debugService = accessor.get(IDebugService);
@@ -697,4 +709,4 @@ registerAction2(class extends ViewAction {
     }
 });
 
-export { ADD_TO_WATCH_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, COPY_EVALUATE_PATH_ID, COPY_VALUE_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesRenderer, VariablesView, VisualizedVariableRenderer, openContextMenuForVariableTreeElement };
+export { BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, BREAK_WHEN_VALUE_IS_READ_ID, SET_VARIABLE_ID, VIEW_MEMORY_ID, VariablesRenderer, VariablesView, VisualizedVariableRenderer, openContextMenuForVariableTreeElement };

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

@@ -10,6 +10,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -32,8 +33,8 @@ const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 let ignoreViewUpdates = false;
 let useCachedEvaluation = false;
 let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
-    constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, menuService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, contextMenuService, debugService, keybindingService, instantiationService, viewDescriptorService, configurationService, contextKeyService, openerService, themeService, telemetryService, hoverService, menuService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
         this.needsRefresh = false;
         this.menu = menuService.createMenu(MenuId.DebugWatchContext, contextKeyService);
@@ -70,9 +71,7 @@ let WatchExpressionsView = class WatchExpressionsView extends ViewPane {
                 }
             },
             dnd: ( (new WatchExpressionsDragAndDrop(this.debugService))),
-            overrideStyles: {
-                listBackground: this.getBackgroundColor()
-            }
+            overrideStyles: this.getLocationBasedColors().listOverrideStyles
         });
         this.tree.setInput(this.debugService);
         CONTEXT_WATCH_EXPRESSIONS_FOCUSED.bindTo(this.tree.contextKeyService);
@@ -188,7 +187,8 @@ WatchExpressionsView = ( (__decorate([
     ( (__param(8, IOpenerService))),
     ( (__param(9, IThemeService))),
     ( (__param(10, ITelemetryService))),
-    ( (__param(11, IMenuService)))
+    ( (__param(11, IHoverService))),
+    ( (__param(12, IMenuService)))
 ], WatchExpressionsView)));
 class WatchExpressionsDelegate {
     getHeight(_element) {
@@ -226,8 +226,8 @@ class WatchExpressionsDataSource extends AbstractExpressionDataSource {
 let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractExpressionsRenderer {
     static { WatchExpressionsRenderer_1 = this; }
     static { this.ID = 'watchexpression'; }
-    constructor(menuService, contextKeyService, debugService, contextViewService) {
-        super(debugService, contextViewService);
+    constructor(menuService, contextKeyService, debugService, contextViewService, hoverService) {
+        super(debugService, contextViewService, hoverService);
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
     }
@@ -252,9 +252,9 @@ let WatchExpressionsRenderer = class WatchExpressionsRenderer extends AbstractEx
         renderExpressionValue(expression, data.value, {
             showChanged: true,
             maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
-            showHover: true,
+            hover: data.elementDisposable,
             colorize: true
-        });
+        }, this.hoverService);
     }
     getInputBoxOptions(expression, settingValue) {
         if (settingValue) {
@@ -304,7 +304,8 @@ WatchExpressionsRenderer = WatchExpressionsRenderer_1 = ( (__decorate([
     ( (__param(0, IMenuService))),
     ( (__param(1, IContextKeyService))),
     ( (__param(2, IDebugService))),
-    ( (__param(3, IContextViewService)))
+    ( (__param(3, IContextViewService))),
+    ( (__param(4, IHoverService)))
 ], WatchExpressionsRenderer)));
 function getContextForWatchExpressionMenu(parentContext, expression) {
     return parentContext.createOverlay([

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

@@ -22,7 +22,8 @@ import { isDiffEditor, isCodeEditor } from 'vscode/vscode/vs/editor/browser/edit
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from './debugCommands.js';
+import { DEBUG_START_COMMAND_ID, SELECT_AND_START_ID, DEBUG_CONFIGURE_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/welcomeView";
 const debugStartLanguageKey = 'debugStartLanguage';
@@ -31,8 +32,8 @@ const CONTEXT_DEBUGGER_INTERESTED_IN_ACTIVE_EDITOR = ( (new RawContextKey('debug
 let WelcomeView = class WelcomeView extends ViewPane {
     static { this.ID = 'workbench.debug.welcome'; }
     static { this.LABEL = ( localize2WithPath(_moduleId, 0, "Run")); }
-    constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, themeService, keybindingService, contextMenuService, configurationService, contextKeyService, debugService, editorService, instantiationService, viewDescriptorService, openerService, storageSevice, telemetryService, hoverService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService);
         this.debugService = debugService;
         this.editorService = editorService;
         this.debugStartLanguageContext = CONTEXT_DEBUG_START_LANGUAGE.bindTo(contextKeyService);
@@ -95,7 +96,8 @@ WelcomeView = ( (__decorate([
     ( (__param(9, IViewDescriptorService))),
     ( (__param(10, IOpenerService))),
     ( (__param(11, IStorageService))),
-    ( (__param(12, ITelemetryService)))
+    ( (__param(12, ITelemetryService))),
+    ( (__param(13, IHoverService)))
 ], WelcomeView)));
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(WelcomeView.ID, {

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

@@ -5,6 +5,7 @@ import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/base/common/arrays';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';