@codingame/monaco-vscode-debug-service-override 6.0.3 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "6.0.3",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

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

@@ -185,7 +185,7 @@ let CallStackView = class CallStackView extends ViewPane {
         this.stateMessage = append(container, $('span.call-stack-state-message'));
         this.stateMessage.hidden = true;
         this.stateMessageLabel = append(this.stateMessage, $('span.label'));
-        this.stateMessageLabelHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.stateMessage, ''));
+        this.stateMessageLabelHover = this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.stateMessage, ''));
     }
     renderBody(container) {
         super.renderBody(container);
@@ -489,7 +489,7 @@ let SessionsRenderer = class SessionsRenderer {
         this.doRenderElement(lastElement, matches, templateData);
     }
     doRenderElement(session, matches, data) {
-        const sessionHover = data.elementDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(_moduleId, 2, "Session"))));
+        const sessionHover = data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(_moduleId, 2, "Session"))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -567,7 +567,7 @@ let ThreadsRenderer = class ThreadsRenderer {
     }
     renderElement(element, _index, data) {
         const thread = element.element;
-        data.elementDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.thread, thread.name));
+        data.elementDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.thread, thread.name));
         data.label.set(thread.name, createMatches(element.filterData));
         data.stateLabel.textContent = thread.stateLabel;
         data.stateLabel.classList.toggle('exception', thread.stoppedDetails?.reason === 'exception');
@@ -639,7 +639,7 @@ let StackFramesRenderer = class StackFramesRenderer {
         if (stackFrame.source.raw.origin) {
             title += `\n${stackFrame.source.raw.origin}`;
         }
-        data.templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.file, title));
+        data.templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.file, title));
         data.label.set(stackFrame.name, createMatches(element.filterData), stackFrame.name);
         data.fileName.textContent = getSpecificSourceName(stackFrame);
         if (stackFrame.range.startLineNumber !== undefined) {
@@ -693,7 +693,7 @@ let ErrorsRenderer = class ErrorsRenderer {
     renderElement(element, index, data) {
         const error = element.element;
         data.label.textContent = error;
-        data.templateDisposable.add(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.label, error));
+        data.templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), data.label, error));
     }
     renderCompressedElements(node, index, templateData, height) {
         throw ( (new Error('Method not implemented.')));

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

@@ -435,9 +435,14 @@ configurationRegistry.registerConfiguration({
     title: ( localizeWithPath(_moduleId, 45, "Debug")),
     type: 'object',
     properties: {
+        'debug.showVariableTypes': {
+            type: 'boolean',
+            description: ( localizeWithPath(_moduleId, 46, "Show variable type in variable pane during debug session")),
+            default: false
+        },
         'debug.allowBreakpointsEverywhere': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 46, "Allow setting breakpoints in any file.")),
+            description: ( localizeWithPath(_moduleId, 47, "Allow setting breakpoints in any file.")),
             default: false
         },
         'debug.gutterMiddleClickAction': {
@@ -445,14 +450,14 @@ configurationRegistry.registerConfiguration({
             enum: ['logpoint', 'conditionalBreakpoint', 'triggeredBreakpoint', 'none'],
             description: ( localizeWithPath(
                 _moduleId,
-                47,
+                48,
                 'Controls the action to perform when clicking the editor gutter with the middle mouse button.'
             )),
             enumDescriptions: [
-                ( localizeWithPath(_moduleId, 48, "Add Logpoint.")),
-                ( localizeWithPath(_moduleId, 49, "Add Conditional Breakpoint.")),
-                ( localizeWithPath(_moduleId, 50, "Add Triggered Breakpoint.")),
-                ( localizeWithPath(_moduleId, 51, "Don't perform any action.")),
+                ( localizeWithPath(_moduleId, 49, "Add Logpoint.")),
+                ( localizeWithPath(_moduleId, 50, "Add Conditional Breakpoint.")),
+                ( localizeWithPath(_moduleId, 51, "Add Triggered Breakpoint.")),
+                ( localizeWithPath(_moduleId, 52, "Don't perform any action.")),
             ],
             default: 'logpoint',
         },
@@ -460,7 +465,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                52,
+                53,
                 "Automatically open the explorer view at the end of a debug session."
             )),
             default: false
@@ -469,7 +474,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                53,
+                54,
                 "At the end of a debug session, all the read-only tabs associated with that session will be closed"
             )),
             default: false
