@theia/monaco 1.34.1 → 1.34.3

package/src/browser/index.ts

@@ -1,17 +1,17 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-export * from './monaco-frontend-module';
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+export * from './monaco-frontend-module';

package/src/browser/markdown-renderer/monaco-markdown-renderer.ts

@@ -1,117 +1,117 @@
-// *****************************************************************************
-// Copyright (C) 2022 Ericsson and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
-import { MarkdownRenderer as CodeMarkdownRenderer } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { MonacoCommandServiceFactory } from '../monaco-command-service';
-import { MonacoEditorService } from '../monaco-editor-service';
-import * as monaco from '@theia/monaco-editor-core';
-import { OpenerService as MonacoOpenerService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService';
-import { OpenerService, PreferenceService, WidgetOpenerOptions, open } from '@theia/core/lib/browser';
-import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
-import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
-import { URI } from '@theia/core/lib/common/uri';
-import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
-import { MarkedOptions, MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
-import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
-import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { DisposableCollection, DisposableGroup } from '@theia/core';
-
-@injectable()
-export class MonacoMarkdownRenderer implements MarkdownRenderer {
-    @inject(MonacoEditorService) protected readonly codeEditorService: MonacoEditorService;
-    @inject(MonacoCommandServiceFactory) protected readonly commandServiceFactory: MonacoCommandServiceFactory;
-    @inject(OpenerService) protected readonly openerService: OpenerService;
-    @inject(PreferenceService) protected readonly preferences: PreferenceService;
-
-    protected delegate: CodeMarkdownRenderer;
-    protected _openerService: OpenerService | undefined;
-
-    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): MarkdownRenderResult {
-        return this.delegate.render(markdown, this.transformOptions(options), markedOptions);
-    }
-
-    protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined {
-        if (!options?.actionHandler) {
-            return options as MarkdownRenderOptions & { actionHandler: undefined } | undefined;
-        }
-        const monacoActionHandler: MonacoMarkdownRenderOptions['actionHandler'] = {
-            disposables: this.toDisposableStore(options.actionHandler.disposables),
-            callback: (content, e) => options.actionHandler!.callback(content, e?.browserEvent)
-        };
-        return { ...options, actionHandler: monacoActionHandler };
-    }
-
-    protected toDisposableStore(current: DisposableGroup): DisposableStore {
-        if (current instanceof DisposableStore) {
-            return current;
-        } else if (current instanceof DisposableCollection) {
-            const store = new DisposableStore();
-            current['disposables'].forEach(disposable => store.add(disposable));
-            return store;
-        } else {
-            return new DisposableStore();
-        }
-    }
-
-    @postConstruct()
-    protected init(): void {
-        const languages = StandaloneServices.get(ILanguageService);
-        const openerService = new MonacoOpenerService(this.codeEditorService, this.commandServiceFactory());
-        openerService.registerOpener({
-            open: (u, options) => this.interceptOpen(u, options)
-        });
-        const getPreference = () => this.preferences.get<string>('editor.fontFamily');
-        const rendererOptions = new Proxy(Object.create(null), { // eslint-disable-line no-null/no-null
-            get(_, field): string | undefined {
-                if (field === 'codeBlockFontFamily') {
-                    return getPreference();
-                } else {
-                    return undefined;
-                }
-            }
-        });
-        this.delegate = new CodeMarkdownRenderer(rendererOptions, languages, openerService);
-    }
-
-    protected async interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {
-        let options = undefined;
-        if (monacoOptions) {
-            if ('openToSide' in monacoOptions && monacoOptions.openToSide) {
-                options = Object.assign(options || {}, <WidgetOpenerOptions>{
-                    widgetOptions: {
-                        mode: 'split-right'
-                    }
-                });
-            }
-            if ('openExternal' in monacoOptions && monacoOptions.openExternal) {
-                options = Object.assign(options || {}, <HttpOpenHandlerOptions>{
-                    openExternal: true
-                });
-            }
-        }
-        const uri = new URI(monacoUri.toString());
-        try {
-            await open(this.openerService, uri, options);
-            return true;
-        } catch (e) {
-            console.error(`Fail to open '${uri.toString()}':`, e);
-            return false;
-        }
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
+import { MarkdownRenderer as CodeMarkdownRenderer } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { MonacoCommandServiceFactory } from '../monaco-command-service';
+import { MonacoEditorService } from '../monaco-editor-service';
+import * as monaco from '@theia/monaco-editor-core';
+import { OpenerService as MonacoOpenerService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService';
+import { OpenerService, PreferenceService, WidgetOpenerOptions, open } from '@theia/core/lib/browser';
+import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
+import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
+import { URI } from '@theia/core/lib/common/uri';
+import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
+import { MarkedOptions, MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
+import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
+import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { DisposableCollection, DisposableGroup } from '@theia/core';
+
+@injectable()
+export class MonacoMarkdownRenderer implements MarkdownRenderer {
+    @inject(MonacoEditorService) protected readonly codeEditorService: MonacoEditorService;
+    @inject(MonacoCommandServiceFactory) protected readonly commandServiceFactory: MonacoCommandServiceFactory;
+    @inject(OpenerService) protected readonly openerService: OpenerService;
+    @inject(PreferenceService) protected readonly preferences: PreferenceService;
+
+    protected delegate: CodeMarkdownRenderer;
+    protected _openerService: OpenerService | undefined;
+
+    render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): MarkdownRenderResult {
+        return this.delegate.render(markdown, this.transformOptions(options), markedOptions);
+    }
+
+    protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined {
+        if (!options?.actionHandler) {
+            return options as MarkdownRenderOptions & { actionHandler: undefined } | undefined;
+        }
+        const monacoActionHandler: MonacoMarkdownRenderOptions['actionHandler'] = {
+            disposables: this.toDisposableStore(options.actionHandler.disposables),
+            callback: (content, e) => options.actionHandler!.callback(content, e?.browserEvent)
+        };
+        return { ...options, actionHandler: monacoActionHandler };
+    }
+
+    protected toDisposableStore(current: DisposableGroup): DisposableStore {
+        if (current instanceof DisposableStore) {
+            return current;
+        } else if (current instanceof DisposableCollection) {
+            const store = new DisposableStore();
+            current['disposables'].forEach(disposable => store.add(disposable));
+            return store;
+        } else {
+            return new DisposableStore();
+        }
+    }
+
+    @postConstruct()
+    protected init(): void {
+        const languages = StandaloneServices.get(ILanguageService);
+        const openerService = new MonacoOpenerService(this.codeEditorService, this.commandServiceFactory());
+        openerService.registerOpener({
+            open: (u, options) => this.interceptOpen(u, options)
+        });
+        const getPreference = () => this.preferences.get<string>('editor.fontFamily');
+        const rendererOptions = new Proxy(Object.create(null), { // eslint-disable-line no-null/no-null
+            get(_, field): string | undefined {
+                if (field === 'codeBlockFontFamily') {
+                    return getPreference();
+                } else {
+                    return undefined;
+                }
+            }
+        });
+        this.delegate = new CodeMarkdownRenderer(rendererOptions, languages, openerService);
+    }
+
+    protected async interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {
+        let options = undefined;
+        if (monacoOptions) {
+            if ('openToSide' in monacoOptions && monacoOptions.openToSide) {
+                options = Object.assign(options || {}, <WidgetOpenerOptions>{
+                    widgetOptions: {
+                        mode: 'split-right'
+                    }
+                });
+            }
+            if ('openExternal' in monacoOptions && monacoOptions.openExternal) {
+                options = Object.assign(options || {}, <HttpOpenHandlerOptions>{
+                    openExternal: true
+                });
+            }
+        }
+        const uri = new URI(monacoUri.toString());
+        try {
+            await open(this.openerService, uri, options);
+            return true;
+        } catch (e) {
+            console.error(`Fail to open '${uri.toString()}':`, e);
+            return false;
+        }
+    }
+}

package/src/browser/monaco-bulk-edit-service.ts

@@ -1,64 +1,64 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { MonacoWorkspace } from './monaco-workspace';
-import {
-    IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit
-} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
-import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
-import { WorkspaceEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
-
-@injectable()
-export class MonacoBulkEditService implements IBulkEditService {
-    declare readonly _serviceBrand: undefined;
-
-    @inject(MonacoWorkspace)
-    protected readonly workspace: MonacoWorkspace;
-
-    private _previewHandler?: IBulkEditPreviewHandler;
-
-    async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
-        const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
-
-        if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
-            editsIn = await this._previewHandler(edits, options);
-            return { ariaSummary: '', success: true };
-        } else {
-            return this.workspace.applyBulkEdit(edits);
-        }
-    }
-
-    hasPreviewHandler(): boolean {
-        return Boolean(this._previewHandler);
-    }
-
-    setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable {
-        this._previewHandler = handler;
-
-        const disposePreviewHandler = () => {
-            if (this._previewHandler === handler) {
-                this._previewHandler = undefined;
-            }
-        };
-
-        return {
-            dispose(): void {
-                disposePreviewHandler();
-            }
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { MonacoWorkspace } from './monaco-workspace';
+import {
+    IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit
+} from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
+import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+import { WorkspaceEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
+
+@injectable()
+export class MonacoBulkEditService implements IBulkEditService {
+    declare readonly _serviceBrand: undefined;
+
+    @inject(MonacoWorkspace)
+    protected readonly workspace: MonacoWorkspace;
+
+    private _previewHandler?: IBulkEditPreviewHandler;
+
+    async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
+        const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
+
+        if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
+            editsIn = await this._previewHandler(edits, options);
+            return { ariaSummary: '', success: true };
+        } else {
+            return this.workspace.applyBulkEdit(edits);
+        }
+    }
+
+    hasPreviewHandler(): boolean {
+        return Boolean(this._previewHandler);
+    }
+
+    setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable {
+        this._previewHandler = handler;
+
+        const disposePreviewHandler = () => {
+            if (this._previewHandler === handler) {
+                this._previewHandler = undefined;
+            }
+        };
+
+        return {
+            dispose(): void {
+                disposePreviewHandler();
+            }
+        };
+    }
+}

package/src/browser/monaco-color-registry.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable } from '@theia/core/shared/inversify';
-import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { Color, ColorDefinition } from '@theia/core/lib/common/color';
-import { Disposable } from '@theia/core/lib/common/disposable';
-import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
-import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
-import { Color as MonacoColor, HSLA, RGBA } from '@theia/monaco-editor-core/esm/vs/base/common/color';
-import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
-
-@injectable()
-export class MonacoColorRegistry extends ColorRegistry {
-
-    protected readonly monacoThemeService = StandaloneServices.get(IStandaloneThemeService);
-    protected readonly monacoColorRegistry = getColorRegistry();
-
-    override *getColors(): IterableIterator<string> {
-        for (const { id } of this.monacoColorRegistry.getColors()) {
-            yield id;
-        }
-    }
-
-    override getCurrentColor(id: string): string | undefined {
-        return this.monacoThemeService.getColorTheme().getColor(id)?.toString();
-    }
-
-    getColor(id: string): MonacoColor | undefined {
-        return this.monacoThemeService.getColorTheme().getColor(id);
-    }
-
-    protected override doRegister(definition: ColorDefinition): Disposable {
-        const defaults: ColorDefaults = {
-            dark: this.toColor(definition.defaults?.dark),
-            light: this.toColor(definition.defaults?.light),
-            hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
-            hcLight: this.toColor(definition.defaults?.hcLight),
-        };
-        const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
-        return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
-    }
-
-    protected toColor(value: Color | undefined): ColorValue | null {
-        if (!value || typeof value === 'string') {
-            return value ?? null; // eslint-disable-line no-null/no-null
-        }
-        if ('kind' in value) {
-            return Colors[value.kind](value.v, value.f);
-        } else if ('r' in value) {
-            const { r, g, b, a } = value;
-            return new MonacoColor(new RGBA(r, g, b, a));
-        } else {
-            const { h, s, l, a } = value;
-            return new MonacoColor(new HSLA(h, s, l, a));
-        }
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { Color, ColorDefinition } from '@theia/core/lib/common/color';
+import { Disposable } from '@theia/core/lib/common/disposable';
+import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import { Color as MonacoColor, HSLA, RGBA } from '@theia/monaco-editor-core/esm/vs/base/common/color';
+import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
+
+@injectable()
+export class MonacoColorRegistry extends ColorRegistry {
+
+    protected readonly monacoThemeService = StandaloneServices.get(IStandaloneThemeService);
+    protected readonly monacoColorRegistry = getColorRegistry();
+
+    override *getColors(): IterableIterator<string> {
+        for (const { id } of this.monacoColorRegistry.getColors()) {
+            yield id;
+        }
+    }
+
+    override getCurrentColor(id: string): string | undefined {
+        return this.monacoThemeService.getColorTheme().getColor(id)?.toString();
+    }
+
+    getColor(id: string): MonacoColor | undefined {
+        return this.monacoThemeService.getColorTheme().getColor(id);
+    }
+
+    protected override doRegister(definition: ColorDefinition): Disposable {
+        const defaults: ColorDefaults = {
+            dark: this.toColor(definition.defaults?.dark),
+            light: this.toColor(definition.defaults?.light),
+            hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
+            hcLight: this.toColor(definition.defaults?.hcLight),
+        };
+        const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
+        return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
+    }
+
+    protected toColor(value: Color | undefined): ColorValue | null {
+        if (!value || typeof value === 'string') {
+            return value ?? null; // eslint-disable-line no-null/no-null
+        }
+        if ('kind' in value) {
+            return Colors[value.kind](value.v, value.f);
+        } else if ('r' in value) {
+            const { r, g, b, a } = value;
+            return new MonacoColor(new RGBA(r, g, b, a));
+        } else {
+            const { h, s, l, a } = value;
+            return new MonacoColor(new HSLA(h, s, l, a));
+        }
+    }
+
+}