@codingame/monaco-vscode-debug-service-override 9.0.3 → 10.0.0

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

@@ -1,6 +1,6 @@
 import { getDomNodePagePosition } from 'vscode/vscode/vs/base/browser/dom';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { KeyCode, KeyChord, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
@@ -12,13 +12,12 @@ import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/acti
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
-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 { CONTEXT_IN_CHAT_SESSION } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 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';
+import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, 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';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
@@ -30,15 +29,15 @@ class ToggleBreakpointAction extends Action2 {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                ...( localize2(5931, "Debug: Toggle Breakpoint")),
-                mnemonicTitle: ( localize(5932, "Toggle &&Breakpoint")),
+                ...( localize2(5950, "Debug: Toggle Breakpoint")),
+                mnemonicTitle: ( localize(5951, "Toggle &&Breakpoint")),
             },
             f1: true,
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             keybinding: {
                 when: ( (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))),
-                primary: KeyCode.F9,
-                weight: KeybindingWeight.EditorContrib
+                primary: 67 ,
+                weight: 100
             },
             menu: {
                 id: MenuId.MenubarDebugMenu,
@@ -90,12 +89,12 @@ class ConditionalBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.conditionalBreakpoint',
-            label: ( localize(5933, "Debug: Add Conditional Breakpoint...")),
+            label: ( localize(5952, "Debug: Add Conditional Breakpoint...")),
             alias: 'Debug: Add Conditional Breakpoint...',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5934, "&&Conditional Breakpoint...")),
+                title: ( localize(5953, "&&Conditional Breakpoint...")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -106,7 +105,7 @@ class ConditionalBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, BreakpointWidgetContext.CONDITION);
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, 0 );
         }
     }
 }
@@ -114,13 +113,13 @@ class LogPointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.addLogPoint',
-            label: ( localize(5935, "Debug: Add Logpoint...")),
+            label: ( localize(5954, "Debug: Add Logpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Add Logpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5936, "&&Logpoint...")),
+                    title: ( localize(5955, "&&Logpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -132,7 +131,7 @@ class LogPointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.LOG_MESSAGE);
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 2 );
         }
     }
 }
@@ -140,13 +139,13 @@ class TriggerByBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.triggerByBreakpoint',
-            label: ( localize(5937, "Debug: Add Triggered Breakpoint...")),
+            label: ( localize(5956, "Debug: Add Triggered Breakpoint...")),
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             alias: 'Debug: Triggered Breakpoint...',
             menuOpts: [
                 {
                     menuId: MenuId.MenubarNewBreakpointMenu,
-                    title: ( localize(5938, "&&Triggered Breakpoint...")),
+                    title: ( localize(5957, "&&Triggered Breakpoint...")),
                     group: '1_breakpoints',
                     order: 4,
                     when: CONTEXT_DEBUGGERS_AVAILABLE,
@@ -158,7 +157,7 @@ class TriggerByBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.TRIGGER_POINT);
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 3 );
         }
     }
 }
@@ -166,12 +165,12 @@ class EditBreakpointAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.editBreakpoint',
-            label: ( localize(5939, "Debug: Edit Breakpoint")),
+            label: ( localize(5958, "Debug: Edit Breakpoint")),
             alias: 'Debug: Edit Existing Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             menuOpts: {
                 menuId: MenuId.MenubarNewBreakpointMenu,
-                title: ( localize(5940, "&&Edit Breakpoint")),
+                title: ( localize(5959, "&&Edit Breakpoint")),
                 group: '1_breakpoints',
                 order: 1,
                 when: CONTEXT_DEBUGGERS_AVAILABLE
@@ -206,8 +205,8 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                ...( localize2(5941, "Open Disassembly View")),
-                mnemonicTitle: ( localize(5942, "&&DisassemblyView")),
+                ...( localize2(5960, "Open Disassembly View")),
+                mnemonicTitle: ( localize(5961, "&&DisassemblyView")),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -258,11 +257,11 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                ...( localize2(5943, "Toggle Source Code in Disassembly View")),
-                mnemonicTitle: ( localize(5944, "&&ToggleSource")),
+                ...( localize2(5962, "Toggle Source Code in Disassembly View")),
+                mnemonicTitle: ( localize(5963, "&&ToggleSource")),
             },
             metadata: {
-                description: ( localize2(5945, 'Shows or hides source code in disassembly'))
+                description: ( localize2(5964, 'Shows or hides source code in disassembly'))
             },
             f1: true,
         });
