@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -1,8 +1,9 @@
-import { KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { CoreEditingCommands } from '../../../browser/coreCommands.js';
 import { EditorAction, registerEditorAction } from '../../../browser/editorExtensions.js';
 import { ReplaceCommandThatSelectsText, ReplaceCommand, ReplaceCommandThatPreservesSelection } from '../../../common/commands/replaceCommand.js';
 import { TrimTrailingWhitespaceCommand } from '../../../common/commands/trimTrailingWhitespaceCommand.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { TypeOperations } from '../../../common/cursor/cursorTypeOperations.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Position } from '../../../common/core/position.js';
@@ -14,6 +15,7 @@ import { MoveLinesCommand } from './moveLinesCommand.js';
 import { SortLinesCommand } from './sortLinesCommand.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 const _moduleId = "vs/editor/contrib/linesOperations/browser/linesOperations";
@@ -59,9 +61,9 @@ class CopyLinesUpAction extends AbstractCopyLinesAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 512  | 1024  | 16 ,
-                linux: { primary: 2048  | 512  | 1024  | 16  },
-                weight: 100
+                primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.UpArrow,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.UpArrow },
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -81,9 +83,9 @@ class CopyLinesDownAction extends AbstractCopyLinesAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 512  | 1024  | 18 ,
-                linux: { primary: 2048  | 512  | 1024  | 18  },
-                weight: 100
+                primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.DownArrow,
+                linux: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.DownArrow },
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -144,7 +146,7 @@ class AbstractMoveLinesAction extends EditorAction {
         const languageConfigurationService = accessor.get(ILanguageConfigurationService);
         const commands = [];
         const selections = editor.getSelections() || [];
-        const autoIndent = editor.getOption(12 );
+        const autoIndent = editor.getOption(EditorOption.autoIndent);
         for (const selection of selections) {
             commands.push(( (new MoveLinesCommand(selection, this.down, autoIndent, languageConfigurationService))));
         }
@@ -162,9 +164,9 @@ class MoveLinesUpAction extends AbstractMoveLinesAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 512  | 16 ,
-                linux: { primary: 512  | 16  },
-                weight: 100
+                primary: KeyMod$1.Alt | KeyCode.UpArrow,
+                linux: { primary: KeyMod$1.Alt | KeyCode.UpArrow },
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -184,9 +186,9 @@ class MoveLinesDownAction extends AbstractMoveLinesAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 512  | 18 ,
-                linux: { primary: 512  | 18  },
-                weight: 100
+                primary: KeyMod$1.Alt | KeyCode.DownArrow,
+                linux: { primary: KeyMod$1.Alt | KeyCode.DownArrow },
+                weight: KeybindingWeight.EditorContrib
             },
             menuOpts: {
                 menuId: MenuId.MenubarSelectionMenu,
@@ -314,8 +316,8 @@ class TrimTrailingWhitespaceAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: KeyChord(2048  | 41 , 2048  | 54 ),
-                weight: 100
+                primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyCode.KeyX),
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -348,8 +350,8 @@ class DeleteLinesAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 1024  | 41 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyK,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -435,8 +437,8 @@ class IndentLinesAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 94 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.BracketRight,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -459,8 +461,8 @@ class OutdentLinesAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 92 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.BracketLeft,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -477,8 +479,8 @@ class InsertLineBeforeAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 1024  | 3 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -500,8 +502,8 @@ class InsertLineAfterAction extends EditorAction {
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 3 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -552,8 +554,8 @@ class DeleteAllLeftAction extends AbstractDeleteAllToBoundaryAction {
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 2048  | 1  },
-                weight: 100
+                mac: { primary: KeyMod$1.CtrlCmd | KeyCode.Backspace },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -638,8 +640,8 @@ class DeleteAllRightAction extends AbstractDeleteAllToBoundaryAction {
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 41 , secondary: [2048  | 20 ] },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyCode.KeyK, secondary: [KeyMod$1.CtrlCmd | KeyCode.Delete] },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -705,8 +707,8 @@ class JoinLinesAction extends EditorAction {
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
                 primary: 0,
-                mac: { primary: 256  | 40  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyCode.KeyJ },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -940,7 +942,7 @@ class AbstractCaseAction extends EditorAction {
         if (model === null) {
             return;
         }
-        const wordSeparators = editor.getOption(131 );
+        const wordSeparators = editor.getOption(EditorOption.wordSeparators);
         const textEdits = [];
         for (const selection of selections) {
             if (selection.isEmpty()) {

package/vscode/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.js

@@ -1,10 +1,12 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { getLeadingWhitespace, lastNonWhitespaceIndex } from '../../../../base/common/strings.js';
 import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
+import { EditorAutoIndentStrategy } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
 import { IndentAction } from '../../../common/languages/languageConfiguration.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { IndentConsts } from '../../../common/languages/supports/indentRules.js';
 import { getSpaceCnt, generateIndent } from '../../indentation/common/indentUtils.js';
 import { getGoodIndentForLine, getIndentMetadata } from '../../../common/languages/autoIndent.js';
 import { getEnterAction } from '../../../common/languages/enterAction.js';
@@ -214,7 +216,7 @@ let MoveLinesCommand = class MoveLinesCommand {
                 const oldIndentation = getLeadingWhitespace(model.getLineContent(line));
                 let newIndentation = getLeadingWhitespace(enterPrefix);
                 const indentMetadataOfMovelingLine = getIndentMetadata(model, line, this._languageConfigurationService);
-                if (indentMetadataOfMovelingLine !== null && indentMetadataOfMovelingLine & 2 ) {
+                if (indentMetadataOfMovelingLine !== null && indentMetadataOfMovelingLine & IndentConsts.DECREASE_MASK) {
                     newIndentation = indentConverter.unshiftIndent(newIndentation);
                 }
                 const newSpaceCnt = getSpaceCnt(newIndentation, tabSize);
@@ -275,7 +277,7 @@ let MoveLinesCommand = class MoveLinesCommand {
         return str.replace(/^\s+/, '');
     }
     shouldAutoIndent(model, selection) {
-        if (this._autoIndent < 4 ) {
+        if (this._autoIndent < EditorAutoIndentStrategy.Full) {
             return false;
         }
         if (!model.tokenization.isCheapToTokenize(selection.startLineNumber)) {

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

@@ -5,19 +5,23 @@ import { CancellationTokenSource, CancellationToken } from '../../../../base/com
 import { Color } from '../../../../base/common/color.js';
 import { isCancellationError, onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
 import { Event } from '../../../../base/common/event.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { commonPrefixLength, commonSuffixLength } from '../../../../base/common/strings.js';
 import { URI } from '../../../../base/common/uri.js';
-import { registerEditorCommand, registerModelAndPositionCommand, registerEditorContribution, registerEditorAction, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorCommand, registerModelAndPositionCommand, registerEditorContribution, registerEditorAction, EditorCommand, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -42,7 +46,7 @@ let LinkedEditingContribution = class LinkedEditingContribution extends Disposab
     static { this.ID = 'editor.contrib.linkedEditing'; }
     static { this.DECORATION = ModelDecorationOptions.register({
         description: 'linked-editing',
-        stickiness: 0 ,
+        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
         className: DECORATION_CLASS_NAME
     }); }
     static get(editor) {
@@ -70,7 +74,7 @@ let LinkedEditingContribution = class LinkedEditingContribution extends Disposab
         this._currentRequestModelVersion = null;
         this._register(this._editor.onDidChangeModel(() => this.reinitialize(true)));
         this._register(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(70 ) || e.hasChanged(93 )) {
+            if (e.hasChanged(EditorOption.linkedEditing) || e.hasChanged(EditorOption.renameOnType)) {
                 this.reinitialize(false);
             }
         }));
@@ -80,7 +84,7 @@ let LinkedEditingContribution = class LinkedEditingContribution extends Disposab
     }
     reinitialize(forceRefresh) {
         const model = this._editor.getModel();
-        const isEnabled = model !== null && (this._editor.getOption(70 ) || this._editor.getOption(93 )) && ( (this._providers.has(model)));
+        const isEnabled = model !== null && (this._editor.getOption(EditorOption.linkedEditing) || this._editor.getOption(EditorOption.renameOnType)) && ( (this._providers.has(model)));
         if (isEnabled === this._enabled && !forceRefresh) {
             return;
         }
@@ -306,8 +310,8 @@ class LinkedEditingAction extends EditorAction {
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 2048  | 1024  | 60 ,
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.F2,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -343,9 +347,9 @@ registerEditorCommand(( (new LinkedEditingCommand({
     handler: x => x.clearRanges(),
     kbOpts: {
         kbExpr: EditorContextKeys.editorTextFocus,
-        weight: 100  + 99,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        weight: KeybindingWeight.EditorContrib + 99,
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 function getLinkedEditingRanges(providers, model, position, token) {
@@ -365,6 +369,6 @@ registerModelAndPositionCommand('_executeLinkedEditingProvider', (_accessor, mod
     const { linkedEditingRangeProvider } = _accessor.get(ILanguageFeaturesService);
     return getLinkedEditingRanges(linkedEditingRangeProvider, model, position, CancellationToken.None);
 });
-registerEditorContribution(LinkedEditingContribution.ID, LinkedEditingContribution, 1 );
+registerEditorContribution(LinkedEditingContribution.ID, LinkedEditingContribution, EditorContributionInstantiation.AfterFirstRender);
 registerEditorAction(LinkedEditingAction);
 export { CONTEXT_ONTYPE_RENAME_INPUT_VISIBLE, LinkedEditingAction, LinkedEditingContribution };

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

@@ -10,7 +10,10 @@ import { originalFSPath, joinPath } from '../../../../base/common/resources.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { URI } from '../../../../base/common/uri.js';
 import './links.css.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 { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
@@ -51,7 +54,7 @@ let LinkDetector = class LinkDetector extends Disposable {
             this.cleanUpActiveLinkDecoration();
         }));
         this._register(editor.onDidChangeConfiguration((e) => {
-            if (!e.hasChanged(71 )) {
+            if (!e.hasChanged(EditorOption.links)) {
                 return;
             }
             this.updateDecorations([]);
@@ -81,7 +84,7 @@ let LinkDetector = class LinkDetector extends Disposable {
         this.computeLinks.schedule(0);
     }
     async computeLinksNow() {
-        if (!this.editor.hasModel() || !this.editor.getOption(71 )) {
+        if (!this.editor.hasModel() || !this.editor.getOption(EditorOption.links)) {
             return;
         }
         const model = this.editor.getModel();
@@ -113,7 +116,7 @@ let LinkDetector = class LinkDetector extends Disposable {
         }
     }
     updateDecorations(links) {
-        const useMetaKey = (this.editor.getOption(78 ) === 'altKey');
+        const useMetaKey = (this.editor.getOption(EditorOption.multiCursorModifier) === 'altKey');
         const oldDecorations = [];
         const keys = ( (Object.keys(this.currentOccurrences)));
         for (const decorationId of keys) {
@@ -137,7 +140,7 @@ let LinkDetector = class LinkDetector extends Disposable {
         });
     }
     _onEditorMouseMove(mouseEvent, withKey) {
-        const useMetaKey = (this.editor.getOption(78 ) === 'altKey');
+        const useMetaKey = (this.editor.getOption(EditorOption.multiCursorModifier) === 'altKey');
         if (this.isEnabled(mouseEvent, withKey)) {
             this.cleanUpActiveLinkDecoration();
             const occurrence = this.getLinkOccurrence(mouseEvent.target.position);
@@ -153,7 +156,7 @@ let LinkDetector = class LinkDetector extends Disposable {
         }
     }
     cleanUpActiveLinkDecoration() {
-        const useMetaKey = (this.editor.getOption(78 ) === 'altKey');
+        const useMetaKey = (this.editor.getOption(EditorOption.multiCursorModifier) === 'altKey');
         if (this.activeLinkDecorationId) {
             const occurrence = this.currentOccurrences[this.activeLinkDecorationId];
             if (occurrence) {
@@ -237,7 +240,7 @@ let LinkDetector = class LinkDetector extends Disposable {
         return null;
     }
     isEnabled(mouseEvent, withKey) {
-        return Boolean(((mouseEvent.target.type === 6) )
+        return Boolean((mouseEvent.target.type === MouseTargetType.CONTENT_TEXT)
             && (mouseEvent.hasTriggerModifier || (withKey && withKey.keyCodeIsTriggerKey)));
     }
     stop() {
@@ -265,13 +268,13 @@ LinkDetector = LinkDetector_1 = ( (__decorate([
 const decoration = {
     general: ModelDecorationOptions.register({
         description: 'detected-link',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         collapseOnReplaceEdit: true,
         inlineClassName: 'detected-link'
     }),
     active: ModelDecorationOptions.register({
         description: 'detected-link-active',
-        stickiness: 1 ,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
         collapseOnReplaceEdit: true,
         inlineClassName: 'detected-link-active'
     })
@@ -357,6 +360,6 @@ class OpenLinkAction extends EditorAction {
         }
     }
 }
-registerEditorContribution(LinkDetector.ID, LinkDetector, 1 );
+registerEditorContribution(LinkDetector.ID, LinkDetector, EditorContributionInstantiation.AfterFirstRender);
 registerEditorAction(OpenLinkAction);
 export { LinkDetector };

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

@@ -1,5 +1,7 @@
 import { Disposable } from '../../../../base/common/lifecycle.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';
 class LongLinesHelper extends Disposable {
     static { this.ID = 'editor.contrib.longLinesHelper'; }
     static get(editor) {
@@ -9,8 +11,8 @@ class LongLinesHelper extends Disposable {
         super();
         this._editor = _editor;
         this._register(this._editor.onMouseDown((e) => {
-            const stopRenderingLineAfter = this._editor.getOption(117 );
-            if (stopRenderingLineAfter >= 0 && e.target.type === 6  && e.target.position.column >= stopRenderingLineAfter) {
+            const stopRenderingLineAfter = this._editor.getOption(EditorOption.stopRenderingLineAfter);
+            if (stopRenderingLineAfter >= 0 && e.target.type === MouseTargetType.CONTENT_TEXT && e.target.position.column >= stopRenderingLineAfter) {
                 this._editor.updateOptions({
                     stopRenderingLineAfter: -1
                 });
@@ -18,4 +20,4 @@ class LongLinesHelper extends Disposable {
         }));
     }
 }
-registerEditorContribution(LongLinesHelper.ID, LongLinesHelper, 2 );
+registerEditorContribution(LongLinesHelper.ID, LongLinesHelper, EditorContributionInstantiation.BeforeFirstInteraction);

package/vscode/src/vs/editor/contrib/message/browser/messageController.js

@@ -3,14 +3,19 @@ import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { Event } from '../../../../base/common/event.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import './messageController.css.js';
-import { registerEditorCommand, registerEditorContribution, EditorCommand } from '../../../browser/editorExtensions.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { registerEditorCommand, registerEditorContribution, EditorCommand, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { PositionAffinity } from '../../../common/model.js';
 import { openLinkFromMarkdown } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { isAncestor, getActiveElement, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
 var MessageController_1;
@@ -103,8 +108,8 @@ registerEditorCommand(( (new MessageCommand({
     precondition: MessageController.MESSAGE_VISIBLE,
     handler: c => c.closeMessage(),
     kbOpts: {
-        weight: 100  + 30,
-        primary: 9
+        weight: KeybindingWeight.EditorContrib + 30,
+        primary: KeyCode.Escape
     }
 }))));
 class MessageWidget {
@@ -123,7 +128,7 @@ class MessageWidget {
         this.allowEditorOverflow = true;
         this.suppressMouseDown = false;
         this._editor = editor;
-        this._editor.revealLinesInCenterIfOutsideViewport(lineNumber, lineNumber, 0 );
+        this._editor.revealLinesInCenterIfOutsideViewport(lineNumber, lineNumber, ScrollType.Smooth);
         this._position = { lineNumber, column };
         this._domNode = document.createElement('div');
         this._domNode.classList.add('monaco-editor-overlaymessage');
@@ -160,15 +165,15 @@ class MessageWidget {
         return {
             position: this._position,
             preference: [
-                1 ,
-                2 ,
+                ContentWidgetPositionPreference.ABOVE,
+                ContentWidgetPositionPreference.BELOW,
             ],
-            positionAffinity: 1 ,
+            positionAffinity: PositionAffinity.Right,
         };
     }
     afterRender(position) {
-        this._domNode.classList.toggle('below', position === 2 );
+        this._domNode.classList.toggle('below', position === ContentWidgetPositionPreference.BELOW);
     }
 }
-registerEditorContribution(MessageController.ID, MessageController, 4 );
+registerEditorContribution(MessageController.ID, MessageController, EditorContributionInstantiation.Lazy);
 export { MessageController };