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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-service-override",
-  "version": "5.3.0",
+  "version": "6.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.3.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.1"
   }
 }

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

@@ -44,7 +44,7 @@ import { renderViewTree } from 'vscode/vscode/vs/workbench/contrib/debug/browser
 import { STOP_ID, DISCONNECT_ID, PAUSE_ID, PAUSE_LABEL, CONTINUE_ID, CONTINUE_LABEL, STEP_OVER_ID, STEP_OVER_LABEL, STEP_INTO_ID, STEP_INTO_LABEL, STEP_OUT_ID, STEP_OUT_LABEL, RESTART_SESSION_ID, RESTART_LABEL, STOP_LABEL, DISCONNECT_LABEL } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
 import { callstackViewSession, debugRestartFrame, debugPause, debugContinue, debugStepOver, debugStepInto, debugStepOut, debugRestart, debugStop, debugDisconnect } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { createDisconnectMenuItemAction } from './debugToolBar.js';
-import { CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, isFrameDeemphasized, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { State, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_CALLSTACK_SESSION_IS_ATTACH, CONTEXT_CALLSTACK_ITEM_STOPPED, CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, isFrameDeemphasized, CALLSTACK_VIEW_ID, CONTEXT_DEBUG_STATE, getStateLabel, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { StackFrame, Thread, ThreadAndSessionIds } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
@@ -147,7 +147,7 @@ let CallStackView = class CallStackView extends ViewPane {
                 this.stateMessageLabel.classList.toggle('exception', stoppedDetails.reason === 'exception');
                 this.stateMessage.hidden = false;
             }
-            else if (sessions.length === 1 && sessions[0].state === 3 ) {
+            else if (sessions.length === 1 && sessions[0].state === State.Running) {
                 this.stateMessageLabel.textContent = ( localizeWithPath(_moduleId, 0, "Running"));
                 this.stateMessageLabelHover.update(sessions[0].getLabel());
                 this.stateMessageLabel.classList.remove('exception');
@@ -313,7 +313,7 @@ let CallStackView = class CallStackView extends ViewPane {
             await this.updateTreeSelection();
         }));
         this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
-        if (this.debugService.state === 2 ) {
+        if (this.debugService.state === State.Stopped) {
             this.onCallStackChangeScheduler.schedule(0);
         }
         this._register(this.onDidChangeBodyVisibility(visible => {
@@ -435,7 +435,7 @@ function getSessionContextOverlay(session) {
     return [
         [CONTEXT_CALLSTACK_ITEM_TYPE.key, 'session'],
         [CONTEXT_CALLSTACK_SESSION_IS_ATTACH.key, isSessionAttach(session)],
-        [CONTEXT_CALLSTACK_ITEM_STOPPED.key, session.state === 2 ],
+        [CONTEXT_CALLSTACK_ITEM_STOPPED.key, session.state === State.Stopped],
         [CONTEXT_CALLSTACK_SESSION_HAS_ONE_THREAD.key, session.getAllThreads().length === 1],
     ];
 }
@@ -943,7 +943,7 @@ registerAction2(class Collapse extends ViewAction {
             title: ( localizeWithPath(_moduleId, 13, "Collapse All")),
             f1: false,
             icon: Codicon.collapseAll,
-            precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(2 )))),
+            precondition: ( (CONTEXT_DEBUG_STATE.isEqualTo(getStateLabel(State.Stopped)))),
             menu: {
                 id: MenuId.ViewTitle,
                 order: 10,

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

@@ -1,20 +1,22 @@
+import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { FileAccess } from 'vscode/vscode/vs/base/common/network';
 import { isWeb, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import './media/debug.contribution.css.js';
 import './media/debugHover.css.js';
-import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Extensions as Extensions$3 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Extensions as Extensions$3, ConfigurationScope } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/common/views';
+import { Extensions as Extensions$2, ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { BreakpointEditorContribution } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointEditorContribution';
 import { BreakpointsView } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { CallStackEditorContribution } from 'vscode/vscode/vs/workbench/contrib/debug/browser/callStackEditorContribution';
@@ -39,7 +41,7 @@ import { StatusBarColorProvider } from './statusbarColorProvider.js';
 import { VIEW_MEMORY_ID, SET_VARIABLE_ID, BREAK_WHEN_VALUE_IS_READ_ID, BREAK_WHEN_VALUE_CHANGES_ID, BREAK_WHEN_VALUE_IS_ACCESSED_ID, VariablesView } from './variablesView.js';
 import { ADD_WATCH_ID, ADD_WATCH_LABEL, REMOVE_WATCH_EXPRESSIONS_COMMAND_ID, REMOVE_WATCH_EXPRESSIONS_LABEL, WatchExpressionsView } from './watchExpressionsView.js';
 import { WelcomeView } from './welcomeView.js';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, getStateLabel, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_VARIABLE_VALUE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_FOCUSED_SESSION_IS_NO_DEBUG, CONTEXT_FOCUSED_SESSION_IS_ATTACH, CONTEXT_TERMINATE_DEBUGGEE_SUPPORTED, CONTEXT_SUSPEND_DEBUGGEE_SUPPORTED, CONTEXT_JUMP_TO_CURSOR_SUPPORTED, getStateLabel, State, CONTEXT_CALLSTACK_ITEM_TYPE, CONTEXT_RESTART_FRAME_SUPPORTED, CONTEXT_STACK_FRAME_SUPPORTS_RESTART, CONTEXT_CAN_VIEW_MEMORY, CONTEXT_SET_VARIABLE_SUPPORTED, CONTEXT_VARIABLE_EVALUATE_NAME_PRESENT, CONTEXT_SET_EXPRESSION_SUPPORTED, CONTEXT_VARIABLE_IS_READONLY, CONTEXT_BREAK_WHEN_VALUE_IS_READ_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_CHANGES_SUPPORTED, CONTEXT_BREAK_WHEN_VALUE_IS_ACCESSED_SUPPORTED, CONTEXT_WATCH_ITEM_TYPE, CONTEXT_VARIABLE_VALUE, DEBUG_PANEL_ID, REPL_VIEW_ID, VIEWLET_ID, VARIABLES_VIEW_ID, CONTEXT_DEBUG_UX, WATCH_VIEW_ID, CALLSTACK_VIEW_ID, BREAKPOINTS_VIEW_ID, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_HAS_DEBUGGED, LOADED_SCRIPTS_VIEW_ID, CONTEXT_LOADED_SCRIPTS_SUPPORTED, DISASSEMBLY_VIEW_ID, INTERNAL_CONSOLE_OPTIONS_SCHEMA } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { DebugContentProvider } from '../common/debugContentProvider.js';
 import { DebugLifecycle } from '../common/debugLifecycle.js';
@@ -47,20 +49,21 @@ import '../common/debugVisualizers.js';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
 import { COPY_NOTEBOOK_VARIABLE_VALUE_ID, COPY_NOTEBOOK_VARIABLE_VALUE_LABEL } from '../../notebook/browser/contrib/notebookVariables/notebookVariableCommands.js';
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debug.contribution";
 const debugCategory = ( localizeWithPath(_moduleId, 0, "Debug"));
 registerColors();
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugStatusContribution, 4 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugProgressContribution, 4 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugStatusContribution, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugProgressContribution, LifecyclePhase.Eventually);
 if (isWeb) {
-    ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugTitleContribution, 4 );
+    ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugTitleContribution, LifecyclePhase.Eventually);
 }
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugToolBar, 3 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugContentProvider, 4 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(StatusBarColorProvider, 4 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DisassemblyViewContribution, 4 );
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugLifecycle, 4 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugToolBar, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugContentProvider, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(StatusBarColorProvider, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DisassemblyViewContribution, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(DebugLifecycle, LifecyclePhase.Eventually);
 ( (Registry.as(Extensions$1.Quickaccess))).registerQuickAccessProvider({
     ctor: StartDebugQuickAccessProvider,
     prefix: DEBUG_QUICK_ACCESS_PREFIX,
@@ -79,9 +82,9 @@ if (isWeb) {
     placeholder: ( localizeWithPath(_moduleId, 3, "Type the name of a debug console to open.")),
     helpEntries: [{ description: ( localizeWithPath(_moduleId, 4, "Show All Debug Consoles")), commandId: SELECT_DEBUG_CONSOLE_ID }]
 });
-registerEditorContribution('editor.contrib.callStack', CallStackEditorContribution, 1 );
-registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointEditorContribution, 1 );
-registerEditorContribution(EDITOR_CONTRIBUTION_ID, DebugEditorContribution, 2 );
+registerEditorContribution('editor.contrib.callStack', CallStackEditorContribution, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointEditorContribution, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(EDITOR_CONTRIBUTION_ID, DebugEditorContribution, EditorContributionInstantiation.BeforeFirstInteraction);
 const registerDebugCommandPaletteItem = (id, title, when, precondition) => {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         when: ( (ContextKeyExpr.and(CONTEXT_DEBUGGERS_AVAILABLE, when))),
@@ -127,15 +130,15 @@ registerDebugCommandPaletteItem(SelectionToWatchExpressionsAction.ID, SelectionT
 registerDebugCommandPaletteItem(TOGGLE_INLINE_BREAKPOINT_ID, ( localize2WithPath(_moduleId, 9, "Inline Breakpoint")));
 registerDebugCommandPaletteItem(DEBUG_START_COMMAND_ID, DEBUG_START_LABEL, ( (ContextKeyExpr.and(
     CONTEXT_DEBUGGERS_AVAILABLE,
-     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))
+     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))
 ))));
 registerDebugCommandPaletteItem(DEBUG_RUN_COMMAND_ID, DEBUG_RUN_LABEL, ( (ContextKeyExpr.and(
     CONTEXT_DEBUGGERS_AVAILABLE,
-     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))
+     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))
 ))));
 registerDebugCommandPaletteItem(SELECT_AND_START_ID, SELECT_AND_START_LABEL, ( (ContextKeyExpr.and(
     CONTEXT_DEBUGGERS_AVAILABLE,
-     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(1 )))
+     (CONTEXT_DEBUG_STATE.notEqualsTo(getStateLabel(State.Initializing)))
 ))));
 registerDebugCommandPaletteItem(NEXT_DEBUG_CONSOLE_ID, NEXT_DEBUG_CONSOLE_LABEL);
 registerDebugCommandPaletteItem(PREV_DEBUG_CONSOLE_ID, PREV_DEBUG_CONSOLE_LABEL);
