@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js

@@ -12,7 +12,7 @@ import { IFileService } from '../../../../platform/files/common/files.service.js
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.service.js';
-import { createEditorOpenError } from '../../../common/editor.js';
+import { Verbosity, createEditorOpenError, EditorInputCapabilities } from '../../../common/editor.js';
 import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
 import { ICustomEditorService } from '../common/customEditor.service.js';
 import { IWebviewService } from '../../webview/browser/webview.service.js';
@@ -100,23 +100,23 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         return this.viewType;
     }
     get capabilities() {
-        let capabilities = 0 ;
-        capabilities |= 128 ;
+        let capabilities = EditorInputCapabilities.None;
+        capabilities |= EditorInputCapabilities.CanDropIntoEditor;
         if (!this.customEditorService.getCustomEditorCapabilities(this.viewType)?.supportsMultipleEditorsPerDocument) {
-            capabilities |= 8 ;
+            capabilities |= EditorInputCapabilities.Singleton;
         }
         if (this._modelRef) {
             if (this._modelRef.object.isReadonly()) {
-                capabilities |= 2 ;
+                capabilities |= EditorInputCapabilities.Readonly;
             }
         }
         else {
             if (this.filesConfigurationService.isReadonly(this.resource)) {
-                capabilities |= 2 ;
+                capabilities |= EditorInputCapabilities.Readonly;
             }
         }
         if (this.resource.scheme === Schemas.untitled) {
-            capabilities |= 4 ;
+            capabilities |= EditorInputCapabilities.Untitled;
         }
         return capabilities;
     }
@@ -126,13 +126,13 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         }
         return this._editorName;
     }
