@codingame/monaco-vscode-debug-service-override 4.5.1 → 4.5.2

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

@@ -7,20 +7,17 @@ import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 
+const _moduleId = "vs/workbench/contrib/debug/browser/debugSessionPicker";
 async function showDebugSessionMenu(accessor, selectAndStartID) {
     const quickInputService = accessor.get(IQuickInputService);
     const debugService = accessor.get(IDebugService);
     const viewsService = accessor.get(IViewsService);
     const commandService = accessor.get(ICommandService);
-    const localDisposableStore = ( new DisposableStore());
+    const localDisposableStore = ( (new DisposableStore()));
     const quickPick = quickInputService.createQuickPick();
     localDisposableStore.add(quickPick);
     quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
-    quickPick.placeholder = ( localizeWithPath(
-        'vs/workbench/contrib/debug/browser/debugSessionPicker',
-        'moveFocusedView.selectView',
-        'Search debug sessions by name'
-    ));
+    quickPick.placeholder = ( localizeWithPath(_moduleId, 0, 'Search debug sessions by name'));
     const pickItems = _getPicksAndActiveItem(quickPick.value, selectAndStartID, debugService, viewsService, commandService);
     quickPick.items = pickItems.picks;
     quickPick.activeItems = pickItems.activeItems;
@@ -64,11 +61,7 @@ function _getPicksAndActiveItem(filter, selectAndStartID, debugService, viewsSer
     if (debugConsolePicks.length) {
         debugConsolePicks.push({ type: 'separator' });
     }
-    const createDebugSessionLabel = ( localizeWithPath(
-        'vs/workbench/contrib/debug/browser/debugSessionPicker',
-        'workbench.action.debug.startDebug',
-        'Start a New Debug Session'
-    ));
+    const createDebugSessionLabel = ( localizeWithPath(_moduleId, 1, 'Start a New Debug Session'));
     debugConsolePicks.push({
         label: `$(plus) ${createDebugSessionLabel}`,
         ariaLabel: createDebugSessionLabel,
@@ -82,13 +75,7 @@ function _getSessionInfo(session) {
     let description = '';
     let ariaLabel = '';
     if (parentName) {
-        ariaLabel = ( localizeWithPath(
-            'vs/workbench/contrib/debug/browser/debugSessionPicker',
-            'workbench.action.debug.spawnFrom',
-            'Session {0} spawned from {1}',
-            label,
-            parentName
-        ));
+        ariaLabel = ( localizeWithPath(_moduleId, 2, 'Session {0} spawned from {1}', label, parentName));
         description = parentName;
     }
     return { label, description, ariaLabel };

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

@@ -5,6 +5,7 @@ import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/d
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 
+const _moduleId = "vs/workbench/contrib/debug/browser/debugStatus";
 let DebugStatusContribution = class DebugStatusContribution {
     constructor(statusBarService, debugService, configurationService) {
         this.statusBarService = statusBarService;
@@ -47,19 +48,10 @@ let DebugStatusContribution = class DebugStatusContribution {
             text = (manager.getLaunches().length > 1 ? `${name} (${manager.selectedConfiguration.launch.name})` : name);
         }
         return {
-            name: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugStatus', 'status.debug', "Debug")),
+            name: ( localizeWithPath(_moduleId, 0, "Debug")),
             text: '$(debug-alt-small) ' + text,
-            ariaLabel: ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugStatus',
-                'debugTarget',
-                "Debug: {0}",
-                text
-            )),
-            tooltip: ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugStatus',
-                'selectAndStartDebug',
-                "Select and start debug configuration"
-            )),
+            ariaLabel: ( localizeWithPath(_moduleId, 1, "Debug: {0}", text)),
+            tooltip: ( localizeWithPath(_moduleId, 2, "Select and start debug configuration")),
             command: 'workbench.action.debug.selectandstart'
         };
     }
@@ -68,10 +60,10 @@ let DebugStatusContribution = class DebugStatusContribution {
         dispose(this.toDispose);
     }
 };
-DebugStatusContribution = ( __decorate([
-    ( __param(0, IStatusbarService)),
-    ( __param(1, IDebugService)),
-    ( __param(2, IConfigurationService))
-], DebugStatusContribution));
+DebugStatusContribution = ( (__decorate([
+    ( (__param(0, IStatusbarService))),
+    ( (__param(1, IDebugService))),
+    ( (__param(2, IConfigurationService)))
+], DebugStatusContribution)));
 
 export { DebugStatusContribution };

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

@@ -14,6 +14,7 @@ import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from './debugCommands.js';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 
+const _moduleId = "vs/workbench/contrib/debug/browser/debugTaskRunner";
 function once(match, event) {
     return (listener, thisArgs = null, disposables) => {
         const result = event(e => {
@@ -63,70 +64,43 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'preLaunchTaskErrors',
-                "Errors exist after running preLaunchTask '{0}'.",
-                taskLabel
-            ))
+                ? ( localizeWithPath(_moduleId, 0, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'preLaunchTaskError',
-                "Error exists after running preLaunchTask '{0}'.",
-                taskLabel
-            ))
+                    ? ( localizeWithPath(_moduleId, 1, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'preLaunchTaskExitCode',
+                _moduleId,
+                2,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'preLaunchTaskTerminated',
-                "The preLaunchTask '{0}' terminated.",
-                taskLabel
-            ));
+                        : ( localizeWithPath(_moduleId, 3, "The preLaunchTask '{0}' terminated.", taskLabel));
             let DebugChoice;
-            ( (function(DebugChoice) {
+            ( ((function(DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 1] = "DebugAnyway";
                 DebugChoice[DebugChoice["ShowErrors"] = 2] = "ShowErrors";
                 DebugChoice[DebugChoice["Cancel"] = 0] = "Cancel";
-            })(DebugChoice || (DebugChoice = {})));
+            })(DebugChoice || (DebugChoice = {}))));
             const { result, checkboxChecked } = await this.dialogService.prompt({
                 type: Severity$1.Warning,
                 message,
                 buttons: [
                     {
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                            { key: 'debugAnyway', comment: ['&& denotes a mnemonic'] },
-                            "&&Debug Anyway"
-                        )),
+                        label: ( localizeWithPath(_moduleId, 4, "&&Debug Anyway")),
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                            { key: 'showErrors', comment: ['&& denotes a mnemonic'] },
-                            "&&Show Errors"
-                        )),
+                        label: ( localizeWithPath(_moduleId, 5, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
                 cancelButton: {
-                    label: ( localizeWithPath('vs/workbench/contrib/debug/browser/debugTaskRunner', 'abort', "Abort")),
+                    label: ( localizeWithPath(_moduleId, 6, "Abort")),
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localizeWithPath(
-                        'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                        'remember',
-                        "Remember my choice in user settings"
-                    )),
+                    label: ( localizeWithPath(_moduleId, 7, "Remember my choice in user settings")),
                 }
             });
             const debugAnyway = result === DebugChoice.DebugAnyway;
@@ -148,11 +122,11 @@ let DebugTaskRunner = class DebugTaskRunner {
             const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, 1 , '{}'));
             let choice = -1;
             let DebugChoice;
