@codingame/monaco-vscode-debug-service-override 5.3.0 → 6.0.1

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

@@ -4,10 +4,12 @@ import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { Markers } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import { ITaskService } from 'vscode/vscode/vs/workbench/contrib/tasks/common/taskService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { TaskEventKind } from 'vscode/vscode/vs/workbench/contrib/tasks/common/tasks';
 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 { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { createErrorWithActions } from 'vscode/vscode/vs/base/common/errorMessage';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
@@ -26,6 +28,11 @@ function once(match, event) {
         return result;
     };
 }
+var TaskRunResult;
+( ((function(TaskRunResult) {
+    TaskRunResult[TaskRunResult["Failure"] = 0] = "Failure";
+    TaskRunResult[TaskRunResult["Success"] = 1] = "Success";
+})(TaskRunResult || (TaskRunResult = {}))));
 const DEBUG_TASK_ERROR_CHOICE_KEY = 'debug.taskerrorchoice';
 let DebugTaskRunner = class DebugTaskRunner {
     constructor(taskService, markerService, configurationService, viewsService, dialogService, storageService, commandService) {
@@ -46,21 +53,21 @@ let DebugTaskRunner = class DebugTaskRunner {
             this.canceled = false;
             const taskSummary = await this.runTask(root, taskId);
             if (this.canceled || (taskSummary && taskSummary.exitCode === undefined)) {
-                return 0 ;
+                return TaskRunResult.Failure;
             }
             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 1 ;
+                return TaskRunResult.Success;
             }
             if (onTaskErrors === 'showErrors') {
                 await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             if (onTaskErrors === 'abort') {
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             const taskLabel = typeof taskId === 'string' ? taskId : taskId ? taskId.name : '';
             const message = errorCount > 1
@@ -109,17 +116,17 @@ let DebugTaskRunner = class DebugTaskRunner {
                 this.configurationService.updateValue('debug.onTaskErrors', result === DebugChoice.DebugAnyway ? 'debugAnyway' : abort ? 'abort' : 'showErrors');
             }
             if (abort) {
-                return Promise.resolve(0 );
+                return Promise.resolve(TaskRunResult.Failure);
             }
             if (debugAnyway) {
-                return 1 ;
+                return TaskRunResult.Success;
             }
             await this.viewsService.openView(Markers.MARKERS_VIEW_ID, true);
-            return Promise.resolve(0 );
+            return Promise.resolve(TaskRunResult.Failure);
         }
         catch (err) {
             const taskConfigureAction = this.taskService.configureAction();
-            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, 1 , '{}'));
+            const choiceMap = JSON.parse(this.storageService.get(DEBUG_TASK_ERROR_CHOICE_KEY, StorageScope.WORKSPACE, '{}'));
             let choice = -1;
             let DebugChoice;
             ( ((function(DebugChoice) {
@@ -154,13 +161,13 @@ let DebugTaskRunner = class DebugTaskRunner {
                 choice = result;
                 if (checkboxChecked) {
                     choiceMap[err.message] = choice;
-                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), 1 , 1 );
+                    this.storageService.store(DEBUG_TASK_ERROR_CHOICE_KEY, JSON.stringify(choiceMap), StorageScope.WORKSPACE, StorageTarget.MACHINE);
                 }
             }
             if (choice === DebugChoice.ConfigureTask) {
                 await taskConfigureAction.run();
             }
-            return choice === DebugChoice.DebugAnyway ? 1  : 0 ;
+            return choice === DebugChoice.DebugAnyway ? TaskRunResult.Success : TaskRunResult.Failure;
         }
     }
     async runTask(root, taskId) {
@@ -192,12 +199,12 @@ let DebugTaskRunner = class DebugTaskRunner {
         const getTaskKey = (t) => t.getKey() ?? t.getMapKey();
         const taskKey = getTaskKey(task);
         const inactivePromise = ( (new Promise((c) => once(e => {
-            return (e.kind === "inactive"
-                || (e.kind === "processEnded"  && e.exitCode === undefined))
+            return (e.kind === TaskEventKind.Inactive
+                || (e.kind === TaskEventKind.ProcessEnded && e.exitCode === undefined))
                 && getTaskKey(e.__task) === taskKey;
         }, this.taskService.onDidStateChange)(e => {
             taskStarted = true;
-            c(e.kind === "processEnded"  ? { exitCode: e.exitCode } : null);
+            c(e.kind === TaskEventKind.ProcessEnded ? { exitCode: e.exitCode } : null);
         }))));
         const promise = this.taskService.getActiveTasks().then(async (tasks) => {
             if (tasks.find(t => getTaskKey(t) === taskKey)) {
@@ -208,7 +215,7 @@ let DebugTaskRunner = class DebugTaskRunner {
                 }
                 return Promise.resolve(null);
             }
-            once(e => (((e.kind === "active") ) || ((e.kind === "dependsOnStarted") )) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
+            once(e => ((e.kind === TaskEventKind.Active) || (e.kind === TaskEventKind.DependsOnStarted)) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
                 taskStarted = true;
             });
             const taskPromise = this.taskService.run(task);
@@ -220,7 +227,7 @@ let DebugTaskRunner = class DebugTaskRunner {
         return (
              (new Promise((c, e) => {
                 const waitForInput = ( (new Promise(
-                    resolve => once(e => ((e.kind === "acquiredInput") ) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
+                    resolve => once(e => (e.kind === TaskEventKind.AcquiredInput) && getTaskKey(e.__task) === taskKey, this.taskService.onDidStateChange)(() => {
                         resolve();
                     })
                 )));
@@ -263,4 +270,4 @@ DebugTaskRunner = ( (__decorate([
     ( (__param(6, ICommandService)))
 ], DebugTaskRunner)));
 
-export { DebugTaskRunner };
+export { DebugTaskRunner, TaskRunResult };

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

@@ -1,4 +1,5 @@
 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';
@@ -8,7 +9,7 @@ let DebugTitleContribution = class DebugTitleContribution {
     constructor(debugService, hostService, titleService) {
         this.toDispose = [];
         const updateTitle = () => {
-            if (debugService.state === 2  && !hostService.hasFocus) {
+            if (debugService.state === State.Stopped && !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 } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ActionBar, ActionsOrientation } 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';
@@ -19,6 +19,7 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 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';
@@ -39,8 +40,9 @@ 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 { 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 { 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 { 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';
@@ -73,7 +75,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
         this._register(this.debugToolBarMenu);
         this.activeActions = [];
         this.actionBar = this._register(( (new ActionBar(actionBarContainer, {
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             actionViewItemProvider: (action, options) => {
                 if (action.id === FOCUS_SESSION_ID) {
                     return this.instantiationService.createInstance(FocusSessionActionViewItem, action, undefined);
@@ -91,10 +93,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 === 0  ||
+            if (state === State.Inactive ||
                 toolBarLocation !== 'floating' ||
                 this.debugService.getModel().getSessions().every(s => s.suppressDebugToolbar) ||
-                (state === 1  && this.debugService.initializingOptions?.suppressDebugToolbar)) {
+                (state === State.Initializing && this.debugService.initializingOptions?.suppressDebugToolbar)) {
                 return this.hide();
             }
             const actions = [];
@@ -116,7 +118,7 @@ let DebugToolBar = class DebugToolBar extends Themable {
             if (e.affectsConfiguration('debug.toolBarLocation')) {
                 this.updateScheduler.schedule();
             }
-            if (e.affectsConfiguration("workbench.editor.showTabs" ) || e.affectsConfiguration("window.commandCenter" )) {
+            if (e.affectsConfiguration(LayoutSettings.EDITOR_TABS_MODE) || e.affectsConfiguration(LayoutSettings.COMMAND_CENTER)) {
                 this._yRange = undefined;
                 this.setCoordinates();
             }
@@ -175,8 +177,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, 0 , 1 );
-            this.storageService.store(DEBUG_TOOLBAR_Y_KEY, y, 0 , 1 );
+            this.storageService.store(DEBUG_TOOLBAR_POSITION_KEY, x, StorageScope.PROFILE, StorageTarget.MACHINE);
+            this.storageService.store(DEBUG_TOOLBAR_Y_KEY, y, StorageScope.PROFILE, StorageTarget.MACHINE);
         }
         else {
             this.auxWindowCoordinates.set(activeWindow, { x, y });
@@ -208,7 +210,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, 0 ))
+                ? Number(this.storageService.get(DEBUG_TOOLBAR_POSITION_KEY, StorageScope.PROFILE))
                 : this.auxWindowCoordinates.get(currentWindow)?.x;
             x = positionPercentage !== undefined && !isNaN(positionPercentage)
                 ? positionPercentage * currentWindow.innerWidth
@@ -218,7 +220,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, 0 )
+                ? this.storageService.getNumber(DEBUG_TOOLBAR_Y_KEY, StorageScope.PROFILE)
                 : this.auxWindowCoordinates.get(currentWindow)?.y;
         }
         this.setYCoordinate(y ?? this.yDefault);
@@ -233,18 +235,18 @@ let DebugToolBar = class DebugToolBar extends Themable {
     }
     get yRange() {
         if (!this._yRange) {
-            const isTitleBarVisible = this.layoutService.isVisible("workbench.parts.titlebar" , getWindow(this.layoutService.activeContainer));
+            const isTitleBarVisible = this.layoutService.isVisible(Parts.TITLEBAR_PART, getWindow(this.layoutService.activeContainer));
             const yMin = isTitleBarVisible ? 0 : this.layoutService.mainContainerOffset.top;
             let yMax = 0;
             if (isTitleBarVisible) {
-                if (this.configurationService.getValue("window.commandCenter" ) === true) {
+                if (this.configurationService.getValue(LayoutSettings.COMMAND_CENTER) === true) {
                     yMax += 35;
                 }
                 else {
                     yMax += 28;
                 }
             }
-            if (this.configurationService.getValue("workbench.editor.showTabs" ) !== "none" ) {
+            if (this.configurationService.getValue(LayoutSettings.EDITOR_TABS_MODE) !== EditorTabsMode.NONE) {
                 yMax += 35;
             }
             this._yRange = [yMin, yMax];

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, 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, 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 { 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';
@@ -101,7 +101,7 @@ let DebugViewPaneContainer = class DebugViewPaneContainer extends ViewPaneContai
             this.progressResolve();
             this.progressResolve = undefined;
         }
-        if (state === 1 ) {
+        if (state === State.Initializing) {
             this.progressService.withProgress({ location: VIEWLET_ID, }, _progress => {
                 return (
                      (new Promise(resolve => this.progressResolve = resolve))
@@ -168,7 +168,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     order: 10,
     group: 'navigation',
     command: {
-        precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))),
+        precondition: ( (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))),
         id: DEBUG_START_COMMAND_ID,
         title: DEBUG_START_LABEL
     }

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

@@ -5,6 +5,7 @@ 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';
@@ -15,6 +16,7 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import { localizeWithPath } 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';
@@ -36,7 +38,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, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { DISASSEMBLY_VIEW_ID, State, 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';
@@ -261,8 +263,8 @@ let DisassemblyView = class DisassemblyView extends EditorPane {
             }
         }));
         this._register(this._debugService.onDidChangeState(e => {
-            if (((e === 3  || e === 2) ) &&
-                ((this._previousDebuggingState !== 3  && this._previousDebuggingState !== 2) )) {
+            if ((e === State.Running || e === State.Stopped) &&
+                (this._previousDebuggingState !== State.Running && this._previousDebuggingState !== State.Stopped)) {
                 this.clear();
                 this._enableSourceCodeRender = this._configurationService.getValue('debug').disassemblyView.showSourceCode;
             }
@@ -695,12 +697,12 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
                 startLineNumber: instruction.line,
                 endLineNumber: instruction.endLine,
                 startColumn: instruction.column || 1,
-                endColumn: instruction.endColumn || 1073741824 ,
+                endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
             } : {
                 startLineNumber: instruction.line,
                 endLineNumber: instruction.line,
                 startColumn: instruction.column || 1,
-                endColumn: instruction.endColumn || 1073741824 ,
+                endColumn: instruction.endColumn || Constants.MAX_SAFE_SMALL_INTEGER,
             };
             this.editorService.openEditor({
                 resource: sourceURI,
@@ -709,7 +711,7 @@ let InstructionRenderer = class InstructionRenderer extends Disposable {
                     preserveFocus: false,
                     selection: selection,
                     revealIfOpened: true,
-                    selectionRevealType: 1 ,
+                    selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
                     pinned: false,
                 }
             });

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

@@ -20,6 +20,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { LinkDetector } from './linkDetector.js';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 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';
@@ -57,7 +58,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _fillContainer(container) {
         this.setCssClass('exception-widget');
-        const fontInfo = this.editor.getOption(50 );
+        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
         container.style.fontSize = `${fontInfo.fontSize}px`;
         container.style.lineHeight = `${fontInfo.lineHeight}px`;
         container.tabIndex = 0;
@@ -92,7 +93,7 @@ let ExceptionWidget = class ExceptionWidget extends ZoneWidget {
     }
     _doLayout(_heightInPixel, _widthInPixel) {
         this.container.style.height = 'initial';
-        const lineHeight = this.editor.getOption(67 );
+        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
         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/extensionHostDebugService.js

@@ -4,7 +4,9 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ExtensionHostDebugChannelClient, ExtensionHostDebugBroadcastChannel } from '../../../../platform/debug/common/extensionHostDebugIpc.js';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { isFolderToOpen, isWorkspaceToOpen } from 'vscode/vscode/vs/platform/window/common/window';
 import { toWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, hasWorkspaceFileExtension } from 'vscode/vscode/vs/platform/workspace/common/workspace';
@@ -50,10 +52,10 @@ let BrowserExtensionHostDebugService = class BrowserExtensionHostDebugService ex
             const workspaceId = toWorkspaceIdentifier(contextService.getWorkspace());
             if (isSingleFolderWorkspaceIdentifier(workspaceId) || isWorkspaceIdentifier(workspaceId)) {
                 const serializedWorkspace = isSingleFolderWorkspaceIdentifier(workspaceId) ? { folderUri: workspaceId.uri.toJSON() } : { workspaceUri: workspaceId.configPath.toJSON() };
-                storageService.store(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, JSON.stringify(serializedWorkspace), 0 , 1 );
+                storageService.store(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, JSON.stringify(serializedWorkspace), StorageScope.PROFILE, StorageTarget.MACHINE);
             }
             else {
-                storageService.remove(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, 0 );
+                storageService.remove(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, StorageScope.PROFILE);
             }
         }
     }
@@ -90,7 +92,7 @@ let BrowserExtensionHostDebugService = class BrowserExtensionHostDebugService ex
         }
         const extensionTestsPath = this.findArgument('extensionTestsPath', args);
         if (!debugWorkspace && !extensionTestsPath) {
-            const lastExtensionDevelopmentWorkspace = this.storageService.get(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, 0 );
+            const lastExtensionDevelopmentWorkspace = this.storageService.get(BrowserExtensionHostDebugService_1.LAST_EXTENSION_DEVELOPMENT_WORKSPACE_KEY, StorageScope.PROFILE);
             if (lastExtensionDevelopmentWorkspace) {
                 try {
                     const serializedWorkspace = JSON.parse(lastExtensionDevelopmentWorkspace);

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

@@ -9,6 +9,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ITunnelService } from 'vscode/vscode/vs/platform/tunnel/common/tunnel.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -175,10 +176,10 @@ let LinkDetector = class LinkDetector {
         };
         link.onkeydown = e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.keyCode === 3  || event.keyCode === 10 ) {
+            if (event.keyCode === KeyCode.Enter || event.keyCode === KeyCode.Space) {
                 event.preventDefault();
                 event.stopPropagation();
-                onClick(event.keyCode === 10 );
+                onClick(event.keyCode === KeyCode.Space);
             }
         };
     }

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

@@ -19,6 +19,7 @@ import { ltrim } from 'vscode/vscode/vs/base/common/strings';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
+import { TreeVisibility } from 'vscode/vscode/vs/base/browser/ui/tree/tree';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { WorkbenchCompressibleObjectTree } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -609,16 +610,16 @@ class LoadedScriptsFilter {
     }
     filter(element, parentVisibility) {
         if (!this.filterText) {
-            return 1 ;
+            return TreeVisibility.Visible;
         }
         if (element.isLeaf()) {
             const name = element.getLabel();
             if (name.indexOf(this.filterText) >= 0) {
-                return 1 ;
+                return TreeVisibility.Visible;
             }
-            return 0 ;
+            return TreeVisibility.Hidden;
         }
-        return 2 ;
+        return TreeVisibility.Recurse;
     }
 }
 registerAction2(class Collapse extends ViewAction {