@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -6,9 +6,7 @@ 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 { GlyphMarginLane, TrackedRangeStickiness } from '../../../common/model.js';
+import { GlyphMarginLane } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 import { computeIndentLevel } from '../../../common/model/utils.js';
 import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
@@ -18,40 +16,39 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Range } from '../../../common/core/range.js';
 var LightBulbWidget_1;
 const GUTTER_LIGHTBULB_ICON = registerIcon('gutter-lightbulb', Codicon.lightBulb, ( localize(
-    4987,
+    5042,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor.'
 )));
 const GUTTER_LIGHTBULB_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-auto-fix', Codicon.lightbulbAutofix, ( localize(
-    4988,
+    5043,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and a quick fix is available.'
 )));
 const GUTTER_LIGHTBULB_AIFIX_ICON = registerIcon('gutter-lightbulb-sparkle', Codicon.lightbulbSparkle, ( localize(
-    4989,
+    5044,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix is available.'
 )));
 const GUTTER_LIGHTBULB_AIFIX_AUTO_FIX_ICON = registerIcon('gutter-lightbulb-aifix-auto-fix', Codicon.lightbulbSparkleAutofix, ( localize(
-    4990,
+    5045,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
 )));
 const GUTTER_SPARKLE_FILLED_ICON = registerIcon('gutter-lightbulb-sparkle-filled', Codicon.sparkleFilled, ( localize(
-    4991,
+    5046,
     'Icon which spawns code actions menu from the gutter when there is no space in the editor and an AI fix and a quick fix is available.'
 )));
 var LightBulbState;
 ( ((function(LightBulbState) {
-    let Type;
     ( ((function(Type) {
         Type[Type["Hidden"] = 0] = "Hidden";
         Type[Type["Showing"] = 1] = "Showing";
-    })(Type = LightBulbState.Type || (LightBulbState.Type = {}))));
-    LightBulbState.Hidden = { type: Type.Hidden };
+    })(LightBulbState.Type || (LightBulbState.Type = {}))));
+    LightBulbState.Hidden = { type: 0  };
     class Showing {
         constructor(actions, trigger, editorPosition, widgetPosition) {
             this.actions = actions;
             this.trigger = trigger;
             this.editorPosition = editorPosition;
             this.widgetPosition = widgetPosition;
-            this.type = Type.Showing;
+            this.type = 1 ;
         }
     }
     LightBulbState.Showing = Showing;
@@ -62,10 +59,10 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         description: 'codicon-gutter-lightbulb-decoration',
         glyphMarginClassName: ThemeIcon.asClassName(Codicon.lightBulb),
         glyphMargin: { position: GlyphMarginLane.Left },
-        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+        stickiness: 1 ,
     }); }
     static { this.ID = 'editor.contrib.lightbulbWidget'; }