-    getDescription(verbosity = 1 ) {
+    getDescription(verbosity = Verbosity.MEDIUM) {
         switch (verbosity) {
-            case 0 :
+            case Verbosity.SHORT:
                 return this.shortDescription;
-            case 2 :
+            case Verbosity.LONG:
                 return this.longDescription;
-            case 1 :
+            case Verbosity.MEDIUM:
             default:
                 return this.mediumDescription;
         }
@@ -175,12 +175,12 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
     }
     getTitle(verbosity) {
         switch (verbosity) {
-            case 0 :
+            case Verbosity.SHORT:
                 return this.shortTitle;
-            case 2 :
+            case Verbosity.LONG:
                 return this.longTitle;
             default:
-            case 1 :
+            case Verbosity.MEDIUM:
                 return this.mediumTitle;
         }
     }

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

@@ -7,6 +7,7 @@ import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { createMatches } from '../../../../base/common/filters.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { toDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -222,8 +223,8 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const toDispose = [
             inputBox,
             addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
-                const isEscape = e.equals(9 );
-                const isEnter = e.equals(3 );
+                const isEscape = e.equals(KeyCode.Escape);
+                const isEnter = e.equals(KeyCode.Enter);
                 if (isEscape || isEnter) {
                     e.preventDefault();
                     e.stopPropagation();

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

@@ -15,9 +15,11 @@ import Severity$1 from '../../../../base/common/severity.js';
 import { noBreakWhitespace } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
+import { MouseTargetType, ContentWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-import { GlyphMarginLane, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { GlyphMarginLane, TrackedRangeStickiness, OverviewRulerLane } from '../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -41,7 +43,7 @@ import { GutterActionsRegistry } from '../../codeEditor/browser/editorLineNumber
 import { getBreakpointMessageAndIcon } from './breakpointsView.js';
 import { BreakpointWidget } from './breakpointWidget.js';
 import { debugBreakpointHint, allBreakpoints, debugBreakpointUnsupported, breakpoint, debugStackframeFocused, debugStackframe } from './debugIcons.js';
-import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, DebuggerString } from '../common/debug.js';
+import { BREAKPOINT_EDITOR_CONTRIBUTION_ID, CONTEXT_BREAKPOINT_WIDGET_VISIBLE, BreakpointWidgetContext, State, DebuggerString } from '../common/debug.js';
 import { IDebugService } from '../common/debug.service.js';
 const _moduleId = "vs/workbench/contrib/debug/browser/breakpointEditorContribution";
 const $ = $$1;
@@ -50,7 +52,7 @@ const breakpointHelperDecoration = {
     glyphMarginClassName: ThemeIcon.asClassName(debugBreakpointHint),
     glyphMargin: { position: GlyphMarginLane.Right },
     glyphMarginHoverMessage: ( (new MarkdownString())).appendText(( localizeWithPath(_moduleId, 0, "Click to add a breakpoint"))),
-    stickiness: 1
+    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
 };
 function createBreakpointDecorations(accessor, model, breakpoints, state, breakpointsActivated, showBreakpointsInOverviewRuler) {
     const result = [];
@@ -129,7 +131,7 @@ function getBreakpointDecorationOptions(accessor, model, breakpoint, state, brea
         glyphMargin: { position: GlyphMarginLane.Right },
         glyphMarginClassName: ThemeIcon.asClassName(icon),
         glyphMarginHoverMessage,
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         before: renderInline ? {
             content: noBreakWhitespace,
             inlineClassName: `debug-breakpoint-placeholder`,
@@ -175,7 +177,7 @@ function createCandidateDecorations(model, breakpointDecorations, lineBreakpoint
                 range,
                 options: {
                     description: 'breakpoint-placeholder-decoration',
-                    stickiness: 1 ,
+                    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
                     before: breakpointAtPosition ? undefined : {
                         content: noBreakWhitespace,
                         inlineClassName: `debug-breakpoint-placeholder`,
@@ -226,7 +228,7 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
             const model = this.editor.getModel();
             if (!e.target.position
                 || !model
-                || e.target.type !== 2
+                || e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN
                 || e.target.detail.isAfterLines
                 || !this.marginFreeFromNonDebugDecorations(e.target.position.lineNumber)
                     && !e.target.element?.className.includes('breakpoint')) {
@@ -297,13 +299,13 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
                             let context;
                             switch (action) {
                                 case 'logpoint':
-                                    context = 2 ;
+                                    context = BreakpointWidgetContext.LOG_MESSAGE;
                                     break;
                                 case 'conditionalBreakpoint':
-                                    context = 0 ;
+                                    context = BreakpointWidgetContext.CONDITION;
                                     break;
                                 case 'triggeredBreakpoint':
-                                    context = 3 ;
+                                    context = BreakpointWidgetContext.TRIGGER_POINT;
                             }
                             this.showBreakpointWidget(lineNumber, undefined, context);
                         }
@@ -321,7 +323,7 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
                 }
                 let showBreakpointHintAtLineNumber = -1;
                 const model = this.editor.getModel();
-                if (model && e.target.position && ((e.target.type === 2  || e.target.type === 3) ) && this.debugService.canSetBreakpointsIn(model) &&
+                if (model && e.target.position && (e.target.type === MouseTargetType.GUTTER_GLYPH_MARGIN || e.target.type === MouseTargetType.GUTTER_LINE_NUMBERS) && this.debugService.canSetBreakpointsIn(model) &&
                     this.marginFreeFromNonDebugDecorations(e.target.position.lineNumber)) {
                     const data = e.target.detail;
                     if (!data.isAfterLines) {
@@ -390,11 +392,11 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
         }
         else {
             actions.push(( (new Action('addBreakpoint', ( localizeWithPath(_moduleId, 26, "Add Breakpoint")), undefined, true, () => this.debugService.addBreakpoints(uri, [{ lineNumber, column }])))));
-            actions.push(( (new Action('addConditionalBreakpoint', ( localizeWithPath(_moduleId, 27, "Add Conditional Breakpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 0 ))))));
-            actions.push(( (new Action('addLogPoint', ( localizeWithPath(_moduleId, 28, "Add Logpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 2 ))))));
-            actions.push(( (new Action('addTriggeredBreakpoint', ( localizeWithPath(_moduleId, 29, "Add Triggered Breakpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 3 ))))));
+            actions.push(( (new Action('addConditionalBreakpoint', ( localizeWithPath(_moduleId, 27, "Add Conditional Breakpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, BreakpointWidgetContext.CONDITION))))));
+            actions.push(( (new Action('addLogPoint', ( localizeWithPath(_moduleId, 28, "Add Logpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, BreakpointWidgetContext.LOG_MESSAGE))))));
+            actions.push(( (new Action('addTriggeredBreakpoint', ( localizeWithPath(_moduleId, 29, "Add Triggered Breakpoint...")), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, BreakpointWidgetContext.TRIGGER_POINT))))));
         }
-        if (this.debugService.state === 2 ) {
+        if (this.debugService.state === State.Stopped) {
             actions.push(( (new Separator())));
             actions.push(( (new Action('runToLine', ( localizeWithPath(_moduleId, 30, "Run to Line")), undefined, true, () => this.debugService.runTo(uri, lineNumber).catch(onUnexpectedError)))));
         }
@@ -652,14 +654,14 @@ class InlineBreakpointWidget {
             });
         }));
         const updateSize = () => {
-            const lineHeight = this.editor.getOption(67 );
+            const lineHeight = this.editor.getOption(EditorOption.lineHeight);
             this.domNode.style.height = `${lineHeight}px`;
             this.domNode.style.width = `${Math.ceil(0.8 * lineHeight)}px`;
             this.domNode.style.marginLeft = `4px`;
         };
         updateSize();
         this.toDispose.push(this.editor.onDidChangeConfiguration(c => {
-            if (c.hasChanged(52 ) || c.hasChanged(67 )) {
+            if (c.hasChanged(EditorOption.fontSize) || c.hasChanged(EditorOption.lineHeight)) {
                 updateSize();
             }
         }));
@@ -677,7 +679,7 @@ class InlineBreakpointWidget {
         this.domNode.classList.toggle('line-start', this.range.startColumn === 1);
         return {
             position: { lineNumber: this.range.startLineNumber, column: this.range.startColumn - 1 },
-            preference: [0 ]
+            preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
     dispose() {

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

@@ -4,15 +4,18 @@ import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
 import './media/breakpointWidget.css.js';
 import { EditorCommand, registerEditorCommand } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { CompletionItemKind } from '../../../../editor/common/languages.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
@@ -26,6 +29,7 @@ import { IContextViewService } from '../../../../platform/contextview/browser/co
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { defaultSelectBoxStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import '../../../../platform/theme/common/colorUtils.js';
@@ -41,7 +45,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
-import { CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BREAKPOINT_EDITOR_CONTRIBUTION_ID, DEBUG_SCHEME } from '../common/debug.js';
+import { CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BREAKPOINT_EDITOR_CONTRIBUTION_ID, BreakpointWidgetContext, DEBUG_SCHEME } from '../common/debug.js';
 import { IDebugService } from '../common/debug.service.js';
 import { IPrivateBreakpointWidgetService } from './breakpointWidget.service.js';
 const _moduleId = "vs/workbench/contrib/debug/browser/breakpointWidget";
@@ -100,16 +104,16 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         }
         if (context === undefined) {
             if (this.breakpoint && !this.breakpoint.condition && !this.breakpoint.hitCondition && this.breakpoint.logMessage) {
-                this.context = 2 ;
+                this.context = BreakpointWidgetContext.LOG_MESSAGE;
             }
             else if (this.breakpoint && !this.breakpoint.condition && this.breakpoint.hitCondition) {
-                this.context = 1 ;
+                this.context = BreakpointWidgetContext.HIT_COUNT;
             }
             else if (this.breakpoint && this.breakpoint.triggeredBy) {
-                this.context = 3 ;
+                this.context = BreakpointWidgetContext.TRIGGER_POINT;
             }
             else {
-                this.context = 0 ;
+                this.context = BreakpointWidgetContext.CONDITION;
             }
         }
         else {
@@ -127,7 +131,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         const acceptString = this.keybindingService.lookupKeybinding(AcceptBreakpointWidgetInputAction.ID)?.getLabel() || 'Enter';
         const closeString = this.keybindingService.lookupKeybinding(CloseBreakpointWidgetCommand.ID)?.getLabel() || 'Escape';
         switch (this.context) {
-            case 2 :
+            case BreakpointWidgetContext.LOG_MESSAGE:
                 return ( localizeWithPath(
                     _moduleId,
                     0,
@@ -135,7 +139,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
                     acceptString,
                     closeString
                 ));
-            case 1 :
+            case BreakpointWidgetContext.HIT_COUNT:
                 return ( localizeWithPath(
                     _moduleId,
                     1,
@@ -155,22 +159,22 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     getInputValue(breakpoint) {
         switch (this.context) {
-            case 2 :
+            case BreakpointWidgetContext.LOG_MESSAGE:
                 return breakpoint && breakpoint.logMessage ? breakpoint.logMessage : this.logMessageInput;
-            case 1 :
+            case BreakpointWidgetContext.HIT_COUNT:
                 return breakpoint && breakpoint.hitCondition ? breakpoint.hitCondition : this.hitCountInput;
             default:
                 return breakpoint && breakpoint.condition ? breakpoint.condition : this.conditionInput;
         }
     }
     rememberInput() {
-        if (this.context !== 3 ) {
+        if (this.context !== BreakpointWidgetContext.TRIGGER_POINT) {
             const value = this.input.getModel().getValue();
             switch (this.context) {
-                case 2 :
+                case BreakpointWidgetContext.LOG_MESSAGE:
                     this.logMessageInput = value;
                     break;
-                case 1 :
+                case BreakpointWidgetContext.HIT_COUNT:
                     this.hitCountInput = value;
                     break;
                 default:
@@ -180,7 +184,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     setInputMode() {
         if (this.editor.hasModel()) {
-            const languageId = this.context === 2  ? PLAINTEXT_LANGUAGE_ID : this.editor.getModel().getLanguageId();
+            const languageId = this.context === BreakpointWidgetContext.LOG_MESSAGE ? PLAINTEXT_LANGUAGE_ID : this.editor.getModel().getLanguageId();
             this.input.getModel().setLanguage(languageId);
         }
     }
@@ -279,7 +283,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         this.selectBreakpointContainer = $('.select-breakpoint-container');
         this.toDispose.push(addDisposableListener(this.selectBreakpointContainer, EventType.KEY_DOWN, e => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if (event.equals(9 )) {
+            if (event.equals(KeyCode.Escape)) {
                 this.close(false);
             }
         }));
@@ -293,7 +297,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         this.toDispose.push(closeButton);
     }
     updateContextInput() {
-        if (this.context === 3 ) {
+        if (this.context === BreakpointWidgetContext.TRIGGER_POINT) {
             this.inputContainer.hidden = true;
             this.selectBreakpointContainer.hidden = false;
         }
@@ -346,13 +350,10 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
             provideCompletionItems: (model, position, _context, token) => {
                 let suggestionsPromise;
                 const underlyingModel = this.editor.getModel();
-                if (underlyingModel && (this.context === 0  || (this.context === 2  && isPositionInCurlyBracketBlock(this.input)))) {
-                    suggestionsPromise = provideSuggestionItems(this.languageFeaturesService.completionProvider, underlyingModel, ( (new Position(this.lineNumber, 1))), ( (new CompletionOptions(
-                        undefined,
-                        ( (new Set())).add(27 )
-                    ))), _context, token).then(suggestions => {
+                if (underlyingModel && (this.context === BreakpointWidgetContext.CONDITION || (this.context === BreakpointWidgetContext.LOG_MESSAGE && isPositionInCurlyBracketBlock(this.input)))) {
+                    suggestionsPromise = provideSuggestionItems(this.languageFeaturesService.completionProvider, underlyingModel, ( (new Position(this.lineNumber, 1))), ( (new CompletionOptions(undefined, ( (new Set())).add(CompletionItemKind.Snippet)))), _context, token).then(suggestions => {
                         let overwriteBefore = 0;
-                        if (this.context === 0 ) {
+                        if (this.context === BreakpointWidgetContext.CONDITION) {
                             overwriteBefore = position.column - 1;
                         }
                         else {
@@ -394,7 +395,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
     }
     centerInputVertically() {
         if (this.container && typeof this.heightInPx === 'number') {
-            const lineHeight = this.input.getOption(67 );
+            const lineHeight = this.input.getOption(EditorOption.lineHeight);
             const lineNum = this.input.getModel().getLineCount();
             const newTopMargin = (this.heightInPx - lineNum * lineHeight) / 2;
             this.inputContainer.style.marginTop = newTopMargin + 'px';
@@ -409,20 +410,20 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
             let mode = this.breakpoint?.mode;
             let modeLabel = this.breakpoint?.modeLabel;
             this.rememberInput();
-            if (this.conditionInput || this.context === 0 ) {
+            if (this.conditionInput || this.context === BreakpointWidgetContext.CONDITION) {
                 condition = this.conditionInput;
             }
-            if (this.hitCountInput || this.context === 1 ) {
+            if (this.hitCountInput || this.context === BreakpointWidgetContext.HIT_COUNT) {
                 hitCondition = this.hitCountInput;
             }
-            if (this.logMessageInput || this.context === 2 ) {
+            if (this.logMessageInput || this.context === BreakpointWidgetContext.LOG_MESSAGE) {
                 logMessage = this.logMessageInput;
             }
             if (this.selectModeBox) {
                 mode = this.modeInput?.mode;
                 modeLabel = this.modeInput?.label;
             }
-            if (this.context === 3 ) {
+            if (this.context === BreakpointWidgetContext.TRIGGER_POINT) {
                 condition = undefined;
                 hitCondition = undefined;
                 logMessage = undefined;
@@ -460,7 +461,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
         this.dispose();
     }
     focusInput() {
-        if (this.context === 3 ) {
+        if (this.context === BreakpointWidgetContext.TRIGGER_POINT) {
             this.selectBreakpointBox.focus();
         }
         else {
@@ -496,8 +497,8 @@ class AcceptBreakpointWidgetInputAction extends EditorCommand {
             precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
             kbOpts: {
                 kbExpr: CONTEXT_IN_BREAKPOINT_WIDGET,
-                primary: 3 ,
-                weight: 100
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -513,9 +514,9 @@ class CloseBreakpointWidgetCommand extends EditorCommand {
             precondition: CONTEXT_BREAKPOINT_WIDGET_VISIBLE,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 9 ,
-                secondary: [1024  | 9 ],
-                weight: 100
+                primary: KeyCode.Escape,
+                secondary: [KeyMod$1.Shift | KeyCode.Escape],
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }

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

@@ -5,14 +5,17 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import '../../../../base/browser/ui/splitview/splitview.js';
 import { Action } from '../../../../base/common/actions.js';
 import { equals } from '../../../../base/common/arrays.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { dispose } from '../../../../base/common/lifecycle.js';
 import { basenameOrAuthority, dirname } from '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
@@ -23,6 +26,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
@@ -36,13 +40,14 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { ViewPane, ViewAction } from '../../../browser/parts/views/viewPane.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { breakpoint, dataBreakpoint, functionBreakpoint, logBreakpoint, conditionalBreakpoint, debugBreakpointUnsupported, watchExpressionsAddFuncBreakpoint, watchExpressionsAddDataBreakpoint, breakpointsActivate, breakpointsRemoveAll } from './debugIcons.js';
-import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DEBUG_SCHEME, DebuggerString, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
+import { CONTEXT_BREAKPOINT_ITEM_TYPE, CONTEXT_BREAKPOINT_ITEM_IS_DATA_BYTES, CONTEXT_BREAKPOINT_HAS_MODES, CONTEXT_BREAKPOINT_SUPPORTS_CONDITION, CONTEXT_BREAKPOINT_INPUT_FOCUSED, CONTEXT_BREAKPOINTS_FOCUSED, DataBreakpointSetType, State, DEBUG_SCHEME, DebuggerString, BREAKPOINTS_VIEW_ID, CONTEXT_DEBUGGERS_AVAILABLE, CONTEXT_SET_DATA_BREAKPOINT_BYTES_SUPPORTED, CONTEXT_BREAKPOINTS_EXIST, CONTEXT_IN_DEBUG_MODE, BREAKPOINT_EDITOR_CONTRIBUTION_ID } from '../common/debug.js';
 import { IDebugService } from '../common/debug.service.js';
 import { Breakpoint, DataBreakpoint, FunctionBreakpoint, InstructionBreakpoint, ExceptionBreakpoint } from '../common/debugModel.js';
 import { DisassemblyViewInput } from '../common/disassemblyViewInput.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 var BreakpointsRenderer_1, FunctionBreakpointsRenderer_1, DataBreakpointsRenderer_1, InstructionBreakpointsRenderer_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/breakpointsView";
 const $ = $$1;
@@ -218,7 +223,7 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
         const session = this.debugService.getViewModel().focusedSession;
         const conditionSupported = element instanceof ExceptionBreakpoint ? element.supportsCondition : (!session || !!session.capabilities.supportsConditionalBreakpoints);
         this.breakpointSupportsCondition.set(conditionSupported);
-        this.breakpointIsDataBytes.set(element instanceof DataBreakpoint && element.src.type === 1 );
+        this.breakpointIsDataBytes.set(element instanceof DataBreakpoint && element.src.type === DataBreakpointSetType.Address);
         const secondary = [];
         createAndFillInContextMenuActions(this.menu, { arg: e.element, shouldForwardArgs: false }, { primary: [], secondary }, 'inline');
         this.contextMenuService.showContextMenu({
@@ -230,8 +235,8 @@ let BreakpointsView = class BreakpointsView extends ViewPane {
     updateSize() {
         const containerModel = this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerByViewId(this.id));
         const sessionId = this.debugService.getViewModel().focusedSession?.getId();
-        this.minimumBodySize = this.orientation === 0  ? getExpandedBodySize(this.debugService.getModel(), sessionId, MAX_VISIBLE_BREAKPOINTS) : 170;
-        this.maximumBodySize = this.orientation === 0  && containerModel.visibleViewDescriptors.length > 1 ? getExpandedBodySize(this.debugService.getModel(), sessionId, Number.POSITIVE_INFINITY) : Number.POSITIVE_INFINITY;
+        this.minimumBodySize = this.orientation === Orientation.VERTICAL ? getExpandedBodySize(this.debugService.getModel(), sessionId, MAX_VISIBLE_BREAKPOINTS) : 170;
+        this.maximumBodySize = this.orientation === Orientation.VERTICAL && containerModel.visibleViewDescriptors.length > 1 ? getExpandedBodySize(this.debugService.getModel(), sessionId, Number.POSITIVE_INFINITY) : Number.POSITIVE_INFINITY;
     }
     updateBreakpointsHint(delayed = false) {
         if (!this.hintContainer) {
@@ -428,7 +433,7 @@ let BreakpointsRenderer = class BreakpointsRenderer {
         const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
-        const debugActive = this.debugService.state === 3  || this.debugService.state === 2 ;
+        const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
         if (debugActive && !breakpoint.verified) {
             data.breakpoint.classList.add('disabled');
         }
@@ -672,7 +677,7 @@ let DataBreakpointsRenderer = class DataBreakpointsRenderer {
         this.breakpointSupportsCondition.set(!session || !!session.capabilities.supportsConditionalBreakpoints);
         this.breakpointHasMultipleModes.set(this.debugService.getModel().getBreakpointModes('data').length > 1);
         this.breakpointItemType.set('dataBreakpoint');
-        this.breakpointIsDataBytes.set(dataBreakpoint.src.type === 1 );
+        this.breakpointIsDataBytes.set(dataBreakpoint.src.type === DataBreakpointSetType.Address);
         createAndFillInActionBarActions(this.menu, { arg: dataBreakpoint, shouldForwardArgs: true }, { primary, secondary: [] }, 'inline');
         data.actionBar.clear();
         data.actionBar.push(primary, { icon: true, label: false });
@@ -727,7 +732,7 @@ let InstructionBreakpointsRenderer = class InstructionBreakpointsRenderer {
         const { message, icon } = getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), breakpoint, this.labelService, this.debugService.getModel());
         data.icon.className = ThemeIcon.asClassName(icon);
         data.toDispose.push(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), data.breakpoint, breakpoint.message || message || ''));
-        const debugActive = this.debugService.state === 3  || this.debugService.state === 2 ;
+        const debugActive = this.debugService.state === State.Running || this.debugService.state === State.Stopped;
         if (debugActive && !breakpoint.verified) {
             data.breakpoint.classList.add('disabled');
         }
@@ -805,8 +810,8 @@ class FunctionBreakpointInputRenderer {
             }
         };
         toDispose.push(addStandardDisposableListener(inputBox.inputElement, 'keydown', (e) => {
-            const isEscape = e.equals(9 );
-            const isEnter = e.equals(3 );
+            const isEscape = e.equals(KeyCode.Escape);
+            const isEnter = e.equals(KeyCode.Enter);
             if (isEscape || isEnter) {
                 e.preventDefault();
                 e.stopPropagation();
@@ -911,8 +916,8 @@ class DataBreakpointInputRenderer {
             }
         };
         toDispose.push(addStandardDisposableListener(inputBox.inputElement, 'keydown', (e) => {
-            const isEscape = e.equals(9 );
-            const isEnter = e.equals(3 );
+            const isEscape = e.equals(KeyCode.Escape);
+            const isEnter = e.equals(KeyCode.Enter);
             if (isEscape || isEnter) {
                 e.preventDefault();
                 e.stopPropagation();
@@ -1000,8 +1005,8 @@ class ExceptionBreakpointInputRenderer {
             this.debugService.setExceptionBreakpointCondition(template.breakpoint, newCondition);
         };
         toDispose.push(addStandardDisposableListener(inputBox.inputElement, 'keydown', (e) => {
-            const isEscape = e.equals(9 );
-            const isEnter = e.equals(3 );
+            const isEscape = e.equals(KeyCode.Escape);
+            const isEnter = e.equals(KeyCode.Enter);
             if (isEscape || isEnter) {
                 e.preventDefault();
                 e.stopPropagation();
@@ -1059,19 +1064,19 @@ class BreakpointsAccessibilityProvider {
     }
 }
 function openBreakpointSource(breakpoint, sideBySide, preserveFocus, pinned, debugService, editorService) {
-    if (breakpoint.uri.scheme === DEBUG_SCHEME && debugService.state === 0 ) {
+    if (breakpoint.uri.scheme === DEBUG_SCHEME && debugService.state === State.Inactive) {
         return Promise.resolve(undefined);
     }
     const selection = breakpoint.endLineNumber ? {
         startLineNumber: breakpoint.lineNumber,
         endLineNumber: breakpoint.endLineNumber,
         startColumn: breakpoint.column || 1,
-        endColumn: breakpoint.endColumn || 1073741824
+        endColumn: breakpoint.endColumn || Constants.MAX_SAFE_SMALL_INTEGER
     } : {
         startLineNumber: breakpoint.lineNumber,
         startColumn: breakpoint.column || 1,
         endLineNumber: breakpoint.lineNumber,
-        endColumn: breakpoint.column || 1073741824
+        endColumn: breakpoint.column || Constants.MAX_SAFE_SMALL_INTEGER
     };
     return editorService.openEditor({
         resource: breakpoint.uri,
@@ -1079,13 +1084,13 @@ function openBreakpointSource(breakpoint, sideBySide, preserveFocus, pinned, deb
             preserveFocus,
             selection,
             revealIfOpened: true,
-            selectionRevealType: 1 ,
+            selectionRevealType: TextEditorSelectionRevealType.CenterIfOutsideViewport,
             pinned
         }
     }, sideBySide ? SIDE_GROUP : ACTIVE_GROUP);
 }
 function getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint$1, labelService, debugModel) {
-    const debugActive = state === 3  || state === 2 ;
+    const debugActive = state === State.Running || state === State.Stopped;
     const breakpointIcon = breakpoint$1 instanceof DataBreakpoint ? dataBreakpoint : breakpoint$1 instanceof FunctionBreakpoint ? functionBreakpoint : breakpoint$1.logMessage ? logBreakpoint : breakpoint;
     if (!breakpoint$1.enabled || !breakpointsActivated) {
         return {
@@ -1249,7 +1254,7 @@ class MemoryBreakpointAction extends Action2 {
             return;
         }
         let defaultValue = undefined;
-        if (existingBreakpoint && existingBreakpoint.src.type === 1 ) {
+        if (existingBreakpoint && existingBreakpoint.src.type === DataBreakpointSetType.Address) {
             defaultValue = `${existingBreakpoint.src.address} + ${existingBreakpoint.src.bytes}`;
         }
         const quickInput = accessor.get(IQuickInputService);
@@ -1283,7 +1288,7 @@ class MemoryBreakpointAction extends Action2 {
             }
             accessType = selectedAccessType.label;
         }
-        const src = { type: 1 , ...range };
+        const src = { type: DataBreakpointSetType.Address, ...range };
         if (existingBreakpoint) {
             await debugService.removeDataBreakpoints(existingBreakpoint.getId());
         }

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

@@ -2,8 +2,9 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { distinct } from '../../../../base/common/arrays.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { GlyphMarginLane, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { GlyphMarginLane, OverviewRulerLane, TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
@@ -34,7 +35,7 @@ const focusedStackFrameColor = registerColor('editor.focusedStackFrameHighlightB
     1,
     'Background color for the highlight of line at focused stack frame position.'
 )));
-const stickiness = 1 ;
+const stickiness = TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges;
 const TOP_STACK_FRAME_MARGIN = {
     description: 'top-stack-frame-margin',
     glyphMarginClassName: ThemeIcon.asClassName(debugStackframe),
@@ -75,7 +76,7 @@ function createDecorationsForStackFrame(stackFrame, isFocusedSession, noCharacte
         stackFrame.range.startLineNumber,
         stackFrame.range.startColumn,
         stackFrame.range.startLineNumber,
-        1073741824
+        Constants.MAX_SAFE_SMALL_INTEGER
     )));
     const range = ( (new Range(
         stackFrame.range.startLineNumber,