-            ( (function(DebugChoice) {
+            ( ((function(DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 0] = "DebugAnyway";
                 DebugChoice[DebugChoice["ConfigureTask"] = 1] = "ConfigureTask";
                 DebugChoice[DebugChoice["Cancel"] = 2] = "Cancel";
-            })(DebugChoice || (DebugChoice = {})));
+            })(DebugChoice || (DebugChoice = {}))));
             if (choiceMap[err.message] !== undefined) {
                 choice = choiceMap[err.message];
             }
@@ -162,11 +136,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     message: err.message,
                     buttons: [
                         {
-                            label: ( localizeWithPath(
-                                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                                { key: 'debugAnyway', comment: ['&& denotes a mnemonic'] },
-                                "&&Debug Anyway"
-                            )),
+                            label: ( localizeWithPath(_moduleId, 4, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -178,11 +148,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localizeWithPath(
-                            'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                            'rememberTask',
-                            "Remember my choice for this task"
-                        ))
+                        label: ( localizeWithPath(_moduleId, 8, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
@@ -202,46 +168,37 @@ let DebugTaskRunner = class DebugTaskRunner {
             return Promise.resolve(null);
         }
         if (!root) {
-            return Promise.reject(( new Error(( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'invalidTaskReference',
+            return Promise.reject(( (new Error(( localizeWithPath(
+                _moduleId,
+                9,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
-            )))));
+            ))))));
         }
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'DebugTaskNotFoundWithTaskId',
-                "Could not find the task '{0}'.",
-                taskId
-            ))
-                : ( localizeWithPath(
-                'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                'DebugTaskNotFound',
-                "Could not find the specified task."
-            ));
-            return Promise.reject(createErrorWithActions(errorMessage, [( new Action(
+                ? ( localizeWithPath(_moduleId, 10, "Could not find the task '{0}'.", taskId))
+                : ( localizeWithPath(_moduleId, 11, "Could not find the specified task."));
+            return Promise.reject(createErrorWithActions(errorMessage, [( (new Action(
                 DEBUG_CONFIGURE_COMMAND_ID,
                 DEBUG_CONFIGURE_LABEL,
                 undefined,
                 true,
                 () => this.commandService.executeCommand(DEBUG_CONFIGURE_COMMAND_ID)
-            ))]));
+            )))]));
         }
         let taskStarted = false;
         const getTaskKey = (t) => t.getKey() ?? t.getMapKey();
         const taskKey = getTaskKey(task);
-        const inactivePromise = ( new Promise((c) => once(e => {
+        const inactivePromise = ( (new Promise((c) => once(e => {
             return (e.kind === "inactive"
                 || (e.kind === "processEnded"  && e.exitCode === undefined))
                 && getTaskKey(e.__task) === taskKey;
         }, this.taskService.onDidStateChange)(e => {
             taskStarted = true;
             c(e.kind === "processEnded"  ? { exitCode: e.exitCode } : null);
-        })));
+        }))));
         const promise = this.taskService.getActiveTasks().then(async (tasks) => {
             if (tasks.find(t => getTaskKey(t) === taskKey)) {
                 const busyTasks = await this.taskService.getBusyTasks();
@@ -260,48 +217,50 @@ let DebugTaskRunner = class DebugTaskRunner {
             }
             return taskPromise.then(x => x ?? null);
         });
-        return ( new Promise((c, e) => {
-            const waitForInput = ( new Promise(
-                resolve => once(e => ((e.kind === "acquiredInput") ) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
-                    resolve();
-                })
-            ));
-            promise.then(result => {
-                taskStarted = true;
-                c(result);
-            }, error => e(error));
-            waitForInput.then(() => {
-                const waitTime = task.configurationProperties.isBackground ? 5000 : 10000;
-                setTimeout(() => {
-                    if (!taskStarted) {
-                        const errorMessage = typeof taskId === 'string'
-                            ? ( localizeWithPath(
-                            'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                            'taskNotTrackedWithTaskId',
-                            "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
-                            taskId
-                        ))
-                            : ( localizeWithPath(
-                            'vs/workbench/contrib/debug/browser/debugTaskRunner',
-                            'taskNotTracked',
-                            "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
-                            JSON.stringify(taskId)
-                        ));
-                        e({ severity: Severity$1.Error, message: errorMessage });
-                    }
-                }, waitTime);
-            });
-        }));
+        return (
+             (new Promise((c, e) => {
+                const waitForInput = ( (new Promise(
+                    resolve => once(e => ((e.kind === "acquiredInput") ) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
+                        resolve();
+                    })
+                )));
+                promise.then(result => {
+                    taskStarted = true;
+                    c(result);
+                }, error => e(error));
+                waitForInput.then(() => {
+                    const waitTime = task.configurationProperties.isBackground ? 5000 : 10000;
+                    setTimeout(() => {
+                        if (!taskStarted) {
+                            const errorMessage = typeof taskId === 'string'
+                                ? ( localizeWithPath(
+                                _moduleId,
+                                12,
+                                "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
+                                taskId
+                            ))
+                                : ( localizeWithPath(
+                                _moduleId,
+                                13,
+                                "The task '{0}' cannot be tracked. Make sure to have a problem matcher defined.",
+                                JSON.stringify(taskId)
+                            ));
+                            e({ severity: Severity$1.Error, message: errorMessage });
+                        }
+                    }, waitTime);
+                });
+            }))
+        );
     }
 };