@@ -277,7 +276,7 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
 }
 class RunToCursorAction extends EditorAction {
     static { this.ID = 'editor.debug.action.runToCursor'; }
-    static { this.LABEL = ( localize2(5946, "Run to Cursor")); }
+    static { this.LABEL = ( localize2(5965, "Run to Cursor")); }
     constructor() {
         super({
             id: RunToCursorAction.ID,
@@ -315,7 +314,7 @@ class RunToCursorAction extends EditorAction {
 }
 class SelectionToReplAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToRepl'; }
-    static { this.LABEL = ( localize2(5947, "Evaluate in Debug Console")); }
+    static { this.LABEL = ( localize2(5966, "Evaluate in Debug Console")); }
     constructor() {
         super({
             id: SelectionToReplAction.ID,
@@ -354,7 +353,7 @@ class SelectionToReplAction extends EditorAction {
 }
 class SelectionToWatchExpressionsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.selectionToWatch'; }
-    static { this.LABEL = ( localize2(5948, "Add to Watch")); }
+    static { this.LABEL = ( localize2(5967, "Add to Watch")); }
     constructor() {
         super({
             id: SelectionToWatchExpressionsAction.ID,
@@ -403,13 +402,13 @@ class ShowDebugHoverAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.showDebugHover',
-            label: ( localize(5949, "Debug: Show Hover")),
+            label: ( localize(5968, "Debug: Show Hover")),
             alias: 'Debug: Show Hover',
             precondition: CONTEXT_IN_DEBUG_MODE,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
-                weight: KeybindingWeight.EditorContrib
+                primary: KeyChord(2048  | 41 , 2048  | 39 ),
+                weight: 100
             }
         });
     }
@@ -421,10 +420,10 @@ class ShowDebugHoverAction extends EditorAction {
         return editor.getContribution(EDITOR_CONTRIBUTION_ID)?.showHover(position, true);
     }
 }
-const NO_TARGETS_MESSAGE = ( localize(5950, "Step targets are not available here"));
+const NO_TARGETS_MESSAGE = ( localize(5969, "Step targets are not available here"));
 class StepIntoTargetsAction extends EditorAction {
     static { this.ID = 'editor.debug.action.stepIntoTargets'; }
-    static { this.LABEL = ( localize(5951, "Step Into Target")); }
+    static { this.LABEL = ( localize(5970, "Step Into Target")); }
     constructor() {
         super({
             id: StepIntoTargetsAction.ID,
@@ -536,7 +535,7 @@ class GoToNextBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(true, {
             id: 'editor.debug.action.goToNextBreakpoint',
-            label: ( localize(5952, "Debug: Go to Next Breakpoint")),
+            label: ( localize(5971, "Debug: Go to Next Breakpoint")),
             alias: 'Debug: Go to Next Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -546,7 +545,7 @@ class GoToPreviousBreakpointAction extends GoToBreakpointAction {
     constructor() {
         super(false, {
             id: 'editor.debug.action.goToPreviousBreakpoint',
-            label: ( localize(5953, "Debug: Go to Previous Breakpoint")),
+            label: ( localize(5972, "Debug: Go to Previous Breakpoint")),
             alias: 'Debug: Go to Previous Breakpoint',
             precondition: CONTEXT_DEBUGGERS_AVAILABLE
         });
@@ -556,12 +555,12 @@ class CloseExceptionWidgetAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.debug.action.closeExceptionWidget',
-            label: ( localize(5954, "Close Exception Widget")),
+            label: ( localize(5973, "Close Exception Widget")),
             alias: 'Close Exception Widget',
             precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
             kbOpts: {
-                primary: KeyCode.Escape,
-                weight: KeybindingWeight.EditorContrib
+                primary: 9 ,
+                weight: 100
             }
         });
     }

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

@@ -9,30 +9,23 @@ import { onUnexpectedExternalError, illegalArgument } from 'vscode/vscode/vs/bas
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { visit } from 'vscode/vscode/vs/base/common/json';
 import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { MutableDisposable, DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { noBreakWhitespace, format } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined, assertType } from 'vscode/vscode/vs/base/common/types';
-import { Constants } from 'vscode/vscode/vs/base/common/uint';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { CoreEditingCommands } from 'vscode/vscode/vs/editor/browser/coreCommands';
-import { MouseTargetType } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { DEFAULT_WORD_REGEXP } from 'vscode/vscode/vs/editor/common/core/wordHelper';
-import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
-import { StandardTokenType } from 'vscode/vscode/vs/editor/common/encodedTokenAttributes';
 import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
 import { ILanguageFeatureDebounceService } from 'vscode/vscode/vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
-import { HoverStartMode, HoverStartSource } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverOperation';
+import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController';
 import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -51,9 +44,9 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { DebugHoverWidget, ShowDebugHoverResult } from './debugHover.js';
+import { DebugHoverWidget } from './debugHover.js';
 import { ExceptionWidget } from './exceptionWidget.js';
-import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
@@ -67,15 +60,15 @@ registerColor('editor.inlineValuesForeground', {
     light: '#00000080',
     hcDark: '#ffffff80',
     hcLight: '#00000080'
-}, ( localize(5955, "Color for the debug inline value text.")));
-registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5956, "Color for the debug inline value background.")));
+}, ( localize(5974, "Color for the debug inline value text.")));
+registerColor('editor.inlineValuesBackground', '#ffc80033', ( localize(5975, "Color for the debug inline value background.")));
 class InlineSegment {
     constructor(column, text) {
         this.column = column;
         this.text = text;
     }
 }
-function createInlineValueDecoration(lineNumber, contentText, column = Constants.MAX_SAFE_SMALL_INTEGER) {
+function createInlineValueDecoration(lineNumber, contentText, column = 1073741824 ) {
     if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
         contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
     }
@@ -163,7 +156,7 @@ function getWordToLineNumbersMap(model, lineNumber, result) {
     const lineTokens = model.tokenization.getLineTokens(lineNumber);
     for (let tokenIndex = 0, tokenCount = lineTokens.getCount(); tokenIndex < tokenCount; tokenIndex++) {
         const tokenType = lineTokens.getStandardTokenType(tokenIndex);
-        if (tokenType === StandardTokenType.Other) {
+        if (tokenType === 0 ) {
             DEFAULT_WORD_REGEXP.lastIndex = 0;
             const tokenStartOffset = lineTokens.getStartOffset(tokenIndex);
             const tokenEndOffset = lineTokens.getEndOffset(tokenIndex);
@@ -246,7 +239,7 @@ let DebugEditorContribution = class DebugEditorContribution {
             }
         }));
         this.toDispose.push(this.debugService.onDidChangeState((state) => {
-            if (state !== State.Stopped) {
+            if (state !== 2 ) {
                 this.toggleExceptionWidget();
             }
         }));
@@ -276,7 +269,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         const ownerDocument = this.editor.getContainerDomNode().ownerDocument;
         this.altListener.value = addDisposableListener(ownerDocument, 'keydown', keydownEvent => {
             const standardKeyboardEvent = ( (new StandardKeyboardEvent(keydownEvent)));
-            if (standardKeyboardEvent.keyCode === KeyCode.Alt) {
+            if (standardKeyboardEvent.keyCode === 6 ) {
                 this.altPressed = true;
                 const debugHoverWasVisible = this.hoverWidget.isVisible();
                 this.hoverWidget.hide();
@@ -290,7 +283,7 @@ let DebugEditorContribution = class DebugEditorContribution {
                     if (isKeyboardEvent(keyupEvent)) {
                         standardKeyboardEvent = ( (new StandardKeyboardEvent(keyupEvent)));
                     }
-                    if (!standardKeyboardEvent || standardKeyboardEvent.keyCode === KeyCode.Alt) {
+                    if (!standardKeyboardEvent || standardKeyboardEvent.keyCode === 6 ) {
                         this.altPressed = false;
                         this.preventDefaultEditorHover();
                         listener.dispose();
@@ -306,7 +299,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         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, mouseEvent);
-            if (result === ShowDebugHoverResult.NOT_AVAILABLE) {
+            if (result === 1 ) {
                 this.showEditorHover(position, focus);
             }
         }
@@ -333,7 +326,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         const hoverController = this.editor.getContribution(ContentHoverController.ID);
         const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
         this.defaultHoverLockout.clear();
-        hoverController?.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Mouse, focus);
+        hoverController?.showContentHover(range, 1 , 0 , focus);
     }
     async onFocusStackFrame(sf) {
         const model = this.editor.getModel();
@@ -371,19 +364,19 @@ let DebugEditorContribution = class DebugEditorContribution {
     }
     onEditorMouseDown(mouseEvent) {
         this.mouseDown = true;
-        if (mouseEvent.target.type === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === DebugHoverWidget.ID) {
+        if (mouseEvent.target.type === 9  && mouseEvent.target.detail === DebugHoverWidget.ID) {
             return;
         }
         this.hideHoverWidget();
     }
     onEditorMouseMove(mouseEvent) {
-        if (this.debugService.state !== State.Stopped) {
+        if (this.debugService.state !== 2 ) {
             return;
         }
         const target = mouseEvent.target;
         const stopKey = isMacintosh ? 'metaKey' : 'ctrlKey';
         if (!this.altPressed) {
-            if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN) {
+            if (target.type === 2 ) {
                 this.defaultHoverLockout.clear();
                 this.gutterIsHovered = true;
             }
@@ -392,13 +385,13 @@ let DebugEditorContribution = class DebugEditorContribution {
                 this.updateHoverConfiguration();
             }
         }
-        if (target.type === MouseTargetType.CONTENT_WIDGET && target.detail === DebugHoverWidget.ID && !mouseEvent.event[stopKey]) {
+        if (target.type === 9  && target.detail === DebugHoverWidget.ID && !mouseEvent.event[stopKey]) {
             const sticky = this.editorHoverOptions?.sticky ?? true;
             if (sticky || this.hoverWidget.isShowingComplexValue) {
                 return;
             }
         }
-        if (target.type === MouseTargetType.CONTENT_TEXT) {
+        if (target.type === 6 ) {
             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();
@@ -410,8 +403,8 @@ let DebugEditorContribution = class DebugEditorContribution {
         }
     }
     onKeyDown(e) {
-        const stopKey = isMacintosh ? KeyCode.Meta : KeyCode.Ctrl;
-        if (e.keyCode !== stopKey && e.keyCode !== KeyCode.Alt) {
+        const stopKey = isMacintosh ? 57  : 5 ;
+        if (e.keyCode !== stopKey && e.keyCode !== 6 ) {
             this.hideHoverWidget();
         }
     }
@@ -681,7 +674,7 @@ let DebugEditorContribution = class DebugEditorContribution {
             return;
         }
         let preservePosition;
-        if (this.editor.getOption(EditorOption.wordWrap) !== 'off') {
+        if (this.editor.getOption(135 ) !== 'off') {
             const position = this.editor.getPosition();
             if (position && ( (this.editor.getVisibleRanges().some(r => r.containsPosition(position))))) {
                 preservePosition = { position, top: this.editor.getTopForPosition(position.lineNumber, position.column) };
@@ -690,7 +683,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         this.oldDecorations.set(allDecorations);
         if (preservePosition) {
             const top = this.editor.getTopForPosition(preservePosition.position.lineNumber, preservePosition.position.column);
-            this.editor.setScrollTop(this.editor.getScrollTop() - (preservePosition.top - top), ScrollType.Immediate);
+            this.editor.setScrollTop(this.editor.getScrollTop() - (preservePosition.top - top), 1 );
         }
     }
     dispose() {

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

@@ -3,13 +3,9 @@ import { $ as $$1, append, addStandardDisposableListener, SafeTriangle, isAncest
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
-import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
-import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -18,7 +14,6 @@ import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IContextMenuService } 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 { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -33,21 +28,15 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { renderExpressionValue, AbstractExpressionDataSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
-import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Variable, Expression, VisualizedExpression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
+import { AbstractExpressionDataSource } from './baseDebugView.js';
+import { DebugExpressionRenderer } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugExpressionRenderer';
+import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 
 var DebugHoverWidget_1;
 const $ = $$1;
-var ShowDebugHoverResult;
-( ((function(ShowDebugHoverResult) {
-    ShowDebugHoverResult[ShowDebugHoverResult["NOT_CHANGED"] = 0] = "NOT_CHANGED";
-    ShowDebugHoverResult[ShowDebugHoverResult["NOT_AVAILABLE"] = 1] = "NOT_AVAILABLE";
-    ShowDebugHoverResult[ShowDebugHoverResult["CANCELLED"] = 2] = "CANCELLED";
-})(ShowDebugHoverResult || (ShowDebugHoverResult = {}))));
 async function doFindExpression(container, namesToFind) {
     if (!container) {
         return null;
@@ -76,21 +65,21 @@ let DebugHoverWidget = class DebugHoverWidget {
     get isShowingComplexValue() {
         return this.complexValueContainer?.hidden === false;
     }
-    constructor(editor, debugService, instantiationService, menuService, contextKeyService, contextMenuService, hoverService) {
+    constructor(editor, debugService, instantiationService, menuService, contextKeyService, contextMenuService) {
         this.editor = editor;
         this.debugService = debugService;
         this.instantiationService = instantiationService;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.contextMenuService = contextMenuService;
-        this.hoverService = hoverService;
         this.allowEditorOverflow = true;
         this.highlightDecorations = this.editor.createDecorationsCollection();
         this.isUpdatingTree = false;
         this.toDispose = [];
         this.showAtPosition = null;
-        this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
+        this.positionPreference = [1 , 2 ];
         this.debugHoverComputer = this.instantiationService.createInstance(DebugHoverComputer, this.editor);
+        this.expressionRenderer = this.instantiationService.createInstance(DebugExpressionRenderer);
     }
     create() {
         this.domNode = $('.debug-hover-widget');
@@ -100,15 +89,14 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.treeContainer.setAttribute('role', 'tree');
         const tip = append(this.complexValueContainer, $('.tip'));
         tip.textContent = ( localize(
-            10283,
+            10340,
             'Hold {0} key to switch to editor language hover',
             isMacintosh ? 'Option' : 'Alt'
         ));
         const dataSource = this.instantiationService.createInstance(DebugHoverDataSource);
-        const linkeDetector = this.instantiationService.createInstance(LinkDetector);
         this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, ( (new DebugHoverDelegate())), [
-            this.instantiationService.createInstance(VariablesRenderer, linkeDetector),
-            this.instantiationService.createInstance(VisualizedVariableRenderer, linkeDetector),
+            this.instantiationService.createInstance(VariablesRenderer, this.expressionRenderer),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, this.expressionRenderer),
         ], dataSource, {
             accessibilityProvider: ( (new DebugHoverAccessibilityProvider())),
             mouseSupport: false,
@@ -123,7 +111,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.valueContainer = $('.value');
         this.valueContainer.tabIndex = 0;
         this.valueContainer.setAttribute('role', 'tooltip');
-        this.scrollbar = ( (new DomScrollableElement(this.valueContainer, { horizontal: ScrollbarVisibility.Hidden })));
+        this.scrollbar = ( (new DomScrollableElement(this.valueContainer, { horizontal: 2  })));
         this.domNode.appendChild(this.scrollbar.getDomNode());
         this.toDispose.push(this.scrollbar);
         this.editor.applyFontInfo(this.domNode);
@@ -153,12 +141,12 @@ let DebugHoverWidget = class DebugHoverWidget {
     }
     registerListeners() {
         this.toDispose.push(addStandardDisposableListener(this.domNode, 'keydown', (e) => {
-            if (e.equals(KeyCode.Escape)) {
+            if (e.equals(9 )) {
                 this.hide();
             }
         }));
         this.toDispose.push(this.editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(EditorOption.fontInfo)) {
+            if (e.hasChanged(52 )) {
                 this.editor.applyFontInfo(this.domNode);
             }
         }));
@@ -193,40 +181,40 @@ let DebugHoverWidget = class DebugHoverWidget {
         const session = this.debugService.getViewModel().focusedSession;
         if (!session || !this.editor.hasModel()) {
             this.hide();
-            return ShowDebugHoverResult.NOT_AVAILABLE;
+            return 1 ;
         }
         const result = await this.debugHoverComputer.compute(position, cancellationSource.token);
         if (cancellationSource.token.isCancellationRequested) {
             this.hide();
-            return ShowDebugHoverResult.CANCELLED;
+            return 2 ;
         }
         if (!result.range) {
             this.hide();
-            return ShowDebugHoverResult.NOT_AVAILABLE;
+            return 1 ;
         }
         if (this.isVisible() && !result.rangeChanged) {
-            return ShowDebugHoverResult.NOT_CHANGED;
+            return 0 ;
         }
         const expression = await this.debugHoverComputer.evaluate(session);
         if (cancellationSource.token.isCancellationRequested) {
             this.hide();
-            return ShowDebugHoverResult.CANCELLED;
+            return 2 ;
         }
         if (!expression || (expression instanceof Expression && !expression.available)) {
             this.hide();
-            return ShowDebugHoverResult.NOT_AVAILABLE;
+            return 1 ;
         }
         this.highlightDecorations.set([{
                 range: result.range,
                 options: DebugHoverWidget_1._HOVER_HIGHLIGHT_DECORATION_OPTIONS
             }]);
-        return this.doShow(result.range.getStartPosition(), expression, focus, mouseEvent);
+        return this.doShow(session, result.range.getStartPosition(), expression, focus, mouseEvent);
     }
     static { this._HOVER_HIGHLIGHT_DECORATION_OPTIONS = ModelDecorationOptions.register({
         description: 'bdebug-hover-highlight',
         className: 'hoverHighlight'
     }); }
-    async doShow(position, expression, focus, mouseEvent) {
+    async doShow(session, position, expression, focus, mouseEvent) {
         if (!this.domNode) {
             this.create();
         }
@@ -236,11 +224,12 @@ let DebugHoverWidget = class DebugHoverWidget {
         if (!expression.hasChildren) {
             this.complexValueContainer.hidden = true;
             this.valueContainer.hidden = false;
-            renderExpressionValue(store, expression, this.valueContainer, {
+            store.add(this.expressionRenderer.renderValue(this.valueContainer, expression, {
                 showChanged: false,
                 colorize: true,
                 hover: false,
-            }, this.hoverService);
+                session,
+            }));
             this.valueContainer.title = '';
             this.editor.layoutContentWidget(this);
             this.scrollbar.scanDomNode();
@@ -252,8 +241,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         }
         this.valueContainer.hidden = true;
         this.expressionToRender = expression;
-        this.complexValueTitle.textContent = expression.value;
-        this.complexValueTitle.title = expression.value;
+        store.add(this.expressionRenderer.renderValue(this.complexValueTitle, expression, { hover: false, session }));
         this.editor.layoutContentWidget(this);
         this.tree.scrollTop = 0;
         this.tree.scrollLeft = 0;
@@ -317,7 +305,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this._isVisible = undefined;
         this.highlightDecorations.clear();
         this.editor.layoutContentWidget(this);
-        this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
+        this.positionPreference = [1 , 2 ];
     }
     getPosition() {
         return this._isVisible ? {
@@ -334,15 +322,14 @@ DebugHoverWidget = DebugHoverWidget_1 = ( (__decorate([
     ( (__param(2, IInstantiationService))),
     ( (__param(3, IMenuService))),
     ( (__param(4, IContextKeyService))),
-    ( (__param(5, IContextMenuService))),
-    ( (__param(6, IHoverService)))
+    ( (__param(5, IContextMenuService)))
 ], DebugHoverWidget)));
 class DebugHoverAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(10284, "Debug Hover"));
+        return ( localize(10341, "Debug Hover"));
     }
     getAriaLabel(element) {
-        return ( localize(10285, "{0}, value {1}, variables, debug", element.name, element.value));
+        return ( localize(10342, "{0}, value {1}, variables, debug", element.name, element.value));
     }
 }
 class DebugHoverDataSource extends AbstractExpressionDataSource {
@@ -417,4 +404,4 @@ DebugHoverComputer = ( (__decorate([
     ( (__param(3, ILogService)))
 ], DebugHoverComputer)));
 
-export { DebugHoverWidget, ShowDebugHoverResult, findExpressionInStackFrame };
+export { DebugHoverWidget, findExpressionInStackFrame };