@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/contrib/comment/browser/blockCommentCommand.js

@@ -1,3 +1,4 @@
+import { CharCode } from '../../../../base/common/charCode.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
@@ -24,10 +25,10 @@ class BlockCommentCommand {
             if (codeA === codeB) {
                 continue;
             }
-            if (codeA >= 65  && codeA <= 90  && codeA + 32 === codeB) {
+            if (codeA >= CharCode.A && codeA <= CharCode.Z && codeA + 32 === codeB) {
                 continue;
             }
-            if (codeB >= 65  && codeB <= 90  && codeB + 32 === codeA) {
+            if (codeB >= CharCode.A && codeB <= CharCode.Z && codeB + 32 === codeA) {
                 continue;
             }
             return false;
@@ -62,10 +63,10 @@ class BlockCommentCommand {
         }
         let ops;
         if (startTokenIndex !== -1 && endTokenIndex !== -1) {
-            if (insertSpace && startTokenIndex + startToken.length < startLineText.length && startLineText.charCodeAt(startTokenIndex + startToken.length) === 32 ) {
+            if (insertSpace && startTokenIndex + startToken.length < startLineText.length && startLineText.charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) {
                 startToken = startToken + ' ';
             }
-            if (insertSpace && endTokenIndex > 0 && endLineText.charCodeAt(endTokenIndex - 1) === 32 ) {
+            if (insertSpace && endTokenIndex > 0 && endLineText.charCodeAt(endTokenIndex - 1) === CharCode.Space) {
                 endToken = ' ' + endToken;
                 endTokenIndex -= 1;
             }

package/vscode/src/vs/editor/contrib/comment/browser/comment.js

@@ -1,12 +1,14 @@
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
 import { registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { BlockCommentCommand } from './blockCommentCommand.js';
-import { LineCommentCommand } from './lineCommentCommand.js';
+import { Type, LineCommentCommand } from './lineCommentCommand.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/comment/browser/comment";
 class CommentLineAction extends EditorAction {
     constructor(type, opts) {
@@ -21,7 +23,7 @@ class CommentLineAction extends EditorAction {
         const model = editor.getModel();
         const commands = [];
         const modelOptions = model.getOptions();
-        const commentsOptions = editor.getOption(23 );
+        const commentsOptions = editor.getOption(EditorOption.comments);
         const selections = ( (editor.getSelections().map((selection, index) => ({ selection, index, ignoreFirstLine: false }))));
         selections.sort((a, b) => Range.compareRangesUsingStarts(a.selection, b.selection));
         let prev = selections[0];
@@ -55,15 +57,15 @@ class CommentLineAction extends EditorAction {
 }
 class ToggleCommentLineAction extends CommentLineAction {
     constructor() {
-        super(0 , {
+        super(Type.Toggle, {
             id: 'editor.action.commentLine',
             label: ( localizeWithPath(_moduleId, 0, "Toggle Line Comment")),
             alias: 'Toggle Line Comment',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 90 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Slash,
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarEditMenu,
@@ -76,30 +78,30 @@ class ToggleCommentLineAction extends CommentLineAction {
 }
 class AddLineCommentAction extends CommentLineAction {
     constructor() {
-        super(1 , {
+        super(Type.ForceAdd, {
             id: 'editor.action.addCommentLine',
             label: ( localizeWithPath(_moduleId, 2, "Add Line Comment")),
             alias: 'Add Line Comment',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 33 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyC),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
 }
 class RemoveLineCommentAction extends CommentLineAction {
     constructor() {
-        super(2 , {
+        super(Type.ForceRemove, {
             id: 'editor.action.removeCommentLine',
             label: ( localizeWithPath(_moduleId, 3, "Remove Line Comment")),
             alias: 'Remove Line Comment',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 51 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyU),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -113,9 +115,9 @@ class BlockCommentAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 1024  | 512  | 31 ,
-                linux: { primary: 2048  | 1024  | 31  },
-                weight: 100
+                primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.KeyA,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyA },
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarEditMenu,
@@ -130,7 +132,7 @@ class BlockCommentAction extends EditorAction {
         if (!editor.hasModel()) {
             return;
         }
-        const commentsOptions = editor.getOption(23 );
+        const commentsOptions = editor.getOption(EditorOption.comments);
         const commands = [];
         const selections = editor.getSelections();
         for (const selection of selections) {

package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js

@@ -1,9 +1,17 @@
+import { CharCode } from '../../../../base/common/charCode.js';
 import { firstNonWhitespaceIndex } from '../../../../base/common/strings.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { BlockCommentCommand } from './blockCommentCommand.js';
+var Type;
+( (function(Type) {
+    Type[Type["Toggle"] = 0] = "Toggle";
+    Type[Type["ForceAdd"] = 1] = "ForceAdd";
+    Type[Type["ForceRemove"] = 2] = "ForceRemove";
+})(Type || (Type = {})));
 class LineCommentCommand {
     constructor(languageConfigurationService, selection, indentSize, type, insertSpace, ignoreEmptyLines, ignoreFirstLine) {
         this.languageConfigurationService = languageConfigurationService;
@@ -39,10 +47,10 @@ class LineCommentCommand {
     static _analyzeLines(type, insertSpace, model, lines, startLineNumber, ignoreEmptyLines, ignoreFirstLine, languageConfigurationService) {
         let onlyWhitespaceLines = true;
         let shouldRemoveComments;
-        if (type === 0 ) {
+        if (type === Type.Toggle) {
             shouldRemoveComments = true;
         }
-        else if (type === 1 ) {
+        else if (type === Type.ForceAdd) {
             shouldRemoveComments = false;
         }
         else {
@@ -66,22 +74,22 @@ class LineCommentCommand {
             lineData.ignore = false;
             lineData.commentStrOffset = lineContentStartOffset;
             if (shouldRemoveComments && !BlockCommentCommand._haystackHasNeedleAtOffset(lineContent, lineData.commentStr, lineContentStartOffset)) {
-                if (type === 0 ) {
+                if (type === Type.Toggle) {
                     shouldRemoveComments = false;
                 }
-                else if (type === 1 ) ;
+                else if (type === Type.ForceAdd) ;
                 else {
                     lineData.ignore = true;
                 }
             }
             if (shouldRemoveComments && insertSpace) {
                 const commentStrEndOffset = lineContentStartOffset + lineData.commentStrLength;
-                if (commentStrEndOffset < lineContent.length && lineContent.charCodeAt(commentStrEndOffset) === 32 ) {
+                if (commentStrEndOffset < lineContent.length && lineContent.charCodeAt(commentStrEndOffset) === CharCode.Space) {
                     lineData.commentStrLength += 1;
                 }
             }
         }
-        if (type === 0  && onlyWhitespaceLines) {
+        if (type === Type.Toggle && onlyWhitespaceLines) {
             shouldRemoveComments = false;
             for (let i = 0, lineCount = lines.length; i < lineCount; i++) {
                 lines[i].ignore = false;
@@ -143,10 +151,10 @@ class LineCommentCommand {
                 endTokenIndex = model.getLineContent(startLineNumber).indexOf(endToken, startTokenIndex + startToken.length);
             }
         }
-        if (startTokenIndex !== -1 && model.getLineContent(startLineNumber).charCodeAt(startTokenIndex + startToken.length) === 32 ) {
+        if (startTokenIndex !== -1 && model.getLineContent(startLineNumber).charCodeAt(startTokenIndex + startToken.length) === CharCode.Space) {
             startToken += ' ';
         }
-        if (endTokenIndex !== -1 && model.getLineContent(endLineNumber).charCodeAt(endTokenIndex - 1) === 32 ) {
+        if (endTokenIndex !== -1 && model.getLineContent(endLineNumber).charCodeAt(endTokenIndex - 1) === CharCode.Space) {
             endToken = ' ' + endToken;
             endTokenIndex -= 1;
         }
@@ -271,7 +279,7 @@ class LineCommentCommand {
         return currentVisibleColumn + columnSize;
     }
     static _normalizeInsertionPoint(model, lines, startLineNumber, indentSize) {
-        let minVisibleColumn = 1073741824 ;
+        let minVisibleColumn = Constants.MAX_SAFE_SMALL_INTEGER;
         let j;
         let lenJ;
         for (let i = 0, len = lines.length; i < len; i++) {
@@ -281,7 +289,7 @@ class LineCommentCommand {
             const lineContent = model.getLineContent(startLineNumber + i);
             let currentVisibleColumn = 0;
             for (let j = 0, lenJ = lines[i].commentStrOffset; currentVisibleColumn < minVisibleColumn && j < lenJ; j++) {
-                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === 9 , 1);
+                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === CharCode.Tab, 1);
             }
             if (currentVisibleColumn < minVisibleColumn) {
                 minVisibleColumn = currentVisibleColumn;
@@ -295,7 +303,7 @@ class LineCommentCommand {
             const lineContent = model.getLineContent(startLineNumber + i);
             let currentVisibleColumn = 0;
             for (j = 0, lenJ = lines[i].commentStrOffset; currentVisibleColumn < minVisibleColumn && j < lenJ; j++) {
-                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === 9 , 1);
+                currentVisibleColumn = LineCommentCommand.nextVisibleColumn(currentVisibleColumn, indentSize, lineContent.charCodeAt(j) === CharCode.Tab, 1);
             }
             if (currentVisibleColumn > minVisibleColumn) {
                 lines[i].commentStrOffset = j - 1;
@@ -306,4 +314,4 @@ class LineCommentCommand {
         }
     }
 }
-export { LineCommentCommand };
+export { LineCommentCommand, Type };

package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js

@@ -2,9 +2,13 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { getShadowRoot, getDomNodePagePosition } from '../../../../base/browser/dom.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { SubmenuAction, Separator } from '../../../../base/common/actions.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { isIOS } from '../../../../base/common/platform.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
@@ -12,6 +16,7 @@ import { IMenuService } from '../../../../platform/actions/common/actions.servic
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { isStandaloneEditorWorkspace } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
@@ -45,10 +50,10 @@ let ContextMenuController = class ContextMenuController {
             }
         }));
         this._toDispose.add(this._editor.onKeyDown((e) => {
-            if (!this._editor.getOption(24 )) {
+            if (!this._editor.getOption(EditorOption.contextmenu)) {
                 return;
             }
-            if (e.keyCode === 58 ) {
+            if (e.keyCode === KeyCode.ContextMenu) {
                 e.preventDefault();
                 e.stopPropagation();
                 this.showContextMenu();
@@ -59,25 +64,25 @@ let ContextMenuController = class ContextMenuController {
         if (!this._editor.hasModel()) {
             return;
         }
-        if (!this._editor.getOption(24 )) {
+        if (!this._editor.getOption(EditorOption.contextmenu)) {
             this._editor.focus();
             if (e.target.position && !this._editor.getSelection().containsPosition(e.target.position)) {
                 this._editor.setPosition(e.target.position);
             }
             return;
         }
-        if (e.target.type === 12 ) {
+        if (e.target.type === MouseTargetType.OVERLAY_WIDGET) {
             return;
         }
-        if (e.target.type === 6  && e.target.detail.injectedText) {
+        if (e.target.type === MouseTargetType.CONTENT_TEXT && e.target.detail.injectedText) {
             return;
         }
         e.event.preventDefault();
         e.event.stopPropagation();
-        if (e.target.type === 11 ) {
+        if (e.target.type === MouseTargetType.SCROLLBAR) {
             return this._showScrollbarContextMenu(e.event);
         }
-        if (e.target.type !== 6  && e.target.type !== 7  && e.target.type !== 1 ) {
+        if (e.target.type !== MouseTargetType.CONTENT_TEXT && e.target.type !== MouseTargetType.CONTENT_EMPTY && e.target.type !== MouseTargetType.TEXTAREA) {
             return;
         }
         this._editor.focus();
@@ -94,13 +99,13 @@ let ContextMenuController = class ContextMenuController {
             }
         }
         let anchor = null;
-        if (e.target.type !== 1 ) {
+        if (e.target.type !== MouseTargetType.TEXTAREA) {
             anchor = e.event;
         }
         this.showContextMenu(anchor);
     }
     showContextMenu(anchor) {
-        if (!this._editor.getOption(24 )) {
+        if (!this._editor.getOption(EditorOption.contextmenu)) {
             return;
         }
         if (!this._editor.hasModel()) {
@@ -145,7 +150,7 @@ let ContextMenuController = class ContextMenuController {
         if (!this._editor.hasModel()) {
             return;
         }
-        const oldHoverSetting = this._editor.getOption(60 );
+        const oldHoverSetting = this._editor.getOption(EditorOption.hover);
         this._editor.updateOptions({
             hover: {
                 enabled: false
@@ -153,7 +158,7 @@ let ContextMenuController = class ContextMenuController {
         });
         let anchor = event;
         if (!anchor) {
-            this._editor.revealPosition(this._editor.getPosition(), 1 );
+            this._editor.revealPosition(this._editor.getPosition(), ScrollType.Immediate);
             this._editor.render();
             const cursorCoords = this._editor.getScrolledVisiblePosition(this._editor.getPosition());
             const editorCoords = getDomNodePagePosition(this._editor.getDomNode());
@@ -161,7 +166,7 @@ let ContextMenuController = class ContextMenuController {
             const posy = editorCoords.top + cursorCoords.top + cursorCoords.height;
             anchor = { x: posx, y: posy };
         }
-        const useShadowDOM = this._editor.getOption(127 ) && !isIOS;
+        const useShadowDOM = this._editor.getOption(EditorOption.useShadowDOM) && !isIOS;
         this._contextMenuIsBeingShownCount++;
         this._contextMenuService.showContextMenu({
             domForShadowRoot: useShadowDOM ? this._editor.getDomNode() : undefined,
@@ -204,7 +209,7 @@ let ContextMenuController = class ContextMenuController {
         if (isStandaloneEditorWorkspace(this._workspaceContextService.getWorkspace())) {
             return;
         }
-        const minimapOptions = this._editor.getOption(73 );
+        const minimapOptions = this._editor.getOption(EditorOption.minimap);
         let lastId = 0;
         const createAction = (opts) => {
             return {
@@ -275,7 +280,7 @@ let ContextMenuController = class ContextMenuController {
                 label: ( localizeWithPath(_moduleId, 8, "Always")),
                 value: 'always'
             }]));
-        const useShadowDOM = this._editor.getOption(127 ) && !isIOS;
+        const useShadowDOM = this._editor.getOption(EditorOption.useShadowDOM) && !isIOS;
         this._contextMenuIsBeingShownCount++;
         this._contextMenuService.showContextMenu({
             domForShadowRoot: useShadowDOM ? this._editor.getDomNode() : undefined,
@@ -315,8 +320,8 @@ class ShowContextMenu extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 1024  | 68 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyCode.F10,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -324,6 +329,6 @@ class ShowContextMenu extends EditorAction {
         ContextMenuController.get(editor)?.showContextMenu();
     }
 }
-registerEditorContribution(ContextMenuController.ID, ContextMenuController, 2 );
+registerEditorContribution(ContextMenuController.ID, ContextMenuController, EditorContributionInstantiation.BeforeFirstInteraction);
 registerEditorAction(ShowContextMenu);
 export { ContextMenuController };

package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js

@@ -1,7 +1,9 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/cursorUndo/browser/cursorUndo";
 class CursorState {
     constructor(selections) {
@@ -109,8 +111,8 @@ class CursorUndo extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 51 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyU,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -131,7 +133,7 @@ class CursorRedo extends EditorAction {
         CursorUndoRedoController.get(editor)?.cursorRedo();
     }
 }
-registerEditorContribution(CursorUndoRedoController.ID, CursorUndoRedoController, 0 );
+registerEditorContribution(CursorUndoRedoController.ID, CursorUndoRedoController, EditorContributionInstantiation.Eager);
 registerEditorAction(CursorUndo);
 registerEditorAction(CursorRedo);
 export { CursorRedo, CursorUndo, CursorUndoRedoController };

package/vscode/src/vs/editor/contrib/dnd/browser/dnd.js

@@ -1,10 +1,15 @@
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import './dnd.css.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { DragAndDropCommand } from './dragAndDropCommand.js';
 function hasTriggerModifier(e) {
@@ -17,7 +22,7 @@ function hasTriggerModifier(e) {
 }
 class DragAndDropController extends Disposable {
     static { this.ID = 'editor.contrib.dragAndDrop'; }
-    static { this.TRIGGER_KEY_VALUE = isMacintosh ? 6  : 5 ; }
+    static { this.TRIGGER_KEY_VALUE = isMacintosh ? KeyCode.Alt : KeyCode.Ctrl; }
     static get(editor) {
         return editor.getContribution(DragAndDropController.ID);
     }
@@ -45,7 +50,7 @@ class DragAndDropController extends Disposable {
         this._modifierPressed = false;
     }
     onEditorKeyDown(e) {
-        if (!this._editor.getOption(35 ) || this._editor.getOption(22 )) {
+        if (!this._editor.getOption(EditorOption.dragAndDrop) || this._editor.getOption(EditorOption.columnSelection)) {
             return;
         }
         if (hasTriggerModifier(e)) {
@@ -58,7 +63,7 @@ class DragAndDropController extends Disposable {
         }
     }
     onEditorKeyUp(e) {
-        if (!this._editor.getOption(35 ) || this._editor.getOption(22 )) {
+        if (!this._editor.getOption(EditorOption.dragAndDrop) || this._editor.getOption(EditorOption.columnSelection)) {
             return;
         }
         if (hasTriggerModifier(e)) {
@@ -150,7 +155,7 @@ class DragAndDropController extends Disposable {
                         }
                     }));
                 }
-                this._editor.setSelections(newSelections || [], 'mouse', 3 );
+                this._editor.setSelections(newSelections || [], 'mouse', CursorChangeReason.Explicit);
             }
             else if (!this._dragSelection.containsPosition(newCursorPosition) ||
                 (((hasTriggerModifier(mouseEvent.event) || this._modifierPressed) && (this._dragSelection.getEndPosition().equals(newCursorPosition) || this._dragSelection.getStartPosition().equals(newCursorPosition)))
@@ -180,19 +185,19 @@ class DragAndDropController extends Disposable {
                 range: ( new Range(position.lineNumber, position.column, position.lineNumber, position.column)),
                 options: DragAndDropController._DECORATION_OPTIONS
             }]);
-        this._editor.revealPosition(position, 1 );
+        this._editor.revealPosition(position, ScrollType.Immediate);
     }
     _removeDecoration() {
         this._dndDecorationIds.clear();
     }
     _hitContent(target) {
-        return target.type === 6  ||
-            target.type === 7 ;
+        return target.type === MouseTargetType.CONTENT_TEXT ||
+            target.type === MouseTargetType.CONTENT_EMPTY;
     }
     _hitMargin(target) {
-        return target.type === 2  ||
-            target.type === 3  ||
-            target.type === 4 ;
+        return target.type === MouseTargetType.GUTTER_GLYPH_MARGIN ||
+            target.type === MouseTargetType.GUTTER_LINE_NUMBERS ||
+            target.type === MouseTargetType.GUTTER_LINE_DECORATIONS;
     }
     dispose() {
         this._removeDecoration();
@@ -202,5 +207,5 @@ class DragAndDropController extends Disposable {
         super.dispose();
     }
 }
-registerEditorContribution(DragAndDropController.ID, DragAndDropController, 2 );
+registerEditorContribution(DragAndDropController.ID, DragAndDropController, EditorContributionInstantiation.BeforeFirstInteraction);
 export { DragAndDropController };

package/vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js

@@ -9,7 +9,7 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { IModelService } from '../../../common/services/model.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
@@ -368,5 +368,5 @@ OutlineModelService = ( __decorate([
     ( __param(1, ILanguageFeatureDebounceService)),
     ( __param(2, IModelService))
 ], OutlineModelService));
-registerSingleton(IOutlineModelService, OutlineModelService, 1 );
+registerSingleton(IOutlineModelService, OutlineModelService, InstantiationType.Delayed);
 export { IOutlineModelService, OutlineElement, OutlineGroup, OutlineModel, OutlineModelService, TreeElement };

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js

@@ -1,12 +1,14 @@
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
-import { registerEditorContribution, registerEditorCommand, EditorCommand, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
+import { registerEditorContribution, registerEditorCommand, EditorCommand, registerEditorAction, EditorAction, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { registerEditorFeature } from '../../../common/editorFeatures.js';
 import { changePasteTypeCommandId, pasteWidgetVisibleCtx, CopyPasteController } from './copyPasteController.js';
 import { DefaultTextPasteOrDropEditProvider, DefaultPasteProvidersFeature } from './defaultProviders.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution";
-registerEditorContribution(CopyPasteController.ID, CopyPasteController, 0 );
+registerEditorContribution(CopyPasteController.ID, CopyPasteController, EditorContributionInstantiation.Eager);
 registerEditorFeature(DefaultPasteProvidersFeature);
 registerEditorCommand(new (class extends EditorCommand {
     constructor() {
@@ -14,8 +16,8 @@ registerEditorCommand(new (class extends EditorCommand {
             id: changePasteTypeCommandId,
             precondition: pasteWidgetVisibleCtx,
             kbOpts: {
-                weight: 100 ,
-                primary: 2048  | 89 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.Period,
             }
         });
     }
@@ -29,8 +31,8 @@ registerEditorCommand(new (class extends EditorCommand {
             id: 'editor.hidePasteWidget',
             precondition: pasteWidgetVisibleCtx,
             kbOpts: {
-                weight: 100 ,
-                primary: 9 ,
+                weight: KeybindingWeight.EditorContrib,
+                primary: KeyCode.Escape,
             }
         });
     }

package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js

@@ -11,18 +11,21 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { ClipboardEventUtils } from '../../../browser/controller/textAreaInput.js';
 import { toVSDataTransfer, toExternalVSDataTransfer } from '../../../browser/dnd.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { Handler } from '../../../common/editorCommon.js';
 import { DocumentPasteTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { DefaultTextPasteOrDropEditProvider } from './defaultProviders.js';
 import { sortEditsByYieldTo, createCombinedWorkspaceEdit } from './edit.js';
-import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { InlineProgressManager } from '../../inlineProgress/browser/inlineProgress.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { PostEditWidgetManager } from './postEditWidget.js';
@@ -69,8 +72,8 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         this._postPasteWidgetManager.clear();
     }
     isPasteAsEnabled() {
-        return this._editor.getOption(85 ).enabled
-            && !this._editor.getOption(91 );
+        return this._editor.getOption(EditorOption.pasteAs).enabled
+            && !this._editor.getOption(EditorOption.readOnly);
     }
     async finishedPaste() {
         await this._currentPasteOperation;
@@ -90,7 +93,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
         if (!model || !selections?.length) {
             return;
         }
-        const enableEmptySelectionClipboard = this._editor.getOption(37 );
+        const enableEmptySelectionClipboard = this._editor.getOption(EditorOption.emptySelectionClipboard);
         let ranges = selections;
         const wasFromEmptySelection = selections.length === 1 && selections[0].isEmpty();
         if (wasFromEmptySelection) {
@@ -215,7 +218,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             const model = editor.getModel();
             const tokenSource = ( (new EditorStateCancellationTokenSource(
                 editor,
-                1  | 2 ,
+                CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection,
                 undefined,
                 token
             )));
@@ -241,7 +244,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
                     return this.applyDefaultPasteHandler(dataTransfer, metadata, tokenSource.token, clipboardEvent);
                 }
                 if (providerEdits.length) {
-                    const canShowWidget = editor.getOption(85 ).showPasteSelector === 'afterPaste';
+                    const canShowWidget = editor.getOption(EditorOption.pasteAs).showPasteSelector === 'afterPaste';
                     return this._postPasteWidgetManager.applyEditAndShowIfNeeded(selections, { activeEditIndex: 0, allEdits: providerEdits }, canShowWidget, async (edit, token) => {
                         const resolved = await edit.provider.resolveDocumentPasteEdit?.(edit, token);
                         if (resolved) {
@@ -271,7 +274,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             const model = editor.getModel();
             const tokenSource = ( (new EditorStateCancellationTokenSource(
                 editor,
-                1  | 2 ,
+                CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection,
                 undefined,
                 token
             )));
@@ -336,7 +339,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             }
         });
         this._progressService.withProgress({
-            location: 10 ,
+            location: ProgressLocation.Window,
             title: ( localizeWithPath(_moduleId, 5, "Running paste handlers")),
         }, () => p);
     }
@@ -417,7 +420,7 @@ let CopyPasteController = class CopyPasteController extends Disposable {
             multicursorText: metadata?.defaultPastePayload.multicursorText ?? null,
             mode: null,
         };
-        this._editor.trigger('keyboard', "paste" , payload);
+        this._editor.trigger('keyboard', Handler.Paste, payload);
     }
     isSupportedPasteProvider(provider, dataTransfer, preference) {
         if (!provider.pasteMimeTypes?.some(type => dataTransfer.matches(type))) {