@@ -477,21 +482,21 @@ configurationRegistry.registerConfiguration({
         'debug.inlineValues': {
             type: 'string',
             'enum': ['on', 'off', 'auto'],
-            description: ( localizeWithPath(_moduleId, 54, "Show variable values inline in editor while debugging.")),
+            description: ( localizeWithPath(_moduleId, 55, "Show variable values inline in editor while debugging.")),
             'enumDescriptions': [
                 ( localizeWithPath(
                     _moduleId,
-                    55,
+                    56,
                     "Always show variable values inline in editor while debugging."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    56,
+                    57,
                     "Never show variable values inline in editor while debugging."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    57,
+                    58,
                     "Show variable values inline in editor while debugging when the language supports inline value locations."
                 )),
             ],
@@ -501,30 +506,30 @@ configurationRegistry.registerConfiguration({
             enum: ['floating', 'docked', 'commandCenter', 'hidden'],
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                58,
-                "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, `commandCenter` (requires `{0}`), or `hidden`.",
-                '#window.commandCenter#'
+                59,
+                "Controls the location of the debug toolbar. Either `floating` in all views, `docked` in the debug view, `commandCenter` (requires {0}), or `hidden`.",
+                '`#window.commandCenter#`'
             )),
             default: 'floating',
             markdownEnumDescriptions: [
-                ( localizeWithPath(_moduleId, 59, "Show debug toolbar in all views.")),
-                ( localizeWithPath(_moduleId, 60, "Show debug toolbar only in debug views.")),
+                ( localizeWithPath(_moduleId, 60, "Show debug toolbar in all views.")),
+                ( localizeWithPath(_moduleId, 61, "Show debug toolbar only in debug views.")),
                 ( localizeWithPath(
                     _moduleId,
-                    61,
+                    62,
                     "`(Experimental)` Show debug toolbar in the command center."
                 )),
-                ( localizeWithPath(_moduleId, 62, "Do not show debug toolbar.")),
+                ( localizeWithPath(_moduleId, 63, "Do not show debug toolbar.")),
             ]
         },
         'debug.showInStatusBar': {
             enum: ['never', 'always', 'onFirstSessionStart'],
-            enumDescriptions: [( localizeWithPath(_moduleId, 63, "Never show debug in Status bar")), ( localizeWithPath(_moduleId, 64, "Always show debug in Status bar")), ( localizeWithPath(
+            enumDescriptions: [( localizeWithPath(_moduleId, 64, "Never show debug in Status bar")), ( localizeWithPath(_moduleId, 65, "Always show debug in Status bar")), ( localizeWithPath(
                 _moduleId,
-                65,
+                66,
                 "Show debug in Status bar only after debug was started for the first time"
             ))],
-            description: ( localizeWithPath(_moduleId, 66, "Controls when the debug Status bar should be visible.")),
+            description: ( localizeWithPath(_moduleId, 67, "Controls when the debug Status bar should be visible.")),
             default: 'onFirstSessionStart'
         },
         'debug.internalConsoleOptions': INTERNAL_CONSOLE_OPTIONS_SCHEMA,
@@ -532,7 +537,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                67,
+                68,
                 "Controls if the Debug Console should be automatically closed when the debug session ends."
             )),
             default: false
@@ -541,7 +546,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                68,
+                69,
                 "Before starting a new debug session in an integrated or external terminal, clear the terminal."
             )),
             default: false
@@ -549,46 +554,46 @@ configurationRegistry.registerConfiguration({
         'debug.openDebug': {
             enum: ['neverOpen', 'openOnSessionStart', 'openOnFirstSessionStart', 'openOnDebugBreak'],
             default: 'openOnDebugBreak',
-            description: ( localizeWithPath(_moduleId, 69, "Controls when the debug view should open."))
+            description: ( localizeWithPath(_moduleId, 70, "Controls when the debug view should open."))
         },
         'debug.showSubSessionsInToolBar': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                70,
+                71,
                 "Controls whether the debug sub-sessions are shown in the debug tool bar. When this setting is false the stop command on a sub-session will also stop the parent session."
             )),
             default: false
         },
         'debug.console.fontSize': {
             type: 'number',
-            description: ( localizeWithPath(_moduleId, 71, "Controls the font size in pixels in the Debug Console.")),
+            description: ( localizeWithPath(_moduleId, 72, "Controls the font size in pixels in the Debug Console.")),
             default: isMacintosh ? 12 : 14,
         },
         'debug.console.fontFamily': {
             type: 'string',
-            description: ( localizeWithPath(_moduleId, 72, "Controls the font family in the Debug Console.")),
+            description: ( localizeWithPath(_moduleId, 73, "Controls the font family in the Debug Console.")),
             default: 'default'
         },
         'debug.console.lineHeight': {
             type: 'number',
             description: ( localizeWithPath(
                 _moduleId,
-                73,
+                74,
                 "Controls the line height in pixels in the Debug Console. Use 0 to compute the line height from the font size."
             )),
             default: 0
         },
         'debug.console.wordWrap': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 74, "Controls if the lines should wrap in the Debug Console.")),
