@codingame/monaco-vscode-theme-service-override 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/services/themes/common/themeExtensionPoints.js

@@ -16,7 +16,7 @@ function registerColorThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "themes",
         jsonSchema: {
-            description: ( localize(15054, "Contributes textmate color themes.")),
+            description: ( localize(16179, "Contributes textmate color themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -30,16 +30,16 @@ function registerColorThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(15055, "Id of the color theme as used in the user settings.")),
+                        description: ( localize(16180, "Id of the color theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(15056, "Label of the color theme as shown in the UI.")),
+                        description: ( localize(16181, "Label of the color theme as shown in the UI.")),
                         type: "string"
                     },
                     uiTheme: {
                         description: ( localize(
-                            15057,
+                            16182,
                             "Base theme defining the colors around the editor: 'vs' is the light color theme, 'vs-dark' is the dark color theme. 'hc-black' is the dark high contrast theme, 'hc-light' is the light high contrast theme."
                         )),
                         enum: [
@@ -51,7 +51,7 @@ function registerColorThemeExtensionPoint() {
                     },
                     path: {
                         description: ( localize(
-                            15058,
+                            16183,
                             "Path of the tmTheme file. The path is relative to the extension folder and is typically './colorthemes/awesome-color-theme.json'."
                         )),
                         type: "string"
@@ -66,7 +66,7 @@ function registerFileIconThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "iconThemes",
         jsonSchema: {
-            description: ( localize(15059, "Contributes file icon themes.")),
+            description: ( localize(16184, "Contributes file icon themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -79,16 +79,16 @@ function registerFileIconThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(15060, "Id of the file icon theme as used in the user settings.")),
+                        description: ( localize(16185, "Id of the file icon theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(15061, "Label of the file icon theme as shown in the UI.")),
+                        description: ( localize(16186, "Label of the file icon theme as shown in the UI.")),
                         type: "string"
                     },
                     path: {
                         description: ( localize(
-                            15062,
+                            16187,
                             "Path of the file icon theme definition file. The path is relative to the extension folder and is typically './fileicons/awesome-icon-theme.json'."
                         )),
                         type: "string"
@@ -103,7 +103,7 @@ function registerProductIconThemeExtensionPoint() {
     return ExtensionsRegistry.registerExtensionPoint({
         extensionPoint: "productIconThemes",
         jsonSchema: {
-            description: ( localize(15063, "Contributes product icon themes.")),
+            description: ( localize(16188, "Contributes product icon themes.")),
             type: "array",
             items: {
                 type: "object",
@@ -116,16 +116,16 @@ function registerProductIconThemeExtensionPoint() {
                 }],
                 properties: {
                     id: {
-                        description: ( localize(15064, "Id of the product icon theme as used in the user settings.")),
+                        description: ( localize(16189, "Id of the product icon theme as used in the user settings.")),
                         type: "string"
                     },
                     label: {
-                        description: ( localize(15065, "Label of the product icon theme as shown in the UI.")),
+                        description: ( localize(16190, "Label of the product icon theme as shown in the UI.")),
                         type: "string"
                     },
                     path: {
                         description: ( localize(
-                            15066,
+                            16191,
                             "Path of the product icon theme definition file. The path is relative to the extension folder and is typically './producticons/awesome-product-icon-theme.json'."
                         )),
                         type: "string"
@@ -147,19 +147,19 @@ class ThemeDataRenderer extends Disposable {
     render(manifest) {
         const markdown = ( new MarkdownString());
         if (manifest.contributes?.themes) {
-            markdown.appendMarkdown(`### ${( localize(15067, "Color Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16192, "Color Themes"))}\n\n`);
             for (const theme of manifest.contributes.themes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
         }
         if (manifest.contributes?.iconThemes) {
-            markdown.appendMarkdown(`### ${( localize(15068, "File Icon Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16193, "File Icon Themes"))}\n\n`);
             for (const theme of manifest.contributes.iconThemes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
         }
         if (manifest.contributes?.productIconThemes) {
-            markdown.appendMarkdown(`### ${( localize(15069, "Product Icon Themes"))}\n\n`);
+            markdown.appendMarkdown(`### ${( localize(16194, "Product Icon Themes"))}\n\n`);
             for (const theme of manifest.contributes.productIconThemes) {
                 markdown.appendMarkdown(`- ${theme.label}\n`);
             }
@@ -172,7 +172,7 @@ class ThemeDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "themes",
-    label: ( localize(15070, "Themes")),
+    label: ( localize(16195, "Themes")),
     access: {
         canToggle: false
     },
@@ -191,6 +191,7 @@ class ThemeRegistry {
     }
     dispose() {
         this.themesExtPoint.setHandler(() => {});
+        this.onDidChangeEmitter.dispose();
     }
     initialize() {
         this.themesExtPoint.setHandler((extensions, delta) => {
@@ -233,13 +234,13 @@ class ThemeRegistry {
         log
     ) {
         if (!Array.isArray(themeContributions)) {
-            log?.error(( localize(15071, "Extension point `{0}` must be an array.", this.themesExtPoint.name)));
+            log?.error(( localize(16196, "Extension point `{0}` must be an array.", this.themesExtPoint.name)));
             return resultingThemes;
         }
         themeContributions.forEach(theme => {
             if (!theme.path || !isString(theme.path)) {
                 log?.error(( localize(
-                    15072,
+                    16197,
                     "Expected string in `contributes.{0}.path`. Provided value: {1}",
                     this.themesExtPoint.name,
                     String(theme.path)
@@ -248,7 +249,7 @@ class ThemeRegistry {
             }
             if (this.idRequired && (!theme.id || !isString(theme.id))) {
                 log?.error(( localize(
-                    15073,
+                    16198,
                     "Expected string in `contributes.{0}.id`. Provided value: {1}",
                     this.themesExtPoint.name,
                     String(theme.id)
@@ -258,7 +259,7 @@ class ThemeRegistry {
             const themeLocation = joinPath(extensionLocation, theme.path);
             if (!isEqualOrParent(themeLocation, extensionLocation)) {
                 log?.warn(( localize(
-                    15074,
+                    16199,
                     "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                     this.themesExtPoint.name,
                     themeLocation.path,

package/vscode/src/vs/platform/theme/common/sizeUtils.d.ts

@@ -1,90 +0,0 @@
-import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { IJSONSchema } from "@codingame/monaco-vscode-api/vscode/vs/base/common/jsonSchema";
-import { IColorTheme } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService";
-export type SizeIdentifier = string;
-/**
- * Size value unit types supported by the registry
- */
-export type SizeUnit = "px" | "rem" | "em" | "%";
-/**
- * A size value with a numeric amount and unit
- */
-export interface SizeValue {
-    readonly value: number;
-    readonly unit: SizeUnit;
-}
-export interface SizeContribution {
-    readonly id: SizeIdentifier;
-    readonly description: string;
-    readonly defaults: SizeDefaults | SizeValue | null;
-    readonly deprecationMessage: string | undefined;
-}
-/**
- * Returns the css variable name for the given size identifier. Dots (`.`) are replaced with hyphens (`-`) and
- * everything is prefixed with `--vscode-`.
- *
- * @sample `editor.fontSize` is `--vscode-editor-fontSize`.
- */
-export declare function asCssVariableName(sizeIdent: SizeIdentifier): string;
-export declare function asCssVariable(size: SizeIdentifier): string;
-export declare function asCssVariableWithDefault(size: SizeIdentifier, defaultCssValue: string): string;
-export interface SizeDefaults {
-    light: SizeValue | null;
-    dark: SizeValue | null;
-    hcDark: SizeValue | null;
-    hcLight: SizeValue | null;
-}
-export declare function isSizeDefaults(value: unknown): value is SizeDefaults;
-/**
- * Helper function to create a size value
- */
-export declare function size(value: number, unit?: SizeUnit): SizeValue;
-/**
- * Helper function to create size defaults that use the same value for all themes
- */
-export declare function sizeForAllThemes(value: number, unit?: SizeUnit): SizeDefaults;
-/**
- * Convert a size value to a CSS string
- */
-export declare function sizeValueToCss(sizeValue: SizeValue): string;
-export declare const Extensions: {
-    SizeContribution: string;
-};
-export declare const DEFAULT_SIZE_CONFIG_VALUE = "default";
-export interface ISizeRegistry {
-    readonly onDidChangeSchema: Event<void>;
-    /**
-     * Register a size to the registry.
-     * @param id The size id as used in theme description files
-     * @param defaults The default values
-     * @param description the description
-     */
-    registerSize(id: string, defaults: SizeDefaults | SizeValue | null, description: string): SizeIdentifier;
-    /**
-     * Deregister a size from the registry.
-     */
-    deregisterSize(id: string): void;
-    /**
-     * Get all size contributions
-     */
-    getSizes(): SizeContribution[];
-    /**
-     * Gets the default size of the given id
-     */
-    resolveDefaultSize(id: SizeIdentifier, theme: IColorTheme): SizeValue | undefined;
-    /**
-     * JSON schema for an object to assign size values to one of the size contributions.
-     */
-    getSizeSchema(): IJSONSchema;
-    /**
-     * JSON schema for a reference to a size contribution.
-     */
-    getSizeReferenceSchema(): IJSONSchema;
-    /**
-     * Notify when the color theme or settings change.
-     */
-    notifyThemeUpdate(theme: IColorTheme): void;
-}
-export declare function registerSize(id: string, defaults: SizeDefaults | SizeValue | null, description: string, deprecationMessage?: string): SizeIdentifier;
-export declare function getSizeRegistry(): ISizeRegistry;
-export declare const workbenchSizesSchemaId = "vscode://schemas/workbench-sizes";

package/vscode/src/vs/platform/theme/common/sizeUtils.js

@@ -1,142 +0,0 @@
-
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
-
-function asCssVariableName(sizeIdent) {
-    return `--vscode-${sizeIdent.replace(/\./g, "-")}`;
-}
-function isSizeDefaults(value) {
-    return value !== null && typeof value === "object" && "light" in value && "dark" in value;
-}
-function size(value, unit = "px") {
-    return {
-        value,
-        unit
-    };
-}
-function sizeForAllThemes(value, unit = "px") {
-    const sizeValue = size(value, unit);
-    return {
-        light: sizeValue,
-        dark: sizeValue,
-        hcDark: sizeValue,
-        hcLight: sizeValue
-    };
-}
-function sizeValueToCss(sizeValue) {
-    return `${sizeValue.value}${sizeValue.unit}`;
-}
-const Extensions = {
-    SizeContribution: "base.contributions.sizes"
-};
-class SizeRegistry extends Disposable {
-    constructor() {
-        super();
-        this._onDidChangeSchema = this._register(( new Emitter()));
-        this.onDidChangeSchema = this._onDidChangeSchema.event;
-        this.sizeSchema = {
-            type: "object",
-            properties: {}
-        };
-        this.sizeReferenceSchema = {
-            type: "string",
-            enum: [],
-            enumDescriptions: []
-        };
-        this.sizesById = {};
-    }
-    notifyThemeUpdate(theme) {
-        for (const key of ( Object.keys(this.sizesById))) {
-            const sizeVal = this.resolveDefaultSize(key, theme);
-            if (sizeVal) {
-                this.sizeSchema.properties[key].default = sizeValueToCss(sizeVal);
-            }
-        }
-        this._onDidChangeSchema.fire();
-    }
-    registerSize(id, defaults, description, deprecationMessage) {
-        const sizeContribution = {
-            id,
-            description,
-            defaults,
-            deprecationMessage
-        };
-        this.sizesById[id] = sizeContribution;
-        const propertySchema = {
-            type: "string",
-            pattern: "^(\\d+(\\.\\d+)?(px|rem|em|%))|default$",
-            patternErrorMessage: "Size must be a number followed by px, rem, em, or % (e.g., \"12px\", \"1.5rem\") or \"default\""
-        };
-        if (deprecationMessage) {
-            propertySchema.deprecationMessage = deprecationMessage;
-        }
-        this.sizeSchema.properties[id] = {
-            description,
-            ...propertySchema
-        };
-        this.sizeReferenceSchema.enum.push(id);
-        this.sizeReferenceSchema.enumDescriptions.push(description);
-        this._onDidChangeSchema.fire();
-        return id;
-    }
-    deregisterSize(id) {
-        delete this.sizesById[id];
-        delete this.sizeSchema.properties[id];
-        const index = this.sizeReferenceSchema.enum.indexOf(id);
-        if (index !== -1) {
-            this.sizeReferenceSchema.enum.splice(index, 1);
-            this.sizeReferenceSchema.enumDescriptions.splice(index, 1);
-        }
-        this._onDidChangeSchema.fire();
-    }
-    getSizes() {
-        return ( ( Object.keys(this.sizesById)).map(id => this.sizesById[id]));
-    }
-    resolveDefaultSize(id, theme) {
-        const sizeDesc = this.sizesById[id];
-        if (sizeDesc?.defaults) {
-            const sizeValue = isSizeDefaults(sizeDesc.defaults) ? sizeDesc.defaults[theme.type] : sizeDesc.defaults;
-            return sizeValue ?? undefined;
-        }
-        return undefined;
-    }
-    getSizeSchema() {
-        return this.sizeSchema;
-    }
-    getSizeReferenceSchema() {
-        return this.sizeReferenceSchema;
-    }
-    toString() {
-        const sorter = (a, b) => {
-            const cat1 = a.indexOf(".") === -1 ? 0 : 1;
-            const cat2 = b.indexOf(".") === -1 ? 0 : 1;
-            if (cat1 !== cat2) {
-                return cat1 - cat2;
-            }
-            return a.localeCompare(b);
-        };
-        return ( ( Object.keys(this.sizesById)).sort(sorter).map(k => `- \`${k}\`: ${this.sizesById[k].description}`)).join("\n");
-    }
-}
-const sizeRegistry = ( new SizeRegistry());
-Registry.add(Extensions.SizeContribution, sizeRegistry);
-function registerSize(id, defaults, description, deprecationMessage) {
-    return sizeRegistry.registerSize(id, defaults, description, deprecationMessage);
-}
-function getSizeRegistry() {
-    return sizeRegistry;
-}
-const workbenchSizesSchemaId = "vscode://schemas/workbench-sizes";
-const schemaRegistry = Registry.as(Extensions$1.JSONContribution);
-schemaRegistry.registerSchema(workbenchSizesSchemaId, sizeRegistry.getSizeSchema());
-const delayer = ( new RunOnceScheduler(() => schemaRegistry.notifySchemaChanged(workbenchSizesSchemaId), 200));
-sizeRegistry.onDidChangeSchema(() => {
-    if (!delayer.isScheduled()) {
-        delayer.schedule();
-    }
-});
-
-export { Extensions, asCssVariableName, getSizeRegistry, isSizeDefaults, registerSize, size, sizeForAllThemes, sizeValueToCss, workbenchSizesSchemaId };

package/vscode/src/vs/platform/theme/common/sizes/baseSizes.d.ts

@@ -1,11 +0,0 @@
-export declare const bodyFontSize: string;
-export declare const bodyFontSizeSmall: string;
-export declare const bodyFontSizeXSmall: string;
-export declare const codiconFontSize: string;
-export declare const cornerRadiusMedium: string;
-export declare const cornerRadiusXSmall: string;
-export declare const cornerRadiusSmall: string;
-export declare const cornerRadiusLarge: string;
-export declare const cornerRadiusXLarge: string;
-export declare const cornerRadiusCircle: string;
-export declare const strokeThickness: string;

package/vscode/src/vs/platform/theme/common/sizes/baseSizes.js

@@ -1,18 +0,0 @@
-
-import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { registerSize, sizeForAllThemes } from '../sizeUtils.js';
-
-registerSize("bodyFontSize", sizeForAllThemes(13, "px"), ( localize(
-    2375,
-    "Base font size. This size is used if not overridden by a component."
-)));
-registerSize("bodyFontSize.small", sizeForAllThemes(12, "px"), ( localize(2376, "Small font size for secondary content.")));
-registerSize("bodyFontSize.xSmall", sizeForAllThemes(11, "px"), ( localize(2377, "Extra small font size for less prominent content.")));
-registerSize("codiconFontSize", sizeForAllThemes(16, "px"), ( localize(2378, "Base font size for codicons.")));
-registerSize("cornerRadius.medium", sizeForAllThemes(6, "px"), ( localize(2379, "Base corner radius for UI elements.")));
-registerSize("cornerRadius.xSmall", sizeForAllThemes(2, "px"), ( localize(2380, "Extra small corner radius for very compact UI elements.")));
-registerSize("cornerRadius.small", sizeForAllThemes(4, "px"), ( localize(2381, "Small corner radius for compact UI elements.")));
-registerSize("cornerRadius.large", sizeForAllThemes(8, "px"), ( localize(2382, "Large corner radius for prominent UI elements.")));
-registerSize("cornerRadius.xLarge", sizeForAllThemes(12, "px"), ( localize(2383, "Extra large corner radius for very prominent UI elements.")));
-registerSize("cornerRadius.circle", sizeForAllThemes(9999, "px"), ( localize(2384, "Circular corner radius for fully rounded UI elements.")));
-registerSize("strokeThickness", sizeForAllThemes(1, "px"), ( localize(2385, "Base stroke thickness for borders and outlines.")));