@codingame/monaco-vscode-api 5.3.0 → 6.0.0

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { $, addStandardDisposableListener, append, clearNode, show, hide } from '../../../../base/browser/dom.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionBar, ActionsOrientation } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action } from '../../../../base/common/actions.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
@@ -8,15 +8,16 @@ import { Color } from '../../../../base/common/color.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { mixin } from '../../../../base/common/objects.js';
 import './media/peekViewWidget.css.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ZoneWidget } from '../../zoneWidget/browser/zoneWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder, activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -50,7 +51,7 @@ registerSingleton(IPeekViewService, class {
         };
         this._widgets.set(editor, { widget, listener: widget.onDidClose(remove) });
     }
-}, 1 );
+}, InstantiationType.Delayed);
 var PeekContext;
 ( ((function(PeekContext) {
     PeekContext.inPeekEditor = ( (new RawContextKey('inReferenceSearchEditor', true, ( localizeWithPath(_moduleId, 0, "Whether the current code editor is embedded inside peek")))));
@@ -68,7 +69,7 @@ let PeekContextController = class PeekContextController {
 PeekContextController = ( (__decorate([
     ( (__param(1, IContextKeyService)))
 ], PeekContextController)));
-registerEditorContribution(PeekContextController.ID, PeekContextController, 0 );
+registerEditorContribution(PeekContextController.ID, PeekContextController, EditorContributionInstantiation.Eager);
 function getOuterEditor(accessor) {
     const editor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
     if (editor instanceof EmbeddedCodeEditorWidget) {
@@ -163,7 +164,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
     _getActionBarOptions() {
         return {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService),
-            orientation: 0
+            orientation: ActionsOrientation.HORIZONTAL
         };
     }
     _onTitleClick(event) {
@@ -196,7 +197,7 @@ let PeekViewWidget = class PeekViewWidget extends ZoneWidget {
             this.dispose();
             return;
         }
-        const headHeight = Math.ceil(this.editor.getOption(67 ) * 1.2);
+        const headHeight = Math.ceil(this.editor.getOption(EditorOption.lineHeight) * 1.2);
         const bodyHeight = Math.round(heightInPixel - ((headHeight + 2) ));
         this._doLayoutHead(headHeight, widthInPixel);
         this._doLayoutBody(bodyHeight, widthInPixel);

package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js

@@ -1,28 +1,30 @@
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { MutableDisposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { getCodeEditor, isDiffEditor } from '../../../browser/editorBrowser.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { OverviewRulerLane } from '../../../common/model.js';
 import { overviewRulerRangeHighlight } from '../../../common/core/editorColorRegistry.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { TextEditorSelectionSource } from '../../../../platform/editor/common/editor.js';
 class AbstractEditorNavigationQuickAccessProvider {
     constructor(options) {
         this.options = options;
         this.rangeHighlightDecorationId = undefined;
     }
-    provide(picker, token) {
+    provide(picker, token, runOptions) {
         const disposables = ( new DisposableStore());
         picker.canAcceptInBackground = !!this.options?.canAcceptInBackground;
         picker.matchOnLabel = picker.matchOnDescription = picker.matchOnDetail = picker.sortByLabel = false;
         const pickerDisposable = disposables.add(( new MutableDisposable()));
-        pickerDisposable.value = this.doProvide(picker, token);
+        pickerDisposable.value = this.doProvide(picker, token, runOptions);
         disposables.add(this.onDidActiveTextEditorControlChange(() => {
             pickerDisposable.value = undefined;
             pickerDisposable.value = this.doProvide(picker, token);
         }));
         return disposables;
     }
-    doProvide(picker, token) {
+    doProvide(picker, token, runOptions) {
         const disposables = ( new DisposableStore());
         const editor = this.activeTextEditorControl;
         if (editor && this.canProvideWithTextEditor(editor)) {
@@ -41,7 +43,7 @@ class AbstractEditorNavigationQuickAccessProvider {
                 disposables.add(createSingleCallFunction(token.onCancellationRequested)(() => context.restoreViewState?.()));
             }
             disposables.add(toDisposable(() => this.clearDecorations(editor)));
-            disposables.add(this.provideWithTextEditor(context, picker, token));
+            disposables.add(this.provideWithTextEditor(context, picker, token, runOptions));
         }
         else {
             disposables.add(this.provideWithoutTextEditor(picker, token));
@@ -52,8 +54,8 @@ class AbstractEditorNavigationQuickAccessProvider {
         return true;
     }
     gotoLocation({ editor }, options) {
-        editor.setSelection(options.range, "code.jump" );
-        editor.revealRangeInCenter(options.range, 0 );
+        editor.setSelection(options.range, TextEditorSelectionSource.JUMP);
+        editor.revealRangeInCenter(options.range, ScrollType.Smooth);
         if (!options.preserveFocus) {
             editor.focus();
         }

package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js

@@ -1,5 +1,7 @@
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { getCodeEditor } from '../../../browser/editorBrowser.js';
+import { EditorOption, RenderLineNumbersType } from '../../../common/config/editorOptions.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { AbstractEditorNavigationQuickAccessProvider } from './editorNavigationQuickAccess.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess";
@@ -43,7 +45,7 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
                 return;
             }
             const range = this.toRange(position.lineNumber, position.column);
-            editor.revealRangeInCenter(range, 0 );
+            editor.revealRangeInCenter(range, ScrollType.Smooth);
             this.addDecorations(editor, range);
         };
         updatePickerAndEditor();
@@ -51,8 +53,8 @@ class AbstractGotoLineQuickAccessProvider extends AbstractEditorNavigationQuickA
         const codeEditor = getCodeEditor(editor);
         if (codeEditor) {
             const options = codeEditor.getOptions();
-            const lineNumbers = options.get(68 );
-            if (lineNumbers.renderType === 2 ) {
+            const lineNumbers = options.get(EditorOption.lineNumbers);
+            if (lineNumbers.renderType === RenderLineNumbersType.Relative) {
                 codeEditor.updateOptions({ lineNumbers: 'on' });
                 disposables.add(toDisposable(() => codeEditor.updateOptions({ lineNumbers: 'relative' })));
             }

package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js

@@ -7,7 +7,8 @@ import { pieceToQuery, scoreFuzzy2, prepareQuery } from '../../../../base/common
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { trim, format } from '../../../../base/common/strings.js';
 import { Range } from '../../../common/core/range.js';
-import { SymbolKinds, getAriaLabelForSymbol } from '../../../common/languages.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { SymbolKind, SymbolKinds, SymbolTag, getAriaLabelForSymbol } from '../../../common/languages.js';
 import { IOutlineModelService } from '../../documentSymbols/browser/outlineModel.js';
 import { AbstractEditorNavigationQuickAccessProvider } from './editorNavigationQuickAccess.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -35,14 +36,14 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         )));
         return Disposable.None;
     }
-    provideWithTextEditor(context, picker, token) {
+    provideWithTextEditor(context, picker, token, runOptions) {
         const editor = context.editor;
         const model = this.getModel(editor);
         if (!model) {
             return Disposable.None;
         }
         if (( (this._languageFeaturesService.documentSymbolProvider.has(model)))) {
-            return this.doProvideWithEditorSymbols(context, model, picker, token);
+            return this.doProvideWithEditorSymbols(context, model, picker, token, runOptions);
         }
         return this.doProvideWithoutEditorSymbols(context, model, picker, token);
     }
@@ -63,7 +64,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         return disposables;
     }
     provideLabelPick(picker, label) {
-        picker.items = [{ label, index: 0, kind: 14  }];
+        picker.items = [{ label, index: 0, kind: SymbolKind.String }];
         picker.ariaLabel = label;
     }
     async waitForLanguageSymbolRegistry(model, disposables) {
@@ -80,13 +81,14 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         disposables.add(toDisposable(() => symbolProviderRegistryPromise.complete(false)));
         return symbolProviderRegistryPromise.p;
     }
-    doProvideWithEditorSymbols(context, model, picker, token) {
+    doProvideWithEditorSymbols(context, model, picker, token, runOptions) {
         const editor = context.editor;
         const disposables = ( (new DisposableStore()));
         disposables.add(picker.onDidAccept(event => {
             const [item] = picker.selectedItems;
             if (item && item.range) {
                 this.gotoLocation(context, { range: item.range.selection, keyMods: picker.keyMods, preserveFocus: event.inBackground });
+                runOptions?.handleAccept?.(item);
                 if (!event.inBackground) {
                     picker.hide();
                 }
@@ -107,7 +109,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
             picker.busy = true;
             try {
                 const query = prepareQuery(picker.value.substr(AbstractGotoSymbolQuickAccessProvider_1.PREFIX.length).trim());
-                const items = await this.doGetSymbolPicks(symbolsPromise, query, undefined, picksCts.token);
+                const items = await this.doGetSymbolPicks(symbolsPromise, query, undefined, picksCts.token, model);
                 if (token.isCancellationRequested) {
                     return;
                 }
@@ -140,13 +142,13 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
         disposables.add(picker.onDidChangeActive(() => {
             const [item] = picker.activeItems;
             if (item && item.range) {
-                editor.revealRangeInCenter(item.range.selection, 0 );
+                editor.revealRangeInCenter(item.range.selection, ScrollType.Smooth);
                 this.addDecorations(editor, item.range.decoration);
             }
         }));
         return disposables;
     }
-    async doGetSymbolPicks(symbolsPromise, query, options, token) {
+    async doGetSymbolPicks(symbolsPromise, query, options, token, model) {
         const symbols = await symbolsPromise;
         if (token.isCancellationRequested) {
             return [];
@@ -215,7 +217,7 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
                     }
                 }
             }
-            const deprecated = symbol.tags && symbol.tags.indexOf(1 ) >= 0;
+            const deprecated = symbol.tags && symbol.tags.indexOf(SymbolTag.Deprecated) >= 0;
             filteredSymbolPicks.push({
                 index,
                 kind: symbol.kind,
@@ -231,6 +233,8 @@ let AbstractGotoSymbolQuickAccessProvider = class AbstractGotoSymbolQuickAccessP
                     selection: Range.collapseToStart(symbol.selectionRange),
                     decoration: symbol.range
                 },
+                uri: model.uri,
+                symbolName: symbolLabel,
                 strikethrough: deprecated,
                 buttons
             });
@@ -314,30 +318,30 @@ AbstractGotoSymbolQuickAccessProvider = AbstractGotoSymbolQuickAccessProvider_1
 ], AbstractGotoSymbolQuickAccessProvider)));
 const FALLBACK_NLS_SYMBOL_KIND = ( localizeWithPath(_moduleId, 7, "properties ({0})"));
 const NLS_SYMBOL_KIND_CACHE = {
-    [5 ]: ( localizeWithPath(_moduleId, 8, "methods ({0})")),
-    [11 ]: ( localizeWithPath(_moduleId, 9, "functions ({0})")),
-    [8 ]: ( localizeWithPath(_moduleId, 10, "constructors ({0})")),
-    [12 ]: ( localizeWithPath(_moduleId, 11, "variables ({0})")),
-    [4 ]: ( localizeWithPath(_moduleId, 12, "classes ({0})")),
-    [22 ]: ( localizeWithPath(_moduleId, 13, "structs ({0})")),
-    [23 ]: ( localizeWithPath(_moduleId, 14, "events ({0})")),
-    [24 ]: ( localizeWithPath(_moduleId, 15, "operators ({0})")),
-    [10 ]: ( localizeWithPath(_moduleId, 16, "interfaces ({0})")),
-    [2 ]: ( localizeWithPath(_moduleId, 17, "namespaces ({0})")),
-    [3 ]: ( localizeWithPath(_moduleId, 18, "packages ({0})")),
-    [25 ]: ( localizeWithPath(_moduleId, 19, "type parameters ({0})")),
-    [1 ]: ( localizeWithPath(_moduleId, 20, "modules ({0})")),
-    [6 ]: ( localizeWithPath(_moduleId, 7, "properties ({0})")),
-    [9 ]: ( localizeWithPath(_moduleId, 21, "enumerations ({0})")),
-    [21 ]: ( localizeWithPath(_moduleId, 22, "enumeration members ({0})")),
-    [14 ]: ( localizeWithPath(_moduleId, 23, "strings ({0})")),
-    [0 ]: ( localizeWithPath(_moduleId, 24, "files ({0})")),
-    [17 ]: ( localizeWithPath(_moduleId, 25, "arrays ({0})")),
-    [15 ]: ( localizeWithPath(_moduleId, 26, "numbers ({0})")),
-    [16 ]: ( localizeWithPath(_moduleId, 27, "booleans ({0})")),
-    [18 ]: ( localizeWithPath(_moduleId, 28, "objects ({0})")),
-    [19 ]: ( localizeWithPath(_moduleId, 29, "keys ({0})")),
-    [7 ]: ( localizeWithPath(_moduleId, 30, "fields ({0})")),
-    [13 ]: ( localizeWithPath(_moduleId, 31, "constants ({0})"))
+    [SymbolKind.Method]: ( localizeWithPath(_moduleId, 8, "methods ({0})")),
+    [SymbolKind.Function]: ( localizeWithPath(_moduleId, 9, "functions ({0})")),
+    [SymbolKind.Constructor]: ( localizeWithPath(_moduleId, 10, "constructors ({0})")),
+    [SymbolKind.Variable]: ( localizeWithPath(_moduleId, 11, "variables ({0})")),
+    [SymbolKind.Class]: ( localizeWithPath(_moduleId, 12, "classes ({0})")),
+    [SymbolKind.Struct]: ( localizeWithPath(_moduleId, 13, "structs ({0})")),
+    [SymbolKind.Event]: ( localizeWithPath(_moduleId, 14, "events ({0})")),
+    [SymbolKind.Operator]: ( localizeWithPath(_moduleId, 15, "operators ({0})")),
+    [SymbolKind.Interface]: ( localizeWithPath(_moduleId, 16, "interfaces ({0})")),
+    [SymbolKind.Namespace]: ( localizeWithPath(_moduleId, 17, "namespaces ({0})")),
+    [SymbolKind.Package]: ( localizeWithPath(_moduleId, 18, "packages ({0})")),
+    [SymbolKind.TypeParameter]: ( localizeWithPath(_moduleId, 19, "type parameters ({0})")),
+    [SymbolKind.Module]: ( localizeWithPath(_moduleId, 20, "modules ({0})")),
+    [SymbolKind.Property]: ( localizeWithPath(_moduleId, 7, "properties ({0})")),
+    [SymbolKind.Enum]: ( localizeWithPath(_moduleId, 21, "enumerations ({0})")),
+    [SymbolKind.EnumMember]: ( localizeWithPath(_moduleId, 22, "enumeration members ({0})")),
+    [SymbolKind.String]: ( localizeWithPath(_moduleId, 23, "strings ({0})")),
+    [SymbolKind.File]: ( localizeWithPath(_moduleId, 24, "files ({0})")),
+    [SymbolKind.Array]: ( localizeWithPath(_moduleId, 25, "arrays ({0})")),
+    [SymbolKind.Number]: ( localizeWithPath(_moduleId, 26, "numbers ({0})")),
+    [SymbolKind.Boolean]: ( localizeWithPath(_moduleId, 27, "booleans ({0})")),
+    [SymbolKind.Object]: ( localizeWithPath(_moduleId, 28, "objects ({0})")),
+    [SymbolKind.Key]: ( localizeWithPath(_moduleId, 29, "keys ({0})")),
+    [SymbolKind.Field]: ( localizeWithPath(_moduleId, 30, "fields ({0})")),
+    [SymbolKind.Constant]: ( localizeWithPath(_moduleId, 31, "constants ({0})"))
 };
 export { AbstractGotoSymbolQuickAccessProvider };

package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js

@@ -1,6 +1,7 @@
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { localizeWithPath } from '../../../../nls.js';
 const _moduleId = "vs/editor/contrib/readOnlyMessage/browser/contribution";
@@ -14,7 +15,7 @@ class ReadOnlyMessageController extends Disposable {
     _onDidAttemptReadOnlyEdit() {
         const messageController = MessageController.get(this.editor);
         if (messageController && this.editor.hasModel()) {
-            let message = this.editor.getOptions().get(92 );
+            let message = this.editor.getOptions().get(EditorOption.readOnlyMessage);
             if (!message) {
                 if (this.editor.isSimpleWidget) {
                     message = ( (new MarkdownString(( localizeWithPath(_moduleId, 0, "Cannot edit in read-only input")))));
@@ -27,5 +28,5 @@ class ReadOnlyMessageController extends Disposable {
         }
     }
 }
-registerEditorContribution(ReadOnlyMessageController.ID, ReadOnlyMessageController, 2 );
+registerEditorContribution(ReadOnlyMessageController.ID, ReadOnlyMessageController, EditorContributionInstantiation.BeforeFirstInteraction);
 export { ReadOnlyMessageController };

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

@@ -4,10 +4,11 @@ import { raceCancellation } from '../../../../base/common/async.js';
 import { CancellationTokenSource, CancellationToken } from '../../../../base/common/cancellation.js';
 import { CancellationError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { registerEditorContribution, registerEditorAction, registerEditorCommand, registerModelAndPositionCommand, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, registerEditorCommand, registerModelAndPositionCommand, EditorContributionInstantiation, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { IBulkEditService } from '../../../browser/services/bulkEditService.js';
 import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
 import { Position } from '../../../common/core/position.js';
@@ -16,13 +17,14 @@ import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { NewSymbolNameTriggerKind } from '../../../common/languages.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { ITextResourceConfigurationService } from '../../../common/services/textResourceConfiguration.js';
-import { EditorStateCancellationTokenSource } from '../../editorState/browser/editorState.js';
+import { EditorStateCancellationTokenSource, CodeEditorStateFlag } from '../../editorState/browser/editorState.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
-import { Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
+import { Extensions, ConfigurationScope } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
@@ -151,7 +153,7 @@ let RenameController = class RenameController {
         }
         const cts1 = ( (new EditorStateCancellationTokenSource(
             this.editor,
-            4  | 1 ,
+            CodeEditorStateFlag.Position | CodeEditorStateFlag.Value,
             undefined,
             this._cts.token
         )));
@@ -193,7 +195,7 @@ let RenameController = class RenameController {
         }
         const cts2 = ( (new EditorStateCancellationTokenSource(
             this.editor,
-            4  | 1 ,
+            CodeEditorStateFlag.Position | CodeEditorStateFlag.Value,
             loc.range,
             this._cts.token
         )));
@@ -337,8 +339,8 @@ class RenameAction extends EditorAction {
             precondition: ( (ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasRenameProvider))),
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
-                primary: 60 ,
-                weight: 100
+                primary: KeyCode.F2,
+                weight: KeybindingWeight.EditorContrib
             },
             contextMenuOpts: {
                 group: '1_modification',
@@ -374,7 +376,7 @@ class RenameAction extends EditorAction {
         return Promise.resolve();
     }
 }
-registerEditorContribution(RenameController.ID, RenameController, 4 );
+registerEditorContribution(RenameController.ID, RenameController, EditorContributionInstantiation.Lazy);
 registerEditorAction(RenameAction);
 const RenameCommand = EditorCommand.bindToContribution(RenameController.get);
 registerEditorCommand(( (new RenameCommand({
@@ -382,9 +384,9 @@ registerEditorCommand(( (new RenameCommand({
     precondition: CONTEXT_RENAME_INPUT_VISIBLE,
     handler: x => x.acceptRenameInput(false),
     kbOpts: {
-        weight: 100  + 99,
+        weight: KeybindingWeight.EditorContrib + 99,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
-        primary: 3
+        primary: KeyCode.Enter
     }
 }))));
 registerEditorCommand(( (new RenameCommand({
@@ -395,9 +397,9 @@ registerEditorCommand(( (new RenameCommand({
     ))),
     handler: x => x.acceptRenameInput(true),
     kbOpts: {
-        weight: 100  + 99,
+        weight: KeybindingWeight.EditorContrib + 99,
         kbExpr: ( (ContextKeyExpr.and(EditorContextKeys.focus, ContextKeyExpr.not('isComposing')))),
-        primary: 2048  + 3
+        primary: KeyMod$1.CtrlCmd + KeyCode.Enter
     }
 }))));
 registerEditorCommand(( (new RenameCommand({
@@ -405,10 +407,10 @@ registerEditorCommand(( (new RenameCommand({
     precondition: CONTEXT_RENAME_INPUT_VISIBLE,
     handler: x => x.cancelRenameInput(),
     kbOpts: {
-        weight: 100  + 99,
+        weight: KeybindingWeight.EditorContrib + 99,
         kbExpr: EditorContextKeys.focus,
-        primary: 9 ,
-        secondary: [1024  | 9 ]
+        primary: KeyCode.Escape,
+        secondary: [KeyMod$1.Shift | KeyCode.Escape]
     }
 }))));
 registerAction2(class FocusNextRenameSuggestion extends Action2 {
@@ -421,8 +423,8 @@ registerAction2(class FocusNextRenameSuggestion extends Action2 {
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 18 ,
-                    weight: 100  + 99,
+                    primary: KeyCode.DownArrow,
+                    weight: KeybindingWeight.EditorContrib + 99,
                 }
             ]
         });
@@ -449,8 +451,8 @@ registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
             precondition: CONTEXT_RENAME_INPUT_VISIBLE,
             keybinding: [
                 {
-                    primary: 16 ,
-                    weight: 100  + 99,
+                    primary: KeyCode.UpArrow,
+                    weight: KeybindingWeight.EditorContrib + 99,
                 }
             ]
         });
@@ -486,7 +488,7 @@ registerModelAndPositionCommand('_executePrepareRename', async function (accesso
     id: 'editor',
     properties: {
         'editor.rename.enablePreview': {
-            scope: 5 ,
+            scope: ConfigurationScope.LANGUAGE_OVERRIDABLE,
             description: ( localizeWithPath(
                 _moduleId,
                 10,

package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js

@@ -11,14 +11,18 @@ import { raceCancellation, DeferredPromise } from '../../../../base/common/async
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { assertType, isDefined } from '../../../../base/common/types.js';
 import './renameWidget.css.js';
 import { applyFontInfo } from '../../../browser/config/domFontInfo.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
-import { NewSymbolNameTriggerKind, NewSymbolNameTag } from '../../../common/languages.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { NewSymbolNameTag, NewSymbolNameTriggerKind } from '../../../common/languages.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -58,7 +62,7 @@ let RenameWidget = class RenameWidget {
         this._disposables.add(this._inputWithButton);
         this._editor.addContentWidget(this);
         this._disposables.add(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this._updateFont();
             }
         }));
@@ -77,7 +81,7 @@ let RenameWidget = class RenameWidget {
             this._domNode.className = 'monaco-editor rename-box';
             this._domNode.appendChild(this._inputWithButton.domNode);
             this._renameCandidateListView = this._disposables.add(( (new RenameCandidateListView(this._domNode, {
-                fontInfo: this._editor.getOption(50 ),
+                fontInfo: this._editor.getOption(EditorOption.fontInfo),
                 onFocusChange: (newSymbolName) => {
                     this._inputWithButton.input.value = newSymbolName;
                     this._isEditingRenameCandidate = false;
@@ -128,7 +132,7 @@ let RenameWidget = class RenameWidget {
         }
         assertType(this._label !== undefined, 'RenameWidget#_updateFont: _label must not be undefined given _domNode is defined');
         this._editor.applyFontInfo(this._inputWithButton.input);
-        const fontInfo = this._editor.getOption(50 );
+        const fontInfo = this._editor.getOption(EditorOption.fontInfo);
         this._label.style.fontSize = `${this._computeLabelFontSize(fontInfo.fontSize)}px`;
     }
     _computeLabelFontSize(editorFontSize) {
@@ -148,11 +152,11 @@ let RenameWidget = class RenameWidget {
         const cursorBoxTop = this._getTopForPosition();
         this._nPxAvailableAbove = cursorBoxTop + editorBox.top;
         this._nPxAvailableBelow = bodyBox.height - this._nPxAvailableAbove;
-        const lineHeight = this._editor.getOption(67 );
+        const lineHeight = this._editor.getOption(EditorOption.lineHeight);
         const { totalHeight: candidateViewHeight } = RenameCandidateView.getLayoutInfo({ lineHeight });
         const positionPreference = this._nPxAvailableBelow > candidateViewHeight * 6
-            ? [2 , 1 ]
-            : [1 , 2 ];
+            ? [ContentWidgetPositionPreference.BELOW, ContentWidgetPositionPreference.ABOVE]
+            : [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
         return {
             position: this._position,
             preference: positionPreference,
@@ -187,7 +191,7 @@ let RenameWidget = class RenameWidget {
         const inputBoxHeight = getTotalHeight(this._inputWithButton.domNode);
         const labelHeight = getTotalHeight(this._label);
         let totalHeightAvailable;
-        if (position === 2 ) {
+        if (position === ContentWidgetPositionPreference.BELOW) {
             totalHeightAvailable = this._nPxAvailableBelow;
         }
         else {
@@ -232,7 +236,7 @@ let RenameWidget = class RenameWidget {
             disposeOnDone.add(addDisposableListener(this._inputWithButton.button, 'click', () => this._requestRenameCandidates(currentName, true)));
             disposeOnDone.add(addDisposableListener(this._inputWithButton.button, EventType.KEY_DOWN, (e) => {
                 const keyEvent = ( (new StandardKeyboardEvent(e)));
-                if (keyEvent.equals(3 ) || keyEvent.equals(10 )) {
+                if (keyEvent.equals(KeyCode.Enter) || keyEvent.equals(KeyCode.Space)) {
                     keyEvent.stopPropagation();
                     keyEvent.preventDefault();
                     this._requestRenameCandidates(currentName, true);
@@ -352,7 +356,7 @@ let RenameWidget = class RenameWidget {
     }
     _show() {
         this._trace('invoking _show');
-        this._editor.revealLineInCenterIfOutsideViewport(this._position.lineNumber, 0 );
+        this._editor.revealLineInCenterIfOutsideViewport(this._position.lineNumber, ScrollType.Smooth);
         this._visible = true;
         this._visibleContextKey.set(true);
         this._editor.layoutContentWidget(this);
@@ -615,7 +619,7 @@ class InputWithButton {
             this._disposables.add(addDisposableListener(this.input, EventType.INPUT, () => this._onDidInputChange.fire()));
             this._disposables.add(addDisposableListener(this.input, EventType.KEY_DOWN, (e) => {
                 const keyEvent = ( (new StandardKeyboardEvent(e)));
-                if (keyEvent.keyCode === 15  || keyEvent.keyCode === 17 ) {
+                if (keyEvent.keyCode === KeyCode.LeftArrow || keyEvent.keyCode === KeyCode.RightArrow) {
                     this._onDidInputChange.fire();
                 }
             }));

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

@@ -1,8 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
+import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { TrackedRangeStickiness, MinimapPosition, MinimapSectionHeaderStyle } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
 let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
@@ -13,18 +16,18 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
         this.languageConfigurationService = languageConfigurationService;
         this.editorWorkerService = editorWorkerService;
         this.decorations = this.editor.createDecorationsCollection();
-        this.options = this.createOptions(editor.getOption(73 ));
+        this.options = this.createOptions(editor.getOption(EditorOption.minimap));
         this.computePromise = null;
         this.currentOccurrences = {};
         this._register(editor.onDidChangeModel((e) => {
             this.currentOccurrences = {};
-            this.options = this.createOptions(editor.getOption(73 ));
+            this.options = this.createOptions(editor.getOption(EditorOption.minimap));
             this.stop();
             this.computeSectionHeaders.schedule(0);
         }));
         this._register(editor.onDidChangeModelLanguage((e) => {
             this.currentOccurrences = {};
-            this.options = this.createOptions(editor.getOption(73 ));
+            this.options = this.createOptions(editor.getOption(EditorOption.minimap));
             this.stop();
             this.computeSectionHeaders.schedule(0);
         }));
@@ -32,16 +35,16 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
             const editorLanguageId = this.editor.getModel()?.getLanguageId();
             if (editorLanguageId && e.affects(editorLanguageId)) {
                 this.currentOccurrences = {};
-                this.options = this.createOptions(editor.getOption(73 ));
+                this.options = this.createOptions(editor.getOption(EditorOption.minimap));
                 this.stop();
                 this.computeSectionHeaders.schedule(0);
             }
         }));
         this._register(editor.onDidChangeConfiguration(e => {
-            if (this.options && !e.hasChanged(73 )) {
+            if (this.options && !e.hasChanged(EditorOption.minimap)) {
                 return;
             }
-            this.options = this.createOptions(editor.getOption(73 ));
+            this.options = this.createOptions(editor.getOption(EditorOption.minimap));
             this.updateDecorations([]);
             this.stop();
             this.computeSectionHeaders.schedule(0);
@@ -108,7 +111,7 @@ let SectionHeaderDetector = class SectionHeaderDetector extends Disposable {
                 const idx = tokens.findTokenIndexAtOffset(validRange.startColumn - 1);
                 const tokenType = tokens.getStandardTokenType(idx);
                 const languageId = tokens.getLanguageId(idx);
-                return (languageId === model.getLanguageId() && tokenType === 1) ;
+                return (languageId === model.getLanguageId() && tokenType === StandardTokenType.Comment);
             });
         }
         const oldDecorations = ( ( Object.values(this.currentOccurrences)).map(occurrence => occurrence.decorationId));
@@ -144,16 +147,16 @@ function decoration(sectionHeader) {
         range: sectionHeader.range,
         options: ModelDecorationOptions.createDynamic({
             description: 'section-header',
-            stickiness: 3 ,
+            stickiness: TrackedRangeStickiness.GrowsOnlyWhenTypingAfter,
             collapseOnReplaceEdit: true,
             minimap: {
                 color: undefined,
-                position: 1 ,
-                sectionHeaderStyle: sectionHeader.hasSeparatorLine ? 2  : 1 ,
+                position: MinimapPosition.Inline,
+                sectionHeaderStyle: sectionHeader.hasSeparatorLine ? MinimapSectionHeaderStyle.Underlined : MinimapSectionHeaderStyle.Normal,
                 sectionHeaderText: sectionHeader.text,
             },
         })
     };
 }
-registerEditorContribution(SectionHeaderDetector.ID, SectionHeaderDetector, 1 );
+registerEditorContribution(SectionHeaderDetector.ID, SectionHeaderDetector, EditorContributionInstantiation.AfterFirstRender);
 export { SectionHeaderDetector };