@@ -380,7 +383,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$2.ViewContainersRegistry))).reg
     storageId: DEBUG_PANEL_ID,
     hideIfEmpty: true,
     order: 2,
-}, 1 , { doNotRegisterOpenCommand: true });
+}, ViewContainerLocation.Panel, { doNotRegisterOpenCommand: true });
 ( (Registry.as(Extensions$2.ViewsRegistry))).registerViews([{
         id: REPL_VIEW_ID,
         name: ( localize2WithPath(_moduleId, 35, "Debug Console")),
@@ -392,7 +395,7 @@ const VIEW_CONTAINER = ( (Registry.as(Extensions$2.ViewContainersRegistry))).reg
         openCommandActionDescriptor: {
             id: 'workbench.debug.action.toggleRepl',
             mnemonicTitle: ( localizeWithPath(_moduleId, 36, "De&&bug Console")),
-            keybindings: { primary: 2048  | 1024  | 55  },
+            keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyY },
             order: 2
         }
     }], VIEW_CONTAINER);
@@ -402,14 +405,14 @@ const viewContainer = ( (Registry.as(Extensions$2.ViewContainersRegistry))).regi
     openCommandActionDescriptor: {
         id: VIEWLET_ID,
         mnemonicTitle: ( localizeWithPath(_moduleId, 38, "&&Run")),
-        keybindings: { primary: 2048  | 1024  | 34  },
+        keybindings: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyD },
         order: 3
     },
     ctorDescriptor: ( (new SyncDescriptor(DebugViewPaneContainer))),
     icon: runViewIcon,
     alwaysUseContainerInfo: true,
     order: 3,