-DebugTaskRunner = ( __decorate([
-    ( __param(0, ITaskService)),
-    ( __param(1, IMarkerService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IViewsService)),
-    ( __param(4, IDialogService)),
-    ( __param(5, IStorageService)),
-    ( __param(6, ICommandService))
-], DebugTaskRunner));
+DebugTaskRunner = ( (__decorate([
+    ( (__param(0, ITaskService))),
+    ( (__param(1, IMarkerService))),
+    ( (__param(2, IConfigurationService))),
+    ( (__param(3, IViewsService))),
+    ( (__param(4, IDialogService))),
+    ( (__param(5, IStorageService))),
+    ( (__param(6, ICommandService)))
+], DebugTaskRunner)));
 
 export { DebugTaskRunner };

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

@@ -47,6 +47,7 @@ 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 _moduleId = "vs/workbench/contrib/debug/browser/debugToolBar";
 const DEBUG_TOOLBAR_POSITION_KEY = 'debug.actionswidgetposition';
 const DEBUG_TOOLBAR_Y_KEY = 'debug.actionswidgety';
 let DebugToolBar = class DebugToolBar extends Themable {
@@ -62,9 +63,9 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.yCoordinate = 0;
         this.isVisible = false;
         this.isBuilt = false;
-        this.stopActionViewItemDisposables = this._register(( new DisposableStore()));
-        this.auxWindowCoordinates = ( new WeakMap());
-        this.trackPixelRatioListener = this._register(( new MutableDisposable()));
+        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)));
@@ -72,7 +73,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.debugToolBarMenu = menuService.createMenu(MenuId.DebugToolBar, contextKeyService);
         this._register(this.debugToolBarMenu);
         this.activeActions = [];