-    static { this._posPref = [ContentWidgetPositionPreference.EXACT]; }
+    static { this._posPref = [0 ]; }
     constructor(_editor, _keybindingService) {
         super();
         this._editor = _editor;
@@ -89,21 +86,21 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._editor.addContentWidget(this);
         this._register(this._editor.onDidChangeModelContent(_ => {
             const editorModel = this._editor.getModel();
-            if (this.state.type !== LightBulbState.Type.Showing || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
+            if (this.state.type !== 1  || !editorModel || this.state.editorPosition.lineNumber >= editorModel.getLineCount()) {
                 this.hide();
             }
-            if (this.gutterState.type !== LightBulbState.Type.Showing || !editorModel || this.gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
+            if (this.gutterState.type !== 1  || !editorModel || this.gutterState.editorPosition.lineNumber >= editorModel.getLineCount()) {
                 this.gutterHide();
             }
         }));
         this._register(addStandardDisposableGenericMouseDownListener(this._domNode, e => {
-            if (this.state.type !== LightBulbState.Type.Showing) {
+            if (this.state.type !== 1 ) {
                 return;
             }
             this._editor.focus();
             e.preventDefault();
             const { top, height } = getDomNodePagePosition(this._domNode);
-            const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+            const lineHeight = this._editor.getOption(69 );
             let pad = Math.floor(lineHeight / 3);
             if (this.state.widgetPosition.position !== null && this.state.widgetPosition.position.lineNumber < this.state.editorPosition.lineNumber) {
                 pad += lineHeight;
@@ -130,12 +127,12 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             if (!e.target.element || !( (this.lightbulbClasses.some(cls => e.target.element && e.target.element.classList.contains(cls))))) {
                 return;
             }
-            if (this.gutterState.type !== LightBulbState.Type.Showing) {
+            if (this.gutterState.type !== 1 ) {
                 return;
             }
             this._editor.focus();
             const { top, height } = getDomNodePagePosition(e.target.element);
-            const lineHeight = this._editor.getOption(EditorOption.lineHeight);
+            const lineHeight = this._editor.getOption(69 );
             let pad = Math.floor(lineHeight / 3);
             if (this.gutterState.widgetPosition.position !== null && this.gutterState.widgetPosition.position.lineNumber < this.gutterState.editorPosition.lineNumber) {
                 pad += lineHeight;
@@ -162,7 +159,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         return this._domNode;
     }
     getPosition() {
-        return this._state.type === LightBulbState.Type.Showing ? this._state.widgetPosition : null;
+        return this._state.type === 1  ? this._state.widgetPosition : null;
     }
     update(actions, trigger, atPosition) {
         if (actions.validActions.length <= 0) {
@@ -175,7 +172,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             return this.hide();
         }
         const options = this._editor.getOptions();
-        if (!options.get(EditorOption.lightbulb).enabled) {
+        if (!options.get(67 ).enabled) {
             this.gutterHide();
             return this.hide();
         }
@@ -186,7 +183,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         }
         const { lineNumber, column } = model.validatePosition(atPosition);
         const tabSize = model.getOptions().tabSize;
-        const fontInfo = this._editor.getOptions().get(EditorOption.fontInfo);
+        const fontInfo = this._editor.getOptions().get(52 );
         const lineContent = model.getLineContent(lineNumber);
         const indent = computeIndentLevel(lineContent, tabSize);
         const lineHasSpace = fontInfo.spaceWidth * indent > 22;
@@ -299,7 +296,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
     _updateLightBulbTitleAndIcon() {
         this._domNode.classList.remove(...this._iconClasses);
         this._iconClasses = [];
-        if (this.state.type !== LightBulbState.Type.Showing) {
+        if (this.state.type !== 1 ) {
             return;
         }
         let icon;
@@ -329,7 +326,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         this._domNode.classList.add(...this._iconClasses);
     }
     _updateGutterLightBulbTitleAndIcon() {
-        if (this.gutterState.type !== LightBulbState.Type.Showing) {
+        if (this.gutterState.type !== 1 ) {
             return;
         }
         let icon;
@@ -359,7 +356,7 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
             description: 'codicon-gutter-lightbulb-decoration',
             glyphMarginClassName: ThemeIcon.asClassName(icon),
             glyphMargin: { position: GlyphMarginLane.Left },
-            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            stickiness: 1 ,
         });
         this.gutterDecoration = GUTTER_DECORATION;
     }
@@ -393,24 +390,24 @@ let LightBulbWidget = class LightBulbWidget extends Disposable {
         });
     }
     _updateLightbulbTitle(autoFix, autoRun) {
-        if (this.state.type !== LightBulbState.Type.Showing) {
+        if (this.state.type !== 1 ) {
             return;
         }
         if (autoRun) {
-            this.title = ( localize(4992, "Run: {0}", this.state.actions.validActions[0].action.title));
+            this.title = ( localize(5047, "Run: {0}", this.state.actions.validActions[0].action.title));
         }
         else if (autoFix && this._preferredKbLabel) {
             this.title = ( localize(
-                4993,
+                5048,
                 "Show Code Actions. Preferred Quick Fix Available ({0})",
                 this._preferredKbLabel
             ));
         }
         else if (!autoFix && this._quickFixKbLabel) {
-            this.title = ( localize(4994, "Show Code Actions ({0})", this._quickFixKbLabel));
+            this.title = ( localize(5049, "Show Code Actions ({0})", this._quickFixKbLabel));
         }
         else if (!autoFix) {
-            this.title = ( localize(4995, "Show Code Actions"));
+            this.title = ( localize(5050, "Show Code Actions"));
         }
     }
     set title(value) {

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

@@ -15,12 +15,6 @@ 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";
@@ -96,9 +90,9 @@ class CodeActionCommandArgs {
     }
     static getApplyFromUser(arg, defaultAutoApply) {
         switch (typeof arg.apply === 'string' ? arg.apply.toLowerCase() : '') {
-            case 'first': return CodeActionAutoApply.First;
-            case 'never': return CodeActionAutoApply.Never;
-            case 'ifsingle': return CodeActionAutoApply.IfSingle;
+            case 'first': return "first" ;
+            case 'never': return "never" ;
+            case 'ifsingle': return "ifSingle" ;
             default: return defaultAutoApply;
         }
     }
@@ -140,4 +134,4 @@ class CodeActionItem {
         return this;
     }
 }
-export { CodeActionAutoApply, CodeActionCommandArgs, CodeActionItem, CodeActionKind, CodeActionTriggerSource, filtersAction, mayIncludeActionsOfKind };
+export { 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, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { StorageScope, WillSaveStateReason, StorageTarget } from '../../../../platform/storage/common/storage.js';
+import { WillSaveStateReason } 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, StorageScope.WORKSPACE));
+        runWhenWindowIdle(mainWindow, () => storageService.remove(oldkey, 1 ));
         const key = 'codelens/cache2';
-        const raw = storageService.get(key, StorageScope.WORKSPACE, '{}');
+        const raw = storageService.get(key, 1 , '{}');
         this._deserialize(raw);
         const onWillSaveStateBecauseOfShutdown = Event.filter(storageService.onWillSaveState, e => e.reason === WillSaveStateReason.SHUTDOWN);
         Event.once(onWillSaveStateBecauseOfShutdown)(e => {
-            storageService.store(key, this._serialize(), StorageScope.WORKSPACE, StorageTarget.MACHINE);
+            storageService.store(key, this._serialize(), 1 , 1 );
         });
     }
     put(model, data) {
@@ -88,5 +88,5 @@ let CodeLensCache = class CodeLensCache {
 CodeLensCache = ( __decorate([
     ( __param(0, IStorageService))
 ], CodeLensCache));
-registerSingleton(ICodeLensCache, CodeLensCache, InstantiationType.Delayed);
+registerSingleton(ICodeLensCache, CodeLensCache, 1 );
 export { CodeLensCache, ICodeLensCache };

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

@@ -3,9 +3,8 @@ 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 { 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 { registerEditorContribution, registerEditorAction, EditorAction } from '../../../browser/editorExtensions.js';
+import { 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 +36,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(EditorOption.fontInfo) || e.hasChanged(EditorOption.codeLensFontSize) || e.hasChanged(EditorOption.codeLensFontFamily)) {
+            if (e.hasChanged(52 ) || e.hasChanged(19 ) || e.hasChanged(18 )) {
                 this._updateLensStyle();
             }
-            if (e.hasChanged(EditorOption.codeLens)) {
+            if (e.hasChanged(17 )) {
                 this._onModelChange();
             }
         }));
@@ -55,10 +54,10 @@ let CodeLensContribution = class CodeLensContribution {
         this._currentCodeLensModel?.dispose();
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(EditorOption.lineHeight) / this._editor.getOption(EditorOption.fontSize));
-        let fontSize = this._editor.getOption(EditorOption.codeLensFontSize);
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(69 ) / this._editor.getOption(54 ));
+        let fontSize = this._editor.getOption(19 );
         if (!fontSize || fontSize < 5) {
-            fontSize = (this._editor.getOption(EditorOption.fontSize) * .9) | 0;
+            fontSize = (this._editor.getOption(54 ) * .9) | 0;
         }
         return {
             fontSize,
@@ -67,8 +66,8 @@ let CodeLensContribution = class CodeLensContribution {
     }
     _updateLensStyle() {
         const { codeLensHeight, fontSize } = this._getLayoutInfo();
-        const fontFamily = this._editor.getOption(EditorOption.codeLensFontFamily);
-        const editorFontInfo = this._editor.getOption(EditorOption.fontInfo);
+        const fontFamily = this._editor.getOption(18 );
+        const editorFontInfo = this._editor.getOption(52 );
         const { style } = this._editor.getContainerDomNode();
         style.setProperty('--vscode-editorCodeLens-lineHeight', `${codeLensHeight}px`);
         style.setProperty('--vscode-editorCodeLens-fontSize', `${fontSize}px`);
@@ -98,7 +97,7 @@ let CodeLensContribution = class CodeLensContribution {
         if (!model) {
             return;
         }
-        if (!this._editor.getOption(EditorOption.codeLens) || model.isTooLargeForTokenization()) {
+        if (!this._editor.getOption(17 ) || model.isTooLargeForTokenization()) {
             return;
         }
         const cachedLenses = this._codeLensCache.get(model);
@@ -197,7 +196,7 @@ let CodeLensContribution = class CodeLensContribution {
             }
         }));
         this._localToDispose.add(this._editor.onMouseDown(e => {
-            if (e.target.type !== MouseTargetType.CONTENT_WIDGET) {
+            if (e.target.type !== 9 ) {
                 return;
             }
             let target = e.target.element;
@@ -382,13 +381,13 @@ CodeLensContribution = ( (__decorate([
     ( (__param(4, INotificationService))),
     ( (__param(5, ICodeLensCache)))
 ], CodeLensContribution)));
-registerEditorContribution(CodeLensContribution.ID, CodeLensContribution, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(CodeLensContribution.ID, CodeLensContribution, 1 );
 registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
     constructor() {
         super({
             id: 'codelens.showLensesInCurrentLine',
             precondition: EditorContextKeys.hasCodeLensProvider,
-            label: ( localize(1230, "Show CodeLens Commands For Current Line")),
+            label: ( localize(1382, "Show CodeLens Commands For Current Line")),
             alias: 'Show CodeLens Commands For Current Line',
         });
     }
@@ -422,7 +421,7 @@ registerEditorAction(class ShowLensesInCurrentLine extends EditorAction {
         }
         const item = await quickInputService.pick(items, {
             canPickMany: false,
-            placeHolder: ( localize(1231, "Select a command"))
+            placeHolder: ( localize(1383, "Select a command"))
         });
         if (!item) {
             return;

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

@@ -1,13 +1,11 @@
 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 = Constants.MAX_SAFE_SMALL_INTEGER;
+        this.afterColumn = 1073741824 ;
         this.afterLineNumber = afterLineNumber;
         this.heightInPx = heightInPx;
         this._onHeight = onHeight;
@@ -92,7 +90,7 @@ class CodeLensContentWidget {
         const column = this._editor.getModel().getLineFirstNonWhitespaceColumn(line);
         this._widgetPosition = {
             position: { lineNumber: line, column: column },
-            preference: [ContentWidgetPositionPreference.ABOVE]
+            preference: [1 ]
         };
     }
     getPosition() {

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

@@ -1,9 +1,6 @@
 import { CancellationToken } from '../../../../base/common/cancellation.js';
-import { illegalArgument, onUnexpectedExternalError } from '../../../../base/common/errors.js';
-import { URI } from '../../../../base/common/uri.js';
-import { Range } from '../../../common/core/range.js';
+import { onUnexpectedExternalError, illegalArgument } from '../../../../base/common/errors.js';
 import { IModelService } from '../../../common/services/model.js';
-import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { DefaultDocumentColorProvider } from './defaultDocumentColorProvider.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -88,22 +85,4 @@ function _setupColorCommand(accessor, resource) {
     const isDefaultColorDecoratorsEnabled = accessor.get(IConfigurationService).getValue('editor.defaultColorDecorators', { resource });
     return { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled };
 }
-CommandsRegistry.registerCommand('_executeDocumentColorProvider', function (accessor, ...args) {
-    const [resource] = args;
-    if (!(resource instanceof URI)) {
-        throw illegalArgument();
-    }
-    const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, resource);
-    return _findColorData(( new ExtColorDataCollector()), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
-});
-CommandsRegistry.registerCommand('_executeColorPresentationProvider', function (accessor, ...args) {
-    const [color, context] = args;
-    const { uri, range } = context;
-    if (!(uri instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
-        throw illegalArgument();
-    }
-    const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, uri);
-    const [red, green, blue, alpha] = color;
-    return _findColorData(( new ColorPresentationsCollector({ range: range, color: { red, green, blue, alpha } })), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
-});
-export { getColorPresentations, getColors };
+export { ColorPresentationsCollector, ExtColorDataCollector, _findColorData, _setupColorCommand, getColorPresentations, getColors };

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

@@ -7,8 +7,6 @@ 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, 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';
@@ -43,9 +41,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(EditorOption.defaultColorDecorators);
-            const updatedColorDecoratorsSetting = prevIsEnabled !== this._isColorDecoratorsEnabled || e.hasChanged(EditorOption.colorDecoratorsLimit);
-            const updatedDefaultColorDecoratorsSetting = e.hasChanged(EditorOption.defaultColorDecorators);
+            this._isDefaultColorDecoratorsEnabled = this._editor.getOption(150 );
+            const updatedColorDecoratorsSetting = prevIsEnabled !== this._isColorDecoratorsEnabled || e.hasChanged(21 );
+            const updatedDefaultColorDecoratorsSetting = e.hasChanged(150 );
             if (updatedColorDecoratorsSetting || updatedDefaultColorDecoratorsSetting) {
                 if (this._isColorDecoratorsEnabled) {
                     this.updateColors();
@@ -58,7 +56,7 @@ let ColorDetector = class ColorDetector extends Disposable {
         this._timeoutTimer = null;
         this._computePromise = null;
         this._isColorDecoratorsEnabled = this.isEnabled();
-        this._isDefaultColorDecoratorsEnabled = this._editor.getOption(EditorOption.defaultColorDecorators);
+        this._isDefaultColorDecoratorsEnabled = this._editor.getOption(150 );
         this.updateColors();
     }
     isEnabled() {
@@ -74,7 +72,7 @@ let ColorDetector = class ColorDetector extends Disposable {
                 return colorDecorators['enable'];
             }
         }
-        return this._editor.getOption(EditorOption.colorDecorators);
+        return this._editor.getOption(20 );
     }
     get limitReporter() {
         return this._decoratorLimitReporter;
@@ -158,7 +156,7 @@ let ColorDetector = class ColorDetector extends Disposable {
     updateColorDecorators(colorData) {
         this._colorDecorationClassRefs.clear();
         const decorations = [];
-        const limit = this._editor.getOption(EditorOption.colorDecoratorsLimit);
+        const limit = this._editor.getOption(21 );
         for (let i = 0; i < colorData.length && decorations.length < limit; i++) {
             const { red, green, blue, alpha } = colorData[i].colorInfo.color;
             const rgba = ( new RGBA(
@@ -242,5 +240,4 @@ class DecoratorLimitReporter {
         }
     }
 }
-registerEditorContribution(ColorDetector.ID, ColorDetector, EditorContributionInstantiation.AfterFirstRender);
 export { ColorDecorationInjectedTextMarker, ColorDetector, DecoratorLimitReporter };

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

@@ -0,0 +1,42 @@
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { illegalArgument } from '../../../../base/common/errors.js';
+import { URI } from '../../../../base/common/uri.js';
+import { registerAction2 } from '../../../../platform/actions/common/actions.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { registerEditorAction, registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { registerEditorFeature } from '../../../common/editorFeatures.js';
+import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
+import { _setupColorCommand, _findColorData, ExtColorDataCollector, ColorPresentationsCollector } from './color.js';
+import { ColorDetector } from './colorDetector.js';
+import { DefaultDocumentColorProviderFeature } from './defaultDocumentColorProvider.js';
+import { HoverColorPickerContribution } from './hoverColorPicker/hoverColorPickerContribution.js';
+import { HoverColorPickerParticipant } from './hoverColorPicker/hoverColorPickerParticipant.js';
+import { HideStandaloneColorPicker, InsertColorWithStandaloneColorPicker, ShowOrFocusStandaloneColorPicker } from './standaloneColorPicker/standaloneColorPickerActions.js';
+import { StandaloneColorPickerController } from './standaloneColorPicker/standaloneColorPickerController.js';
+import { Range } from '../../../common/core/range.js';
+registerEditorAction(HideStandaloneColorPicker);
+registerEditorAction(InsertColorWithStandaloneColorPicker);
+registerAction2(ShowOrFocusStandaloneColorPicker);
+registerEditorContribution(HoverColorPickerContribution.ID, HoverColorPickerContribution, 2 );
+registerEditorContribution(StandaloneColorPickerController.ID, StandaloneColorPickerController, 1 );
+registerEditorContribution(ColorDetector.ID, ColorDetector, 1 );
+registerEditorFeature(DefaultDocumentColorProviderFeature);
+HoverParticipantRegistry.register(HoverColorPickerParticipant);
+CommandsRegistry.registerCommand('_executeDocumentColorProvider', function (accessor, ...args) {
+    const [resource] = args;
+    if (!(resource instanceof URI)) {
+        throw illegalArgument();
+    }
+    const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, resource);
+    return _findColorData(( new ExtColorDataCollector()), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
+});
+CommandsRegistry.registerCommand('_executeColorPresentationProvider', function (accessor, ...args) {
+    const [color, context] = args;
+    const { uri, range } = context;
+    if (!(uri instanceof URI) || !Array.isArray(color) || color.length !== 4 || !Range.isIRange(range)) {
+        throw illegalArgument();
+    }
+    const { model, colorProviderRegistry, isDefaultColorDecoratorsEnabled } = _setupColorCommand(accessor, uri);
+    const [red, green, blue, alpha] = color;
+    return _findColorData(( new ColorPresentationsCollector({ range: range, color: { red, green, blue, alpha } })), colorProviderRegistry, model, CancellationToken.None, isDefaultColorDecoratorsEnabled);
+});

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

@@ -0,0 +1,51 @@
+import { CancellationToken } from '../../../../base/common/cancellation.js';
+import { Color, RGBA } from '../../../../base/common/color.js';
+import { getColorPresentations } from './color.js';
+import { ColorPickerModel } from './colorPickerModel.js';
+import { Range } from '../../../common/core/range.js';
+async function createColorHover(editorModel, colorInfo, provider) {
+    const originalText = editorModel.getValueInRange(colorInfo.range);
+    const { red, green, blue, alpha } = colorInfo.color;
+    const rgba = ( new RGBA(
+        Math.round(red * 255),
+        Math.round(green * 255),
+        Math.round(blue * 255),
+        alpha
+    ));
+    const color = ( new Color(rgba));
+    const colorPresentations = await getColorPresentations(editorModel, colorInfo, provider, CancellationToken.None);
+    const model = ( new ColorPickerModel(color, [], 0));
+    model.colorPresentations = colorPresentations || [];
+    model.guessColorPresentation(color, originalText);
+    return {
+        range: Range.lift(colorInfo.range),
+        model,
+        provider
+    };
+}
+function updateEditorModel(editor, range, model) {
+    const textEdits = [];
+    const edit = model.presentation.textEdit ?? { range, text: model.presentation.label, forceMoveMarkers: false };
+    textEdits.push(edit);
+    if (model.presentation.additionalTextEdits) {
+        textEdits.push(...model.presentation.additionalTextEdits);
+    }
+    const replaceRange = Range.lift(edit.range);
+    const trackedRange = editor.getModel()._setTrackedRange(null, replaceRange, 3 );
+    editor.executeEdits('colorpicker', textEdits);
+    editor.pushUndoStop();
+    return editor.getModel()._getTrackedRange(trackedRange) ?? replaceRange;
+}
+async function updateColorPresentations(editorModel, colorPickerModel, color, range, colorHover) {
+    const colorPresentations = await getColorPresentations(editorModel, {
+        range: range,
+        color: {
+            red: color.rgba.r / 255,
+            green: color.rgba.g / 255,
+            blue: color.rgba.b / 255,
+            alpha: color.rgba.a
+        }
+    }, colorHover.provider, CancellationToken.None);
+    colorPickerModel.colorPresentations = colorPresentations || [];
+}
+export { createColorHover, updateColorPresentations, updateEditorModel };

package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerBody.js

@@ -0,0 +1,71 @@
+import '../colorPicker.css.js';
+import { append, $ as $$1 } from '../../../../../base/browser/dom.js';
+import { Color, HSVA } from '../../../../../base/common/color.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { SaturationBox } from './colorPickerSaturationBox.js';
+import { InsertButton } from './colorPickerInsertButton.js';
+import { OpacityStrip, HueStrip } from './colorPickerStrip.js';
+const $ = $$1;
+class ColorPickerBody extends Disposable {
+    constructor(container, model, pixelRatio, isStandaloneColorPicker = false) {
+        super();
+        this.model = model;
+        this.pixelRatio = pixelRatio;
+        this._insertButton = null;
+        this._domNode = $('.colorpicker-body');
+        append(container, this._domNode);
+        this._saturationBox = ( new SaturationBox(this._domNode, this.model, this.pixelRatio));
+        this._register(this._saturationBox);
+        this._register(this._saturationBox.onDidChange(this.onDidSaturationValueChange, this));
+        this._register(this._saturationBox.onColorFlushed(this.flushColor, this));
+        this._opacityStrip = ( new OpacityStrip(this._domNode, this.model, isStandaloneColorPicker));
+        this._register(this._opacityStrip);
+        this._register(this._opacityStrip.onDidChange(this.onDidOpacityChange, this));
+        this._register(this._opacityStrip.onColorFlushed(this.flushColor, this));
+        this._hueStrip = ( new HueStrip(this._domNode, this.model, isStandaloneColorPicker));
+        this._register(this._hueStrip);
+        this._register(this._hueStrip.onDidChange(this.onDidHueChange, this));
+        this._register(this._hueStrip.onColorFlushed(this.flushColor, this));
+        if (isStandaloneColorPicker) {
+            this._insertButton = this._register(( new InsertButton(this._domNode)));
+            this._domNode.classList.add('standalone-colorpicker');
+        }
+    }
+    flushColor() {
+        this.model.flushColor();
+    }
+    onDidSaturationValueChange({ s, v }) {
+        const hsva = this.model.color.hsva;
+        this.model.color = ( new Color(( new HSVA(hsva.h, s, v, hsva.a))));
+    }
+    onDidOpacityChange(a) {
+        const hsva = this.model.color.hsva;
+        this.model.color = ( new Color(( new HSVA(hsva.h, hsva.s, hsva.v, a))));
+    }
+    onDidHueChange(value) {
+        const hsva = this.model.color.hsva;
+        const h = (1 - value) * 360;
+        this.model.color = ( new Color(( new HSVA(h === 360 ? 0 : h, hsva.s, hsva.v, hsva.a))));
+    }
+    get domNode() {
+        return this._domNode;
+    }
+    get saturationBox() {
+        return this._saturationBox;
+    }
+    get opacityStrip() {
+        return this._opacityStrip;
+    }
+    get hueStrip() {
+        return this._hueStrip;
+    }
+    get enterButton() {
+        return this._insertButton;
+    }
+    layout() {
+        this._saturationBox.layout();
+        this._opacityStrip.layout();
+        this._hueStrip.layout();
+    }
+}
+export { ColorPickerBody };