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

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

@@ -12,26 +12,19 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers.service';
-import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { DEBUG_CONFIGURE_COMMAND_ID, DEBUG_CONFIGURE_LABEL } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { Markers } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
-import { TaskEventKind, CustomTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
+import { CustomTask, ConfiguringTask } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 const onceFilter = (event, filter) => Event.once(Event.filter(event, filter));
-var TaskRunResult;
-( ((function(TaskRunResult) {
-    TaskRunResult[TaskRunResult["Failure"] = 0] = "Failure";
-    TaskRunResult[TaskRunResult["Success"] = 1] = "Success";
-})(TaskRunResult || (TaskRunResult = {}))));
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
-const ABORT_LABEL = ( localize(5777, "Abort"));
-const DEBUG_ANYWAY_LABEL = ( localize(5778, "&&Debug Anyway"));
-const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5779, "Debug Anyway"));
+const ABORT_LABEL = ( localize(5800, "Abort"));
+const DEBUG_ANYWAY_LABEL = ( localize(5801, "&&Debug Anyway"));
+const DEBUG_ANYWAY_LABEL_NO_MEMO = ( localize(5802, "Debug Anyway"));
 let DebugTaskRunner = class DebugTaskRunner {
     constructor(taskService, markerService, configurationService, viewsService, dialogService, storageService, commandService, progressService) {
         this.taskService = taskService;
@@ -55,35 +48,35 @@ let DebugTaskRunner = class DebugTaskRunner {
         try {
             const taskSummary = await this.runTask(root, taskId, this.globalCancellation.token);
             if (taskSummary && (taskSummary.exitCode === undefined || taskSummary.cancelled)) {
-                return TaskRunResult.Failure;
+                return 0 ;
             }
             const errorCount = taskId ? this.markerService.read({ severities: MarkerSeverity.Error, take: 2 }).length : 0;
             const successExitCode = taskSummary && taskSummary.exitCode === 0;
             const failureExitCode = taskSummary && taskSummary.exitCode !== 0;
             const onTaskErrors = this.configurationService.getValue('debug').onTaskErrors;
             if (successExitCode || onTaskErrors === 'debugAnyway' || (errorCount === 0 && !failureExitCode)) {
-                return TaskRunResult.Success;
+                return 1 ;
             }
             if (onTaskErrors === 'showErrors') {
                 await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-                return Promise.resolve(TaskRunResult.Failure);
+                return Promise.resolve(0 );
             }
             if (onTaskErrors === 'abort') {
-                return Promise.resolve(TaskRunResult.Failure);
+                return Promise.resolve(0 );
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
-                ? ( localize(5780, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
+                ? ( localize(5803, "Errors exist after running preLaunchTask '{0}'.", taskLabel))
                 : errorCount === 1
-                    ? ( localize(5781, "Error exists after running preLaunchTask '{0}'.", taskLabel))
+                    ? ( localize(5804, "Error exists after running preLaunchTask '{0}'.", taskLabel))
                     : taskSummary && typeof taskSummary.exitCode === 'number'
                         ? ( localize(
-                5782,
+                5805,
                 "The preLaunchTask '{0}' terminated with exit code {1}.",
                 taskLabel,
                 taskSummary.exitCode
             ))
-                        : ( localize(5783, "The preLaunchTask '{0}' terminated.", taskLabel));
+                        : ( localize(5806, "The preLaunchTask '{0}' terminated.", taskLabel));
             let DebugChoice;
             ( ((function(DebugChoice) {
                 DebugChoice[DebugChoice["DebugAnyway"] = 1] = "DebugAnyway";
@@ -99,7 +92,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.DebugAnyway
                     },
                     {
-                        label: ( localize(5784, "&&Show Errors")),
+                        label: ( localize(5807, "&&Show Errors")),
                         run: () => DebugChoice.ShowErrors
                     }
                 ],
@@ -108,7 +101,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     run: () => DebugChoice.Cancel
                 },
                 checkbox: {
-                    label: ( localize(5785, "Remember my choice in user settings")),
+                    label: ( localize(5808, "Remember my choice in user settings")),
                 }
             });
             const debugAnyway = result === DebugChoice.DebugAnyway;
@@ -117,17 +110,17 @@ let DebugTaskRunner = class DebugTaskRunner {
                 this.configurationService.updateValue('debug.onTaskErrors', result === DebugChoice.DebugAnyway ? 'debugAnyway' : abort ? 'abort' : 'showErrors');
             }
             if (abort) {
-                return Promise.resolve(TaskRunResult.Failure);
+                return Promise.resolve(0 );
             }
             if (debugAnyway) {
-                return TaskRunResult.Success;
+                return 1 ;
             }
             await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-            return Promise.resolve(TaskRunResult.Failure);
+            return Promise.resolve(0 );
         }
         catch (err) {
             const taskConfigureAction = this.taskService.configureAction();
-            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, StorageScope.WORKSPACE, '{}'));
+            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, 1 , '{}'));
             let choice = -1;
             let DebugChoice;
             ( ((function(DebugChoice) {
@@ -144,7 +137,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                     message: err.message,
                     buttons: [
                         {
-                            label: ( localize(5778, "&&Debug Anyway")),
+                            label: ( localize(5801, "&&Debug Anyway")),
                             run: () => DebugChoice.DebugAnyway
                         },
                         {
@@ -156,19 +149,19 @@ let DebugTaskRunner = class DebugTaskRunner {
                         run: () => DebugChoice.Cancel
                     },
                     checkbox: {
-                        label: ( localize(5786, "Remember my choice for this task"))
+                        label: ( localize(5809, "Remember my choice for this task"))
                     }
                 });
                 choice = result;
                 if (checkboxChecked) {
                     choiceMap[err.message] = choice;
-                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), 1 , 1 );
                 }
             }
             if (choice === DebugChoice.ConfigureTask) {
                 await taskConfigureAction.run();
             }
-            return choice === DebugChoice.DebugAnyway ? TaskRunResult.Success : TaskRunResult.Failure;
+            return choice === DebugChoice.DebugAnyway ? 1  : 0 ;
         }
     }
     async runTask(root, taskId, token = this.globalCancellation.token) {
@@ -177,7 +170,7 @@ let DebugTaskRunner = class DebugTaskRunner {
         }
         if (!root) {
             return Promise.reject(( (new Error(( localize(
-                5787,
+                5810,
                 "Task '{0}' can not be referenced from a launch configuration that is in a different workspace folder.",
                 typeof taskId === 'string' ? taskId : taskId.type
             ))))));
@@ -185,8 +178,8 @@ let DebugTaskRunner = class DebugTaskRunner {
         const task = await this.taskService.getTask(root, taskId);
         if (!task) {
             const errorMessage = typeof taskId === 'string'
-                ? ( localize(5788, "Could not find the task '{0}'.", taskId))
-                : ( localize(5789, "Could not find the specified task."));
+                ? ( localize(5811, "Could not find the task '{0}'.", taskId))
+                : ( localize(5812, "Could not find the specified task."));
             return Promise.reject(createErrorWithActions(errorMessage, [( (new Action(
                 DEBUG_CONFIGURE_COMMAND_ID,
                 DEBUG_CONFIGURE_LABEL,
@@ -201,19 +194,19 @@ let DebugTaskRunner = class DebugTaskRunner {
         const taskKey = getTaskKey(task);
         const inactivePromise = ( (new Promise(
             (resolve) => store.add(onceFilter(this.taskService.onDidStateChange, e => {
-                return (e.kind === TaskEventKind.Inactive
-                    || (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
+                return (e.kind === "inactive"
+                    || (e.kind === "processEnded"  && e.exitCode === undefined))
                     && getTaskKey(e.__task) === taskKey;
             })(e => {
                 taskStarted = true;
-                resolve(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
+                resolve(e.kind === "processEnded"  ? { exitCode: e.exitCode } : null);
             }))
         )));
-        store.add(onceFilter(this.taskService.onDidStateChange, e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey)(() => {
+        store.add(onceFilter(this.taskService.onDidStateChange, e => (((e.kind === "active") ) || ((e.kind === "dependsOnStarted") )) && getTaskKey(e.__task) === taskKey)(() => {
             taskStarted = true;
         }));
         const didAcquireInput = store.add(( (new Emitter())));
-        store.add(onceFilter(this.taskService.onDidStateChange, e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey)(() => didAcquireInput.fire()));
+        store.add(onceFilter(this.taskService.onDidStateChange, e => ((e.kind === "acquiredInput") ) && getTaskKey(e.__task) === taskKey)(() => didAcquireInput.fire()));
         const taskDonePromise = this.taskService.getActiveTasks().then(async (tasks) => {
             if (tasks.find(t => getTaskKey(t) === taskKey)) {
                 didAcquireInput.fire();
@@ -244,7 +237,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 store.add(disposableTimeout(() => {
                     if (!taskStarted) {
                         const errorMessage = ( localize(
-                            5790,
+                            5813,
                             "The task '{0}' has not exited and doesn't have a 'problemMatcher' defined. Make sure to define a problem matcher for watch tasks.",
                             typeof taskId === 'string' ? taskId : JSON.stringify(taskId)
                         ));
@@ -253,16 +246,16 @@ let DebugTaskRunner = class DebugTaskRunner {
                 }, waitTime));
                 store.add(disposableTimeout(() => {
                     const message = ( localize(
-                        5791,
+                        5814,
                         "Waiting for preLaunchTask '{0}'...",
                         task.configurationProperties.name
                     ));
                     const buttons = [DEBUG_ANYWAY_LABEL_NO_MEMO, ABORT_LABEL];
                     const canConfigure = task instanceof CustomTask || task instanceof ConfiguringTask;
                     if (canConfigure) {
-                        buttons.splice(1, 0, ( localize(5792, "Configure Task")));
+                        buttons.splice(1, 0, ( localize(5815, "Configure Task")));
                     }
-                    this.progressService.withProgress({ location: ProgressLocation.Notification, title: message, buttons }, () => result.catch(() => { }), (choice) => {
+                    this.progressService.withProgress({ location: 15 , title: message, buttons }, () => result.catch(() => { }), (choice) => {
                         if (choice === undefined) ;
                         else if (choice === 0) {
                             resolve({ exitCode: 0 });
@@ -292,4 +285,4 @@ DebugTaskRunner = ( (__decorate([
     ( (__param(7, IProgressService)))
 ], DebugTaskRunner)));
 
-export { DebugTaskRunner, TaskRunResult };
+export { DebugTaskRunner };

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

@@ -1,5 +1,4 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
@@ -9,7 +8,7 @@ let DebugTitleContribution = class DebugTitleContribution {
     constructor(debugService, hostService, titleService) {
         this.toDispose = [];
         const updateTitle = () => {
-            if (debugService.state === State.Stopped && !hostService.hasFocus) {
+            if (debugService.state === 2  && !hostService.hasFocus) {
                 titleService.updateProperties({ prefix: '🔴' });
             }
             else {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { $, append, addDisposableGenericMouseUpListener, getWindow, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, addDisposableListener, EventType, show, hide } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardMouseEvent } from 'vscode/vscode/vs/base/browser/mouseEvent';
-import { ActionBar, ActionsOrientation } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { equals } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -16,10 +16,8 @@ import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.s
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -40,9 +38,8 @@ import { FocusSessionActionViewItem } from './debugActionViewItems.js';
 import { debugToolBarBackground, debugToolBarBorder } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugColors';
 import { FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, CONTINUE_ID, CONTINUE_LABEL, PAUSE_ID, PAUSE_LABEL, STOP_LABEL, DISCONNECT_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STEP_BACK_ID, REVERSE_CONTINUE_ID, FOCUS_SESSION_LABEL, DISCONNECT_AND_SUSPEND_ID, DISCONNECT_AND_SUSPEND_LABEL } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { debugGripper, debugContinue, debugPause, debugStop, debugDisconnect, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStepBack, debugReverseContinue } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import { State, VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { VIEWLET_ID, CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_MODE, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_STEP_BACK_SUPPORTED, CONTEXT_MULTI_SESSION_DEBUG, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
-import { LayoutSettings, Parts, EditorTabsMode } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
@@ -74,7 +71,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this._register(this.debugToolBarMenu);
         this.activeActions = [];
         this.actionBar = this._register(( (new ActionBar(actionBarContainer, {
-            orientation: ActionsOrientation.HORIZONTAL,
+            orientation: 0 ,
             actionViewItemProvider: (action, options) => {
                 if (action.id === FOCUS_SESSION_ID) {
                     return this.instantiationService.createInstance(FocusSessionActionViewItem, action, undefined);
@@ -92,10 +89,10 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.updateScheduler = this._register(( (new RunOnceScheduler(() => {
             const state = this.debugService.state;
             const toolBarLocation = this.configurationService.getValue('debug').toolBarLocation;
-            if (state === State.Inactive ||
+            if (state === 0  ||
                 toolBarLocation !== 'floating' ||
                 this.debugService.getModel().getSessions().every(s => s.suppressDebugToolbar) ||
-                (state === State.Initializing && this.debugService.initializingOptions?.suppressDebugToolbar)) {
+                (state === 1  && this.debugService.initializingOptions?.suppressDebugToolbar)) {
                 return this.hide();
             }
             const actions = [];
@@ -117,7 +114,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             if (e.affectsConfiguration('debug.toolBarLocation')) {
                 this.updateScheduler.schedule();
             }
-            if (e.affectsConfiguration(LayoutSettings.EDITOR_TABS_MODE) || e.affectsConfiguration(LayoutSettings.COMMAND_CENTER)) {
+            if (e.affectsConfiguration("workbench.editor.showTabs" ) || e.affectsConfiguration("window.commandCenter" )) {
                 this._yRange = undefined;
                 this.setCoordinates();
             }
@@ -176,8 +173,8 @@ let DebugToolBar = class DebugToolBar extends Themable {
         const y = rect.top;
         const x = rect.left / activeWindow.innerWidth;
         if (isMainWindow) {
-            this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, x, StorageScope.PROFILE, StorageTarget.MACHINE);
-            this.storageService.store(DEBUG_TOOLBAR_Y_KEY, y, StorageScope.PROFILE, StorageTarget.MACHINE);
+            this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, x, 0 , 1 );
+            this.storageService.store(DEBUG_TOOLBAR_Y_KEY, y, 0 , 1 );
         }
         else {
             this.auxWindowCoordinates.set(activeWindow, { x, y });
@@ -209,7 +206,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         const isMainWindow = currentWindow === mainWindow;
         if (x === undefined) {
             const positionPercentage = isMainWindow
-                ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, StorageScope.PROFILE))
+                ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, 0 ))
                 : this.auxWindowCoordinates.get(currentWindow)?.x;
             x = positionPercentage !== undefined && !isNaN(positionPercentage)
                 ? positionPercentage * currentWindow.innerWidth
@@ -219,7 +216,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this.$el.style.left = `${x}px`;
         if (y === undefined) {
             y = isMainWindow
-                ? this.storageService.getNumber(DEBUG_TOOLBAR_Y_KEY, StorageScope.PROFILE)
+                ? this.storageService.getNumber(DEBUG_TOOLBAR_Y_KEY, 0 )
                 : this.auxWindowCoordinates.get(currentWindow)?.y;
         }
         this.setYCoordinate(y ?? this.yDefault);
@@ -234,18 +231,18 @@ let DebugToolBar = class DebugToolBar extends Themable {
     }
     get yRange() {
         if (!this._yRange) {
-            const isTitleBarVisible = this.layoutService.isVisible(Parts.TITLEBAR_PART, getWindow(this.layoutService.activeContainer));
+            const isTitleBarVisible = this.layoutService.isVisible("workbench.parts.titlebar" , getWindow(this.layoutService.activeContainer));
             const yMin = isTitleBarVisible ? 0 : this.layoutService.mainContainerOffset.top;
             let yMax = 0;
             if (isTitleBarVisible) {
-                if (this.configurationService.getValue(LayoutSettings.COMMAND_CENTER) === true) {
+                if (this.configurationService.getValue("window.commandCenter" ) === true) {
                     yMax += 35;
                 }
                 else {
                     yMax += 28;
                 }
             }
-            if (this.configurationService.getValue(LayoutSettings.EDITOR_TABS_MODE) !== EditorTabsMode.NONE) {
+            if (this.configurationService.getValue("workbench.editor.showTabs" ) !== "none" ) {
                 yMax += 35;
             }
             this._yRange = [yMin, yMax];
@@ -294,15 +291,14 @@ function createDisconnectMenuItemAction(action, disposables, accessor, options)
     const menuService = accessor.get(IMenuService);
     const contextKeyService = accessor.get(IContextKeyService);
     const instantiationService = accessor.get(IInstantiationService);
-    const contextMenuService = accessor.get(IContextMenuService);
     const menu = menuService.getMenuActions(MenuId.DebugToolBarStop, contextKeyService, { shouldForwardArgs: true });
     const secondary = [];
     createAndFillInActionBarActions(menu, secondary);
     if (!secondary.length) {
         return undefined;
     }
-    const dropdownAction = disposables.add(( (new Action('notebook.moreRunActions', ( localize(6025, "More...")), 'codicon-chevron-down', true))));
-    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', contextMenuService, options);
+    const dropdownAction = disposables.add(( (new Action('notebook.moreRunActions', ( localize(6044, "More...")), 'codicon-chevron-down', true))));
+    const item = instantiationService.createInstance(DropdownWithPrimaryActionViewItem, action, dropdownAction, secondary, 'debug-stop-actions', options);
     return item;
 }
 const debugViewTitleItems = [];
@@ -375,8 +371,8 @@ registerDebugToolBarItem(STEP_OVER_ID, STEP_OVER_LABEL, 20, debugStepOver, undef
 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, ( localize(6026, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
-registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(6027, "Reverse")), 55, debugReverseContinue, CONTEXT_STEP_BACK_SUPPORTED, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(STEP_BACK_ID, ( localize(6045, "Step Back")), 50, debugStepBack, CONTEXT_STEP_BACK_SUPPORTED, ( (CONTEXT_DEBUG_STATE.isEqualTo('stopped'))));
+registerDebugToolBarItem(REVERSE_CONTINUE_ID, ( localize(6046, "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())

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

@@ -24,7 +24,7 @@ import { DEBUG_START_COMMAND_ID, FOCUS_SESSION_ID, STOP_ID, DISCONNECT_ID, DEBUG
 import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
 import { WelcomeView } from './welcomeView.js';
-import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, State, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUGGERS_AVAILABLE, REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { VIEWLET_ID, CONTEXT_DEBUG_UX_KEY, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUG_UX, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_DEBUGGERS_AVAILABLE, REPL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
@@ -100,7 +100,7 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
             this.progressResolve();
             this.progressResolve = undefined;
         }
-        if (state === State.Initializing) {
+        if (state === 1 ) {
             this.progressService.withProgress({ location: VIEWLET_ID, }, _progress => {
                 return (
                      (new Promise(resolve => this.progressResolve = resolve))
@@ -167,7 +167,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     group: 'navigation',
     command: {
-        precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))),
+        precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))),
         id: DEBUG_START_COMMAND_ID,
         title: DEBUG_START_LABEL
     }
@@ -179,10 +179,10 @@ registerAction2(class extends Action2 {
             title: {
                 value: DEBUG_CONFIGURE_LABEL,
                 original: 'Open \'launch.json\'',
-                mnemonicTitle: ( localize(6028, "Open &&Configurations"))
+                mnemonicTitle: ( localize(6047, "Open &&Configurations"))
             },
             metadata: {
-                description: ( localize2(6029, 'Opens the file used to configure how your program is debugged'))
+                description: ( localize2(6048, 'Opens the file used to configure how your program is debugged'))
             },
             f1: true,
             icon: debugConfigure,
@@ -234,7 +234,7 @@ registerAction2(class extends Action2 {
                 const picked = await quickInputService.pick(picks, {
                     activeItem: picks[0],
                     placeHolder: ( localize(
-                        6030,
+                        6049,
                         "Select a workspace folder to create a launch.json file in or add it to the workspace config file"
                     ))
                 });
@@ -252,7 +252,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'debug.toggleReplIgnoreFocus',
-            title: ( localize(6031, "Debug Console")),
+            title: ( localize(6050, "Debug Console")),
             toggled: ( (ContextKeyExpr.has(`view.${REPL_VIEW_ID}.visible`))),
             menu: [{
                     id: ViewsSubMenu,
@@ -284,7 +284,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     command: {
         id: SELECT_AND_START_ID,
-        title: ( localize(6032, "Start Additional Session")),
+        title: ( localize(6051, "Start Additional Session")),
     }
 });
 

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

@@ -5,7 +5,6 @@ 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';
 import { isAbsolute } from 'vscode/vscode/vs/base/common/path';
-import { Constants } from 'vscode/vscode/vs/base/common/uint';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { applyFontInfo } from 'vscode/vscode/vs/editor/browser/config/domFontInfo';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
@@ -16,7 +15,6 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import { localize } from 'vscode/vscode/vs/nls';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { TextEditorSelectionRevealType } from 'vscode/vscode/vs/platform/editor/common/editor';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -38,7 +36,7 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { topStackFrameColor, focusedStackFrameColor } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
 import { breakpoint, debugBreakpointHint, debugStackframe, debugStackframeFocused } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
-import { DISASSEMBLY_VIEW_ID, State, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { DISASSEMBLY_VIEW_ID, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { InstructionBreakpoint } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { getUriFromSource } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugSource';
@@ -56,7 +54,7 @@ const disassemblyNotAvailable = {
     address: 0n,
     instruction: {
         address: '-1',
-        instruction: ( localize(6033, "Disassembly not available."))
+        instruction: ( localize(6069, "Disassembly not available."))
     },
 };
 let DisassemblyView = class DisassemblyView extends EditorPane {
@@ -170,7 +168,7 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
                 project(row) { return row; }
             },
             {
-                label: ( localize(6034, "instructions")),
+                label: ( localize(6070, "instructions")),
                 tooltip: '',
                 weight: 0.3,
                 templateId: InstructionRenderer.TEMPLATE_ID,
@@ -263,8 +261,8 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
         }));
         this._register(this._debugService.onDidChangeState(e => {
-            if ((e === State.Running || e === State.Stopped) &&
-                (this._previousDebuggingState !== State.Running && this._previousDebuggingState !== State.Stopped)) {
+            if (((e === 3  || e === 2) ) &&
+                ((this._previousDebuggingState !== 3  && this._previousDebuggingState !== 2) )) {
                 this.clear();
                 this._enableSourceCodeRender = this._configurationService.getValue('debug').disassemblyView.showSourceCode;
             }
@@ -696,21 +694,21 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
                 startLineNumber: instruction.line,
                 endLineNumber: instruction.endLine,
                 startColumn: instruction.column || 1,
-                endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
+                endColumn: instruction.endColumn || 1073741824 ,
             } : {
                 startLineNumber: instruction.line,
                 endLineNumber: instruction.line,
                 startColumn: instruction.column || 1,
-                endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
+                endColumn: instruction.endColumn || 1073741824 ,
             };
             this.editorService.openEditor({
                 resource: sourceURI,
-                description: ( localize(6035, "from disassembly")),
+                description: ( localize(6071, "from disassembly")),
                 options: {
                     preserveFocus: false,
                     selection: selection,
                     revealIfOpened: true,
-                    selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
+                    selectionRevealType: 1 ,
                     pinned: false,
                 }
             });
@@ -740,18 +738,18 @@ InstructionRenderer = InstructionRenderer_1 = ( (__decorate([
 ], InstructionRenderer)));
 class AccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6036, "Disassembly View"));
+        return ( localize(6072, "Disassembly View"));
     }
     getAriaLabel(element) {
         let label = '';
         const instruction = element.instruction;
         if (instruction.address !== '-1') {
-            label += `${( localize(6037, "Address"))}: ${instruction.address}`;
+            label += `${( localize(6073, "Address"))}: ${instruction.address}`;
         }
         if (instruction.instructionBytes) {
-            label += `, ${( localize(6038, "Bytes"))}: ${instruction.instructionBytes}`;
+            label += `, ${( localize(6074, "Bytes"))}: ${instruction.instructionBytes}`;
         }
-        label += `, ${( localize(6039, "Instruction"))}: ${instruction.instruction}`;
+        label += `, ${( localize(6075, "Instruction"))}: ${instruction.instruction}`;
         return label;
     }
 }

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

@@ -19,15 +19,14 @@ 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, DebugLinkHoverBehavior } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
+import { LinkDetector } from 'vscode/vscode/vs/workbench/contrib/debug/browser/linkDetector';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { widgetClose } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 
 const $ = $$1;
-const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', '#a31515', ( localize(10286, 'Exception widget border color.')));
-const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, ( localize(10287, 'Exception widget background color.')));
+const debugExceptionWidgetBorder = registerColor('debugExceptionWidget.border', '#a31515', ( localize(10343, 'Exception widget border color.')));
+const debugExceptionWidgetBackground = registerColor('debugExceptionWidget.background', { dark: '#420b0d', light: '#f1dfde', hcDark: '#420b0d', hcLight: '#f1dfde' }, ( localize(10344, 'Exception widget background color.')));
 let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     constructor(editor, exceptionInfo, debugSession, themeService, instantiationService) {
         super(editor, { showFrame: true, showArrow: true, isAccessible: true, frameWidth: 1, className: 'exception-widget-container' });
@@ -57,7 +56,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _fillContainer(container) {
         this.setCssClass('exception-widget');
-        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
+        const fontInfo = this.editor.getOption(52 );
         container.style.fontSize = `${fontInfo.fontSize}px`;
         container.style.lineHeight = `${fontInfo.lineHeight}px`;
         container.tabIndex = 0;
@@ -66,10 +65,10 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
         append(title, label);
         const actions = $('.actions');
         append(title, actions);
-        label.textContent = this.exceptionInfo.id ? ( localize(10288, 'Exception has occurred: {0}', this.exceptionInfo.id)) : ( localize(10289, 'Exception has occurred.'));
+        label.textContent = this.exceptionInfo.id ? ( localize(10345, 'Exception has occurred: {0}', this.exceptionInfo.id)) : ( localize(10346, 'Exception has occurred.'));
         let ariaLabel = label.textContent;
         const actionBar = ( (new ActionBar(actions)));
-        actionBar.push(( (new Action('editor.closeExceptionWidget', ( localize(10290, "Close")), ThemeIcon.asClassName(widgetClose), true, async () => {
+        actionBar.push(( (new Action('editor.closeExceptionWidget', ( localize(10347, "Close")), ThemeIcon.asClassName(widgetClose), true, async () => {
             const contribution = this.editor.getContribution(EDITOR_CONTRIBUTION_ID);
             contribution?.closeExceptionWidget();
         }))), { label: false, icon: true });
@@ -83,7 +82,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
         if (this.exceptionInfo.details && this.exceptionInfo.details.stackTrace) {
             const stackTrace = $('.stack-trace');
             const linkDetector = this.instantiationService.createInstance(LinkDetector);
-            const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined, undefined, { type: DebugLinkHoverBehavior.Rich, store: this._disposables });
+            const linkedStackTrace = linkDetector.linkify(this.exceptionInfo.details.stackTrace, true, this.debugSession ? this.debugSession.root : undefined, undefined, { type: 0 , store: this._disposables });
             stackTrace.appendChild(linkedStackTrace);
             append(container, stackTrace);
             ariaLabel += ', ' + this.exceptionInfo.details.stackTrace;
@@ -92,7 +91,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _doLayout(_heightInPixel, _widthInPixel) {
         this.container.style.height = 'initial';
-        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+        const lineHeight = this.editor.getOption(69 );
         const arrowHeight = Math.round(lineHeight / 3);
         const computedLinesNumber = Math.ceil((this.container.offsetHeight + arrowHeight) / lineHeight);
         this._relayout(computedLinesNumber);