-        this.actionBar = this._register(( new ActionBar(actionBarContainer, {
+        this.actionBar = this._register(( (new ActionBar(actionBarContainer, {
             orientation: 0 ,
             actionViewItemProvider: (action, options) => {
                 if (action.id === FOCUS_SESSION_ID) {
@@ -87,8 +88,8 @@ let DebugToolBar = class DebugToolBar extends Themable {
                 }
                 return createActionViewItem(this.instantiationService, action, options);
             }
-        })));
-        this.updateScheduler = this._register(( new RunOnceScheduler(() => {
+        }))));
+        this.updateScheduler = this._register(( (new RunOnceScheduler(() => {
             const state = this.debugService.state;
             const toolBarLocation = this.configurationService.getValue('debug').toolBarLocation;
             if (state === 0  ||
@@ -105,7 +106,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
                 this.activeActions = actions;
             }
             this.show();
-        }, 20)));
+        }, 20))));
         this.updateStyles();
         this.registerListeners();
         this.hide();
@@ -129,7 +130,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             this.telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: 'debugActionsWidget' });
         }));
         this._register(addDisposableGenericMouseUpListener(this.dragArea, (event) => {
-            const mouseClickEvent = ( new StandardMouseEvent(getWindow(this.dragArea), event));
+            const mouseClickEvent = ( (new StandardMouseEvent(getWindow(this.dragArea), event)));
             const activeWindow = getWindow(this.layoutService.activeContainer);
             if (mouseClickEvent.detail === 2) {
                 const widgetWidth = this.$el.clientWidth;
@@ -141,7 +142,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             this.dragArea.classList.add('dragged');
             const activeWindow = getWindow(this.layoutService.activeContainer);
             const mouseMoveListener = addDisposableGenericMouseMoveListener(activeWindow, (e) => {
-                const mouseMoveEvent = ( new StandardMouseEvent(activeWindow, e));
+                const mouseMoveEvent = ( (new StandardMouseEvent(activeWindow, e)));
                 mouseMoveEvent.preventDefault();
                 this.setCoordinates(mouseMoveEvent.posx - 14, mouseMoveEvent.posy - 14);
             });
@@ -153,7 +154,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             });
         }));
         this._register(this.layoutService.onDidChangePartVisibility(() => this.setYCoordinate()));
-        const resizeListener = this._register(( new MutableDisposable()));
+        const resizeListener = this._register(( (new MutableDisposable())));
         this._register(this.layoutService.onDidChangeActiveContainer(async () => {
             this._yRange = undefined;
             await this.layoutService.whenContainerStylesLoaded(getWindow(this.layoutService.activeContainer));
@@ -272,18 +273,18 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.$el?.remove();
     }
 };
-DebugToolBar = ( __decorate([
-    ( __param(0, INotificationService)),
-    ( __param(1, ITelemetryService)),
-    ( __param(2, IDebugService)),
-    ( __param(3, IWorkbenchLayoutService)),
-    ( __param(4, IStorageService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IThemeService)),
-    ( __param(7, IInstantiationService)),
-    ( __param(8, IMenuService)),
-    ( __param(9, IContextKeyService))
-], DebugToolBar));
+DebugToolBar = ( (__decorate([
+    ( (__param(0, INotificationService))),
+    ( (__param(1, ITelemetryService))),
+    ( (__param(2, IDebugService))),
+    ( (__param(3, IWorkbenchLayoutService))),
+    ( (__param(4, IStorageService))),
+    ( (__param(5, IConfigurationService))),
+    ( (__param(6, IThemeService))),
+    ( (__param(7, IInstantiationService))),
+    ( (__param(8, IMenuService))),
+    ( (__param(9, IContextKeyService)))
+], DebugToolBar)));
 function createDisconnectMenuItemAction(action, disposables, accessor, options) {
     const menuService = accessor.get(IMenuService);
     const contextKeyService = accessor.get(IContextKeyService);
@@ -295,11 +296,7 @@ function createDisconnectMenuItemAction(action, disposables, accessor, options)
     if (!secondary.length) {
         return undefined;
     }
-    const dropdownAction = disposables.add(( new Action('notebook.moreRunActions', ( localizeWithPath(
-        'vs/workbench/contrib/debug/browser/debugToolBar',
-        'notebook.moreRunActionsLabel',
-        "More..."
-    )), 'codicon-chevron-down', true)));
+    const dropdownAction = disposables.add(( (new Action('notebook.moreRunActions', ( localizeWithPath(_moduleId, 0, "More...")), 'codicon-chevron-down', true))));
     const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, options);
     return item;
 }
@@ -319,7 +316,12 @@ const registerDebugToolBarItem = (id, title, order, icon, when, precondition, al
     });
     debugViewTitleItems.push(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
         group: 'navigation',
-        when: ( ContextKeyExpr.and(when, ( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked')))),
+        when: ( (ContextKeyExpr.and(
+            when,
+             (ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
+             (CONTEXT_DEBUG_STATE.notEqualsTo('inactive')),
+             (ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))
+        ))),
         order,
         command: {
             id,
@@ -330,47 +332,56 @@ const registerDebugToolBarItem = (id, title, order, icon, when, precondition, al
     }));
 };
 MenuRegistry.onDidChangeMenu(e => {
-    if (( e.has(MenuId.DebugToolBar))) {
+    if (( (e.has(MenuId.DebugToolBar)))) {
         dispose(debugViewTitleItems);
         const items = MenuRegistry.getMenuItems(MenuId.DebugToolBar);
         for (const i of items) {
             debugViewTitleItems.push(MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
                 ...i,
-                when: ( ContextKeyExpr.and(i.when, ( ContextKeyExpr.equals('viewContainer', VIEWLET_ID)), ( CONTEXT_DEBUG_STATE.notEqualsTo('inactive')), ( ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))))
+                when: ( (ContextKeyExpr.and(
+                    i.when,
+                     (ContextKeyExpr.equals('viewContainer', VIEWLET_ID)),
+                     (CONTEXT_DEBUG_STATE.notEqualsTo('inactive')),
+                     (ContextKeyExpr.equals('config.debug.toolBarLocation', 'docked'))
+                )))
             }));
         }
     }
 });
-const CONTEXT_TOOLBAR_COMMAND_CENTER = ( ContextKeyExpr.equals('config.debug.toolBarLocation', 'commandCenter'));
+const CONTEXT_TOOLBAR_COMMAND_CENTER = ( (ContextKeyExpr.equals('config.debug.toolBarLocation', 'commandCenter')));
 MenuRegistry.appendMenuItem(MenuId.CommandCenterCenter, {
     submenu: MenuId.DebugToolBar,
     title: 'Debug',
     icon: Codicon.debug,
     order: 1,
-    when: ( ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_TOOLBAR_COMMAND_CENTER))
+    when: ( (ContextKeyExpr.and(CONTEXT_IN_DEBUG_MODE, CONTEXT_TOOLBAR_COMMAND_CENTER)))
 });
-registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, debugContinue, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, debugPause, ( CONTEXT_DEBUG_STATE.notEqualsTo('stopped')), ( ContextKeyExpr.and(( CONTEXT_DEBUG_STATE.isEqualTo('running')), ( CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated()))));
-registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, debugStop, ( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), undefined, { id: DISCONNECT_ID, title: DISCONNECT_LABEL, icon: debugDisconnect, precondition: ( ContextKeyExpr.and(( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)), });
-registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, 70, debugDisconnect, CONTEXT_FOCUSED_SESSION_IS_ATTACH, undefined, { id: STOP_ID, title: STOP_LABEL, icon: debugStop, precondition: ( ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)), });
-registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, debugStepOver, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, debugStepInto, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, debugStepOut, undefined, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
+registerDebugToolBarItem(CONTINUE_ID, CONTINUE_LABEL, 10, debugContinue, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(PAUSE_ID, PAUSE_LABEL, 10, debugPause, ( (CONTEXT_DEBUG_STATE.notEqualsTo('stopped'))), ( (ContextKeyExpr.and(
+     (CONTEXT_DEBUG_STATE.isEqualTo('running')),
+     (CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG.toNegated())
+))));
+registerDebugToolBarItem(STOP_ID, STOP_LABEL, 70, debugStop, ( (CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated())), undefined, { id: DISCONNECT_ID, title: DISCONNECT_LABEL, icon: debugDisconnect, precondition: ( (ContextKeyExpr.and(
+     (CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()),
+    CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED
+))), });
+registerDebugToolBarItem(DISCONNECT_ID, DISCONNECT_LABEL, 70, debugDisconnect, CONTEXT_FOCUSED_SESSION_IS_ATTACH, undefined, { id: STOP_ID, title: STOP_LABEL, icon: debugStop, precondition: ( (ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED))), });
+registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, debugStepOver, undefined, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(STEP_INTO_ID, STEP_INTO_LABEL, 30, debugStepInto, undefined, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(STEP_OUT_ID, STEP_OUT_LABEL, 40, debugStepOut, undefined, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
 registerDebugToolBarItem(RESTART_SESSION_ID, RESTART_LABEL, 60, debugRestart);
-registerDebugToolBarItem(STEP_BACK_ID, ( localizeWithPath(
-    'vs/workbench/contrib/debug/browser/debugToolBar',
-    'stepBackDebug',
-    "Step Back"
-)), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localizeWithPath(
-    'vs/workbench/contrib/debug/browser/debugToolBar',
-    'reverseContinue',
-    "Reverse"
-)), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( CONTEXT_DEBUG_STATE.isEqualTo('stopped')));
-registerDebugToolBarItem(FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, 100, Codicon.listTree, ( ContextKeyExpr.and(CONTEXT_MULTI_SESSION_DEBUG, ( CONTEXT_TOOLBAR_COMMAND_CENTER.negate()))));
+registerDebugToolBarItem(STEP_BACK_ID, ( localizeWithPath(_moduleId, 1, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localizeWithPath(_moduleId, 2, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(FOCUS_SESSION_ID, FOCUS_SESSION_LABEL, 100, Codicon.listTree, ( (ContextKeyExpr.and(
+    CONTEXT_MULTI_SESSION_DEBUG,
+     (CONTEXT_TOOLBAR_COMMAND_CENTER.negate())
+))));
 MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
     group: 'navigation',
-    when: ( ContextKeyExpr.and(( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)),
+    when: ( (ContextKeyExpr.and(
+         (CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()),
+        CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED
+    ))),
     order: 0,
     command: {
         id: DISCONNECT_ID,
@@ -380,7 +391,7 @@ MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
 });
 MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
     group: 'navigation',
-    when: ( ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)),
+    when: ( (ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED))),
     order: 0,
     command: {
         id: STOP_ID,
@@ -390,7 +401,11 @@ MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
 });
 MenuRegistry.appendMenuItem(MenuId.DebugToolBarStop, {
     group: 'navigation',
-    when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()), CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED)), ( ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED)))),
+    when: ( (ContextKeyExpr.or( (ContextKeyExpr.and(
+         (CONTEXT_FOCUSED_SESSION_IS_ATTACH.toNegated()),
+        CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED,
+        CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED
+    )),  (ContextKeyExpr.and(CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED))))),
     order: 0,
     command: {
         id: DISCONNECT_AND_SUSPEND_ID,