+            description: ( localizeWithPath(_moduleId, 75, "Controls if the lines should wrap in the Debug Console.")),
             default: true
         },
         'debug.console.historySuggestions': {
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                75,
+                76,
                 "Controls if the Debug Console should suggest previously typed input."
             )),
             default: true
@@ -597,7 +602,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                76,
+                77,
                 "Controls if the Debug Console should collapse identical lines and show a number of occurrences with a badge."
             )),
             default: true
@@ -606,7 +611,7 @@ configurationRegistry.registerConfiguration({
             enum: ['off', 'on'],
             description: ( localizeWithPath(
                 _moduleId,
-                77,
+                78,
                 "Controls whether suggestions should be accepted on Enter in the Debug Console. Enter is also used to evaluate whatever is typed in the Debug Console."
             )),
             default: 'off'
@@ -615,7 +620,7 @@ configurationRegistry.registerConfiguration({
             type: 'object',
             description: ( localizeWithPath(
                 _moduleId,
-                78,
+                79,
                 "Global debug launch configuration. Should be used as an alternative to 'launch.json' that is shared across workspaces."
             )),
             default: { configurations: [], compounds: [] },
@@ -625,7 +630,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                79,
+                80,
                 "Controls whether the workbench window should be focused when the debugger breaks."
             )),
             default: true
@@ -634,17 +639,17 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                80,
+                81,
                 "Controls whether the editor should be focused when the debugger breaks."
             )),
             default: true
         },
         'debug.onTaskErrors': {
             enum: ['debugAnyway', 'showErrors', 'prompt', 'abort'],
-            enumDescriptions: [( localizeWithPath(_moduleId, 81, "Ignore task errors and start debugging.")), ( localizeWithPath(_moduleId, 82, "Show the Problems view and do not start debugging.")), ( localizeWithPath(_moduleId, 83, "Prompt user.")), ( localizeWithPath(_moduleId, 84, "Cancel debugging."))],
+            enumDescriptions: [( localizeWithPath(_moduleId, 82, "Ignore task errors and start debugging.")), ( localizeWithPath(_moduleId, 83, "Show the Problems view and do not start debugging.")), ( localizeWithPath(_moduleId, 84, "Prompt user.")), ( localizeWithPath(_moduleId, 85, "Cancel debugging."))],
             description: ( localizeWithPath(
                 _moduleId,
-                85,
+                86,
                 "Controls what to do when errors are encountered after running a preLaunchTask."
             )),
             default: 'prompt'
@@ -653,7 +658,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                86,
+                87,
                 "Controls whether breakpoints should be shown in the overview ruler."
             )),
             default: false
