@codingame/monaco-vscode-debug-service-override 2.2.2 → 3.1.0

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

@@ -7,7 +7,7 @@ import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -27,12 +27,11 @@ class ToggleBreakpointAction extends Action2 {
         super({
             id: 'editor.debug.action.toggleBreakpoint',
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'toggleBreakpointAction',
                     "Debug: Toggle Breakpoint"
                 )),
-                original: 'Debug: Toggle Breakpoint',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'miToggleBreakpoint', comment: ['&& denotes a mnemonic'] },
@@ -66,7 +65,7 @@ class ToggleBreakpointAction extends Action2 {
                     debugService.removeInstructionBreakpoints(toRemove.instructionReference, toRemove.offset);
                 }
                 else {
-                    debugService.addInstructionBreakpoint(location.reference, location.offset, location.address);
+                    debugService.addInstructionBreakpoint({ instructionReference: location.reference, offset: location.offset, address: location.address, canPersist: false });
                 }
             }
             return;
@@ -241,17 +240,16 @@ class OpenDisassemblyViewAction extends Action2 {
         super({
             id: OpenDisassemblyViewAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'openDisassemblyView',
                     "Open Disassembly View"
                 )),
-                original: 'Open Disassembly View',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'miDisassemblyView', comment: ['&& denotes a mnemonic'] },
                     "&&DisassemblyView"
-                ))
+                )),
             },
             precondition: CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE,
             menu: [
@@ -286,17 +284,16 @@ class ToggleDisassemblyViewSourceCodeAction extends Action2 {
         super({
             id: ToggleDisassemblyViewSourceCodeAction.ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     'toggleDisassemblyViewSourceCode',
                     "Toggle Source Code in Disassembly View"
                 )),
-                original: 'Toggle Source Code in Disassembly View',
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/contrib/debug/browser/debugEditorActions',
                     { key: 'mitogglesource', comment: ['&& denotes a mnemonic'] },
                     "&&ToggleSource"
-                ))
+                )),
             },
             f1: true,
         });

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