-}, 0 );
+}, ViewContainerLocation.Sidebar);
 const viewsRegistry = ( (Registry.as(Extensions$2.ViewsRegistry)));
 viewsRegistry.registerViews([{ id: VARIABLES_VIEW_ID, name: ( localize2WithPath(_moduleId, 39, "Variables")), containerIcon: variablesViewIcon, ctorDescriptor: ( (new SyncDescriptor(VariablesView))), order: 10, weight: 40, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusVariablesView' }, when: ( (CONTEXT_DEBUG_UX.isEqualTo('default'))) }], viewContainer);
 viewsRegistry.registerViews([{ id: WATCH_VIEW_ID, name: ( localize2WithPath(_moduleId, 40, "Watch")), containerIcon: watchViewIcon, ctorDescriptor: ( (new SyncDescriptor(WatchExpressionsView))), order: 20, weight: 10, canToggleVisibility: true, canMoveView: true, focusCommand: { id: 'workbench.debug.action.focusWatchView' }, when: ( (CONTEXT_DEBUG_UX.isEqualTo('default'))) }], viewContainer);
@@ -685,7 +688,7 @@ configurationRegistry.registerConfiguration({
                 ( localizeWithPath(_moduleId, 91, "Don't save any editors before starting a debug session.")),
             ],
             default: 'allEditorsInActiveGroup',
-            scope: 5
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE
         },
         'debug.confirmOnExit': {
             description: ( localizeWithPath(

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

@@ -1,10 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { $ as $$1, append, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { SelectBox } from 'vscode/vscode/vs/base/browser/ui/selectBox/selectBox';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { asCssVariable } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -19,6 +21,7 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ADD_CONFIGURATION_ID } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugCommands';
@@ -81,7 +84,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         this.start.ariaLabel = title;
         this.toDispose.push(addDisposableListener(this.start, EventType.CLICK, () => {
             this.start.blur();
-            if (this.debugService.state !== 1 ) {
+            if (this.debugService.state !== State.Initializing) {
                 this.actionRunner.run(this.action, this.context);
             }
         }));
@@ -98,7 +101,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         }));
         this.toDispose.push(addDisposableListener(this.start, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(17 )) {
+            if (event.equals(KeyCode.RightArrow)) {
                 this.start.tabIndex = -1;
                 this.selectBox.focus();
                 event.stopPropagation();
@@ -118,7 +121,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         this.selectBox.render(append(container, selectBoxContainer));
         this.toDispose.push(addDisposableListener(selectBoxContainer, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(15 )) {
+            if (event.equals(KeyCode.LeftArrow)) {
                 this.selectBox.setFocusable(false);
                 this.start.tabIndex = 0;
                 this.start.focus();
@@ -176,7 +179,7 @@ let StartDebugActionViewItem = class StartDebugActionViewItem extends BaseAction
         this.selected = 0;
         this.debugOptions = [];
         const manager = this.debugService.getConfigurationManager();
-        const inWorkspace = this.contextService.getWorkbenchState() === 3 ;
+        const inWorkspace = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE;
         let lastGroup;
         const disabledIdxs = [];
         manager.getAllConfigurations().forEach(({ launch, name, presentation }) => {
@@ -291,7 +294,7 @@ let FocusSessionActionViewItem = class FocusSessionActionViewItem extends Select
             }
             return label;
         })));
-        this.setOptions(( (names.map(data => ({ text: data })))), session ? sessions.indexOf(session) : undefined);
+        this.setOptions(( (names.map((data) => ({ text: data })))), session ? sessions.indexOf(session) : undefined);
     }
     getSelectedSession() {
         const session = this.debugService.getViewModel().focusedSession;

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

@@ -22,6 +22,7 @@ import { TaskDefinitionRegistry } from 'vscode/vscode/vs/workbench/contrib/tasks
 import { launchSchemaId } from 'vscode/vscode/vs/workbench/services/configuration/common/configuration';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 
 const _moduleId = "vs/workbench/contrib/debug/browser/debugAdapterManager";
@@ -61,7 +62,7 @@ let AdapterManager = class AdapterManager extends Disposable {
         this._register(this.onDidDebuggersExtPointRead(() => {
             this.debugExtensionsAvailable.set(this.debuggers.length > 0);
         }));
-        this.lifecycleService.when(4 )
+        this.lifecycleService.when(LifecyclePhase.Eventually)
             .then(() => this.debugExtensionsAvailable.set(this.debuggers.length > 0));
         this._register(delegate.onDidNewSession(s => {
             this.usedDebugTypes.add(s.configuration.type);

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { flatten, distinct } from 'vscode/vscode/vs/base/common/arrays';
+import { distinct } from 'vscode/vscode/vs/base/common/arrays';
 import { sequence } from 'vscode/vscode/vs/base/common/async';
 import { CancellationTokenSource, CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
@@ -10,6 +10,7 @@ import { joinPath } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ConfigurationTarget } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -17,8 +18,10 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { debugConfigure } from 'vscode/vscode/vs/workbench/contrib/debug/browser/debugIcons';
 import { CONTEXT_DEBUG_CONFIGURATION_TYPE, DebugConfigurationProviderTriggerKind } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
@@ -60,10 +63,10 @@ let ConfigurationManager = class ConfigurationManager {
         this.initLaunches();
         this.setCompoundSchemaValues();
         this.registerListeners();
-        const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, 1 );
-        const previousSelectedType = this.storageService.get(DEBUG_SELECTED_TYPE, 1 );
+        const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, StorageScope.WORKSPACE);
+        const previousSelectedType = this.storageService.get(DEBUG_SELECTED_TYPE, StorageScope.WORKSPACE);
         const previousSelectedLaunch = this.launches.find(l => ( (l.uri.toString())) === previousSelectedRoot);
-        const previousSelectedName = this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, 1 );
+        const previousSelectedName = this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE);
         this.debugConfigurationTypeContext = CONTEXT_DEBUG_CONFIGURATION_TYPE.bindTo(contextKeyService);
         const dynamicConfig = previousSelectedType ? { type: previousSelectedType } : undefined;
         if (previousSelectedLaunch && previousSelectedLaunch.getConfigurationNames().length) {
@@ -212,7 +215,7 @@ let ConfigurationManager = class ConfigurationManager {
                             disposables.add(input.onDidHide(() => resolve(undefined)));
                         })));
                         const nestedPicks = await Promise.all(picks);
-                        const items = flatten(nestedPicks);
+                        const items = nestedPicks.flat();
                         input.items = items;
                         input.busy = false;
                         input.show();
@@ -242,7 +245,7 @@ let ConfigurationManager = class ConfigurationManager {
     }
     removeRecentDynamicConfigurations(name, type) {
         const remaining = this.getRecentDynamicConfigurations().filter(c => c.name !== name || c.type !== type);
-        this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(remaining), 1 , 1 );
+        this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(remaining), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         if (this.selectedConfiguration.name === name && this.selectedType === type && this.selectedDynamic) {
             this.selectConfiguration(undefined, undefined);
         }
@@ -251,7 +254,7 @@ let ConfigurationManager = class ConfigurationManager {
         }
     }
     getRecentDynamicConfigurations() {
-        return JSON.parse(this.storageService.get(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, 1 , '[]'));
+        return JSON.parse(this.storageService.get(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, StorageScope.WORKSPACE, '[]'));
     }
     registerListeners() {
         this.toDispose.push(Event.any(this.contextService.onDidChangeWorkspaceFolders, this.contextService.onDidChangeWorkbenchState)(() => {
@@ -273,7 +276,7 @@ let ConfigurationManager = class ConfigurationManager {
         this.launches = ( (this.contextService.getWorkspace().folders.map(
             folder => this.instantiationService.createInstance(Launch, this, this.adapterManager, folder)
         )));
-        if (this.contextService.getWorkbenchState() === 3 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             this.launches.push(this.instantiationService.createInstance(WorkspaceLaunch, this, this.adapterManager));
         }
         this.launches.push(this.instantiationService.createInstance(UserLaunch, this, this.adapterManager));
@@ -311,7 +314,7 @@ let ConfigurationManager = class ConfigurationManager {
         return this._onDidSelectConfigurationName.event;
     }
     getWorkspaceLaunch() {
-        if (this.contextService.getWorkbenchState() === 3 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             return this.launches[this.launches.length - 1];
         }
         return undefined;
@@ -329,10 +332,10 @@ let ConfigurationManager = class ConfigurationManager {
         const previousSelectedDynamic = this.selectedDynamic;
         this.selectedLaunch = launch;
         if (this.selectedLaunch) {
-            this.storageService.store(DEBUG_SELECTED_ROOT, ( (this.selectedLaunch.uri.toString())), 1 , 1 );
+            this.storageService.store(DEBUG_SELECTED_ROOT, ( (this.selectedLaunch.uri.toString())), StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_SELECTED_ROOT, 1 );
+            this.storageService.remove(DEBUG_SELECTED_ROOT, StorageScope.WORKSPACE);
         }
         const names = launch ? launch.getConfigurationNames() : [];
         this.getSelectedConfig = () => {
@@ -366,7 +369,7 @@ let ConfigurationManager = class ConfigurationManager {
             if (name && dynamicConfig.type) {
                 recentDynamicProviders.unshift({ name, type: dynamicConfig.type });
                 recentDynamicProviders = distinct(recentDynamicProviders, t => `${t.name} : ${t.type}`);
-                this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(recentDynamicProviders), 1 , 1 );
+                this.storageService.store(DEBUG_RECENT_DYNAMIC_CONFIGURATIONS, JSON.stringify(recentDynamicProviders), StorageScope.WORKSPACE, StorageTarget.MACHINE);
             }
         }
         else if (!this.selectedName || names.indexOf(this.selectedName) === -1) {
@@ -379,7 +382,7 @@ let ConfigurationManager = class ConfigurationManager {
         }
         this.selectedType = dynamicConfig?.type || config?.type;
         this.selectedDynamic = !!dynamicConfig;
-        this.storageService.store(DEBUG_SELECTED_TYPE, dynamicConfig ? this.selectedType : undefined, 1 , 1 );
+        this.storageService.store(DEBUG_SELECTED_TYPE, dynamicConfig ? this.selectedType : undefined, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         if (type) {
             this.debugConfigurationTypeContext.set(type);
         }
@@ -393,10 +396,10 @@ let ConfigurationManager = class ConfigurationManager {
     setSelectedLaunchName(selectedName) {
         this.selectedName = selectedName;
         if (this.selectedName) {
-            this.storageService.store(DEBUG_SELECTED_CONFIG_NAME_KEY, this.selectedName, 1 , 1 );
+            this.storageService.store(DEBUG_SELECTED_CONFIG_NAME_KEY, this.selectedName, StorageScope.WORKSPACE, StorageTarget.MACHINE);
         }
         else {
-            this.storageService.remove(DEBUG_SELECTED_CONFIG_NAME_KEY, 1 );
+            this.storageService.remove(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE);
         }
     }
     dispose() {
@@ -457,13 +460,13 @@ class AbstractLaunch {
         const configuration = config.configurations.find(config => config && config.name === name);
         if (configuration) {
             if (this instanceof UserLaunch) {
-                configuration.__configurationTarget = 2 ;
+                configuration.__configurationTarget = ConfigurationTarget.USER;
             }
             else if (this instanceof WorkspaceLaunch) {
-                configuration.__configurationTarget = 5 ;
+                configuration.__configurationTarget = ConfigurationTarget.WORKSPACE;
             }
             else {
-                configuration.__configurationTarget = 6 ;
+                configuration.__configurationTarget = ConfigurationTarget.WORKSPACE_FOLDER;
             }
         }
         return configuration;
@@ -555,7 +558,7 @@ let Launch = class Launch extends AbstractLaunch {
             fullConfig.configurations = [];
         }
         fullConfig.configurations.push(configuration);
-        await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri }, 6 );
+        await this.configurationService.updateValue('launch', fullConfig, { resource: this.workspace.uri }, ConfigurationTarget.WORKSPACE_FOLDER);
     }
 };
 Launch = ( (__decorate([
@@ -588,7 +591,7 @@ let WorkspaceLaunch = class WorkspaceLaunch extends AbstractLaunch {
         if (!launchExistInFile) {
             const content = await this.getInitialConfigurationContent(undefined, type, useInitialConfigs, token);
             if (content) {
-                await this.configurationService.updateValue('launch', parse(content), 5 );
+                await this.configurationService.updateValue('launch', parse(content), ConfigurationTarget.WORKSPACE);
             }
             else {
                 return { editor: null, created: false };

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

@@ -1,6 +1,6 @@
 import { getDomNodePagePosition } from 'vscode/vscode/vs/base/browser/dom';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeyCode, KeyChord, KeyMod } from 'vscode/vscode/vs/base/common/keyCodes';
 import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
@@ -12,12 +12,13 @@ import { Action2, MenuId, registerAction2 } from 'vscode/vscode/vs/platform/acti
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { PanelFocusContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { openBreakpointSource } from 'vscode/vscode/vs/workbench/contrib/debug/browser/breakpointsView';
 import { DisassemblyView } from './disassemblyView.js';
-import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, REPL_VIEW_ID, WATCH_VIEW_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_DISASSEMBLY_VIEW_FOCUS, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, CONTEXT_FOCUSED_STACK_FRAME_HAS_INSTRUCTION_POINTER_REFERENCE, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE, CONTEXT_DISASSEMBLE_REQUEST_SUPPORTED, CONTEXT_LANGUAGE_SUPPORTS_DISASSEMBLE_REQUEST, CONTEXT_CALLSTACK_ITEM_TYPE, REPL_VIEW_ID, WATCH_VIEW_ID, EDITOR_CONTRIBUTION_ID, CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 import { DisassemblyViewInput } from 'vscode/vscode/vs/workbench/contrib/debug/common/disassemblyViewInput';
@@ -35,8 +36,8 @@ class ToggleBreakpointAction extends Action2 {
             precondition: CONTEXT_DEBUGGERS_AVAILABLE,
             keybinding: {
                 when: ( (ContextKeyExpr.or(EditorContextKeys.editorTextFocus, CONTEXT_DISASSEMBLY_VIEW_FOCUS))),
-                primary: 67 ,
-                weight: 100
+                primary: KeyCode.F9,
+                weight: KeybindingWeight.EditorContrib
             },
             menu: {
                 id: MenuId.MenubarDebugMenu,
@@ -104,7 +105,7 @@ class ConditionalBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, 0 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, undefined, BreakpointWidgetContext.CONDITION);
         }
     }
 }
@@ -130,7 +131,7 @@ class LogPointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 2 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.LOG_MESSAGE);
         }
     }
 }
@@ -156,7 +157,7 @@ class TriggerByBreakpointAction extends EditorAction {
         const debugService = accessor.get(IDebugService);
         const position = editor.getPosition();
         if (position && editor.hasModel() && debugService.canSetBreakpointsIn(editor.getModel())) {
-            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, 3 );
+            editor.getContribution(BREAKPOINT_EDITOR_CONTRIBUTION_ID)?.showBreakpointWidget(position.lineNumber, position.column, BreakpointWidgetContext.TRIGGER_POINT);
         }
     }
 }
@@ -397,8 +398,8 @@ class ShowDebugHoverAction extends EditorAction {
             precondition: CONTEXT_IN_DEBUG_MODE,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 39 ),
-                weight: 100
+                primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -549,8 +550,8 @@ class CloseExceptionWidgetAction extends EditorAction {
             alias: 'Close Exception Widget',
             precondition: CONTEXT_EXCEPTION_WIDGET_VISIBLE,
             kbOpts: {
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }