@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js

@@ -3,9 +3,10 @@ import { isCancellationError } from '../../../../base/common/errors.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { isEqual } from '../../../../base/common/resources.js';
-import { ShowLightbulbIconMode } from '../../../common/config/editorOptions.js';
+import { EditorOption, ShowLightbulbIconMode } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Selection } from '../../../common/core/selection.js';
+import { CodeActionTriggerType } from '../../../common/languages.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { CodeActionTriggerSource, CodeActionKind } from '../common/types.js';
@@ -36,7 +37,7 @@ class CodeActionOracle extends Disposable {
     }
     _tryAutoTrigger() {
         this._autoTriggerTimer.cancelAndSet(() => {
-            this.trigger({ type: 2 , triggerAction: CodeActionTriggerSource.Default });
+            this.trigger({ type: CodeActionTriggerType.Auto, triggerAction: CodeActionTriggerSource.Default });
         }, this._delay);
     }
     _getRangeOfSelectionUnlessWhitespaceEnclosed(trigger) {
@@ -44,10 +45,10 @@ class CodeActionOracle extends Disposable {
             return undefined;
         }
         const selection = this._editor.getSelection();
-        if (trigger.type === 1 ) {
+        if (trigger.type === CodeActionTriggerType.Invoke) {
             return selection;
         }
-        const enabled = this._editor.getOption(65 ).enabled;
+        const enabled = this._editor.getOption(EditorOption.lightbulb).enabled;
         if (enabled === ShowLightbulbIconMode.Off) {
             return undefined;
         }
@@ -86,17 +87,18 @@ class CodeActionOracle extends Disposable {
 }
 var CodeActionsState;
 ( (function(CodeActionsState) {
+    let Type;
     ( (function(Type) {
         Type[Type["Empty"] = 0] = "Empty";
         Type[Type["Triggered"] = 1] = "Triggered";
-    })(CodeActionsState.Type || (CodeActionsState.Type = {})));
-    CodeActionsState.Empty = { type: 0  };
+    })(Type = CodeActionsState.Type || (CodeActionsState.Type = {})));
+    CodeActionsState.Empty = { type: Type.Empty };
     class Triggered {
         constructor(trigger, position, _cancellablePromise) {
             this.trigger = trigger;
             this.position = position;
             this._cancellablePromise = _cancellablePromise;
-            this.type = 1 ;
+            this.type = Type.Triggered;
             this.actions = _cancellablePromise.catch((e) => {
                 if (isCancellationError(e)) {
                     return emptyCodeActionSet;
@@ -137,7 +139,7 @@ class CodeActionModel extends Disposable {
         this._register(this._editor.onDidChangeModelLanguage(() => this._update()));
         this._register(this._registry.onDidChange(() => this._update()));
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(65 )) {
+            if (e.hasChanged(EditorOption.lightbulb)) {
                 this._update();
             }
         }));
@@ -164,7 +166,7 @@ class CodeActionModel extends Disposable {
         const model = this._editor.getModel();
         if (model
             && ( this._registry.has(model))
-            && !this._editor.getOption(91 )) {
+            && !this._editor.getOption(EditorOption.readOnly)) {
             const supportedActions = this._registry.all(model).flatMap(provider => provider.providedCodeActionKinds ?? []);
             this._supportedCodeActions.set(supportedActions.join(' '));
             this._codeActionOracle.value = ( new CodeActionOracle(this._editor, this._markerService, trigger => {
@@ -174,7 +176,7 @@ class CodeActionModel extends Disposable {
                 }
                 const startPosition = trigger.selection.getStartPosition();
                 const actions = createCancelablePromise(async (token) => {
-                    if (this._settingEnabledNearbyQuickfixes() && trigger.trigger.type === 1  && (trigger.trigger.triggerAction === CodeActionTriggerSource.QuickFix || trigger.trigger.filter?.include?.contains(CodeActionKind.QuickFix))) {
+                    if (this._settingEnabledNearbyQuickfixes() && trigger.trigger.type === CodeActionTriggerType.Invoke && (trigger.trigger.triggerAction === CodeActionTriggerSource.QuickFix || trigger.trigger.filter?.include?.contains(CodeActionKind.QuickFix))) {
                         const codeActionSet = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
                         const allCodeActions = [...codeActionSet.allActions];
                         if (token.isCancellationRequested) {
@@ -259,15 +261,15 @@ class CodeActionModel extends Disposable {
                     }
                     return getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
                 });
-                if (trigger.trigger.type === 1 ) {
+                if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
                     this._progressService?.showWhile(actions, 250);
                 }
                 const newState = new CodeActionsState.Triggered(trigger.trigger, startPosition, actions);
                 let isManualToAutoTransition = false;
-                if (this._state.type === 1 ) {
-                    isManualToAutoTransition = this._state.trigger.type === 1  &&
-                        newState.type === 1  &&
-                        newState.trigger.type === 2  &&
+                if (this._state.type === CodeActionsState.Type.Triggered) {
+                    isManualToAutoTransition = this._state.trigger.type === CodeActionTriggerType.Invoke &&
+                        newState.type === CodeActionsState.Type.Triggered &&
+                        newState.trigger.type === CodeActionTriggerType.Auto &&
                         this._state.position !== newState.position;
                 }
                 if (!isManualToAutoTransition) {
@@ -279,7 +281,7 @@ class CodeActionModel extends Disposable {
                     }, 500);
                 }
             }, undefined));
-            this._codeActionOracle.value.trigger({ type: 2 , triggerAction: CodeActionTriggerSource.Default });
+            this._codeActionOracle.value.trigger({ type: CodeActionTriggerType.Auto, triggerAction: CodeActionTriggerSource.Default });
         }
         else {
             this._supportedCodeActions.reset();
@@ -292,7 +294,7 @@ class CodeActionModel extends Disposable {
         if (newState === this._state) {
             return;
         }
-        if (this._state.type === 1 ) {
+        if (this._state.type === CodeActionsState.Type.Triggered) {
             this._state.cancel();
         }
         this._state = newState;

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js

@@ -6,6 +6,8 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import './lightBulbWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { computeIndentLevel } from '../../../common/model/utils.js';
 import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
 import { localizeWithPath } from '../../../../nls.js';
@@ -15,18 +17,19 @@ var LightBulbWidget_1;
 const _moduleId = "vs/editor/contrib/codeAction/browser/lightBulbWidget";
 var LightBulbState;
 ( ((function(LightBulbState) {
+    let Type;
     ( ((function(Type) {
         Type[Type["Hidden"] = 0] = "Hidden";
         Type[Type["Showing"] = 1] = "Showing";
-    })(LightBulbState.Type || (LightBulbState.Type = {}))));
-    LightBulbState.Hidden = { type: 0  };
+    })(Type = LightBulbState.Type || (LightBulbState.Type = {}))));
+    LightBulbState.Hidden = { type: Type.Hidden };
     class Showing {
         constructor(actions, trigger, editorPosition, widgetPosition) {
             this.actions = actions;
             this.trigger = trigger;
             this.editorPosition = editorPosition;
             this.widgetPosition = widgetPosition;
-            this.type = 1 ;
+            this.type = Type.Showing;
         }
     }
     LightBulbState.Showing = Showing;
@@ -34,7 +37,7 @@ var LightBulbState;
 let LightBulbWidget = class LightBulbWidget extends Disposable {
     static { LightBulbWidget_1 = this; }
     static { this.ID = 'editor.contrib.lightbulbWidget'; }
-    static { this._posPref = [0 ]; }
+    static { this._posPref = [ContentWidgetPositionPreference.EXACT]; }
     constructor(_editor, _keybindingService, commandService) {
         super();
         this._editor = _editor;
@@ -49,18 +52,18 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._editor.addContentWidget(this);
         this._register(this._editor.onDidChangeModelContent(_ => {
             const editorModel = this._editor.getModel();
-            if (this.state.type !== 1  || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
+            if (this.state.type !== LightBulbState.Type.Showing || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
                 this.hide();
             }
         }));
         this._register(addStandardDisposableGenericMouseDownListener(this._domNode, e => {
-            if (this.state.type !== 1 ) {
+            if (this.state.type !== LightBulbState.Type.Showing) {
                 return;
             }
             this._editor.focus();
             e.preventDefault();
             const { top, height } = getDomNodePagePosition(this._domNode);
-            const lineHeight = this._editor.getOption(67 );
+            const lineHeight = this._editor.getOption(EditorOption.lineHeight);
             let pad = Math.floor(lineHeight / 3);
             if (this.state.widgetPosition.position !== null && this.state.widgetPosition.position.lineNumber < this.state.editorPosition.lineNumber) {
                 pad += lineHeight;
@@ -95,14 +98,14 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         return this._domNode;
     }
     getPosition() {
-        return this._state.type === 1  ? this._state.widgetPosition : null;
+        return this._state.type === LightBulbState.Type.Showing ? this._state.widgetPosition : null;
     }
     update(actions, trigger, atPosition) {
         if (actions.validActions.length <= 0) {
             return this.hide();
         }
         const options = this._editor.getOptions();
-        if (!options.get(65 ).enabled) {
+        if (!options.get(EditorOption.lightbulb).enabled) {
             return this.hide();
         }
         const model = this._editor.getModel();
@@ -111,7 +114,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         }
         const { lineNumber, column } = model.validatePosition(atPosition);
         const tabSize = model.getOptions().tabSize;
-        const fontInfo = this._editor.getOptions().get(50 );
+        const fontInfo = this._editor.getOptions().get(EditorOption.fontInfo);
         const lineContent = model.getLineContent(lineNumber);
         const indent = computeIndentLevel(lineContent, tabSize);
         const lineHasSpace = fontInfo.spaceWidth * indent > 22;
@@ -136,6 +139,12 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             position: { lineNumber: effectiveLineNumber, column: effectiveColumnNumber },
             preference: LightBulbWidget_1._posPref
         });
+        const validActions = actions.validActions;
+        const actionKind = actions.validActions[0].action.kind;
+        if (validActions.length !== 1 || !actionKind) {
+            this._editor.layoutContentWidget(this);
+            return;
+        }
         this._editor.layoutContentWidget(this);
     }
     hide() {
@@ -153,7 +162,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
     _updateLightBulbTitleAndIcon() {
         this._domNode.classList.remove(...this._iconClasses);
         this._iconClasses = [];
-        if (this.state.type !== 1 ) {
+        if (this.state.type !== LightBulbState.Type.Showing) {
             return;
         }
         let icon;
@@ -183,7 +192,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._domNode.classList.add(...this._iconClasses);
     }
     _updateLightbulbTitle(autoFix, autoRun) {
-        if (this.state.type !== 1 ) {
+        if (this.state.type !== LightBulbState.Type.Showing) {
             return;
         }
         if (autoRun) {

package/vscode/src/vs/editor/contrib/codeAction/common/types.js

@@ -15,6 +15,12 @@ const CodeActionKind = new (class {
         this.SurroundWith = this.Refactor.append('surround');
     }
 });
+var CodeActionAutoApply;
+( (function(CodeActionAutoApply) {
+    CodeActionAutoApply["IfSingle"] = "ifSingle";
+    CodeActionAutoApply["First"] = "first";
+    CodeActionAutoApply["Never"] = "never";
+})(CodeActionAutoApply || (CodeActionAutoApply = {})));
 var CodeActionTriggerSource;
 ( (function(CodeActionTriggerSource) {
     CodeActionTriggerSource["Refactor"] = "refactor";
@@ -90,9 +96,9 @@ class CodeActionCommandArgs {
     }
     static getApplyFromUser(arg, defaultAutoApply) {
         switch (typeof arg.apply === 'string' ? arg.apply.toLowerCase() : '') {
-            case 'first': return "first" ;
-            case 'never': return "never" ;
-            case 'ifsingle': return "ifSingle" ;
+            case 'first': return CodeActionAutoApply.First;
+            case 'never': return CodeActionAutoApply.Never;
+            case 'ifsingle': return CodeActionAutoApply.IfSingle;
             default: return defaultAutoApply;
         }
     }
@@ -134,4 +140,4 @@ class CodeActionItem {
         return this;
     }
 }
-export { CodeActionCommandArgs, CodeActionItem, CodeActionKind, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind };
+export { CodeActionAutoApply, CodeActionCommandArgs, CodeActionItem, CodeActionKind, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind };

package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js

@@ -3,9 +3,9 @@ import { Event } from '../../../../base/common/event.js';
 import { LRUCache } from '../../../../base/common/map.js';
 import { Range } from '../../../common/core/range.js';
 import { CodeLensModel } from './codelens.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { StorageScope, WillSaveStateReason, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
@@ -25,13 +25,13 @@ let CodeLensCache = class CodeLensCache {
         };
         this._cache = ( new LRUCache(20, 0.75));
         const oldkey = 'codelens/cache';
-        runWhenWindowIdle(mainWindow, () => storageService.remove(oldkey, 1 ));
+        runWhenWindowIdle(mainWindow, () => storageService.remove(oldkey, StorageScope.WORKSPACE));
         const key = 'codelens/cache2';
-        const raw = storageService.get(key, 1 , '{}');
+        const raw = storageService.get(key, StorageScope.WORKSPACE, '{}');
         this._deserialize(raw);
         Event.once(storageService.onWillSaveState)(e => {
             if (e.reason === WillSaveStateReason.SHUTDOWN) {
-                storageService.store(key, this._serialize(), 1 , 1 );
+                storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
             }
         });
     }
@@ -89,5 +89,5 @@ let CodeLensCache = class CodeLensCache {
 CodeLensCache = ( __decorate([
     ( __param(0, IStorageService))
 ], CodeLensCache));
-registerSingleton(ICodeLensCache, CodeLensCache, 1 );
+registerSingleton(ICodeLensCache, CodeLensCache, InstantiationType.Delayed);
 export { CodeLensCache, ICodeLensCache };

package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js

@@ -3,8 +3,9 @@ import { RunOnceScheduler, disposableTimeout, createCancelablePromise } from '..
 import { onUnexpectedError, onUnexpectedExternalError } from '../../../../base/common/errors.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
-import { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
-import { EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../browser/editorExtensions.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { getCodeLensModel } from './codelens.js';
 import { ICodeLensCache } from './codeLensCache.js';
@@ -37,10 +38,10 @@ let CodeLensContribution = class CodeLensContribution {
         this._disposables.add(this._editor.onDidChangeModel(() => this._onModelChange()));
         this._disposables.add(this._editor.onDidChangeModelLanguage(() => this._onModelChange()));
         this._disposables.add(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(50 ) || e.hasChanged(19 ) || e.hasChanged(18 )) {
+            if (e.hasChanged(EditorOption.fontInfo) || e.hasChanged(EditorOption.codeLensFontSize) || e.hasChanged(EditorOption.codeLensFontFamily)) {
                 this._updateLensStyle();
             }
-            if (e.hasChanged(17 )) {
+            if (e.hasChanged(EditorOption.codeLens)) {
                 this._onModelChange();
             }
         }));
@@ -55,10 +56,10 @@ let CodeLensContribution = class CodeLensContribution {
         this._currentCodeLensModel?.dispose();
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(67 ) / this._editor.getOption(52 ));
-        let fontSize = this._editor.getOption(19 );
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(EditorOption.lineHeight) / this._editor.getOption(EditorOption.fontSize));
+        let fontSize = this._editor.getOption(EditorOption.codeLensFontSize);
         if (!fontSize || fontSize < 5) {
-            fontSize = (this._editor.getOption(52 ) * .9) | 0;
+            fontSize = (this._editor.getOption(EditorOption.fontSize) * .9) | 0;
         }
         return {
             fontSize,
@@ -67,8 +68,8 @@ let CodeLensContribution = class CodeLensContribution {
     }
     _updateLensStyle() {
         const { codeLensHeight, fontSize } = this._getLayoutInfo();
-        const fontFamily = this._editor.getOption(18 );
-        const editorFontInfo = this._editor.getOption(50 );
+        const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
+        const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
         const { style } = this._editor.getContainerDomNode();
         style.setProperty('--vscode-editorCodeLens-lineHeight', `${codeLensHeight}px`);
         style.setProperty('--vscode-editorCodeLens-fontSize', `${fontSize}px`);
@@ -98,7 +99,7 @@ let CodeLensContribution = class CodeLensContribution {
         if (!model) {
             return;
         }
-        if (!this._editor.getOption(17 ) || model.isTooLargeForTokenization()) {
+        if (!this._editor.getOption(EditorOption.codeLens) || model.isTooLargeForTokenization()) {
             return;
         }
         const cachedLenses = this._codeLensCache.get(model);
@@ -168,7 +169,7 @@ let CodeLensContribution = class CodeLensContribution {
             this._resolveCodeLensesPromise?.cancel();
             this._resolveCodeLensesPromise = undefined;
         }));
-        this._localToDispose.add(this._editor.onDidFocusEditorWidget(() => {
+        this._localToDispose.add(this._editor.onDidFocusEditorText(() => {
             scheduler.schedule();
         }));
         this._localToDispose.add(this._editor.onDidBlurEditorText(() => {
@@ -197,7 +198,7 @@ let CodeLensContribution = class CodeLensContribution {
             }
         }));
         this._localToDispose.add(this._editor.onMouseDown(e => {
-            if (e.target.type !== 9 ) {
+            if (e.target.type !== MouseTargetType.CONTENT_WIDGET) {
                 return;
             }
             let target = e.target.element;
@@ -382,7 +383,7 @@ CodeLensContribution = ( (__decorate([
     ( (__param(4, INotificationService))),
     ( (__param(5, ICodeLensCache)))
 ], CodeLensContribution)));
-registerEditorContribution(CodeLensContribution.ID, CodeLensContribution, 1 );
+registerEditorContribution(CodeLensContribution.ID, CodeLensContribution, EditorContributionInstantiation.AfterFirstRender);
 registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
     constructor() {
         super({

package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.js

@@ -1,11 +1,13 @@
 import { $, reset } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { Constants } from '../../../../base/common/uint.js';
 import './codelensWidget.css.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { Range } from '../../../common/core/range.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 class CodeLensViewZone {
     constructor(afterLineNumber, heightInPx, onHeight) {
-        this.afterColumn = 1073741824 ;
+        this.afterColumn = Constants.MAX_SAFE_SMALL_INTEGER;
         this.afterLineNumber = afterLineNumber;
         this.heightInPx = heightInPx;
         this._onHeight = onHeight;
@@ -90,7 +92,7 @@ class CodeLensContentWidget {
         const column = this._editor.getModel().getLineFirstNonWhitespaceColumn(line);
         this._widgetPosition = {
             position: { lineNumber: line, column: column },
-            preference: [1 ]
+            preference: [ContentWidgetPositionPreference.ABOVE]
         };
     }
     getPosition() {

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js

@@ -1,9 +1,12 @@
 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';
 import { Range } from '../../../common/core/range.js';
 import { ColorDecorationInjectedTextMarker } from './colorDetector.js';
 import { ColorHoverParticipant } from './colorHoverParticipant.js';
 import { HoverController } from '../../hover/browser/hoverController.js';
+import { HoverStartMode, HoverStartSource } from '../../hover/browser/hoverOperation.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 class ColorContribution extends Disposable {
     static { this.ID = 'editor.contrib.colorContribution'; }
@@ -17,12 +20,12 @@ class ColorContribution extends Disposable {
         super.dispose();
     }
     onMouseDown(mouseEvent) {
-        const colorDecoratorsActivatedOn = this._editor.getOption(148 );
+        const colorDecoratorsActivatedOn = this._editor.getOption(EditorOption.colorDecoratorsActivatedOn);
         if (colorDecoratorsActivatedOn !== 'click' && colorDecoratorsActivatedOn !== 'clickAndHover') {
             return;
         }
         const target = mouseEvent.target;
-        if (target.type !== 6 ) {
+        if (target.type !== MouseTargetType.CONTENT_TEXT) {
             return;
         }
         if (!target.detail.injectedText) {
@@ -45,10 +48,10 @@ class ColorContribution extends Disposable {
                 target.range.endLineNumber,
                 target.range.endColumn + 1
             ));
-            hoverController.showContentHover(range, 1 , 0 , false, true);
+            hoverController.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Mouse, false, true);
         }
     }
 }
-registerEditorContribution(ColorContribution.ID, ColorContribution, 2 );
+registerEditorContribution(ColorContribution.ID, ColorContribution, EditorContributionInstantiation.BeforeFirstInteraction);
 HoverParticipantRegistry.register(ColorHoverParticipant);
 export { ColorContribution };

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorDetector.js

@@ -7,7 +7,8 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { noBreakWhitespace } from '../../../../base/common/strings.js';
 import { DynamicCssRules } from '../../../browser/editorDom.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
@@ -42,9 +43,9 @@ let ColorDetector = class ColorDetector extends Disposable {
         this._register(_editor.onDidChangeConfiguration((e) => {
             const prevIsEnabled = this._isColorDecoratorsEnabled;
             this._isColorDecoratorsEnabled = this.isEnabled();
-            this._isDefaultColorDecoratorsEnabled = this._editor.getOption(147 );
-            const updatedColorDecoratorsSetting = prevIsEnabled !== this._isColorDecoratorsEnabled || e.hasChanged(21 );
-            const updatedDefaultColorDecoratorsSetting = e.hasChanged(147 );
+            this._isDefaultColorDecoratorsEnabled = this._editor.getOption(EditorOption.defaultColorDecorators);
+            const updatedColorDecoratorsSetting = prevIsEnabled !== this._isColorDecoratorsEnabled || e.hasChanged(EditorOption.colorDecoratorsLimit);
+            const updatedDefaultColorDecoratorsSetting = e.hasChanged(EditorOption.defaultColorDecorators);
             if (updatedColorDecoratorsSetting || updatedDefaultColorDecoratorsSetting) {
                 if (this._isColorDecoratorsEnabled) {
                     this.updateColors();
@@ -57,7 +58,7 @@ let ColorDetector = class ColorDetector extends Disposable {
         this._timeoutTimer = null;
         this._computePromise = null;
         this._isColorDecoratorsEnabled = this.isEnabled();
-        this._isDefaultColorDecoratorsEnabled = this._editor.getOption(147 );
+        this._isDefaultColorDecoratorsEnabled = this._editor.getOption(EditorOption.defaultColorDecorators);
         this.updateColors();
     }
     isEnabled() {
@@ -73,7 +74,7 @@ let ColorDetector = class ColorDetector extends Disposable {
                 return colorDecorators['enable'];
             }
         }
-        return this._editor.getOption(20 );
+        return this._editor.getOption(EditorOption.colorDecorators);
     }
     get limitReporter() {
         return this._decoratorLimitReporter;
@@ -157,7 +158,7 @@ let ColorDetector = class ColorDetector extends Disposable {
     updateColorDecorators(colorData) {
         this._colorDecorationClassRefs.clear();
         const decorations = [];
-        const limit = this._editor.getOption(21 );
+        const limit = this._editor.getOption(EditorOption.colorDecoratorsLimit);
         for (let i = 0; i < colorData.length && decorations.length < limit; i++) {
             const { red, green, blue, alpha } = colorData[i].colorInfo.color;
             const rgba = ( new RGBA(
@@ -241,5 +242,5 @@ class DecoratorLimitReporter {
         }
     }
 }
-registerEditorContribution(ColorDetector.ID, ColorDetector, 1 );
+registerEditorContribution(ColorDetector.ID, ColorDetector, EditorContributionInstantiation.AfterFirstRender);
 export { ColorDecorationInjectedTextMarker, ColorDetector, DecoratorLimitReporter };

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js

@@ -3,11 +3,14 @@ import { AsyncIterableObject } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Color, RGBA } from '../../../../base/common/color.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { getColors, getColorPresentations } from './color.js';
 import { ColorDetector } from './colorDetector.js';
 import { ColorPickerModel } from './colorPickerModel.js';
 import { ColorPickerWidget } from './colorPickerWidget.js';
+import { HoverAnchorType } from '../../hover/browser/hoverTypes.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { Dimension } from '../../../../base/browser/dom.js';
 class ColorHover {
@@ -19,7 +22,7 @@ class ColorHover {
         this.forceShowAtRange = true;
     }
     isValidForHoverAnchor(anchor) {
-        return (anchor.type === 1
+        return (anchor.type === HoverAnchorType.Range
             && this.range.startColumn <= anchor.range.startColumn
             && this.range.endColumn >= anchor.range.endColumn);
     }
@@ -156,7 +159,7 @@ function renderHoverParts(participant, editor, themeService, hoverParts, context
         return Disposable.None;
     }
     if (context.setMinimumDimensions) {
-        const minimumHeight = editor.getOption(67 ) + 8;
+        const minimumHeight = editor.getOption(EditorOption.lineHeight) + 8;
         context.setMinimumDimensions(( new Dimension(302, minimumHeight)));
     }
     const disposables = ( new DisposableStore());
@@ -166,7 +169,7 @@ function renderHoverParts(participant, editor, themeService, hoverParts, context
     const widget = disposables.add(( new ColorPickerWidget(
         context.fragment,
         model,
-        editor.getOption(143 ),
+        editor.getOption(EditorOption.pixelRatio),
         themeService,
         participant instanceof StandaloneColorPickerParticipant
     )));
@@ -215,7 +218,7 @@ function _updateEditorModel(editor, range, model) {
         textEdits.push(...model.presentation.additionalTextEdits);
     }
     const replaceRange = Range.lift(edit.range);
-    const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, 3 );
+    const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, TrackedRangeStickiness.GrowsOnlyWhenTypingAfter);
     editor.executeEdits('colorpicker', textEdits);
     editor.pushUndoStop();
     return editor.getModel()._getTrackedRange(trackedRange) ?? replaceRange;

package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js

@@ -1,5 +1,7 @@
 import { registerEditorAction, EditorAction2, EditorAction } from '../../../browser/editorExtensions.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { StandaloneColorPickerController } from './standaloneColorPickerWidget.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { registerAction2, MenuId } from '../../../../platform/actions/common/actions.js';
@@ -38,8 +40,8 @@ class HideStandaloneColorPicker extends EditorAction {
             alias: 'Hide the Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerVisible.isEqualTo(true))),
             kbOpts: {
-                primary: 9 ,
-                weight: 100
+                primary: KeyCode.Escape,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(_moduleId, 4, "Hide the standalone color picker.")),
@@ -58,8 +60,8 @@ class InsertColorWithStandaloneColorPicker extends EditorAction {
             alias: 'Insert Color with Standalone Color Picker',
             precondition: ( (EditorContextKeys.standaloneColorPickerFocused.isEqualTo(true))),
             kbOpts: {
-                primary: 3 ,
-                weight: 100
+                primary: KeyCode.Enter,
+                weight: KeybindingWeight.EditorContrib
             },
             metadata: {
                 description: ( localize2WithPath(

package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js

@@ -1,12 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { PositionAffinity } from '../../../common/model.js';
 import { StandaloneColorPickerParticipant } from './colorHoverParticipant.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EditorHoverStatusBar } from '../../hover/browser/contentHoverStatusBar.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IModelService } from '../../../common/services/model.js';
@@ -72,7 +75,7 @@ StandaloneColorPickerController = StandaloneColorPickerController_1 = ( __decora
     ( __param(5, ILanguageFeaturesService)),
     ( __param(6, ILanguageConfigurationService))
 ], StandaloneColorPickerController));
-registerEditorContribution(StandaloneColorPickerController.ID, StandaloneColorPickerController, 1 );
+registerEditorContribution(StandaloneColorPickerController.ID, StandaloneColorPickerController, EditorContributionInstantiation.AfterFirstRender);
 const PADDING = 8;
 const CLOSE_BUTTON_WIDTH = 22;
 let StandaloneColorPickerWidget = class StandaloneColorPickerWidget extends Disposable {
@@ -148,12 +151,12 @@ let StandaloneColorPickerWidget = class StandaloneColorPickerWidget extends Disp
         if (!this._position) {
             return null;
         }
-        const positionPreference = this._editor.getOption(60 ).above;
+        const positionPreference = this._editor.getOption(EditorOption.hover).above;
         return {
             position: this._position,
             secondaryPosition: this._position,
-            preference: positionPreference ? [1 , 2 ] : [2 , 1 ],
-            positionAffinity: 2
+            preference: positionPreference ? [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW] : [ContentWidgetPositionPreference.BELOW, ContentWidgetPositionPreference.ABOVE],
+            positionAffinity: PositionAffinity.None
         };
     }
     hide() {