@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -1,72 +1,72 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const debugConsoleViewIcon = registerIcon('debug-console-view-icon', Codicon.debugConsole, ( localize(5951, 'View icon of the debug console view.')));
-const runViewIcon = registerIcon('run-view-icon', Codicon.debugAlt, ( localize(5952, 'View icon of the run view.')));
-const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5953, 'View icon of the variables view.')));
-const watchViewIcon = registerIcon('watch-view-icon', Codicon.debugAlt, ( localize(5954, 'View icon of the watch view.')));
-const callStackViewIcon = registerIcon('callstack-view-icon', Codicon.debugAlt, ( localize(5955, 'View icon of the call stack view.')));
-const breakpointsViewIcon = registerIcon('breakpoints-view-icon', Codicon.debugAlt, ( localize(5956, 'View icon of the breakpoints view.')));
-const loadedScriptsViewIcon = registerIcon('loaded-scripts-view-icon', Codicon.debugAlt, ( localize(5957, 'View icon of the loaded scripts view.')));
+const debugConsoleViewIcon = registerIcon('debug-console-view-icon', Codicon.debugConsole, ( localize(5976, 'View icon of the debug console view.')));
+const runViewIcon = registerIcon('run-view-icon', Codicon.debugAlt, ( localize(5977, 'View icon of the run view.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5978, 'View icon of the variables view.')));
+const watchViewIcon = registerIcon('watch-view-icon', Codicon.debugAlt, ( localize(5979, 'View icon of the watch view.')));
+const callStackViewIcon = registerIcon('callstack-view-icon', Codicon.debugAlt, ( localize(5980, 'View icon of the call stack view.')));
+const breakpointsViewIcon = registerIcon('breakpoints-view-icon', Codicon.debugAlt, ( localize(5981, 'View icon of the breakpoints view.')));
+const loadedScriptsViewIcon = registerIcon('loaded-scripts-view-icon', Codicon.debugAlt, ( localize(5982, 'View icon of the loaded scripts view.')));
 const breakpoint = {
-    regular: registerIcon('debug-breakpoint', Codicon.debugBreakpoint, ( localize(5958, 'Icon for breakpoints.'))),
-    disabled: registerIcon('debug-breakpoint-disabled', Codicon.debugBreakpointDisabled, ( localize(5959, 'Icon for disabled breakpoints.'))),
-    unverified: registerIcon('debug-breakpoint-unverified', Codicon.debugBreakpointUnverified, ( localize(5960, 'Icon for unverified breakpoints.'))),
-    pending: registerIcon('debug-breakpoint-pending', Codicon.debugBreakpointPending, ( localize(5961, 'Icon for breakpoints waiting on another breakpoint.'))),
+    regular: registerIcon('debug-breakpoint', Codicon.debugBreakpoint, ( localize(5983, 'Icon for breakpoints.'))),
+    disabled: registerIcon('debug-breakpoint-disabled', Codicon.debugBreakpointDisabled, ( localize(5984, 'Icon for disabled breakpoints.'))),
+    unverified: registerIcon('debug-breakpoint-unverified', Codicon.debugBreakpointUnverified, ( localize(5985, 'Icon for unverified breakpoints.'))),
+    pending: registerIcon('debug-breakpoint-pending', Codicon.debugBreakpointPending, ( localize(5986, 'Icon for breakpoints waiting on another breakpoint.'))),
 };
 const functionBreakpoint = {
-    regular: registerIcon('debug-breakpoint-function', Codicon.debugBreakpointFunction, ( localize(5962, 'Icon for function breakpoints.'))),
-    disabled: registerIcon('debug-breakpoint-function-disabled', Codicon.debugBreakpointFunctionDisabled, ( localize(5963, 'Icon for disabled function breakpoints.'))),
-    unverified: registerIcon('debug-breakpoint-function-unverified', Codicon.debugBreakpointFunctionUnverified, ( localize(5964, 'Icon for unverified function breakpoints.')))
+    regular: registerIcon('debug-breakpoint-function', Codicon.debugBreakpointFunction, ( localize(5987, 'Icon for function breakpoints.'))),
+    disabled: registerIcon('debug-breakpoint-function-disabled', Codicon.debugBreakpointFunctionDisabled, ( localize(5988, 'Icon for disabled function breakpoints.'))),
+    unverified: registerIcon('debug-breakpoint-function-unverified', Codicon.debugBreakpointFunctionUnverified, ( localize(5989, 'Icon for unverified function breakpoints.')))
 };
 const conditionalBreakpoint = {
-    regular: registerIcon('debug-breakpoint-conditional', Codicon.debugBreakpointConditional, ( localize(5965, 'Icon for conditional breakpoints.'))),
-    disabled: registerIcon('debug-breakpoint-conditional-disabled', Codicon.debugBreakpointConditionalDisabled, ( localize(5966, 'Icon for disabled conditional breakpoints.'))),
-    unverified: registerIcon('debug-breakpoint-conditional-unverified', Codicon.debugBreakpointConditionalUnverified, ( localize(5967, 'Icon for unverified conditional breakpoints.')))
+    regular: registerIcon('debug-breakpoint-conditional', Codicon.debugBreakpointConditional, ( localize(5990, 'Icon for conditional breakpoints.'))),
+    disabled: registerIcon('debug-breakpoint-conditional-disabled', Codicon.debugBreakpointConditionalDisabled, ( localize(5991, 'Icon for disabled conditional breakpoints.'))),
+    unverified: registerIcon('debug-breakpoint-conditional-unverified', Codicon.debugBreakpointConditionalUnverified, ( localize(5992, 'Icon for unverified conditional breakpoints.')))
 };
 const dataBreakpoint = {
-    regular: registerIcon('debug-breakpoint-data', Codicon.debugBreakpointData, ( localize(5968, 'Icon for data breakpoints.'))),
-    disabled: registerIcon('debug-breakpoint-data-disabled', Codicon.debugBreakpointDataDisabled, ( localize(5969, 'Icon for disabled data breakpoints.'))),
-    unverified: registerIcon('debug-breakpoint-data-unverified', Codicon.debugBreakpointDataUnverified, ( localize(5970, 'Icon for unverified data breakpoints.'))),
+    regular: registerIcon('debug-breakpoint-data', Codicon.debugBreakpointData, ( localize(5993, 'Icon for data breakpoints.'))),
+    disabled: registerIcon('debug-breakpoint-data-disabled', Codicon.debugBreakpointDataDisabled, ( localize(5994, 'Icon for disabled data breakpoints.'))),
+    unverified: registerIcon('debug-breakpoint-data-unverified', Codicon.debugBreakpointDataUnverified, ( localize(5995, 'Icon for unverified data breakpoints.'))),
 };
 const logBreakpoint = {
-    regular: registerIcon('debug-breakpoint-log', Codicon.debugBreakpointLog, ( localize(5971, 'Icon for log breakpoints.'))),
-    disabled: registerIcon('debug-breakpoint-log-disabled', Codicon.debugBreakpointLogDisabled, ( localize(5972, 'Icon for disabled log breakpoint.'))),
-    unverified: registerIcon('debug-breakpoint-log-unverified', Codicon.debugBreakpointLogUnverified, ( localize(5973, 'Icon for unverified log breakpoints.'))),
+    regular: registerIcon('debug-breakpoint-log', Codicon.debugBreakpointLog, ( localize(5996, 'Icon for log breakpoints.'))),
+    disabled: registerIcon('debug-breakpoint-log-disabled', Codicon.debugBreakpointLogDisabled, ( localize(5997, 'Icon for disabled log breakpoint.'))),
+    unverified: registerIcon('debug-breakpoint-log-unverified', Codicon.debugBreakpointLogUnverified, ( localize(5998, 'Icon for unverified log breakpoints.'))),
 };
-const debugBreakpointHint = registerIcon('debug-hint', Codicon.debugHint, ( localize(5974, 'Icon for breakpoint hints shown on hover in editor glyph margin.')));
-const debugBreakpointUnsupported = registerIcon('debug-breakpoint-unsupported', Codicon.debugBreakpointUnsupported, ( localize(5975, 'Icon for unsupported breakpoints.')));
+const debugBreakpointHint = registerIcon('debug-hint', Codicon.debugHint, ( localize(5999, 'Icon for breakpoint hints shown on hover in editor glyph margin.')));
+const debugBreakpointUnsupported = registerIcon('debug-breakpoint-unsupported', Codicon.debugBreakpointUnsupported, ( localize(6000, 'Icon for unsupported breakpoints.')));
 const allBreakpoints = [breakpoint, functionBreakpoint, conditionalBreakpoint, dataBreakpoint, logBreakpoint];
-const debugStackframe = registerIcon('debug-stackframe', Codicon.debugStackframe, ( localize(5976, 'Icon for a stackframe shown in the editor glyph margin.')));
-const debugStackframeFocused = registerIcon('debug-stackframe-focused', Codicon.debugStackframeFocused, ( localize(5977, 'Icon for a focused stackframe  shown in the editor glyph margin.')));
-const debugGripper = registerIcon('debug-gripper', Codicon.gripper, ( localize(5978, 'Icon for the debug bar gripper.')));
-const debugRestartFrame = registerIcon('debug-restart-frame', Codicon.debugRestartFrame, ( localize(5979, 'Icon for the debug restart frame action.')));
-const debugStop = registerIcon('debug-stop', Codicon.debugStop, ( localize(5980, 'Icon for the debug stop action.')));
-const debugDisconnect = registerIcon('debug-disconnect', Codicon.debugDisconnect, ( localize(5981, 'Icon for the debug disconnect action.')));
-const debugRestart = registerIcon('debug-restart', Codicon.debugRestart, ( localize(5982, 'Icon for the debug restart action.')));
-const debugStepOver = registerIcon('debug-step-over', Codicon.debugStepOver, ( localize(5983, 'Icon for the debug step over action.')));
-const debugStepInto = registerIcon('debug-step-into', Codicon.debugStepInto, ( localize(5984, 'Icon for the debug step into action.')));
-const debugStepOut = registerIcon('debug-step-out', Codicon.debugStepOut, ( localize(5985, 'Icon for the debug step out action.')));
-const debugStepBack = registerIcon('debug-step-back', Codicon.debugStepBack, ( localize(5986, 'Icon for the debug step back action.')));
-const debugPause = registerIcon('debug-pause', Codicon.debugPause, ( localize(5987, 'Icon for the debug pause action.')));
-const debugContinue = registerIcon('debug-continue', Codicon.debugContinue, ( localize(5988, 'Icon for the debug continue action.')));
-const debugReverseContinue = registerIcon('debug-reverse-continue', Codicon.debugReverseContinue, ( localize(5989, 'Icon for the debug reverse continue action.')));
-const debugRun = registerIcon('debug-run', Codicon.run, ( localize(5990, 'Icon for the run or debug action.')));
-const debugStart = registerIcon('debug-start', Codicon.debugStart, ( localize(5991, 'Icon for the debug start action.')));
-const debugConfigure = registerIcon('debug-configure', Codicon.gear, ( localize(5992, 'Icon for the debug configure action.')));
-registerIcon('debug-console', Codicon.gear, ( localize(5993, 'Icon for the debug console open action.')));
-const debugRemoveConfig = registerIcon('debug-remove-config', Codicon.trash, ( localize(5994, 'Icon for removing debug configurations.')));
-registerIcon('debug-collapse-all', Codicon.collapseAll, ( localize(5995, 'Icon for the collapse all action in the debug views.')));
-const callstackViewSession = registerIcon('callstack-view-session', Codicon.bug, ( localize(5996, 'Icon for the session icon in the call stack view.')));
-const debugConsoleClearAll = registerIcon('debug-console-clear-all', Codicon.clearAll, ( localize(5997, 'Icon for the clear all action in the debug console.')));
-const watchExpressionsRemoveAll = registerIcon('watch-expressions-remove-all', Codicon.closeAll, ( localize(5998, 'Icon for the Remove All action in the watch view.')));
-const watchExpressionRemove = registerIcon('watch-expression-remove', Codicon.removeClose, ( localize(5999, 'Icon for the Remove action in the watch view.')));
-const watchExpressionsAdd = registerIcon('watch-expressions-add', Codicon.add, ( localize(6000, 'Icon for the add action in the watch view.')));
-const watchExpressionsAddFuncBreakpoint = registerIcon('watch-expressions-add-function-breakpoint', Codicon.add, ( localize(6001, 'Icon for the add function breakpoint action in the watch view.')));
-const watchExpressionsAddDataBreakpoint = registerIcon('watch-expressions-add-data-breakpoint', Codicon.variableGroup, ( localize(6002, 'Icon for the add data breakpoint action in the breakpoints view.')));
-const breakpointsRemoveAll = registerIcon('breakpoints-remove-all', Codicon.closeAll, ( localize(6003, 'Icon for the Remove All action in the breakpoints view.')));
-const breakpointsActivate = registerIcon('breakpoints-activate', Codicon.activateBreakpoints, ( localize(6004, 'Icon for the activate action in the breakpoints view.')));
-const debugConsoleEvaluationInput = registerIcon('debug-console-evaluation-input', Codicon.arrowSmallRight, ( localize(6005, 'Icon for the debug evaluation input marker.')));
-const debugConsoleEvaluationPrompt = registerIcon('debug-console-evaluation-prompt', Codicon.chevronRight, ( localize(6006, 'Icon for the debug evaluation prompt.')));
-const debugInspectMemory = registerIcon('debug-inspect-memory', Codicon.fileBinary, ( localize(6007, 'Icon for the inspect memory action.')));
+const debugStackframe = registerIcon('debug-stackframe', Codicon.debugStackframe, ( localize(6001, 'Icon for a stackframe shown in the editor glyph margin.')));
+const debugStackframeFocused = registerIcon('debug-stackframe-focused', Codicon.debugStackframeFocused, ( localize(6002, 'Icon for a focused stackframe  shown in the editor glyph margin.')));
+const debugGripper = registerIcon('debug-gripper', Codicon.gripper, ( localize(6003, 'Icon for the debug bar gripper.')));
+const debugRestartFrame = registerIcon('debug-restart-frame', Codicon.debugRestartFrame, ( localize(6004, 'Icon for the debug restart frame action.')));
+const debugStop = registerIcon('debug-stop', Codicon.debugStop, ( localize(6005, 'Icon for the debug stop action.')));
+const debugDisconnect = registerIcon('debug-disconnect', Codicon.debugDisconnect, ( localize(6006, 'Icon for the debug disconnect action.')));
+const debugRestart = registerIcon('debug-restart', Codicon.debugRestart, ( localize(6007, 'Icon for the debug restart action.')));
+const debugStepOver = registerIcon('debug-step-over', Codicon.debugStepOver, ( localize(6008, 'Icon for the debug step over action.')));
+const debugStepInto = registerIcon('debug-step-into', Codicon.debugStepInto, ( localize(6009, 'Icon for the debug step into action.')));
+const debugStepOut = registerIcon('debug-step-out', Codicon.debugStepOut, ( localize(6010, 'Icon for the debug step out action.')));
+const debugStepBack = registerIcon('debug-step-back', Codicon.debugStepBack, ( localize(6011, 'Icon for the debug step back action.')));
+const debugPause = registerIcon('debug-pause', Codicon.debugPause, ( localize(6012, 'Icon for the debug pause action.')));
+const debugContinue = registerIcon('debug-continue', Codicon.debugContinue, ( localize(6013, 'Icon for the debug continue action.')));
+const debugReverseContinue = registerIcon('debug-reverse-continue', Codicon.debugReverseContinue, ( localize(6014, 'Icon for the debug reverse continue action.')));
+const debugRun = registerIcon('debug-run', Codicon.run, ( localize(6015, 'Icon for the run or debug action.')));
+const debugStart = registerIcon('debug-start', Codicon.debugStart, ( localize(6016, 'Icon for the debug start action.')));
+const debugConfigure = registerIcon('debug-configure', Codicon.gear, ( localize(6017, 'Icon for the debug configure action.')));
+registerIcon('debug-console', Codicon.gear, ( localize(6018, 'Icon for the debug console open action.')));
+const debugRemoveConfig = registerIcon('debug-remove-config', Codicon.trash, ( localize(6019, 'Icon for removing debug configurations.')));
+registerIcon('debug-collapse-all', Codicon.collapseAll, ( localize(6020, 'Icon for the collapse all action in the debug views.')));
+const callstackViewSession = registerIcon('callstack-view-session', Codicon.bug, ( localize(6021, 'Icon for the session icon in the call stack view.')));
+const debugConsoleClearAll = registerIcon('debug-console-clear-all', Codicon.clearAll, ( localize(6022, 'Icon for the clear all action in the debug console.')));
+const watchExpressionsRemoveAll = registerIcon('watch-expressions-remove-all', Codicon.closeAll, ( localize(6023, 'Icon for the Remove All action in the watch view.')));
+const watchExpressionRemove = registerIcon('watch-expression-remove', Codicon.removeClose, ( localize(6024, 'Icon for the Remove action in the watch view.')));
+const watchExpressionsAdd = registerIcon('watch-expressions-add', Codicon.add, ( localize(6025, 'Icon for the add action in the watch view.')));
+const watchExpressionsAddFuncBreakpoint = registerIcon('watch-expressions-add-function-breakpoint', Codicon.add, ( localize(6026, 'Icon for the add function breakpoint action in the watch view.')));
+const watchExpressionsAddDataBreakpoint = registerIcon('watch-expressions-add-data-breakpoint', Codicon.variableGroup, ( localize(6027, 'Icon for the add data breakpoint action in the breakpoints view.')));
+const breakpointsRemoveAll = registerIcon('breakpoints-remove-all', Codicon.closeAll, ( localize(6028, 'Icon for the Remove All action in the breakpoints view.')));
+const breakpointsActivate = registerIcon('breakpoints-activate', Codicon.activateBreakpoints, ( localize(6029, 'Icon for the activate action in the breakpoints view.')));
+const debugConsoleEvaluationInput = registerIcon('debug-console-evaluation-input', Codicon.arrowSmallRight, ( localize(6030, 'Icon for the debug evaluation input marker.')));
+const debugConsoleEvaluationPrompt = registerIcon('debug-console-evaluation-prompt', Codicon.chevronRight, ( localize(6031, 'Icon for the debug evaluation prompt.')));
+const debugInspectMemory = registerIcon('debug-inspect-memory', Codicon.fileBinary, ( localize(6032, 'Icon for the inspect memory action.')));
 export { allBreakpoints, breakpoint, breakpointsActivate, breakpointsRemoveAll, breakpointsViewIcon, callStackViewIcon, callstackViewSession, conditionalBreakpoint, dataBreakpoint, debugBreakpointHint, debugBreakpointUnsupported, debugConfigure, debugConsoleClearAll, debugConsoleEvaluationInput, debugConsoleEvaluationPrompt, debugConsoleViewIcon, debugContinue, debugDisconnect, debugGripper, debugInspectMemory, debugPause, debugRemoveConfig, debugRestart, debugRestartFrame, debugReverseContinue, debugRun, debugStackframe, debugStackframeFocused, debugStart, debugStepBack, debugStepInto, debugStepOut, debugStepOver, debugStop, functionBreakpoint, loadedScriptsViewIcon, logBreakpoint, runViewIcon, variablesViewIcon, watchExpressionRemove, watchExpressionsAdd, watchExpressionsAddDataBreakpoint, watchExpressionsAddFuncBreakpoint, watchExpressionsRemoveAll, watchViewIcon };

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

@@ -15,7 +15,7 @@ async function showDebugSessionMenu(accessor, selectAndStartID) {
     const quickPick = quickInputService.createQuickPick({ useSeparators: true });
     localDisposableStore.add(quickPick);
     quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
-    quickPick.placeholder = ( localize(10258, 'Search debug sessions by name'));
+    quickPick.placeholder = ( localize(10316, 'Search debug sessions by name'));
     const pickItems = _getPicksAndActiveItem(quickPick.value, selectAndStartID, debugService, viewsService, commandService);
     quickPick.items = pickItems.picks;
     quickPick.activeItems = pickItems.activeItems;
@@ -59,7 +59,7 @@ function _getPicksAndActiveItem(filter, selectAndStartID, debugService, viewsSer
     if (debugConsolePicks.length) {
         debugConsolePicks.push({ type: 'separator' });
     }
-    const createDebugSessionLabel = ( localize(10259, 'Start a New Debug Session'));
+    const createDebugSessionLabel = ( localize(10317, 'Start a New Debug Session'));
     debugConsolePicks.push({
         label: `$(plus) ${createDebugSessionLabel}`,
         ariaLabel: createDebugSessionLabel,
@@ -73,7 +73,7 @@ function _getSessionInfo(session) {
     let description = '';
     let ariaLabel = '';
     if (parentName) {
-        ariaLabel = ( localize(10260, 'Session {0} spawned from {1}', label, parentName));
+        ariaLabel = ( localize(10318, 'Session {0} spawned from {1}', label, parentName));
         description = parentName;
     }
     return { label, description, ariaLabel };

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

@@ -2,7 +2,6 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { getWindow } from '../../../../base/browser/dom.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { normalize, posix, join } from '../../../../base/common/path.js';
 import { isWindows, isMacintosh } from '../../../../base/common/platform.js';
@@ -32,12 +31,6 @@ const PATH_LINK_REGEX = ( (new RegExp(
 )));
 const LINE_COLUMN_REGEX = /:([\d]+)(?::([\d]+))?$/;
 const MAX_LENGTH = 2000;
-var DebugLinkHoverBehavior;
-( ((function(DebugLinkHoverBehavior) {
-    DebugLinkHoverBehavior[DebugLinkHoverBehavior["Rich"] = 0] = "Rich";
-    DebugLinkHoverBehavior[DebugLinkHoverBehavior["Basic"] = 1] = "Basic";
-    DebugLinkHoverBehavior[DebugLinkHoverBehavior["None"] = 2] = "None";
-})(DebugLinkHoverBehavior || (DebugLinkHoverBehavior = {}))));
 let LinkDetector = class LinkDetector {
     constructor(editorService, fileService, openerService, pathService, tunnelService, environmentService, configurationService, hoverService) {
         this.editorService = editorService;
@@ -50,6 +43,9 @@ let LinkDetector = class LinkDetector {
         this.hoverService = hoverService;
     }
     linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior) {
+        return this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior);
+    }
+    _linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, defaultRef) {
         if (splitLines) {
             const lines = text.split('\n');
             for (let i = 0; i < lines.length - 1; i++) {
@@ -58,7 +54,9 @@ let LinkDetector = class LinkDetector {
             if (!lines[lines.length - 1]) {
                 lines.pop();
             }
-            const elements = ( (lines.map(line => this.linkify(line, false, workspaceFolder, includeFulltext))));
+            const elements = ( (lines.map(
+                line => this._linkify(line, false, workspaceFolder, includeFulltext, hoverBehavior, defaultRef)
+            )));
             if (elements.length === 1) {
                 return elements[0];
             }
@@ -71,7 +69,7 @@ let LinkDetector = class LinkDetector {
             try {
                 switch (part.kind) {
                     case 'text':
-                        container.appendChild(document.createTextNode(part.value));
+                        container.appendChild(defaultRef ? this.linkifyLocation(part.value, defaultRef.locationReference, defaultRef.session, hoverBehavior) : document.createTextNode(part.value));
                         break;
                     case 'web':
                         container.appendChild(this.createWebLink(includeFulltext ? text : undefined, part.value, hoverBehavior));
@@ -104,6 +102,12 @@ let LinkDetector = class LinkDetector {
         });
         return link;
     }
+    makeReferencedLinkDetector(locationReference, session) {
+        return {
+            linkify: (text, splitLines, workspaceFolder, includeFulltext, hoverBehavior) => this._linkify(text, splitLines, workspaceFolder, includeFulltext, hoverBehavior, { locationReference, session }),
+            linkifyLocation: this.linkifyLocation.bind(this),
+        };
+    }
     createWebLink(fulltext, url, hoverBehavior) {
         const link = this.createLink(url);
         let uri = ( (URI.parse(url)));
@@ -176,14 +180,14 @@ let LinkDetector = class LinkDetector {
     }
     decorateLink(link, uri, fulltext, hoverBehavior, onClick) {
         link.classList.add('link');
-        const followLink = uri && this.tunnelService.canTunnel(uri) ? ( localize(10297, "follow link using forwarded port")) : ( localize(10298, "follow link"));
+        const followLink = uri && this.tunnelService.canTunnel(uri) ? ( localize(11493, "follow link using forwarded port")) : ( localize(11494, "follow link"));
         const title = link.ariaLabel = fulltext
-            ? (isMacintosh ? ( localize(10299, "Cmd + click to {0}\n{1}", followLink, fulltext)) : ( localize(10300, "Ctrl + click to {0}\n{1}", followLink, fulltext)))
-            : (isMacintosh ? ( localize(10301, "Cmd + click to {0}", followLink)) : ( localize(10302, "Ctrl + click to {0}", followLink)));
-        if (hoverBehavior?.type === DebugLinkHoverBehavior.Rich) {
+            ? (isMacintosh ? ( localize(11495, "Cmd + click to {0}\n{1}", followLink, fulltext)) : ( localize(11496, "Ctrl + click to {0}\n{1}", followLink, fulltext)))
+            : (isMacintosh ? ( localize(11497, "Cmd + click to {0}", followLink)) : ( localize(11498, "Ctrl + click to {0}", followLink)));
+        if (hoverBehavior?.type === 0 ) {
             hoverBehavior.store.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('element'), link, title));
         }
-        else if (hoverBehavior?.type !== DebugLinkHoverBehavior.None) {
+        else if (hoverBehavior?.type !== 2 ) {
             link.title = title;
         }
         link.onmousemove = (event) => { link.classList.toggle('pointer', isMacintosh ? event.metaKey : event.ctrlKey); };
@@ -202,10 +206,10 @@ let LinkDetector = class LinkDetector {
         };
         link.onkeydown = e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.keyCode === KeyCode.Enter || event.keyCode === KeyCode.Space) {
+            if (event.keyCode === 3  || event.keyCode === 10 ) {
                 event.preventDefault();
                 event.stopPropagation();
-                onClick(event.keyCode === KeyCode.Space);
+                onClick(event.keyCode === 10 );
             }
         };
     }
@@ -257,4 +261,4 @@ LinkDetector = ( (__decorate([
     ( (__param(6, IConfigurationService))),
     ( (__param(7, IHoverService)))
 ], LinkDetector)));
-export { DebugLinkHoverBehavior, LinkDetector };
+export { LinkDetector };

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

@@ -61,7 +61,7 @@ class AbstractDebugAdapter {
                         request_seq: request.seq,
                         success: false,
                         command,
-                        message: ( localize(3758, "Timeout after {0} ms for '{1}'", timeout, command))
+                        message: ( localize(3871, "Timeout after {0} ms for '{1}'", timeout, command))
                     };
                     clb(err);
                 }

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

@@ -54,11 +54,13 @@ interface IExpressionValue {
 }
 interface IExpressionContainer extends ITreeElement, IExpressionValue {
     readonly hasChildren: boolean;
+    getSession(): IDebugSession | undefined;
     evaluateLazy(): Promise<void>;
     getChildren(): Promise<IExpression[]>;
     readonly reference?: number;
     readonly memoryReference?: string;
     readonly presentationHint?: DebugProtocol.VariablePresentationHint | undefined;
+    readonly valueLocationReference?: number;
 }
 interface IExpression extends IExpressionContainer {
     name: string;
@@ -255,7 +257,10 @@ interface IDebugSession extends ITreeElement {
     readonly onDidEndAdapter: Event<AdapterEndEvent | undefined>;
     readonly onDidChangeState: Event<void>;
     readonly onDidChangeReplElements: Event<IReplElement | undefined>;
+    /** DA capabilities. Set only when there is a running session available. */
     readonly capabilities: DebugProtocol.Capabilities;
+    /** DA capabilities. These are retained on the session even after is implementation ends. */
+    readonly rememberedCapabilities?: DebugProtocol.Capabilities;
     readonly onDidLoadedSource: Event<LoadedSourceEvent>;
     readonly onDidCustomEvent: Event<DebugProtocol.Event>;
     readonly onDidProgressStart: Event<DebugProtocol.ProgressStartEvent>;
@@ -664,13 +669,8 @@ interface IDebugAdapterNamedPipeServer {
     readonly type: 'pipeServer';
     readonly path: string;
 }
-interface IDebugAdapterInlineImpl extends IDisposable {
-    readonly onDidSendMessage: Event<DebugProtocol.Message>;
-    handleMessage(message: DebugProtocol.Message): void;
-}
 interface IDebugAdapterImpl {
     readonly type: 'implementation';
-    readonly implementation: IDebugAdapterInlineImpl;
 }
 type IAdapterDescriptor = IDebugAdapterExecutable | IDebugAdapterServer | IDebugAdapterNamedPipeServer | IDebugAdapterImpl;
 declare enum DebugConfigurationProviderTriggerKind {
@@ -809,4 +809,4 @@ interface ILaunch {
     }>;
 }
 
-export { type AdapterEndEvent, DataBreakpointSetType, type DataBreakpointSource, DebugConfigurationProviderTriggerKind, DebuggerString, type IAdapterDescriptor, type IAdapterManager, type IBaseBreakpoint, type IBreakpoint, type IBreakpointData, type IBreakpointUpdateData, type IBreakpointsChangeEvent, type ICompound, type IConfig, type IConfigPresentation, type IConfigurationManager, type IDataBreakpoint, type IDataBreakpointInfoResponse, type IDebugAdapter, type IDebugAdapterDescriptorFactory, type IDebugAdapterExecutable, type IDebugAdapterExecutableOptions, type IDebugAdapterFactory, type IDebugAdapterImpl, type IDebugAdapterInlineImpl, type IDebugAdapterNamedPipeServer, type IDebugAdapterServer, type IDebugConfigurationProvider, type IDebugEvaluatePosition, type IDebugLocationReferenced, type IDebugModel, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugTestRunReference, type IDebugger, type IDebuggerMetadata, type IEnablement, type IErrorMemoryRange, type IEvaluate, type IExceptionBreakpoint, type IExceptionInfo, type IExpression, type IExpressionContainer, type IExpressionValue, type IFunctionBreakpoint, type IInstructionBreakpoint, type ILaunch, type IMemoryInvalidationEvent, type IMemoryRange, type IMemoryRegion, type INewReplElementData, type IRawModelUpdate, type IRawStoppedDetails, type IReplElement, type IReplElementSource, type IScope, type IStackFrame, type IThread, type ITreeElement, type IUnreadableMemoryRange, type IValidMemoryRange, type IViewModel, type LoadedSourceEvent, type MemoryRange, MemoryRangeType, State };
+export { type AdapterEndEvent, DataBreakpointSetType, type DataBreakpointSource, DebugConfigurationProviderTriggerKind, DebuggerString, type IAdapterDescriptor, type IAdapterManager, type IBaseBreakpoint, type IBreakpoint, type IBreakpointData, type IBreakpointUpdateData, type IBreakpointsChangeEvent, type ICompound, type IConfig, type IConfigPresentation, type IConfigurationManager, type IDataBreakpoint, type IDataBreakpointInfoResponse, type IDebugAdapter, type IDebugAdapterDescriptorFactory, type IDebugAdapterExecutable, type IDebugAdapterExecutableOptions, type IDebugAdapterFactory, type IDebugAdapterImpl, type IDebugAdapterNamedPipeServer, type IDebugAdapterServer, type IDebugConfigurationProvider, type IDebugEvaluatePosition, type IDebugLocationReferenced, type IDebugModel, type IDebugSession, type IDebugSessionOptions, type IDebugSessionReplMode, type IDebugTestRunReference, type IDebugger, type IDebuggerMetadata, type IEnablement, type IErrorMemoryRange, type IEvaluate, type IExceptionBreakpoint, type IExceptionInfo, type IExpression, type IExpressionContainer, type IExpressionValue, type IFunctionBreakpoint, type IInstructionBreakpoint, type ILaunch, type IMemoryInvalidationEvent, type IMemoryRange, type IMemoryRegion, type INewReplElementData, type IRawModelUpdate, type IRawStoppedDetails, type IReplElement, type IReplElementSource, type IScope, type IStackFrame, type IThread, type ITreeElement, type IUnreadableMemoryRange, type IValidMemoryRange, type IViewModel, type LoadedSourceEvent, type MemoryRange, MemoryRangeType, State };

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

@@ -332,37 +332,19 @@ const INTERNAL_CONSOLE_OPTIONS_SCHEMA = {
     default: 'openOnFirstSessionStart',
     description: ( localize(68, "Controls when the internal Debug Console should open."))
 };
-var State;
-( ((function(State) {
-    State[State["Inactive"] = 0] = "Inactive";
-    State[State["Initializing"] = 1] = "Initializing";
-    State[State["Stopped"] = 2] = "Stopped";
-    State[State["Running"] = 3] = "Running";
-})(State || (State = {}))));
 function getStateLabel(state) {
     switch (state) {
-        case State.Initializing: return 'initializing';
-        case State.Stopped: return 'stopped';
-        case State.Running: return 'running';
+        case 1 : return 'initializing';
+        case 2 : return 'stopped';
+        case 3 : return 'running';
         default: return 'inactive';
     }
 }
-var MemoryRangeType;
-( ((function(MemoryRangeType) {
-    MemoryRangeType[MemoryRangeType["Valid"] = 0] = "Valid";
-    MemoryRangeType[MemoryRangeType["Unreadable"] = 1] = "Unreadable";
-    MemoryRangeType[MemoryRangeType["Error"] = 2] = "Error";
-})(MemoryRangeType || (MemoryRangeType = {}))));
 const DEBUG_MEMORY_SCHEME = 'vscode-debug-memory';
 function isFrameDeemphasized(frame) {
     const hint = frame.presentationHint ?? frame.source.presentationHint;
     return hint === 'deemphasize' || hint === 'subtle';
 }
-var DataBreakpointSetType;
-( ((function(DataBreakpointSetType) {
-    DataBreakpointSetType[DataBreakpointSetType["Variable"] = 0] = "Variable";
-    DataBreakpointSetType[DataBreakpointSetType["Address"] = 1] = "Address";
-})(DataBreakpointSetType || (DataBreakpointSetType = {}))));
 var DebugConfigurationProviderTriggerKind;
 ( ((function(DebugConfigurationProviderTriggerKind) {
     DebugConfigurationProviderTriggerKind[DebugConfigurationProviderTriggerKind["Initial"] = 1] = "Initial";
@@ -374,24 +356,6 @@ var DebuggerString;
 ( ((function(DebuggerString) {
     DebuggerString["UnverifiedBreakpoints"] = "unverifiedBreakpoints";
 })(DebuggerString || (DebuggerString = {}))));
-var BreakpointWidgetContext;
-( ((function(BreakpointWidgetContext) {
-    BreakpointWidgetContext[BreakpointWidgetContext["CONDITION"] = 0] = "CONDITION";
-    BreakpointWidgetContext[BreakpointWidgetContext["HIT_COUNT"] = 1] = "HIT_COUNT";
-    BreakpointWidgetContext[BreakpointWidgetContext["LOG_MESSAGE"] = 2] = "LOG_MESSAGE";
-    BreakpointWidgetContext[BreakpointWidgetContext["TRIGGER_POINT"] = 3] = "TRIGGER_POINT";
-})(BreakpointWidgetContext || (BreakpointWidgetContext = {}))));
-var DebugVisualizationType;
-( ((function(DebugVisualizationType) {
-    DebugVisualizationType[DebugVisualizationType["Command"] = 0] = "Command";
-    DebugVisualizationType[DebugVisualizationType["Tree"] = 1] = "Tree";
-})(DebugVisualizationType || (DebugVisualizationType = {}))));
-var DebugTreeItemCollapsibleState;
-( ((function(DebugTreeItemCollapsibleState) {
-    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["None"] = 0] = "None";
-    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["Collapsed"] = 1] = "Collapsed";
-    DebugTreeItemCollapsibleState[DebugTreeItemCollapsibleState["Expanded"] = 2] = "Expanded";
-})(DebugTreeItemCollapsibleState || (DebugTreeItemCollapsibleState = {}))));
 var IDebugVisualization;
 ( ((function(IDebugVisualization) {
     IDebugVisualization.deserialize = (v) => ({
@@ -403,4 +367,4 @@ var IDebugVisualization;
     });
     IDebugVisualization.serialize = (visualizer) => visualizer;
 })(IDebugVisualization || (IDebugVisualization = {}))));
-export { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_CONFIGURATION_TYPE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_BREAKPOINT_WIDGET, CONTEXT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_REPL, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_MULTI_SESSION_REPL, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_MEMORY_SCHEME, DEBUG_PANEL_ID, DEBUG_SCHEME, DISASSEMBLY_VIEW_ID, DataBreakpointSetType, DebugConfigurationProviderTriggerKind, DebugTreeItemCollapsibleState, DebugVisualizationType, DebuggerString, EDITOR_CONTRIBUTION_ID, IDebugVisualization, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, MemoryRangeType, REPL_VIEW_ID, State, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel, isFrameDeemphasized };
+export { BREAKPOINTS_VIEW_ID, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CALLSTACK_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_BREAKPOINTS_FOCUSED, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DEBUG_CONFIGURATION_TYPE, CONTEXT_DEBUG_EXTENSION_AVAILABLE, CONTEXT_DEBUG_PROTOCOL_VARIABLE_MENU_CONTEXT, CONTEXT_DEBUG_STATE, CONTEXT_DEBUG_TYPE, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_UX_KEY, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_DISASSEMBLY_VIEW_FOCUS, CONTEXT_EXCEPTION_WIDGET_VISIBLE, CONTEXT_EXPRESSION_SELECTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_HAS_DEBUGGED, CONTEXT_IN_BREAKPOINT_WIDGET, CONTEXT_IN_DEBUG_MODE, CONTEXT_IN_DEBUG_REPL, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_MULTI_SESSION_REPL, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_VARIABLES_FOCUSED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_VARIABLE_EXTENSIONID, CONTEXT_VARIABLE_INTERFACES, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_VARIABLE_LANGUAGE, CONTEXT_VARIABLE_NAME, CONTEXT_VARIABLE_TYPE, CONTEXT_VARIABLE_VALUE, CONTEXT_WATCH_EXPRESSIONS_EXIST, CONTEXT_WATCH_EXPRESSIONS_FOCUSED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_MEMORY_SCHEME, DEBUG_PANEL_ID, DEBUG_SCHEME, DISASSEMBLY_VIEW_ID, DebugConfigurationProviderTriggerKind, DebuggerString, EDITOR_CONTRIBUTION_ID, IDebugVisualization, INTERNAL_CONSOLE_OPTIONS_SCHEMA, LOADED_SCRIPTS_VIEW_ID, REPL_VIEW_ID, VARIABLES_VIEW_ID, VIEWLET_ID, WATCH_VIEW_ID, debuggerDisabledMessage, getStateLabel, isFrameDeemphasized };

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

@@ -4,22 +4,22 @@ import { findLastIdx } from '../../../../base/common/arraysFind.js';
 import { RunOnceScheduler, DeferredPromise } from '../../../../base/common/async.js';
 import { decodeBase64, VSBuffer, encodeBase64 } from '../../../../base/common/buffer.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
-import { Emitter } from '../../../../base/common/event.js';
+import { Emitter, trackSetChanges } from '../../../../base/common/event.js';
 import { stringHash } from '../../../../base/common/hash.js';
-import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
-import '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/utils.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
-import { isString, isUndefinedOrNull } from '../../../../base/common/types.js';
+import { isUndefinedOrNull, isString } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
-import { DebugTreeItemCollapsibleState, DEBUG_MEMORY_SCHEME, DataBreakpointSetType, isFrameDeemphasized, State, MemoryRangeType } from './debug.js';
+import { DEBUG_MEMORY_SCHEME, isFrameDeemphasized } from './debug.js';
 import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
 import { DisassemblyViewInput } from './disassemblyViewInput.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
@@ -161,7 +161,7 @@ class ExpressionContainer {
                     );
                 }
                 return (
-                     (new Variable(this.session, this.threadId, this, 0, '', undefined, ( localize(5787, "Invalid variable attributes")), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false))
+                     (new Variable(this.session, this.threadId, this, 0, '', undefined, ( localize(5748, "Invalid variable attributes")), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false))
                 );
             })));
             if (this.session.autoExpandLazyVariables) {
@@ -202,7 +202,7 @@ class ExpressionContainer {
     }
     async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false, location) {
         if (!session || (!stackFrame && context !== 'repl')) {
-            this.value = context === 'repl' ? ( localize(5788, "Please start a debug session to evaluate expressions")) : Expression.DEFAULT_VALUE;
+            this.value = context === 'repl' ? ( localize(5749, "Please start a debug session to evaluate expressions")) : Expression.DEFAULT_VALUE;
             this.reference = 0;
             return false;
         }
@@ -246,7 +246,7 @@ class VisualizedExpression {
         return Promise.resolve();
     }
     getChildren() {
-        return this.visualizer.getVisualizedChildren(this.treeId, this.treeItem.id);
+        return this.visualizer.getVisualizedChildren(this.session, this.treeId, this.treeItem.id);
     }
     getId() {
         return this.id;
@@ -258,15 +258,19 @@ class VisualizedExpression {
         return this.treeItem.description || '';
     }
     get hasChildren() {
-        return this.treeItem.collapsibleState !== DebugTreeItemCollapsibleState.None;
+        return this.treeItem.collapsibleState !== 0 ;
     }
-    constructor(visualizer, treeId, treeItem, original) {
+    constructor(session, visualizer, treeId, treeItem, original) {
+        this.session = session;
         this.visualizer = visualizer;
         this.treeId = treeId;
         this.treeItem = treeItem;
         this.original = original;
         this.id = generateUuid();
     }
+    getSession() {
+        return this.session;
+    }
     async edit(newValue) {
         try {
             await this.visualizer.editTreeItem(this.treeId, this.treeItem, newValue);
@@ -279,7 +283,7 @@ class VisualizedExpression {
     }
 }
 class Expression extends ExpressionContainer {
-    static { this.DEFAULT_VALUE = ( localize(5789, "not available")); }
+    static { this.DEFAULT_VALUE = ( localize(5750, "not available")); }
     constructor(name, id = generateUuid()) {
         super(undefined, undefined, 0, id);
         this.name = name;
@@ -513,9 +517,9 @@ class Thread {
     get stateLabel() {
         if (this.stoppedDetails) {
             return this.stoppedDetails.description ||
-                (this.stoppedDetails.reason ? ( localize(5790, "Paused on {0}", this.stoppedDetails.reason)) : ( localize(5791, "Paused")));
+                (this.stoppedDetails.reason ? ( localize(5751, "Paused on {0}", this.stoppedDetails.reason)) : ( localize(5752, "Paused")));
         }
-        return ( localize(5792, "Running"));
+        return ( localize(5753, "Running"));
     }
     async fetchCallStack(levels = 20) {
         if (this.stopped) {
@@ -634,14 +638,14 @@ class MemoryRegion extends Disposable {
         const offset = fromOffset;
         const result = await this.session.readMemory(this.memoryReference, offset, length);
         if (result === undefined || !result.body?.data) {
-            return [{ type: MemoryRangeType.Unreadable, offset, length }];
+            return [{ type: 1 , offset, length }];
         }
         let data;
         try {
             data = decodeBase64(result.body.data);
         }
         catch {
-            return [{ type: MemoryRangeType.Error, offset, length, error: 'Invalid base64 data from debug adapter' }];
+            return [{ type: 2 , offset, length, error: 'Invalid base64 data from debug adapter' }];
         }
         const unreadable = result.body.unreadableBytes || 0;
         const dataLength = length - unreadable;
@@ -654,11 +658,11 @@ class MemoryRegion extends Disposable {
             data = data.slice(0, dataLength);
         }
         if (!unreadable) {
-            return [{ type: MemoryRangeType.Valid, offset, length, data }];
+            return [{ type: 0 , offset, length, data }];
         }
         return [
-            { type: MemoryRangeType.Valid, offset, length: dataLength, data },
-            { type: MemoryRangeType.Unreadable, offset: offset + dataLength, length: unreadable },
+            { type: 0 , offset, length: dataLength, data },
+            { type: 1 , offset: offset + dataLength, length: unreadable },
         ];
     }
     async write(offset, data) {
@@ -822,7 +826,7 @@ class Breakpoint extends BaseBreakpoint {
     get message() {
         if (this.textFileService.isDirty(this.uri)) {
             return ( localize(
-                5793,
+                5754,
                 "Unverified breakpoint. File is modified, please restart debug session."
             ));
         }
@@ -944,7 +948,7 @@ class DataBreakpoint extends BaseBreakpoint {
         this.sessionDataIdForAddr = ( (new WeakMap()));
         this.description = opts.description;
         if ('dataId' in opts) {
-            opts.src = { type: DataBreakpointSetType.Variable, dataId: opts.dataId };
+            opts.src = { type: 0 , dataId: opts.dataId };
         }
         this.src = opts.src;
         this.canPersist = opts.canPersist;
@@ -956,7 +960,7 @@ class DataBreakpoint extends BaseBreakpoint {
     }
     async toDAP(session) {
         let dataId;
-        if (this.src.type === DataBreakpointSetType.Variable) {
+        if (this.src.type === 0 ) {
             dataId = this.src.dataId;
         }
         else {
@@ -1108,7 +1112,6 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeWatchExpressions = this._register(( (new Emitter())));
         this._onDidChangeWatchExpressionValue = this._register(( (new Emitter())));
         this._breakpointModes = ( (new Map()));
-        this.watchExpressionChangeListeners = this._register(( (new DisposableMap())));
         this._register(autorun(reader => {
             this.breakpoints = debugStorage.breakpoints.read(reader);
             this.functionBreakpoints = debugStorage.functionBreakpoints.read(reader);
@@ -1120,11 +1123,9 @@ let DebugModel = class DebugModel extends Disposable {
             this.watchExpressions = debugStorage.watchExpressions.read(reader);
             this._onDidChangeWatchExpressions.fire(undefined);
         }));
+        this._register(trackSetChanges(() => ( (new Set(this.watchExpressions))), this.onDidChangeWatchExpressions, (we) => we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e))));
         this.instructionBreakpoints = [];
         this.sessions = [];
-        for (const we of this.watchExpressions) {
-            this.watchExpressionChangeListeners.set(we.getId(), we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e)));
-        }
     }
     getId() {
         return 'root';
@@ -1136,14 +1137,14 @@ let DebugModel = class DebugModel extends Disposable {
         return undefined;
     }
     getSessions(includeInactive = false) {
-        return this.sessions.filter(s => includeInactive || s.state !== State.Inactive);
+        return this.sessions.filter(s => includeInactive || s.state !== 0 );
     }
     addSession(session) {
         this.sessions = this.sessions.filter(s => {
             if (s.getId() === session.getId()) {
                 return false;
             }
-            if (s.state === State.Inactive && s.configuration.name === session.configuration.name) {
+            if (s.state === 0  && s.configuration.name === session.configuration.name) {
                 return false;
             }
             return true;
@@ -1624,7 +1625,6 @@ let DebugModel = class DebugModel extends Disposable {
     }
     addWatchExpression(name) {
         const we = ( (new Expression(name || '')));
-        this.watchExpressionChangeListeners.set(we.getId(), we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e)));
         this.watchExpressions.push(we);
         this._onDidChangeWatchExpressions.fire(we);
         return we;
@@ -1639,11 +1639,6 @@ let DebugModel = class DebugModel extends Disposable {
     removeWatchExpressions(id = null) {
         this.watchExpressions = id ? this.watchExpressions.filter(we => we.getId() !== id) : [];
         this._onDidChangeWatchExpressions.fire(undefined);
-        if (!id) {
-            this.watchExpressionChangeListeners.clearAndDisposeAll();
-            return;
-        }
-        this.watchExpressionChangeListeners.deleteAndDispose(id);
     }
     moveWatchExpression(id, position) {
         const we = this.watchExpressions.find(we => we.getId() === id);