@theia/core 1.66.0-next.67 → 1.66.0-next.80

package/src/common/color.ts

@@ -14,6 +14,8 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import { isObject } from './types';
+
 /**
  * Either be a reference to an existing color or a color value as a hex string, rgba, or hsla.
  */
@@ -36,12 +38,23 @@ export namespace Color {
     export function darken(v: string, f: number): ColorTransformation {
         return { v, f, kind: 'darken' };
     }
+    export function is(value: unknown): value is Color {
+        return typeof value === 'string' || (ColorTransformation.is(value) || RGBA.is(value) || HSLA.is(value));
+    }
 }
 export interface ColorTransformation {
     kind: 'transparent' | 'lighten' | 'darken'
     v: string
     f: number
 }
+export namespace ColorTransformation {
+    export function is(value: unknown): value is ColorTransformation {
+        return isObject(value)
+            && (value.kind === 'transparent' || value.kind === 'lighten' || value.kind === 'darken')
+            && typeof value.v === 'string'
+            && typeof value.f === 'number';
+    }
+}
 export interface RGBA {
     /**
      * Red: integer in [0-255]
@@ -63,6 +76,11 @@ export interface RGBA {
      */
     readonly a: number;
 }
+export namespace RGBA {
+    export function is(value: unknown): value is RGBA {
+        return isObject(value) && typeof value.r === 'number' && typeof value.g === 'number' && typeof value.b === 'number' && typeof value.a === 'number';
+    }
+}
 export interface HSLA {
     /**
      * Hue: integer in [0, 360]
@@ -81,6 +99,11 @@ export interface HSLA {
      */
     readonly a: number;
 }
+export namespace HSLA {
+    export function is(value: unknown): value is HSLA {
+        return isObject(value) && typeof value.h === 'number' && typeof value.s === 'number' && typeof value.l === 'number' && typeof value.a === 'number';
+    }
+}
 
 export interface ColorDefaults {
     light?: Color
@@ -91,9 +114,36 @@ export interface ColorDefaults {
     hcLight?: Color;
 }
 
+export namespace ColorDefaults {
+    export function getLight(defaults: ColorDefaults | Color | undefined): Color | undefined {
+        if (Color.is(defaults)) {
+            return defaults;
+        }
+        return defaults?.light;
+    }
+    export function getDark(defaults: ColorDefaults | Color | undefined): Color | undefined {
+        if (Color.is(defaults)) {
+            return defaults;
+        }
+        return defaults?.dark;
+    }
+    export function getHCDark(defaults: ColorDefaults | Color | undefined): Color | undefined {
+        if (Color.is(defaults)) {
+            return defaults;
+        }
+        return defaults?.hcDark ?? defaults?.hc;
+    }
+    export function getHCLight(defaults: ColorDefaults | Color | undefined): Color | undefined {
+        if (Color.is(defaults)) {
+            return defaults;
+        }
+        return defaults?.hcLight;
+    }
+}
+
 export interface ColorDefinition {
     id: string
-    defaults?: ColorDefaults
+    defaults?: ColorDefaults | Color;
     description: string
 }
 

package/src/common/preferences/preference-schema-service.ts

@@ -25,8 +25,8 @@ import { PreferenceUtils } from './preference-provider';
 import { ContributionProvider } from '../contribution-provider';
 import { Deferred } from '../promise-util';
 
-const NO_OVERRIDE = {};
-const OVERRIDE_PROPERTY = '\\[(.*)\\]$';
+export const NO_OVERRIDE = {};
+export const OVERRIDE_PROPERTY = '\\[(.*)\\]$';
 
 @injectable()
 export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
@@ -125,7 +125,8 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
 
         for (const [key, property] of Object.entries(schema.properties)) {
             if (this.properties.has(key)) {
-                throw new Error(`Property with id '${key}' already exists`);
+                console.warn(`Property with id '${key}' already exists`);
+                continue;
             }
 
             if (property.scope === undefined) {
@@ -344,14 +345,14 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
         return this.jsonSchemas[scope];
     }
 
-    private setJSONSchemasProperty(key: string, property: PreferenceDataProperty): void {
+    protected setJSONSchemasProperty(key: string, property: PreferenceDataProperty): void {
         for (const scope of this.validScopes) {
             if (this.isValidInScope(key, scope)) {
                 this.setJSONSchemaProperty(this.jsonSchemas[scope], key, property);
             }
         }
     }
-    private deleteFromJSONSchemas(key: string, property: PreferenceDataProperty): void {
+    protected deleteFromJSONSchemas(key: string, property: PreferenceDataProperty): void {
         for (const scope of this.validScopes) {
             if (this.isValidInScope(key, scope)) {
                 const schema = this.jsonSchemas[scope];
@@ -367,7 +368,7 @@ export class PreferenceSchemaServiceImpl implements PreferenceSchemaService {
         }
     }
 
-    private setJSONSchemaProperty(schema: IJSONSchema, key: string, property: PreferenceDataProperty): void {
+    protected setJSONSchemaProperty(schema: IJSONSchema, key: string, property: PreferenceDataProperty): void {
         // Add property to the schema
         const prop = { ...property, default: this.getDefaultValue(key, undefined) };
         schema.properties![key] = prop;

package/src/electron-browser/menu/electron-menu-contribution.ts

@@ -335,7 +335,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
         registry.registerKeybindings(
             {
                 command: ElectronCommands.TOGGLE_DEVELOPER_TOOLS.id,
-                keybinding: 'ctrlcmd+alt+i'
+                keybinding: 'alt+f12'
             },
             {
                 command: ElectronCommands.RELOAD.id,