@@ -17,11 +17,11 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 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 { renderExpressionValue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
+import { renderExpressionValue, AbstractExpressionDataSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
 import { LinkDetector } from './linkDetector.js';
-import { VariablesRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
+import { VariablesRenderer, VisualizedVariableRenderer, openContextMenuForVariableTreeElement } from './variablesView.js';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { Variable, Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
+import { Variable, Expression, VisualizedExpression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var DebugHoverWidget_1;
@@ -83,9 +83,12 @@ let DebugHoverWidget = class DebugHoverWidget {
             'Hold {0} key to switch to editor language hover',
             isMacintosh ? 'Option' : 'Alt'
         ));
-        const dataSource = ( new DebugHoverDataSource());
+        const dataSource = this.instantiationService.createInstance(DebugHoverDataSource);
         const linkeDetector = this.instantiationService.createInstance(LinkDetector);
-        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, ( new DebugHoverDelegate()), [this.instantiationService.createInstance(VariablesRenderer, linkeDetector)], dataSource, {
+        this.tree = this.instantiationService.createInstance(WorkbenchAsyncDataTree, 'DebugHover', this.treeContainer, ( new DebugHoverDelegate()), [
+            this.instantiationService.createInstance(VariablesRenderer, linkeDetector),
+            this.instantiationService.createInstance(VisualizedVariableRenderer, linkeDetector),
+        ], dataSource, {
             accessibilityProvider: ( new DebugHoverAccessibilityProvider()),
             mouseSupport: false,
             horizontalScrolling: true,
@@ -95,6 +98,7 @@ let DebugHoverWidget = class DebugHoverWidget {
                 listBackground: editorHoverBackground
             }
         });
+        this.toDispose.push(VisualizedVariableRenderer.rendererOnVisualizationRange(this.debugService.getViewModel(), this.tree));
         this.valueContainer = $('.value');
         this.valueContainer.tabIndex = 0;
         this.valueContainer.setAttribute('role', 'tooltip');
@@ -322,11 +326,11 @@ class DebugHoverAccessibilityProvider {
         ));
     }
 }
-class DebugHoverDataSource {
+class DebugHoverDataSource extends AbstractExpressionDataSource {
     hasChildren(element) {
         return element.hasChildren;
     }
-    getChildren(element) {
+    doGetChildren(element) {
         return element.getChildren();
     }
 }
@@ -335,6 +339,9 @@ class DebugHoverDelegate {
         return 18;
     }
     getTemplateId(element) {
+        if (element instanceof VisualizedExpression) {
+            return VisualizedVariableRenderer.ID;
+        }
         return VariablesRenderer.ID;
     }
 }

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

@@ -1,10 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
-import { VIEWLET_ID, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { VIEWLET_ID, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
-import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
 
 let DebugProgressContribution = class DebugProgressContribution {
     constructor(debugService, progressService, viewsService) {
@@ -31,7 +30,6 @@ let DebugProgressContribution = class DebugProgressContribution {
                         location: 15 ,
                         title: progressStartEvent.body.title,
                         cancellable: progressStartEvent.body.cancellable,
-                        priority: NotificationPriority.SILENT,
                         source,
                         delay: 500
                     }, progressStep => {

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

@@ -952,8 +952,8 @@ let DebugService = class DebugService {
         this.model.setBreakpointsActivated(activated);
         return this.sendAllBreakpoints();
     }
-    addFunctionBreakpoint(name, id) {
-        this.model.addFunctionBreakpoint(name || '', id);
+    addFunctionBreakpoint(name, id, mode) {
+        this.model.addFunctionBreakpoint(name || '', id, mode);
     }
     async updateFunctionBreakpoint(id, update) {
         this.model.updateFunctionBreakpoint(id, update);
@@ -965,8 +965,8 @@ let DebugService = class DebugService {
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendFunctionBreakpoints();
     }
-    async addDataBreakpoint(label, dataId, canPersist, accessTypes, accessType) {
-        this.model.addDataBreakpoint(label, dataId, canPersist, accessTypes, accessType);
+    async addDataBreakpoint(description, dataId, canPersist, accessTypes, accessType, mode) {
+        this.model.addDataBreakpoint({ description, dataId, canPersist, accessTypes, accessType, mode });
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendDataBreakpoints();
         this.debugStorage.storeBreakpoints(this.model);
@@ -981,8 +981,8 @@ let DebugService = class DebugService {
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendDataBreakpoints();
     }
-    async addInstructionBreakpoint(instructionReference, offset, address, condition, hitCondition) {
-        this.model.addInstructionBreakpoint(instructionReference, offset, address, condition, hitCondition);
+    async addInstructionBreakpoint(opts) {
+        this.model.addInstructionBreakpoint(opts);
         this.debugStorage.storeBreakpoints(this.model);
         await this.sendInstructionBreakpoints();
         this.debugStorage.storeBreakpoints(this.model);
@@ -996,8 +996,8 @@ let DebugService = class DebugService {
         this.model.setExceptionBreakpointFallbackSession(sessionId);
         this.debugStorage.storeBreakpoints(this.model);
     }
-    setExceptionBreakpointsForSession(session, data) {
-        this.model.setExceptionBreakpointsForSession(session.getId(), data);
+    setExceptionBreakpointsForSession(session, filters) {
+        this.model.setExceptionBreakpointsForSession(session.getId(), filters);
         this.debugStorage.storeBreakpoints(this.model);
     }
     async setExceptionBreakpointCondition(exceptionBreakpoint, condition) {

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

@@ -259,6 +259,7 @@ let DebugSession = class DebugSession {
             this.initialized = true;
             this._onDidChangeState.fire();
             this.debugService.setExceptionBreakpointsForSession(this, (this.raw && this.raw.capabilities.exceptionBreakpointFilters) || []);
+            this.debugService.getModel().registerBreakpointModes(this.configuration.type, this.raw.capabilities.breakpointModes || []);
         }
         catch (err) {
             this.initialized = true;
@@ -347,9 +348,7 @@ let DebugSession = class DebugSession {
         const response = await this.raw.setBreakpoints({
             source: rawSource,
             lines: ( breakpointsToSend.map(bp => bp.sessionAgnosticData.lineNumber)),
-            breakpoints: ( breakpointsToSend.map(
-                bp => ({ line: bp.sessionAgnosticData.lineNumber, column: bp.sessionAgnosticData.column, condition: bp.condition, hitCondition: bp.hitCondition, logMessage: bp.logMessage })
-            )),
+            breakpoints: ( breakpointsToSend.map(bp => bp.toDAP())),
             sourceModified
         });
         if (response && response.body) {
@@ -365,7 +364,7 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'function breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setFunctionBreakpoints({ breakpoints: fbpts });
+            const response = await this.raw.setFunctionBreakpoints({ breakpoints: ( fbpts.map(bp => bp.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < fbpts.length; i++) {
@@ -414,7 +413,7 @@ 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 });
+            const response = await this.raw.setDataBreakpoints({ breakpoints: ( dataBreakpoints.map(bp => bp.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < dataBreakpoints.length; i++) {
@@ -429,7 +428,7 @@ let DebugSession = class DebugSession {
             throw new Error(localizeWithPath('vs/workbench/contrib/debug/browser/debugSession', 'noDebugAdapter', "No debugger available, can not send '{0}'", 'instruction breakpoints'));
         }
         if (this.raw.readyForBreakpoints) {
-            const response = await this.raw.setInstructionBreakpoints({ breakpoints: ( instructionBreakpoints.map(ib => ib.toJSON())) });
+            const response = await this.raw.setInstructionBreakpoints({ breakpoints: ( instructionBreakpoints.map(ib => ib.toDAP())) });
             if (response && response.body) {
                 const data = ( new Map());
                 for (let i = 0; i < instructionBreakpoints.length; i++) {

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { PixelRatio } from 'vscode/vscode/vs/base/browser/browser';
 import { $, append, addDisposableGenericMouseUpListener, getWindow, addDisposableGenericMouseDownListener, addDisposableListener, EventType, show, hide } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
@@ -32,6 +31,7 @@ import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/lay
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
 
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
@@ -50,6 +50,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.isBuilt = false;
         this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
         this.auxWindowCoordinates = ( new WeakMap());
+        this.trackPixelRatioListener = this._register(( new MutableDisposable()));
         this.$el = $('div.debug-toolbar');
         this.$el.style.top = `${layoutService.mainContainerOffset.top}px`;
         this.dragArea = append(this.$el, $('div.drag-area' + ThemeIcon.asCSSSelector(debugGripper)));
@@ -59,18 +60,18 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.activeActions = [];
         this.actionBar = this._register(( new ActionBar(actionBarContainer, {
             orientation: 0 ,
-            actionViewItemProvider: (action) => {
+            actionViewItemProvider: (action, options) => {
                 if (action.id === FOCUS_SESSION_ID) {
                     return this.instantiationService.createInstance(FocusSessionActionViewItem, action, undefined);
                 }
                 else if (action.id === STOP_ID || action.id === DISCONNECT_ID) {
                     this.stopActionViewItemDisposables.clear();
-                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor));
+                    const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor, { hoverDelegate: options.hoverDelegate }));
                     if (item) {
                         return item;
                     }
                 }
-                return createActionViewItem(this.instantiationService, action);
+                return createActionViewItem(this.instantiationService, action, options);
             }
         })));
         this.updateScheduler = this._register(( new RunOnceScheduler(() => {
@@ -127,13 +128,12 @@ let DebugToolBar = class DebugToolBar extends Themable {
             getWindow(this.layoutService.activeContainer);
         }));
         this._register(this.layoutService.onDidChangePartVisibility(() => this.setYCoordinate()));
-        this._register(PixelRatio.onDidChange(() => this.setYCoordinate()));
         const resizeListener = this._register(( new MutableDisposable()));
         this._register(this.layoutService.onDidChangeActiveContainer(() => {
             this._yRange = undefined;
             this.layoutService.whenActiveContainerStylesLoaded.then(() => {
                 if (this.isBuilt) {
-                    this.layoutService.activeContainer.appendChild(this.$el);
+                    this.doShowInActiveContainer();
                     this.setCoordinates();
                 }
                 resizeListener.value = this._register(addDisposableListener(getWindow(this.layoutService.activeContainer), EventType.RESIZE, () => this.setYCoordinate()));
@@ -180,7 +180,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             const positionPercentage = isMainWindow
                 ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, 0 ))
                 : this.auxWindowCoordinates.get(currentWindow)?.x;
-            x = positionPercentage !== undefined
+            x = positionPercentage !== undefined && !isNaN(positionPercentage)
                 ? positionPercentage * currentWindow.innerWidth
                 : (0.5 * currentWindow.innerWidth - 0.5 * widgetWidth);
         }
@@ -229,12 +229,16 @@ let DebugToolBar = class DebugToolBar extends Themable {
         }
         if (!this.isBuilt) {
             this.isBuilt = true;
-            this.layoutService.activeContainer.appendChild(this.$el);
+            this.doShowInActiveContainer();
         }
         this.isVisible = true;
         show(this.$el);
         this.setCoordinates();
     }
+    doShowInActiveContainer() {
+        this.layoutService.activeContainer.appendChild(this.$el);
+        this.trackPixelRatioListener.value = PixelRatio.getInstance(getWindow(this.$el)).onDidChange(() => this.setYCoordinate());
+    }
     hide() {
         this.isVisible = false;
         hide(this.$el);
@@ -256,7 +260,7 @@ DebugToolBar = ( __decorate([
     ( __param(8, IMenuService)),
     ( __param(9, IContextKeyService))
 ], DebugToolBar));
-function createDisconnectMenuItemAction(action, disposables, accessor) {
+function createDisconnectMenuItemAction(action, disposables, accessor, options) {
     const menuService = accessor.get(IMenuService);
     const contextKeyService = accessor.get(IContextKeyService);
     const instantiationService = accessor.get(IInstantiationService);
@@ -272,7 +276,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor) {
         'notebook.moreRunActionsLabel',
         "More..."
     )), 'codicon-chevron-down', true)));
-    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, {});
+    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, options);
     return item;
 }
 const debugViewTitleItems = [];

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

@@ -19,7 +19,7 @@ import { WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/context
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
 import { StartDebugActionViewItem, FocusSessionActionViewItem } from './debugActionViewItems.js';
-import { DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID } from './debugCommands.js';
+import { DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL, SELECT_AND_START_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID } from './debugCommands.js';
 import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { WelcomeView } from './welcomeView.js';
@@ -62,9 +62,9 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
             this.focusView(WelcomeView.ID);
         }
     }
-    getActionViewItem(action) {
+    getActionViewItem(action, options) {
         if (action.id === DEBUG_START_COMMAND_ID) {
-            this.startDebugActionViewItem = this.instantiationService.createInstance(StartDebugActionViewItem, null, action);
+            this.startDebugActionViewItem = this.instantiationService.createInstance(StartDebugActionViewItem, null, action, options);
             return this.startDebugActionViewItem;
         }
         if (action.id === FOCUS_SESSION_ID) {
@@ -78,12 +78,12 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
         }
         if (action.id === STOP_ID || action.id === DISCONNECT_ID) {
             this.stopActionViewItemDisposables.clear();
-            const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor));
+            const item = this.instantiationService.invokeFunction(accessor => createDisconnectMenuItemAction(action, this.stopActionViewItemDisposables, accessor, { hoverDelegate: options.hoverDelegate }));
             if (item) {
                 return item;
             }
         }
-        return createActionViewItem(this.instantiationService, action);
+        return createActionViewItem(this.instantiationService, action, options);
     }
     focusView(id) {
         const view = this.getView(id);
@@ -144,7 +144,7 @@ DebugViewPaneContainer = ( __decorate([
     ( __param(12, IContextKeyService)),
     ( __param(13, IViewDescriptorService))
 ], DebugViewPaneContainer));
-( MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_UX.notEqualsTo('simple')), ( WorkbenchStateContext.notEqualsTo('empty')), ( ContextKeyExpr.or(( CONTEXT_DEBUG_STATE.isEqualTo('inactive')), ( ContextKeyExpr.notEquals('config.debug.toolBarLocation', 'docked')))), ( ContextKeyExpr.or(
         ContextKeyExpr.not('config.debug.hideLauncherWhileDebugging'),
         ContextKeyExpr.not('inDebugMode')
@@ -156,7 +156,7 @@ DebugViewPaneContainer = ( __decorate([
         id: DEBUG_START_COMMAND_ID,
         title: DEBUG_START_LABEL
     }
-}));
+});
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -251,5 +251,17 @@ registerAction2(class extends Action2 {
         }
     }
 });
+MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
+    when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')), ( ContextKeyExpr.has('config.debug.hideLauncherWhileDebugging')))))),
+    order: 10,
+    command: {
+        id: SELECT_AND_START_ID,
+        title: ( localizeWithPath(
+            'vs/workbench/contrib/debug/browser/debugViewlet',
+            'startAdditionalSession',
+            "Start Additional Session"
+        )),
+    }
+});
 
 export { DebugViewPaneContainer };

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/browser';
-import { append, $, addStandardDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
+import { PixelRatio } from 'vscode/vscode/vs/base/browser/pixelRatio';
+import { getWindowById, 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';
@@ -65,11 +65,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
         this._disassembledInstructions = undefined;
         this._onDidChangeStackFrame = this._register(( new Emitter({ leakWarningThreshold: 1000 })));
         this._previousDebuggingState = _debugService.state;
-        this._fontInfo = BareFontInfo.createFromRawSettings(_configurationService.getValue('editor'), PixelRatio.value);
         this._register(_configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('editor')) {
-                this._fontInfo = BareFontInfo.createFromRawSettings(_configurationService.getValue('editor'), PixelRatio.value);
-            }
             if (e.affectsConfiguration('debug')) {
                 const newValue = this._configurationService.getValue('debug').disassemblyView.showSourceCode;
                 if (this._enableSourceCodeRender !== newValue) {
@@ -81,7 +77,21 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
         }));
     }
-    get fontInfo() { return this._fontInfo; }
+    get fontInfo() {
+        if (!this._fontInfo) {
+            this._fontInfo = this.createFontInfo();
+            this._register(this._configurationService.onDidChangeConfiguration(e => {
+                if (e.affectsConfiguration('editor')) {
+                    this._fontInfo = this.createFontInfo();
+                }
+            }));
+        }
+        return this._fontInfo;
+    }
+    createFontInfo() {
+        const window = getWindowById(this.group?.windowId, true).window;
+        return BareFontInfo.createFromRawSettings(this._configurationService.getValue('editor'), PixelRatio.getInstance(window).value);
+    }
     get currentInstructionAddresses() {
         return ( ( ( ( this._debugService.getModel().getSessions(false).
             map(session => session.getAllThreads())).
@@ -516,7 +526,7 @@ let BreakpointRenderer = class BreakpointRenderer {
                         this._debugService.removeInstructionBreakpoints(reference, offset);
                     }
                     else if (currentElement.element.allowBreakpoint && !currentElement.element.isBreakpointSet) {
-                        this._debugService.addInstructionBreakpoint(reference, offset, currentElement.element.address);
+                        this._debugService.addInstructionBreakpoint({ instructionReference: reference, offset, address: currentElement.element.address, canPersist: false });
                     }
                 }
             })

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

@@ -98,7 +98,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _doLayout(_heightInPixel, _widthInPixel) {
         this.container.style.height = 'initial';
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         const arrowHeight = Math.round(lineHeight / 3);
         const computedLinesNumber = Math.ceil((this.container.offsetHeight + arrowHeight) / lineHeight);
         this._relayout(computedLinesNumber);

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { posix, isAbsolute, normalize } from 'vscode/vscode/vs/base/common/path';
-import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser/baseDebugView';
-import { CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_ITEM_TYPE, IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { normalizeDriveLetter, tildify } from 'vscode/vscode/vs/base/common/labels';
 import { isWindows } from 'vscode/vscode/vs/base/common/platform';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
@@ -23,6 +23,8 @@ import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
@@ -488,6 +490,9 @@ let LoadedScriptsView = class LoadedScriptsView extends ViewPane {
         super.layoutBody(height, width);
         this.tree.layout(height, width);
     }
+    collapseAll() {
+        this.tree.collapseAll();
+    }
     dispose() {
         dispose(this.tree);
         dispose(this.treeLabels);
@@ -636,5 +641,29 @@ class LoadedScriptsFilter {
         return 2 ;
     }
 }
+registerAction2(class Collapse extends ViewAction {
+    constructor() {
+        super({
+            id: 'loadedScripts.collapse',
+            viewId: LOADED_SCRIPTS_VIEW_ID,
+            title: ( localizeWithPath(
+                'vs/workbench/contrib/debug/browser/loadedScriptsView',
+                'collapse',
+                "Collapse All"
+            )),
+            f1: false,
+            icon: Codicon.collapseAll,
+            menu: {
+                id: MenuId.ViewTitle,
+                order: 30,
+                group: 'navigation',
+                when: ( ContextKeyExpr.equals('view', LOADED_SCRIPTS_VIEW_ID))
+            }
+        });
+    }
+    runInView(_accessor, view) {
+        view.collapseAll();
+    }
+});
 
 export { LoadedScriptsView };

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

@@ -55,7 +55,7 @@ import { Variable } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugM
 import { ReplEvaluationResult, ReplGroup } from 'vscode/vscode/vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { registerNavigableContainer } from 'vscode/vscode/vs/workbench/browser/actions/widgetNavigationCommands';
-import { IAudioCueService, AudioCue } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+import { IAccessibilitySignalService, AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 
 var Repl_1, ReplOptions_1;
 const $ = $$1;
@@ -294,7 +294,7 @@ let Repl = class Repl extends FilterViewPane {
                 lineHeight: this.replOptions.replConfiguration.lineHeight,
                 fontFamily: this.replOptions.replConfiguration.fontFamily === 'default' ? EDITOR_FONT_DEFAULTS.fontFamily : this.replOptions.replConfiguration.fontFamily
             });
-            const replInputLineHeight = this.replInput.getOption(66 );
+            const replInputLineHeight = this.replInput.getOption(67 );
             this.styleElement.textContent = `
 				.repl .repl-input-wrapper .repl-input-chevron {
 					line-height: ${replInputLineHeight}px
@@ -875,9 +875,9 @@ registerAction2(class extends ViewAction {
         });
     }
     runInView(_accessor, view) {
-        const audioCueService = _accessor.get(IAudioCueService);
+        const accessibilitySignalService = _accessor.get(IAccessibilitySignalService);
         view.clearRepl();
-        audioCueService.playAudioCue(AudioCue.clear);
+        accessibilitySignalService.playSignal(AccessibilitySignal.clear);
     }
 });
 registerAction2(class extends ViewAction {