@codingame/monaco-vscode-debug-service-override 3.2.2 → 4.0.0

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,3 +1,5 @@
+export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
+
 var ConfirmResult;
 ( (function(ConfirmResult) {
     ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -23,7 +23,17 @@ import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/li
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { asCssVariable, textLinkForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { textLinkForeground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
@@ -35,6 +45,8 @@ import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Thread, StackFrame, ThreadAndSessionIds } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;
 const $ = $$1;
@@ -125,7 +137,7 @@ let CallStackView = class CallStackView extends ViewPane {
             const stoppedDetails = sessions.length === 1 ? sessions[0].getStoppedDetails() : undefined;
             if (stoppedDetails && (thread || typeof stoppedDetails.threadId !== 'number')) {
                 this.stateMessageLabel.textContent = stoppedDescription(stoppedDetails);
-                this.stateMessageLabel.title = stoppedText(stoppedDetails);
+                this.stateMessageLabelHover.update(stoppedText(stoppedDetails));
                 this.stateMessageLabel.classList.toggle('exception', stoppedDetails.reason === 'exception');
                 this.stateMessage.hidden = false;
             }
@@ -135,7 +147,7 @@ let CallStackView = class CallStackView extends ViewPane {
                     { key: 'running', comment: ['indicates state'] },
                     "Running"
                 ));
-                this.stateMessageLabel.title = sessions[0].getLabel();
+                this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
                 this.stateMessage.hidden = false;
             }
@@ -171,6 +183,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(setupCustomHover(getDefaultHoverDelegate('mouse'), this.stateMessage, ''));
     }
     renderBody(container) {
         super.renderBody(container);
@@ -294,6 +307,7 @@ let CallStackView = class CallStackView extends ViewPane {
             }
             if (!this.isBodyVisible()) {
                 this.needsRefresh = true;
+                this.selectionNeedsUpdate = true;
                 return;
             }
             if (this.onCallStackChangeScheduler.isScheduled()) {
@@ -444,8 +458,8 @@ let SessionsRenderer = class SessionsRenderer {
         append(session, $(ThemeIcon.asCSSSelector(callstackViewSession)));
         const name = append(session, $('.name'));
         const stateLabel = append(session, $('span.state.label.monaco-count-badge.long'));
-        const label = ( new HighlightedLabel(name));
         const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(name)));
         const stopActionViewItemDisposables = templateDisposable.add(( new DisposableStore()));
         const actionBar = templateDisposable.add(( new ActionBar(session, {
             actionViewItemProvider: (action, options) => {
@@ -457,10 +471,10 @@ let SessionsRenderer = class SessionsRenderer {
                     }
                 }
                 if (action instanceof MenuItemAction) {
-                    return this.instantiationService.createInstance(MenuEntryActionViewItem, action, undefined);
+                    return this.instantiationService.createInstance(MenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                 }
                 else if (action instanceof SubmenuItemAction) {
-                    return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, undefined);
+                    return this.instantiationService.createInstance(SubmenuEntryActionViewItem, action, { hoverDelegate: options.hoverDelegate });
                 }
                 return undefined;
             }
@@ -477,11 +491,11 @@ let SessionsRenderer = class SessionsRenderer {
         this.doRenderElement(lastElement, matches, templateData);
     }
     doRenderElement(session, matches, data) {
-        data.session.title = ( localizeWithPath(
+        const sessionHover = data.elementDisposable.add(setupCustomHover(getDefaultHoverDelegate('mouse'), data.session, ( localizeWithPath(
             'vs/workbench/contrib/debug/browser/callStackView',
             { key: 'session', comment: ['Session is a noun'] },
             "Session"
-        ));
+        ))));
         data.label.set(session.getLabel(), matches);
         const stoppedDetails = session.getStoppedDetails();
         const thread = session.getAllThreads().find(t => t.stopped);
@@ -501,12 +515,12 @@ let SessionsRenderer = class SessionsRenderer {
         data.stateLabel.style.display = '';
         if (stoppedDetails) {
             data.stateLabel.textContent = stoppedDescription(stoppedDetails);
-            data.session.title = `${session.getLabel()}: ${stoppedText(stoppedDetails)}`;
+            sessionHover.update(`${session.getLabel()}: ${stoppedText(stoppedDetails)}`);
             data.stateLabel.classList.toggle('exception', stoppedDetails.reason === 'exception');
         }
         else if (thread && thread.stoppedDetails) {
             data.stateLabel.textContent = stoppedDescription(thread.stoppedDetails);
-            data.session.title = `${session.getLabel()}: ${stoppedText(thread.stoppedDetails)}`;
+            sessionHover.update(`${session.getLabel()}: ${stoppedText(thread.stoppedDetails)}`);
             data.stateLabel.classList.toggle('exception', thread.stoppedDetails.reason === 'exception');
         }
         else {
@@ -553,15 +567,15 @@ let ThreadsRenderer = class ThreadsRenderer {
         const thread = append(container, $('.thread'));
         const name = append(thread, $('.name'));
         const stateLabel = append(thread, $('span.state.label.monaco-count-badge.long'));
-        const label = ( new HighlightedLabel(name));
         const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(name)));
         const actionBar = templateDisposable.add(( new ActionBar(thread)));
         const elementDisposable = templateDisposable.add(( new DisposableStore()));
         return { thread, name, stateLabel, label, actionBar, elementDisposable, templateDisposable };
     }
     renderElement(element, _index, data) {
         const thread = element.element;
-        data.thread.title = thread.name;
+        data.elementDisposable.add(setupCustomHover(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');
@@ -616,8 +630,8 @@ let StackFramesRenderer = class StackFramesRenderer {
         const fileName = append(file, $('span.file-name'));
         const wrapper = append(file, $('span.line-number-wrapper'));
         const lineNumber = append(wrapper, $('span.line-number.monaco-count-badge'));
-        const label = ( new HighlightedLabel(labelDiv));
         const templateDisposable = ( new DisposableStore());
+        const label = templateDisposable.add(( new HighlightedLabel(labelDiv)));
         const actionBar = templateDisposable.add(( new ActionBar(stackFrame)));
         return { file, fileName, label, lineNumber, stackFrame, actionBar, templateDisposable };
     }
@@ -628,10 +642,11 @@ let StackFramesRenderer = class StackFramesRenderer {
         data.stackFrame.classList.toggle('subtle', stackFrame.presentationHint === 'subtle');
         const hasActions = !!stackFrame.thread.session.capabilities.supportsRestartFrame && stackFrame.presentationHint !== 'label' && stackFrame.presentationHint !== 'subtle' && stackFrame.canRestart;
         data.stackFrame.classList.toggle('has-actions', hasActions);
-        data.file.title = stackFrame.source.inMemory ? stackFrame.source.uri.path : this.labelService.getUriLabel(stackFrame.source.uri);
+        let title = stackFrame.source.inMemory ? stackFrame.source.uri.path : this.labelService.getUriLabel(stackFrame.source.uri);
         if (stackFrame.source.raw.origin) {
-            data.file.title += `\n${stackFrame.source.raw.origin}`;
+            title += `\n${stackFrame.source.raw.origin}`;
         }
+        data.templateDisposable.add(setupCustomHover(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) {
@@ -679,12 +694,12 @@ class ErrorsRenderer {
     }
     renderTemplate(container) {
         const label = append(container, $('.error'));
-        return { label };
+        return { label, templateDisposable: ( new DisposableStore()) };
     }
     renderElement(element, index, data) {
         const error = element.element;
         data.label.textContent = error;
-        data.label.title = error;
+        data.templateDisposable.add(setupCustomHover(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

@@ -27,6 +27,7 @@ import { DebugEditorContribution } from './debugEditorContribution.js';
 import { debugRun, debugConsoleViewIcon, runViewIcon, variablesViewIcon, watchViewIcon, callStackViewIcon, breakpointsViewIcon, loadedScriptsViewIcon, debugInspectMemory, watchExpressionRemove } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { DebugProgressContribution } from './debugProgress.js';
 import { StartDebugQuickAccessProvider } from './debugQuickAccess.js';
+import './debugService.js';
 import { DebugStatusContribution } from './debugStatus.js';
 import { DebugTitleContribution } from './debugTitle.js';
 import { DebugToolBar } from './debugToolBar.js';
@@ -41,6 +42,7 @@ import { WelcomeView } from './welcomeView.js';
 import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_DEBUGGERS_AVAILABLE, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_VARIABLE_VALUE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { DebugLifecycle } from '../common/debugLifecycle.js';
+import 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { COPY_NOTEBOOK_VARIABLE_VALUE_LABEL, COPY_NOTEBOOK_VARIABLE_VALUE_ID } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
@@ -609,6 +611,38 @@ configurationRegistry.registerConfiguration({
             )),
             default: false
         },
+        'debug.gutterMiddleClickAction': {
+            type: 'string',
+            enum: ['logpoint', 'conditionalBreakpoint', 'triggeredBreakpoint', 'none'],
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/debug.contribution',
+                { comment: ['This is the description for a setting'], key: 'gutterMiddleClickAction' },
+                'Controls the action to perform when clicking the editor gutter with the middle mouse button.'
+            )),
+            enumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/debug/browser/debug.contribution',
+                    'debug.gutterMiddleClickAction.logpoint',
+                    "Add Logpoint."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/debug/browser/debug.contribution',
+                    'debug.gutterMiddleClickAction.conditionalBreakpoint',
+                    "Add Conditional Breakpoint."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/debug/browser/debug.contribution',
+                    'debug.gutterMiddleClickAction.triggeredBreakpoint',
+                    "Add Triggered Breakpoint."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/debug/browser/debug.contribution',
+                    'debug.gutterMiddleClickAction.none',
+                    "Don't perform any action."
+                )),
+            ],
+            default: 'logpoint',
+        },
         'debug.openExplorerOnEnd': {
             type: 'boolean',
             description: ( localizeWithPath(

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

@@ -7,7 +7,17 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { asCssVariable, selectBorder, selectBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import { selectBorder, selectBackground } from 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -16,6 +26,8 @@ import { BaseActionViewItem, SelectActionViewItem } from 'vscode/vscode/vs/base/
 import { debugStart } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { defaultSelectBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var StartDebugActionViewItem_1;
 const $ = $$1;
@@ -65,9 +77,10 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         this.start = append(container, $(ThemeIcon.asCSSSelector(debugStart)));
         const keybinding = this.keybindingService.lookupKeybinding(this.action.id)?.getLabel();
         const keybindingLabel = keybinding ? ` (${keybinding})` : '';
-        this.start.title = this.action.label + keybindingLabel;
+        const title = this.action.label + keybindingLabel;
+        this.toDispose.push(setupCustomHover(getDefaultHoverDelegate('mouse'), this.start, title));
         this.start.setAttribute('role', 'button');
-        this.start.ariaLabel = this.start.title;
+        this.start.ariaLabel = title;
         this.toDispose.push(addDisposableListener(this.start, EventType.CLICK, () => {
             this.start.blur();
             if (this.debugService.state !== 1 ) {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { equalsIgnoreCase } from 'vscode/vscode/vs/base/common/strings';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
@@ -317,7 +317,7 @@ let AdapterManager = class AdapterManager extends Disposable {
                 languageLabel = `'${languageLabel}'`;
             }
             const { confirmed } = await this.dialogService.confirm({
-                type: Severity.Warning,
+                type: Severity$1.Warning,
                 message: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugAdapterManager',
                     'CouldNotFindLanguage',

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

@@ -297,7 +297,7 @@ async function goToBottomOfCallStack(debugService) {
         if (callStack.length > 0) {
             const nextVisibleFrame = findNextVisibleFrame(false, callStack, 0);
             if (nextVisibleFrame) {
-                debugService.focusStackFrame(nextVisibleFrame);
+                debugService.focusStackFrame(nextVisibleFrame, undefined, undefined, { preserveFocus: false });
             }
         }
     }
@@ -305,7 +305,7 @@ async function goToBottomOfCallStack(debugService) {
 function goToTopOfCallStack(debugService) {
     const thread = debugService.getViewModel().focusedThread;
     if (thread) {
-        debugService.focusStackFrame(thread.getTopStackFrame());
+        debugService.focusStackFrame(thread.getTopStackFrame(), undefined, undefined, { preserveFocus: false });
     }
 }
 function findNextVisibleFrame(down, callStack, startIndex) {

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 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 { flatten, distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationToken, CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
@@ -10,7 +10,7 @@ import { illegalArgument, onUnexpectedExternalError } 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 { MutableDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+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';
@@ -32,7 +32,17 @@ import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/com
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { DebugHoverWidget } from './debugHover.js';
 import { ExceptionWidget } from './exceptionWidget.js';
@@ -190,10 +200,11 @@ let DebugEditorContribution = class DebugEditorContribution {
         this.altListener = ( new MutableDisposable());
         this.altPressed = false;
         this.oldDecorations = this.editor.createDecorationsCollection();
+        this.displayedStore = ( new DisposableStore());
         this.defaultHoverLockout = ( new MutableDisposable());
         this.debounceInfo = featureDebounceService.for(languageFeaturesService.inlineValuesProvider, 'InlineValues', { min: DEAFULT_INLINE_DEBOUNCE_DELAY });
         this.hoverWidget = this.instantiationService.createInstance(DebugHoverWidget, this.editor);
-        this.toDispose = [this.defaultHoverLockout, this.altListener];
+        this.toDispose = [this.defaultHoverLockout, this.altListener, this.displayedStore];
         this.registerListeners();
         this.exceptionWidgetVisible = CONTEXT_EXCEPTION_WIDGET_VISIBLE.bindTo(contextKeyService);
         this.toggleExceptionWidget();
@@ -519,7 +530,7 @@ let DebugEditorContribution = class DebugEditorContribution {
     }
     get removeInlineValuesScheduler() {
         return ( new RunOnceScheduler(() => {
-            this.oldDecorations.clear();
+            this.displayedStore.clear();
         }, 100));
     }
     get updateInlineValuesScheduler() {
@@ -542,8 +553,11 @@ let DebugEditorContribution = class DebugEditorContribution {
             return;
         }
         this.removeInlineValuesScheduler.cancel();
+        this.displayedStore.clear();
         const viewRanges = this.editor.getVisibleRangesPlusViewportAboveBelow();
         let allDecorations;
+        const cts = ( new CancellationTokenSource());
+        this.displayedStore.add(toDisposable(() => cts.dispose(true)));
         if (( this.languageFeaturesService.inlineValuesProvider.has(model))) {
             const findVariable = async (_key, caseSensitiveLookup) => {
                 const scopes = await stackFrame.getMostSpecificScopes(stackFrame.range);
@@ -566,12 +580,11 @@ let DebugEditorContribution = class DebugEditorContribution {
                     stackFrame.range.endColumn + 1
                 ))
             };
-            const token = ( new CancellationTokenSource()).token;
             const providers = this.languageFeaturesService.inlineValuesProvider.ordered(model).reverse();
             allDecorations = [];
             const lineDecorations = ( new Map());
-            const promises = flatten(( providers.map(provider => ( viewRanges.map(
-                range => Promise.resolve(provider.provideInlineValues(model, range, ctx, token)).then(async (result) => {
+            const promises = providers.flatMap(provider => ( viewRanges.map(
+                range => Promise.resolve(provider.provideInlineValues(model, range, ctx, cts.token)).then(async (result) => {
                     if (result) {
                         for (const iv of result) {
                             let text = undefined;
@@ -623,7 +636,7 @@ let DebugEditorContribution = class DebugEditorContribution {
                 }, err => {
                     onUnexpectedExternalError(err);
                 })
-            )))));
+            )));
             const startTime = Date.now();
             await Promise.all(promises);
             this.updateInlineValuesScheduler.delay = this.debounceInfo.update(model, Date.now() - startTime);
@@ -650,10 +663,13 @@ let DebugEditorContribution = class DebugEditorContribution {
                 }
                 return createInlineValueDecorationsInsideRange(variables, ownRanges, model, this._wordToLineNumbersMap.value);
             })));
-            allDecorations = distinct(decorationsPerScope.reduce((previous, current) => previous.concat(current), []),
+            allDecorations = distinct(decorationsPerScope.flat(),
             decoration => `${decoration.range.startLineNumber}:${decoration?.options.after?.content}`);
         }
-        this.oldDecorations.set(allDecorations);
+        if (!cts.token.isCancellationRequested) {
+            this.oldDecorations.set(allDecorations);
+            this.displayedStore.add(toDisposable(() => this.oldDecorations.clear()));
+        }
     }
     dispose() {
         if (this.hoverWidget) {
@@ -663,7 +679,6 @@ let DebugEditorContribution = class DebugEditorContribution {
             this.configurationWidget.dispose();
         }
         this.toDispose = dispose(this.toDispose);
-        this.oldDecorations.clear();
     }
 };
 DebugEditorContribution.__decorator = ( __decorate([

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

@@ -16,7 +16,17 @@ import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/brows
 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';
-import { editorHoverBackground, asCssVariable, editorHoverBorder, editorHoverForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorHoverBackground, editorHoverBorder, editorHoverForeground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 './linkDetector.js';
 import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';

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

@@ -9,7 +9,7 @@ import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { deepClone, equals } from 'vscode/vscode/vs/base/common/objects';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
@@ -27,7 +27,6 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceTrustRequestService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { AdapterManager } from './debugAdapterManager.js';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from './debugCommands.js';
 import { ConfigurationManager } from './debugConfigurationManager.js';
@@ -50,6 +49,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 let DebugService = class DebugService {
@@ -811,7 +811,7 @@ let DebugService = class DebugService {
             errorActions :
             [...errorActions, ...(promptLaunchJson ? [configureAction] : [])];
         await this.dialogService.prompt({
-            type: Severity.Error,
+            type: Severity$1.Error,
             message,
             buttons: ( actions.map(action => ({
                 label: action.label,
@@ -965,8 +965,8 @@ let DebugService = class DebugService {
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendFunctionBreakpoints();
     }
-    async addDataBreakpoint(description, dataId, canPersist, accessTypes, accessType, mode) {
-        this.model.addDataBreakpoint({ description, dataId, canPersist, accessTypes, accessType, mode });
+    async addDataBreakpoint(opts) {
+        this.model.addDataBreakpoint(opts);
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendDataBreakpoints();
         this.debugStorage.storeBreakpoints(this.model);

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

@@ -10,7 +10,7 @@ import { DisposableStore, MutableDisposable, dispose, Disposable, DisposableMap
 import { mixin } from 'vscode/vscode/vs/base/common/objects';
 import { language } from 'vscode/vscode/vs/base/common/platform';
 import { basenameOrAuthority } from 'vscode/vscode/vs/base/common/resources';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { generateUuid } from 'vscode/vscode/vs/base/common/uuid';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
@@ -34,6 +34,7 @@ import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
 import { getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { isDefined } from 'vscode/vscode/vs/base/common/types';
 
 const TRIGGERED_BREAKPOINT_MAX_DELAY = 1500;
 let DebugSession = class DebugSession {
@@ -351,7 +352,7 @@ let DebugSession = class DebugSession {
             breakpoints: ( breakpointsToSend.map(bp => bp.toDAP())),
             sourceModified
         });
-        if (response && response.body) {
+        if (response?.body) {
             const data = ( new Map());
             for (let i = 0; i < breakpointsToSend.length; i++) {
                 data.set(breakpointsToSend[i].getId(), response.body.breakpoints[i]);
@@ -365,7 +366,7 @@ let DebugSession = class DebugSession {
         }
         if (this.raw.readyForBreakpoints) {
             const response = await this.raw.setFunctionBreakpoints({ breakpoints: ( fbpts.map(bp => bp.toDAP())) });
-            if (response && response.body) {
+            if (response?.body) {
                 const data = ( new Map());
                 for (let i = 0; i < fbpts.length; i++) {
                     data.set(fbpts[i].getId(), response.body.breakpoints[i]);
@@ -389,7 +390,7 @@ let DebugSession = class DebugSession {
                 }))
             } : { filters: ( exbpts.map(exb => exb.filter)) };
             const response = await this.raw.setExceptionBreakpoints(args);
-            if (response && response.body && response.body.breakpoints) {
+            if (response?.body && response.body.breakpoints) {
                 const data = ( new Map());
                 for (let i = 0; i < exbpts.length; i++) {
                     data.set(exbpts[i].getId(), response.body.breakpoints[i]);
@@ -398,14 +399,23 @@ let DebugSession = class DebugSession {
             }
         }
     }
-    async dataBreakpointInfo(name, variablesReference) {
+    dataBytesBreakpointInfo(address, bytes) {
+        if (this.raw?.capabilities.supportsDataBreakpointBytes === false) {
+            throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'sessionDoesNotSupporBytesBreakpoints', "Session does not support breakpoints with bytes"));
+        }
+        return this._dataBreakpointInfo({ name: address, bytes, asAddress: true });
+    }
+    dataBreakpointInfo(name, variablesReference) {
+        return this._dataBreakpointInfo({ name, variablesReference });
+    }
+    async _dataBreakpointInfo(args) {
         if (!this.raw) {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'data breakpoints info'));
         }
         if (!this.raw.readyForBreakpoints) {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'sessionNotReadyForBreakpoints', "Session is not ready for breakpoints"));
         }
-        const response = await this.raw.dataBreakpointInfo({ name, variablesReference });
+        const response = await this.raw.dataBreakpointInfo(args);
         return response?.body;
     }
     async sendDataBreakpoints(dataBreakpoints) {
@@ -413,11 +423,26 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'data breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setDataBreakpoints({ breakpoints: ( dataBreakpoints.map(bp => bp.toDAP())) });
-            if (response && response.body) {
+            const converted = await Promise.all(( dataBreakpoints.map(async (bp) => {
+                try {
+                    const dap = await bp.toDAP(this);
+                    return { dap, bp };
+                }
+                catch (e) {
+                    return { bp, message: e.message };
+                }
+            })));
+            const response = await this.raw.setDataBreakpoints({ breakpoints: ( converted.map(d => d.dap)).filter(isDefined) });
+            if (response?.body) {
                 const data = ( new Map());
-                for (let i = 0; i < dataBreakpoints.length; i++) {
-                    data.set(dataBreakpoints[i].getId(), response.body.breakpoints[i]);
+                let i = 0;
+                for (const dap of converted) {
+                    if (!dap.dap) {
+                        data.set(dap.bp.getId(), dap.message);
+                    }
+                    else if (i < response.body.breakpoints.length) {
+                        data.set(dap.bp.getId(), response.body.breakpoints[i++]);
+                    }
                 }
                 this.model.setBreakpointSessionData(this.getId(), this.capabilities, data);
             }
@@ -429,7 +454,7 @@ let DebugSession = class DebugSession {
         }
         if (this.raw.readyForBreakpoints) {
             const response = await this.raw.setInstructionBreakpoints({ breakpoints: ( instructionBreakpoints.map(ib => ib.toDAP())) });
-            if (response && response.body) {
+            if (response?.body) {
                 const data = ( new Map());
                 for (let i = 0; i < instructionBreakpoints.length; i++) {
                     data.set(instructionBreakpoints[i].getId(), response.body.breakpoints[i]);
@@ -626,7 +651,7 @@ let DebugSession = class DebugSession {
             )))));
         }
         const response = await this.raw.loadedSources({});
-        if (response && response.body && response.body.sources) {
+        if (response?.body && response.body.sources) {
             return ( response.body.sources.map(src => this.getSource(src)));
         }
         else {
@@ -795,7 +820,7 @@ let DebugSession = class DebugSession {
     async fetchThreads(stoppedDetails) {
         if (this.raw) {
             const response = await this.raw.threads();
-            if (response && response.body && response.body.threads) {
+            if (response?.body && response.body.threads) {
                 this.model.rawUpdate({
                     sessionId: this.getId(),
                     threads: response.body.threads,
@@ -903,7 +928,7 @@ let DebugSession = class DebugSession {
         }));
         const outputQueue = ( new Queue());
         this.rawListeners.add(this.raw.onDidOutput(async (event) => {
-            const outputSeverity = event.body.category === 'stderr' ? Severity.Error : event.body.category === 'console' ? Severity.Warning : Severity.Info;
+            const outputSeverity = event.body.category === 'stderr' ? Severity$1.Error : event.body.category === 'console' ? Severity$1.Warning : Severity$1.Info;
             if (event.body.variablesReference) {
                 const source = event.body.source && event.body.line ? {
                     lineNumber: event.body.line,

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Markers } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
@@ -97,7 +97,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 DebugChoice[DebugChoice["Cancel"] = 0] = "Cancel";
             })(DebugChoice || (DebugChoice = {})));
             const { result, checkboxChecked } = await this.dialogService.prompt({
-                type: Severity.Warning,
+                type: Severity$1.Warning,
                 message,
                 buttons: [
                     {
@@ -158,7 +158,7 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             else {
                 const { result, checkboxChecked } = await this.dialogService.prompt({
-                    type: Severity.Error,
+                    type: Severity$1.Error,
                     message: err.message,
                     buttons: [
                         {
@@ -287,7 +287,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                             "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
                             JSON.stringify(taskId)
                         ));
-                        e({ severity: Severity.Error, message: errorMessage });
+                        e({ severity: Severity$1.Error, message: errorMessage });
                     }
                 }, waitTime);
             });

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

@@ -19,7 +19,17 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { widgetShadow, widgetBorder } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { widgetShadow, widgetBorder } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { Themable, IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { FocusSessionActionViewItem } from './debugActionViewItems.js';
@@ -129,15 +139,14 @@ let DebugToolBar = class DebugToolBar extends Themable {
         }));
         this._register(this.layoutService.onDidChangePartVisibility(() => this.setYCoordinate()));
         const resizeListener = this._register(( new MutableDisposable()));
-        this._register(this.layoutService.onDidChangeActiveContainer(() => {
+        this._register(this.layoutService.onDidChangeActiveContainer(async () => {
             this._yRange = undefined;
-            this.layoutService.whenActiveContainerStylesLoaded.then(() => {
-                if (this.isBuilt) {
-                    this.doShowInActiveContainer();
-                    this.setCoordinates();
-                }
-                resizeListener.value = this._register(addDisposableListener(getWindow(this.layoutService.activeContainer), EventType.RESIZE, () => this.setYCoordinate()));
-            });
+            await this.layoutService.whenContainerStylesLoaded(getWindow(this.layoutService.activeContainer));
+            if (this.isBuilt) {
+                this.doShowInActiveContainer();
+                this.setCoordinates();
+            }
+            resizeListener.value = this._register(addDisposableListener(getWindow(this.layoutService.activeContainer), EventType.RESIZE, () => this.setYCoordinate()));
         }));
     }
     storePosition() {

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
-import { getWindowById, append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { binarySearch2 } from 'vscode/vscode/vs/base/common/arrays';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { dispose, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -20,7 +20,17 @@ import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listServi
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
@@ -53,8 +63,8 @@ const disassemblyNotAvailable = {
 let DisassemblyView = class DisassemblyView extends EditorPane {
     static { DisassemblyView_1 = this; }
     static { this.NUM_INSTRUCTIONS_TO_LOAD = 50; }
-    constructor(telemetryService, themeService, storageService, _configurationService, _instantiationService, _debugService) {
-        super(DISASSEMBLY_VIEW_ID, telemetryService, themeService, storageService);
+    constructor(group, telemetryService, themeService, storageService, _configurationService, _instantiationService, _debugService) {
+        super(DISASSEMBLY_VIEW_ID, group, telemetryService, themeService, storageService);
         this._configurationService = _configurationService;
         this._instantiationService = _instantiationService;
         this._debugService = _debugService;
@@ -89,8 +99,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         return this._fontInfo;
     }
     createFontInfo() {
-        const window = getWindowById(this.group?.windowId, true).window;
-        return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(window).value);
+        return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(this.window).value);
     }
     get currentInstructionAddresses() {
         return ( ( ( ( this._debugService.getModel().getSessions(false).
@@ -476,12 +485,12 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
     }
 };
 DisassemblyView = DisassemblyView_1 = ( __decorate([
-    ( __param(0, ITelemetryService)),
-    ( __param(1, IThemeService)),
-    ( __param(2, IStorageService)),
-    ( __param(3, IConfigurationService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IDebugService))
+    ( __param(1, ITelemetryService)),
+    ( __param(2, IThemeService)),
+    ( __param(3, IStorageService)),
+    ( __param(4, IConfigurationService)),
+    ( __param(5, IInstantiationService)),
+    ( __param(6, IDebugService))
 ], DisassemblyView));
 let BreakpointRenderer = class BreakpointRenderer {
     static { BreakpointRenderer_1 = this; }

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

@@ -7,7 +7,17 @@ import { EDITOR_CONTRIBUTION_ID } from 'vscode/vscode/vs/workbench/contrib/debug
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { LinkDetector } from './linkDetector.js';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';

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

@@ -14,7 +14,7 @@ import './media/repl.css.js';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
 import { registerEditorAction, EditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
-import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { EDITOR_FONT_DEFAULTS } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
@@ -39,7 +39,17 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { resolveColorValue, editorForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { resolveColorValue } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import { editorForeground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { FilterViewPane, ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';

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

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, clearNode, addDisposableListener, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { append, clearNode, $ as $$1, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { CachedListVirtualDelegate } from 'vscode/vscode/vs/base/browser/ui/list/list';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { basename } from 'vscode/vscode/vs/base/common/path';
-import Severity from 'vscode/vscode/vs/base/common/severity';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
@@ -20,6 +20,8 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplVariableElement, ReplEvaluationResult, ReplOutputElement, ReplEvaluationInput, ReplGroup, RawObjectReplElement } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
+import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 
 var ReplGroupRenderer_1, ReplOutputElementRenderer_1, ReplVariablesRenderer_1;
 const $ = $$1;
@@ -39,6 +41,7 @@ class ReplEvaluationInputsRenderer {
         templateData.label.set(evaluation.value, createMatches(element.filterData));
     }
     disposeTemplate(templateData) {
+        templateData.label.dispose();
     }
 }
 let ReplGroupRenderer = class ReplGroupRenderer {
@@ -134,9 +137,9 @@ let ReplOutputElementRenderer = class ReplOutputElementRenderer {
         clearNode(templateData.value);
         templateData.value.className = 'value';
         templateData.value.appendChild(handleANSIOutput(element.value, this.linkDetector, this.themeService, element.session.root));
-        templateData.value.classList.add((element.severity === Severity.Warning) ? 'warn' : (element.severity === Severity.Error) ? 'error' : (element.severity === Severity.Ignore) ? 'ignore' : 'info');
+        templateData.value.classList.add((element.severity === Severity$1.Warning) ? 'warn' : (element.severity === Severity$1.Error) ? 'error' : (element.severity === Severity$1.Ignore) ? 'ignore' : 'info');
         templateData.source.textContent = element.sourceData ? `${basename(element.sourceData.source.name)}:${element.sourceData.lineNumber}` : '';
-        templateData.source.title = element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : '';
+        templateData.toDispose.push(setupCustomHover(getDefaultHoverDelegate('mouse'), templateData.source, element.sourceData ? `${this.labelService.getUriLabel(element.sourceData.source.uri)}:${element.sourceData.lineNumber}` : ''));
         templateData.getReplElementSource = () => element.sourceData;
     }
     setElementCount(element, templateData) {
@@ -225,6 +228,7 @@ class ReplRawObjectsRenderer {
         });
     }
     disposeTemplate(templateData) {
+        templateData.label.dispose();
     }
 }
 function isNestedVariable(element) {

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

@@ -1,6 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { registerColor, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { registerColor, asCssVariableName, asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
+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 { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { STATUS_BAR_FOREGROUND, STATUS_BAR_BORDER, COMMAND_CENTER_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
@@ -80,7 +90,7 @@ let StatusBarColorProvider = class StatusBarColorProvider {
             if (e.affectsConfiguration('debug.enableStatusBarColor') || e.affectsConfiguration('debug.toolBarLocation')) {
                 this.update();
             }
-        });
+        }, this.disposables);
         this.update();
     }
     update() {

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

@@ -3,7 +3,7 @@ import { append, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
 import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
-import { timeout, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
@@ -13,16 +13,15 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { MenuId, registerAction2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { CommandsRegistry, ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
 import { WorkbenchAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { INotificationService, Severity } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
@@ -33,6 +32,7 @@ import { IDebugService, VARIABLES_VIEW_ID, CONTEXT_VARIABLES_FOCUSED, CONTEXT_BR
 import { getContextForVariable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugContext';
 import { VisualizedExpression, Variable, getUriForDebugMemory, Expression, ErrorScope, Scope, StackFrame } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IDebugVisualizerService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugVisualizers';
+import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IEditorService, SIDE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 
@@ -301,6 +301,7 @@ class ScopesRenderer {
         templateData.label.set(element.element.name, createMatches(element.filterData));
     }
     disposeTemplate(templateData) {
+        templateData.label.dispose();
     }
 }
 class ScopeErrorRenderer {
@@ -623,14 +624,13 @@ CommandsRegistry.registerCommand({
             sessionId = focused.getId();
             memoryReference = arg.memoryReference;
         }
-        const commandService = accessor.get(ICommandService);
+        const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
         const editorService = accessor.get(IEditorService);
-        const notifications = accessor.get(INotificationService);
-        const progressService = accessor.get(IProgressService);
+        const notificationService = accessor.get(INotificationService);
         const extensionService = accessor.get(IExtensionService);
         const telemetryService = accessor.get(ITelemetryService);
         const ext = await extensionService.getExtension(HEX_EDITOR_EXTENSION_ID);
-        if (ext || (await tryInstallHexEditor(notifications, progressService, extensionService, commandService))) {
+        if (ext || (await tryInstallHexEditor(extensionsWorkbenchService, notificationService))) {
             telemetryService.publicLog('debug/didViewMemory', {
                 debugType: debugService.getModel().getSession(sessionId)?.configuration.type,
             });
@@ -644,51 +644,22 @@ CommandsRegistry.registerCommand({
         }
     }
 });
-function tryInstallHexEditor(notifications, progressService, extensionService, commandService) {
-    return ( new Promise(resolve => {
-        let installing = false;
-        const handle = notifications.prompt(Severity.Info, ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/variablesView',
-            "viewMemory.prompt",
-            "Inspecting binary data requires the Hex Editor extension. Would you like to install it now?"
-        )), [
-            {
-                label: ( localizeWithPath('vs/workbench/contrib/debug/browser/variablesView', "cancel", "Cancel")),
-                run: () => resolve(false),
-            },
-            {
-                label: ( localizeWithPath('vs/workbench/contrib/debug/browser/variablesView', "install", "Install")),
-                run: async () => {
-                    installing = true;
-                    try {
-                        await progressService.withProgress({
-                            location: 15 ,
-                            title: ( localizeWithPath(
-                                'vs/workbench/contrib/debug/browser/variablesView',
-                                "viewMemory.install.progress",
-                                "Installing the Hex Editor..."
-                            )),
-                        }, async () => {
-                            await commandService.executeCommand('workbench.extensions.installExtension', HEX_EDITOR_EXTENSION_ID);
-                            while (!(await extensionService.getExtension(HEX_EDITOR_EXTENSION_ID))) {
-                                await timeout(30);
-                            }
-                        });
-                        resolve(true);
-                    }
-                    catch (e) {
-                        notifications.error(e);
-                        resolve(false);
-                    }
-                }
-            },
-        ], { sticky: true });
-        handle.onDidClose(e => {
-            if (!installing) {
-                resolve(false);
-            }
-        });
-    }));
+async function tryInstallHexEditor(extensionsWorkbenchService, notificationService) {
+    try {
+        await extensionsWorkbenchService.install(HEX_EDITOR_EXTENSION_ID, {
+            justification: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/variablesView',
+                "viewMemory.prompt",
+                "Inspecting binary data requires this extension."
+            )),
+            enable: true
+        }, 15 );
+        return true;
+    }
+    catch (error) {
+        notificationService.error(error);
+        return false;
+    }
 }
 const BREAK_WHEN_VALUE_CHANGES_ID = 'debug.breakWhenValueChanges';
 CommandsRegistry.registerCommand({
@@ -696,7 +667,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'write', undefined);
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'write' });
         }
     }
 });
@@ -706,7 +677,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'readWrite', undefined);
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'readWrite' });
         }
     }
 });
@@ -716,7 +687,7 @@ CommandsRegistry.registerCommand({
     handler: async (accessor) => {
         const debugService = accessor.get(IDebugService);
         if (dataBreakpointInfoResponse) {
-            await debugService.addDataBreakpoint(dataBreakpointInfoResponse.description, dataBreakpointInfoResponse.dataId, !!dataBreakpointInfoResponse.canPersist, dataBreakpointInfoResponse.accessTypes, 'read', undefined);
+            await debugService.addDataBreakpoint({ description: dataBreakpointInfoResponse.description, src: { type: 0 , dataId: dataBreakpointInfoResponse.dataId }, canPersist: !!dataBreakpointInfoResponse.canPersist, accessTypes: dataBreakpointInfoResponse.accessTypes, accessType: 'read' });
         }
     }
 });

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

@@ -1,12 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
+import 'vscode/vscode/vs/base/common/observableInternal/derived';
+import 'vscode/vscode/vs/base/common/observableInternal/autorun';
+import 'vscode/vscode/vs/base/common/observableInternal/utils';
+import 'vscode/vscode/vs/base/common/cancellation';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 import { Breakpoint, FunctionBreakpoint, ExceptionBreakpoint, DataBreakpoint, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { observableValue } from 'vscode/vscode/vs/base/common/observableInternal/base';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 const DEBUG_FUNCTION_BREAKPOINTS_KEY = 'debug.functionbreakpoint';

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

@@ -1,5 +1,5 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
-import { CONTEXT_EXPRESSION_SELECTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_EXPRESSION_SELECTED, CONTEXT_LOADED_SCRIPTS_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 class ViewModel {
@@ -25,6 +25,7 @@ class ViewModel {
             this.stepIntoTargetsSupported = CONTEXT_STEP_INTO_TARGETS_SUPPORTED.bindTo(contextKeyService);
             this.jumpToCursorSupported = CONTEXT_JUMP_TO_CURSOR_SUPPORTED.bindTo(contextKeyService);
             this.setVariableSupported = CONTEXT_SET_VARIABLE_SUPPORTED.bindTo(contextKeyService);
+            this.setDataBreakpointAtByteSupported = CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED.bindTo(contextKeyService);
             this.setExpressionSupported = CONTEXT_SET_EXPRESSION_SUPPORTED.bindTo(contextKeyService);
             this.multiSessionDebug = CONTEXT_MULTI_SESSION_DEBUG.bindTo(contextKeyService);
             this.terminateDebuggeeSupported = CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED.bindTo(contextKeyService);
@@ -53,15 +54,16 @@ class ViewModel {
         this._focusedThread = thread;
         this._focusedSession = session;
         this.contextKeyService.bufferChangeEvents(() => {
-            this.loadedScriptsSupportedContextKey.set(session ? !!session.capabilities.supportsLoadedSourcesRequest : false);
-            this.stepBackSupportedContextKey.set(session ? !!session.capabilities.supportsStepBack : false);
-            this.restartFrameSupportedContextKey.set(session ? !!session.capabilities.supportsRestartFrame : false);
-            this.stepIntoTargetsSupported.set(session ? !!session.capabilities.supportsStepInTargetsRequest : false);
-            this.jumpToCursorSupported.set(session ? !!session.capabilities.supportsGotoTargetsRequest : false);
-            this.setVariableSupported.set(session ? !!session.capabilities.supportsSetVariable : false);
-            this.setExpressionSupported.set(session ? !!session.capabilities.supportsSetExpression : false);
-            this.terminateDebuggeeSupported.set(session ? !!session.capabilities.supportTerminateDebuggee : false);
-            this.suspendDebuggeeSupported.set(session ? !!session.capabilities.supportSuspendDebuggee : false);
+            this.loadedScriptsSupportedContextKey.set(!!session?.capabilities.supportsLoadedSourcesRequest);
+            this.stepBackSupportedContextKey.set(!!session?.capabilities.supportsStepBack);
+            this.restartFrameSupportedContextKey.set(!!session?.capabilities.supportsRestartFrame);
+            this.stepIntoTargetsSupported.set(!!session?.capabilities.supportsStepInTargetsRequest);
+            this.jumpToCursorSupported.set(!!session?.capabilities.supportsGotoTargetsRequest);
+            this.setVariableSupported.set(!!session?.capabilities.supportsSetVariable);
+            this.setDataBreakpointAtByteSupported.set(!!session?.capabilities.supportsDataBreakpointBytes);
+            this.setExpressionSupported.set(!!session?.capabilities.supportsSetExpression);
+            this.terminateDebuggeeSupported.set(!!session?.capabilities.supportTerminateDebuggee);
+            this.suspendDebuggeeSupported.set(!!session?.capabilities.supportSuspendDebuggee);
             this.disassembleRequestSupported.set(!!session?.capabilities.supportsDisassembleRequest);
             this.focusedStackFrameHasInstructionPointerReference.set(!!stackFrame?.instructionPointerReference);
             const attach = !!session && isSessionAttach(session);

package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js

@@ -5,6 +5,7 @@ import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { BaseConfigurationResolverService } from './baseConfigurationResolverService.js';
+import 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';