@@ -662,7 +667,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             description: ( localizeWithPath(
                 _moduleId,
-                87,
+                88,
                 "Controls whether inline breakpoints candidate decorations should be shown in the editor while debugging."
             )),
             default: true
@@ -670,22 +675,22 @@ configurationRegistry.registerConfiguration({
         'debug.saveBeforeStart': {
             description: ( localizeWithPath(
                 _moduleId,
-                88,
+                89,
                 "Controls what editors to save before starting a debug session."
             )),
             enum: ['allEditorsInActiveGroup', 'nonUntitledEditorsInActiveGroup', 'none'],
             enumDescriptions: [
                 ( localizeWithPath(
                     _moduleId,
-                    89,
+                    90,
                     "Save all editors in the active group before starting a debug session."
                 )),
                 ( localizeWithPath(
                     _moduleId,
-                    90,
+                    91,
                     "Save all editors in the active group except untitled ones before starting a debug session."
                 )),
-                ( localizeWithPath(_moduleId, 91, "Don't save any editors before starting a debug session.")),
+                ( localizeWithPath(_moduleId, 92, "Don't save any editors before starting a debug session.")),
             ],
             default: 'allEditorsInActiveGroup',
             scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
@@ -693,43 +698,43 @@ configurationRegistry.registerConfiguration({
         'debug.confirmOnExit': {
             description: ( localizeWithPath(
                 _moduleId,
-                92,
+                93,
                 "Controls whether to confirm when the window closes if there are active debug sessions."
             )),
             type: 'string',
             enum: ['never', 'always'],
             enumDescriptions: [
-                ( localizeWithPath(_moduleId, 93, "Never confirm.")),
-                ( localizeWithPath(_moduleId, 94, "Always confirm if there are debug sessions.")),
+                ( localizeWithPath(_moduleId, 94, "Never confirm.")),
+                ( localizeWithPath(_moduleId, 95, "Always confirm if there are debug sessions.")),
             ],
             default: 'never'
         },
         'debug.disassemblyView.showSourceCode': {
             type: 'boolean',
             default: true,
-            description: ( localizeWithPath(_moduleId, 95, "Show Source Code in Disassembly View."))
+            description: ( localizeWithPath(_moduleId, 96, "Show Source Code in Disassembly View."))
         },
         'debug.autoExpandLazyVariables': {
             type: 'boolean',
             default: false,
             description: ( localizeWithPath(
                 _moduleId,
-                96,
+                97,
                 "Automatically show values for variables that are lazily resolved by the debugger, such as getters."
             ))
         },
         'debug.enableStatusBarColor': {
             type: 'boolean',
-            description: ( localizeWithPath(_moduleId, 97, "Color of the Status bar when debugger is active.")),
+            description: ( localizeWithPath(_moduleId, 98, "Color of the Status bar when debugger is active.")),
             default: true
         },
         'debug.hideLauncherWhileDebugging': {
             type: 'boolean',
             markdownDescription: ( localizeWithPath(
                 _moduleId,
-                98,
-                "Hide 'Start Debugging' control in title bar of 'Run and Debug' view while debugging is active. Only relevant when `{0}` is not `docked`.",
-                '#debug.toolBarLocation#'
+                99,
+                "Hide 'Start Debugging' control in title bar of 'Run and Debug' view while debugging is active. Only relevant when {0} is not `docked`.",
+                '`#debug.toolBarLocation#`'
             )),
             default: false
         }

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

@@ -79,7 +79,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         const keybinding = this.keybindingService.lookupKeybinding(this.action.id)?.getLabel();
         const keybindingLabel = keybinding ? ` (${keybinding})` : '';
         const title = this.action.label + keybindingLabel;
-        this.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.start, title));
+        this.toDispose.push(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this.start, title));
         this.start.setAttribute('role', 'button');
         this.start.ariaLabel = title;
         this.toDispose.push(addDisposableListener(this.start, EventType.CLICK, () => {

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

@@ -15,7 +15,6 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from './disassemblyView.js';
 import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, REPL_VIEW_ID, WATCH_VIEW_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -23,6 +22,7 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debugEditorActions";
 class ToggleBreakpointAction extends Action2 {
@@ -33,6 +33,7 @@ class ToggleBreakpointAction extends Action2 {
                 ...( localize2WithPath(_moduleId, 0, "Debug: Toggle Breakpoint")),
                 mnemonicTitle: ( localizeWithPath(_moduleId, 1, "Toggle &&Breakpoint")),
             },
+            f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             keybinding: {
                 when: ( (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))),
@@ -342,8 +343,8 @@ class SelectionToReplAction extends EditorAction {
         else {
             text = editor.getModel().getValueInRange(selection);
         }
-        await session.addReplExpression(viewModel.focusedStackFrame, text);
-        await viewsService.openView(REPL_VIEW_ID, false);
+        const replView = await viewsService.openView(REPL_VIEW_ID, false);
+        replView?.sendReplInput(text);
     }
 }
 class SelectionToWatchExpressionsAction extends EditorAction {

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { addDisposableListener, isKeyboardEvent } from 'vscode/vscode/vs/base/browser/dom';
 import { DomEmitter } from 'vscode/vscode/vs/base/browser/event';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
-import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource, CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
@@ -70,12 +69,7 @@ registerColor('editor.inlineValuesForeground', {
     hcDark: '#ffffff80',
     hcLight: '#00000080'
 }, ( localizeWithPath(_moduleId, 0, "Color for the debug inline value text.")));
-registerColor('editor.inlineValuesBackground', {
-    dark: '#ffc80033',
-    light: '#ffc80033',
-    hcDark: '#ffc80033',
-    hcLight: '#ffc80033'
-}, ( localizeWithPath(_moduleId, 1, "Color for the debug inline value background.")));
+registerColor('editor.inlineValuesBackground', '#ffc80033', ( localizeWithPath(_moduleId, 1, "Color for the debug inline value background.")));
 class InlineSegment {
     constructor(column, text) {
         this.column = column;
@@ -150,15 +144,15 @@ function createInlineValueDecorationsInsideRange(expressions, ranges, model, wor
             }
         }
     });
-    const decorations = [];
-    lineToNamesMap.forEach((names, line) => {
-        const contentText = ( (names.sort((first, second) => {
-            const content = model.getLineContent(line);
-            return content.indexOf(first) - content.indexOf(second);
-        }).map(name => `${name} = ${nameValueMap.get(name)}`))).join(', ');
-        decorations.push(...createInlineValueDecoration(line, contentText));
-    });
-    return decorations;
+    return (
+         ([...lineToNamesMap].map(([line, names]) => ({
+            line,
+            variables: ( (names.sort((first, second) => {
+                const content = model.getLineContent(line);
+                return content.indexOf(first) - content.indexOf(second);
+            }).map(name => ({ name, value: nameValueMap.get(name) }))))
+        })))
+    );
 }
 function getWordToLineNumbersMap(model, lineNumber, result) {
     const lineLength = model.getLineLength(lineNumber);
@@ -196,7 +190,6 @@ let DebugEditorContribution = class DebugEditorContribution {
         this.hostService = hostService;
         this.uriIdentityService = uriIdentityService;
         this.languageFeaturesService = languageFeaturesService;
-        this.hoverPosition = null;
         this.mouseDown = false;
         this.gutterIsHovered = false;
         this.altListener = ( (new MutableDisposable()));
@@ -290,7 +283,7 @@ let DebugEditorContribution = class DebugEditorContribution {
                 this.hoverWidget.hide();
                 this.defaultHoverLockout.clear();
                 if (debugHoverWasVisible && this.hoverPosition) {
-                    this.showEditorHover(this.hoverPosition, false);
+                    this.showEditorHover(this.hoverPosition.position, false);
                 }
                 const onKeyUp = ( (new DomEmitter(ownerDocument, 'keyup')));
                 const listener = Event.any(this.hostService.onDidChangeFocus, onKeyUp.event)(keyupEvent => {
@@ -308,12 +301,12 @@ let DebugEditorContribution = class DebugEditorContribution {
             }
         });
     }
-    async showHover(position, focus) {
+    async showHover(position, focus, mouseEvent) {
         this.preventDefaultEditorHover();
         const sf = this.debugService.getViewModel().focusedStackFrame;
         const model = this.editor.getModel();
         if (sf && model && this.uriIdentityService.extUri.isEqual(sf.source.uri, model.uri)) {
-            const result = await this.hoverWidget.showAt(position, focus);
+            const result = await this.hoverWidget.showAt(position, focus, mouseEvent);
             if (result === ShowDebugHoverResult.NOT_AVAILABLE) {
                 this.showEditorHover(position, focus);
             }
@@ -364,7 +357,7 @@ let DebugEditorContribution = class DebugEditorContribution {
     get showHoverScheduler() {
         const scheduler = ( (new RunOnceScheduler(() => {
             if (this.hoverPosition && !this.altPressed) {
-                this.showHover(this.hoverPosition, false);
+                this.showHover(this.hoverPosition.position, false, this.hoverPosition.event);
             }
         }, this.hoverDelay)));
         this.toDispose.push(scheduler);
@@ -407,8 +400,8 @@ let DebugEditorContribution = class DebugEditorContribution {
             }
         }
         if (target.type === MouseTargetType.CONTENT_TEXT) {
-            if (target.position && !Position.equals(target.position, this.hoverPosition)) {
-                this.hoverPosition = target.position;
+            if (target.position && !Position.equals(target.position, this.hoverPosition?.position || null) && !this.hoverWidget.isInSafeTriangle(mouseEvent.event.posx, mouseEvent.event.posy)) {
+                this.hoverPosition = { position: target.position, event: mouseEvent.event };
                 this.preventDefaultEditorHover();
                 this.showHoverScheduler.schedule(this.hoverDelay);
             }
@@ -657,8 +650,9 @@ let DebugEditorContribution = class DebugEditorContribution {
         }
         else {
             const scopes = await stackFrame.getMostSpecificScopes(stackFrame.range);
-            const decorationsPerScope = await Promise.all(( (scopes.map(async (scope) => {
-                const variables = await scope.getChildren();
+            const scopesWithVariables = await Promise.all(( (scopes.map(async (scope) => ({ scope, variables: await scope.getChildren() })))));
+            const valuesPerLine = ( (new Map()));
+            for (const { scope, variables } of scopesWithVariables) {
                 let scopeRange = ( (new Range(0, 0, stackFrame.range.startLineNumber, stackFrame.range.startColumn)));
                 if (scope.range) {
                     scopeRange = scopeRange.setStartPosition(scope.range.startLineNumber, scope.range.startColumn);
@@ -668,10 +662,21 @@ let DebugEditorContribution = class DebugEditorContribution {
                 for (const range of ownRanges) {
                     this._wordToLineNumbersMap.ensureRangePopulated(range);
                 }
-                return createInlineValueDecorationsInsideRange(variables, ownRanges, model, this._wordToLineNumbersMap.value);
-            }))));
-            allDecorations = distinct(decorationsPerScope.flat(),
-            decoration => `${decoration.range.startLineNumber}:${decoration?.options.after?.content}`);
+                const mapped = createInlineValueDecorationsInsideRange(variables, ownRanges, model, this._wordToLineNumbersMap.value);
+                for (const { line, variables } of mapped) {
+                    let values = valuesPerLine.get(line);
+                    if (!values) {
+                        values = ( (new Map()));
+                        valuesPerLine.set(line, values);
+                    }
+                    for (const { name, value } of variables) {
+                        if (!( (values.has(name)))) {
+                            values.set(name, value);
+                        }
+                    }
+                }
+            }
+            allDecorations = [...valuesPerLine.entries()].flatMap(([line, values]) => createInlineValueDecoration(line, ( ([...values].map(([n, v]) => `${n} = ${v}`))).join(', ')));
         }
         if (cts.token.isCancellationRequested) {
             return;