@theia/core 1.65.0-next.6 → 1.65.1

package/lib/common/preferences/preference-schema.d.ts

@@ -1,62 +1,164 @@
-import { JSONValue } from '@lumino/coreutils';
+import { JSONObject, JSONValue } from '@lumino/coreutils';
 import { IJSONSchema } from '../json-schema';
 import { PreferenceScope } from './preference-scope';
-export interface PreferenceSchema {
-    [name: string]: any;
-    scope?: 'application' | 'window' | 'resource' | PreferenceScope;
-    overridable?: boolean;
+import { Event } from '../event';
+import { Disposable } from '../disposable';
+export declare const PreferenceContribution: unique symbol;
+/**
+ * A {@link PreferenceContribution} allows adding additional custom preferences.
+ * For this, the {@link PreferenceContribution} has to provide a valid `PrefernceSchema` specifying which preferences
+ * are available including their types and description.
+ *
+ * ### Example usage
+ * ```typescript
+ * const MyPreferencesSchema: PreferenceSchema = {
+ *     'scope': PreferenceScope.Folder,
+ *     'properties': {
+ *         'myext.decorations.enabled': {
+ *             'type': 'boolean',
+ *             'description': 'Show file status',
+ *             'default': true
+ *         },
+ *         // [...]
+ *     }
+ * }
+ * @injectable()
+ * export class MyPreferenceContribution implements PreferenceContribution{
+ *     schema= MyPreferencesSchema;
+ * }
+ * ```
+ */
+export interface PreferenceContribution {
+    readonly schema?: PreferenceSchema;
     /**
-     * The title of the preference schema.
-     * It is used in the preference UI to associate a localized group of preferences.
+     * Allows to do additional intialisation of the preference schema, for example registering overrides
+     * @param service the preference schema service
      */
-    title?: string;
-    properties: PreferenceSchemaProperties;
-}
-export declare namespace PreferenceSchema {
-    function is(obj: unknown): obj is PreferenceSchema;
-    function getDefaultScope(schema: PreferenceSchema): PreferenceScope;
-}
-export interface PreferenceSchemaProperties {
-    [name: string]: PreferenceSchemaProperty;
+    initSchema?(service: PreferenceSchemaService): Promise<void>;
 }
-export declare namespace PreferenceSchemaProperties {
-    function is(obj: unknown): obj is PreferenceSchemaProperties;
+export interface IndexedAccess<T> {
+    [name: string]: T;
 }
-export interface PreferenceDataSchema {
-    [name: string]: any;
+export interface PreferenceSchema {
+    /** The default scope for properties in this schema */
     scope?: PreferenceScope;
-    properties: {
-        [name: string]: PreferenceDataProperty;
-    };
-    patternProperties: {
-        [name: string]: PreferenceDataProperty;
-    };
+    /** Optional title to be used in UI */
+    title?: string;
+    /** Whether properties in this schema are overridable by default. Defaults to false. */
+    defaultOverridable?: boolean;
+    properties: IndexedAccess<PreferenceDataProperty>;
 }
-export interface PreferenceItem extends IJSONSchema {
+export interface PreferenceDataProperty extends IJSONSchema {
     /**
-     * preference default value, if `undefined` then `default`
+     * Whether distinct values can be defined for language override identifers. E.g. values valid when editing typescript files vs.
+     * when editing Java files
      */
-    defaultValue?: JSONValue;
     overridable?: boolean;
-    /** If false, the preference will not be included in the schema or the UI. */
+    /** If false, the preference will not be included in the schema or the UI. E.g. OS-Specific prefs */
     included?: boolean;
     /** If true, this item will registered as part of the preference schema, but hidden in the preference editor UI. */
     hidden?: boolean;
-    [key: string]: any;
-}
-export interface PreferenceSchemaProperty extends PreferenceItem {
-    description?: string;
-    markdownDescription?: string;
-    scope?: 'application' | 'machine' | 'window' | 'resource' | 'language-overridable' | 'machine-overridable' | PreferenceScope;
-    tags?: string[];
-}
-export interface PreferenceDataProperty extends PreferenceItem {
-    description?: string;
-    markdownDescription?: string;
+    /** The maximum scope where values for this property can be set. */
     scope?: PreferenceScope;
+    /** Metadata intended for custom renderers */
     typeDetails?: any;
+    /** Tags can be searched for in the UI */
+    tags?: string[];
+}
+export interface DefaultValueChangedEvent {
+    /** The preference key */
+    key: string;
+    /** The override identifier that the default changed for */
+    overrideIdentifier?: string;
+    /**
+     * When the default for the base property changes, indicates which override identifiers will be affected
+     */
+    otherAffectedOverrides: string[];
+    oldValue: JSONValue | undefined;
+    newValue: JSONValue | undefined;
 }
-export declare namespace PreferenceDataProperty {
-    function fromPreferenceSchemaProperty(schemaProps: PreferenceSchemaProperty, defaultScope?: PreferenceScope): PreferenceDataProperty;
+export declare const PreferenceSchemaService: unique symbol;
+export interface PreferenceSchemaService {
+    /**
+     * Resolves after static contributions have been processed
+     */
+    readonly ready: Promise<void>;
+    /**
+     * Register an override identifier for language specific preferences
+     * @param overrideIdentifier The identifier to register
+     * @returns A disposable to unregister the identifier
+     */
+    registerOverrideIdentifier(overrideIdentifier: string): Disposable;
+    readonly overrideIdentifiers: ReadonlySet<string>;
+    /**
+     * Add a preference schema. It is an error to register the same property in two different schemas
+     * @param schema The schema to add
+     * @returns A disposable to remove the schema
+     */
+    addSchema(schema: PreferenceSchema): Disposable;
+    /**
+     * The scopes which this preference schema service handles. Any properties that are not applicable within the
+     * valid scopes will be ignored
+     */
+    readonly validScopes: readonly PreferenceScope[];
+    /**
+     * Check if a preference is valid in a specific scope
+     * @param preferenceName The preference name
+     * @param scope The scope to check
+     * @returns True if the preference is valid in the given scope
+     */
+    isValidInScope(preferenceName: string, scope: PreferenceScope): boolean;
+    getSchemaProperty(key: string): PreferenceDataProperty | undefined;
+    getSchemaProperties(): ReadonlyMap<string, PreferenceDataProperty>;
+    /**
+     * Update a property in the schema. The corresponding JSON Schemas, etc. will be updated
+     * @param key The property key
+     * @param property The updated property
+     */
+    updateSchemaProperty(key: string, property: PreferenceDataProperty): void;
+    /**
+     * Register an override for a preference default value. If multiple overrides are registered for the same value,
+     * the last override will be in effect. Removing the last override will make the second-to-last override active, etc.
+     * @param key The preference key
+     * @param overrideIdentifier The override identifier, undefined for global default
+     * @param value The default value
+     * @returns A disposable to unregister the override
+     */
+    registerOverride(key: string, overrideIdentifier: string | undefined, value: JSONValue): Disposable;
+    /**
+     * Get the default value for a preference. This is the value a client will see for the given key/override
+     * @param key The preference key
+     * @param overrideIdentifier The override identifier, undefined for global default
+     * @returns The default value or undefined if not found
+     */
+    getDefaultValue(key: string, overrideIdentifier: string | undefined): JSONValue | undefined;
+    /**
+     * Gets the default value for a preference. This method not fall back to the global value if no override is given
+     * @param key The preference key
+     * @param overrideIdentifier The override identifier, undefined for global default
+     * @returns The default value or undefined if not found
+     */
+    inspectDefaultValue(key: string, overrideIdentifier: string | undefined): JSONValue | undefined;
+    /**
+     * Gets a JSON schema a preference.json file for the given scope.
+     * @param scope The scope to generate schema for
+     * @returns The JSON schema
+     */
+    getJSONSchema(scope: PreferenceScope): IJSONSchema;
+    /**
+     * Get the collection of all defined default values as JSONObject of the form like in a preferences.json
+     *
+     * #### Example usage
+     * ```json
+     * {
+     *   "my.preference": "a string default",
+     *   "[typescript]": {
+     *      "another.preference": 39
+     *   }
+     * }
+     */
+    getDefaultValues(): JSONObject;
+    onDidChangeDefaultValue: Event<DefaultValueChangedEvent>;
+    onDidChangeSchema: Event<void>;
 }
 //# sourceMappingURL=preference-schema.d.ts.map

package/lib/common/preferences/preference-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preference-schema.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,MAAM,WAAW,gBAAgB;IAC7B,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IACpB,KAAK,CAAC,EAAE,aAAa,GAAG,QAAQ,GAAG,UAAU,GAAG,eAAe,CAAC;IAChE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,0BAA0B,CAAA;CACzC;AACD,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,gBAAgB,CAExD;IACD,SAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,eAAe,CAQzE;CACJ;AAED,MAAM,WAAW,0BAA0B;IACvC,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,CAAA;CAC3C;AACD,yBAAiB,0BAA0B,CAAC;IACxC,SAAgB,EAAE,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,0BAA0B,CAElE;CACJ;AAED,MAAM,WAAW,oBAAoB;IACjC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IACpB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE;QACR,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAAA;KACzC,CAAA;IACD,iBAAiB,EAAE;QACf,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAAA;KACzC,CAAC;CACL;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IAC/C;;OAEG;IACH,YAAY,CAAC,EAAE,SAAS,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mHAAmH;IACnH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AACD,MAAM,WAAW,wBAAyB,SAAQ,cAAc;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,sBAAsB,GAAG,qBAAqB,GAAG,eAAe,CAAC;IAC7H,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC1D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,WAAW,CAAC,EAAE,GAAG,CAAC;CACrB;AACD,yBAAiB,sBAAsB,CAAC;IACpC,SAAgB,4BAA4B,CAAC,WAAW,EAAE,wBAAwB,EAAE,YAAY,GAAE,eAA2C,GAAG,sBAAsB,CAOrK;CACJ"}
+{"version":3,"file":"preference-schema.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IACnC;;;OAGG;IACH,UAAU,CAAC,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/D;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC5B,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC7B,sDAAsD;IACtD,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,EAAE,aAAa,CAAC,sBAAsB,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,sBAAuB,SAAQ,WAAW;IACvD;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oGAAoG;IACpG,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mHAAmH;IACnH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,yCAAyC;IACzC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;CAClB;AAED,MAAM,WAAW,wBAAwB;IACrC,yBAAyB;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,2DAA2D;IAC3D,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,QAAQ,EAAE,SAAS,GAAG,SAAS,CAAC;IAChC,QAAQ,EAAE,SAAS,GAAG,SAAS,CAAC;CACnC;AAED,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACpC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B;;;;OAIG;IACH,0BAA0B,CAAC,kBAAkB,EAAE,MAAM,GAAG,UAAU,CAAC;IACnE,QAAQ,CAAC,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAElD;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,UAAU,CAAC;IAEhD;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,SAAS,eAAe,EAAE,CAAC;IACjD;;;;;OAKG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;IACxE,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAAC;IACnE,mBAAmB,IAAI,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAEnE;;;;OAIG;IACH,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAE1E;;;;;;;OAOG;IACH,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,SAAS,GAAG,UAAU,CAAC;IACpG;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5F;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IAEhG;;;;OAIG;IACH,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,WAAW,CAAC;IACnD;;;;;;;;;;;OAWG;IACH,gBAAgB,IAAI,UAAU,CAAC;IAG/B,uBAAuB,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACzD,iBAAiB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;CAClC"}

package/lib/common/preferences/preference-schema.js

@@ -15,45 +15,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreferenceDataProperty = exports.PreferenceSchemaProperties = exports.PreferenceSchema = void 0;
-const preference_scope_1 = require("./preference-scope");
-const types_1 = require("../types");
-var PreferenceSchema;
-(function (PreferenceSchema) {
-    function is(obj) {
-        return (0, types_1.isObject)(obj) && PreferenceSchemaProperties.is(obj.properties);
-    }
-    PreferenceSchema.is = is;
-    function getDefaultScope(schema) {
-        let defaultScope = preference_scope_1.PreferenceScope.Workspace;
-        if (!preference_scope_1.PreferenceScope.is(schema.scope)) {
-            defaultScope = preference_scope_1.PreferenceScope.fromString(schema.scope) || preference_scope_1.PreferenceScope.Workspace;
-        }
-        else {
-            defaultScope = schema.scope;
-        }
-        return defaultScope;
-    }
-    PreferenceSchema.getDefaultScope = getDefaultScope;
-})(PreferenceSchema || (exports.PreferenceSchema = PreferenceSchema = {}));
-var PreferenceSchemaProperties;
-(function (PreferenceSchemaProperties) {
-    function is(obj) {
-        return (0, types_1.isObject)(obj);
-    }
-    PreferenceSchemaProperties.is = is;
-})(PreferenceSchemaProperties || (exports.PreferenceSchemaProperties = PreferenceSchemaProperties = {}));
-var PreferenceDataProperty;
-(function (PreferenceDataProperty) {
-    function fromPreferenceSchemaProperty(schemaProps, defaultScope = preference_scope_1.PreferenceScope.Workspace) {
-        if (!schemaProps.scope) {
-            schemaProps.scope = defaultScope;
-        }
-        else if ((0, types_1.isString)(schemaProps.scope)) {
-            return Object.assign(schemaProps, { scope: preference_scope_1.PreferenceScope.fromString(schemaProps.scope) || defaultScope });
-        }
-        return schemaProps;
-    }
-    PreferenceDataProperty.fromPreferenceSchemaProperty = fromPreferenceSchemaProperty;
-})(PreferenceDataProperty || (exports.PreferenceDataProperty = PreferenceDataProperty = {}));
+exports.PreferenceSchemaService = exports.PreferenceContribution = void 0;
+exports.PreferenceContribution = Symbol('PreferenceContribution');
+exports.PreferenceSchemaService = Symbol('PreferenceSchemaService');
 //# sourceMappingURL=preference-schema.js.map

package/lib/common/preferences/preference-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"preference-schema.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAMhF,yDAAqD;AACrD,oCAA8C;AAa9C,IAAiB,gBAAgB,CAahC;AAbD,WAAiB,gBAAgB;IAC7B,SAAgB,EAAE,CAAC,GAAY;QAC3B,OAAO,IAAA,gBAAQ,EAAmB,GAAG,CAAC,IAAI,0BAA0B,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC5F,CAAC;IAFe,mBAAE,KAEjB,CAAA;IACD,SAAgB,eAAe,CAAC,MAAwB;QACpD,IAAI,YAAY,GAAoB,kCAAe,CAAC,SAAS,CAAC;QAC9D,IAAI,CAAC,kCAAe,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,YAAY,GAAG,kCAAe,CAAC,UAAU,CAAS,MAAM,CAAC,KAAK,CAAC,IAAI,kCAAe,CAAC,SAAS,CAAC;QACjG,CAAC;aAAM,CAAC;YACJ,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC;QAChC,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IARe,gCAAe,kBAQ9B,CAAA;AACL,CAAC,EAbgB,gBAAgB,gCAAhB,gBAAgB,QAahC;AAKD,IAAiB,0BAA0B,CAI1C;AAJD,WAAiB,0BAA0B;IACvC,SAAgB,EAAE,CAAC,GAAY;QAC3B,OAAO,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAFe,6BAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,0BAA0B,0CAA1B,0BAA0B,QAI1C;AAsCD,IAAiB,sBAAsB,CAStC;AATD,WAAiB,sBAAsB;IACnC,SAAgB,4BAA4B,CAAC,WAAqC,EAAE,eAAgC,kCAAe,CAAC,SAAS;QACzI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACrB,WAAW,CAAC,KAAK,GAAG,YAAY,CAAC;QACrC,CAAC;aAAM,IAAI,IAAA,gBAAQ,EAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,kCAAe,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;QAChH,CAAC;QACD,OAA+B,WAAW,CAAC;IAC/C,CAAC;IAPe,mDAA4B,+BAO3C,CAAA;AACL,CAAC,EATgB,sBAAsB,sCAAtB,sBAAsB,QAStC"}
+{"version":3,"file":"preference-schema.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAUnE,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AA+E1D,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC"}

package/lib/common/preferences/preference-scope.d.ts

@@ -1,3 +1,7 @@
+/**
+ * An array of preference scopes that are valid in a given context, sorted from more general to more specific
+ */
+export declare const ValidPreferenceScopes: unique symbol;
 export declare enum PreferenceScope {
     Default = 0,
     User = 1,
@@ -15,6 +19,5 @@ export declare namespace PreferenceScope {
      */
     function getReversedScopes(): PreferenceScope[];
     function getScopeNames(scope?: PreferenceScope): string[];
-    function fromString(strScope: string): PreferenceScope | undefined;
 }
 //# sourceMappingURL=preference-scope.d.ts.map

package/lib/common/preferences/preference-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preference-scope.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-scope.ts"],"names":[],"mappings":"AAgBA,oBAAY,eAAe;IACvB,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,MAAM,IAAA;CACT;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAE3D;IAED;;OAEG;IACH,SAAgB,SAAS,IAAI,eAAe,EAAE,CAE7C;IAED;;OAEG;IACH,SAAgB,iBAAiB,IAAI,eAAe,EAAE,CAErD;IAED,SAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,eAAe,GAAG,MAAM,EAAE,CAW/D;IAED,SAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAWxE;CACJ"}
+{"version":3,"file":"preference-scope.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-scope.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,eAAO,MAAM,qBAAqB,eAAkC,CAAC;AAErE,oBAAY,eAAe;IACvB,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,SAAS,IAAA;IACT,MAAM,IAAA;CACT;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAE3D;IAED;;OAEG;IACH,SAAgB,SAAS,IAAI,eAAe,EAAE,CAE7C;IAED;;OAEG;IACH,SAAgB,iBAAiB,IAAI,eAAe,EAAE,CAErD;IAED,SAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,eAAe,GAAG,MAAM,EAAE,CAW/D;CACJ"}

package/lib/common/preferences/preference-scope.js

@@ -15,7 +15,11 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreferenceScope = void 0;
+exports.PreferenceScope = exports.ValidPreferenceScopes = void 0;
+/**
+ * An array of preference scopes that are valid in a given context, sorted from more general to more specific
+ */
+exports.ValidPreferenceScopes = Symbol('ValidPreferenceScopes');
 var PreferenceScope;
 (function (PreferenceScope) {
     PreferenceScope[PreferenceScope["Default"] = 0] = "Default";
@@ -55,18 +59,5 @@ var PreferenceScope;
         return names;
     }
     PreferenceScope.getScopeNames = getScopeNames;
-    function fromString(strScope) {
-        switch (strScope) {
-            case 'application':
-                return PreferenceScope.User;
-            case 'window':
-                return PreferenceScope.Folder;
-            case 'resource':
-                return PreferenceScope.Folder;
-            case 'language-overridable':
-                return PreferenceScope.Folder;
-        }
-    }
-    PreferenceScope.fromString = fromString;
 })(PreferenceScope || (exports.PreferenceScope = PreferenceScope = {}));
 //# sourceMappingURL=preference-scope.js.map

package/lib/common/preferences/preference-scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"preference-scope.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-scope.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,2DAAO,CAAA;IACP,qDAAI,CAAA;IACJ,+DAAS,CAAA;IACT,yDAAM,CAAA;AACV,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAED,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,KAAc;QAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAFe,kBAAE,KAEjB,CAAA;IAED;;OAEG;IACH,SAAgB,SAAS;QACrB,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAsB,CAAC;IAClH,CAAC;IAFe,yBAAS,YAExB,CAAA;IAED;;OAEG;IACH,SAAgB,iBAAiB;QAC7B,OAAO,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAFe,iCAAiB,oBAEhC,CAAA;IAED,SAAgB,aAAa,CAAC,KAAuB;QACjD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,IAAI,KAAK,EAAE,CAAC;YACR,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,CAAC;gBAC9B,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC5C,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAXe,6BAAa,gBAW5B,CAAA;IAED,SAAgB,UAAU,CAAC,QAAgB;QACvC,QAAQ,QAAQ,EAAE,CAAC;YACf,KAAK,aAAa;gBACd,OAAO,eAAe,CAAC,IAAI,CAAC;YAChC,KAAK,QAAQ;gBACT,OAAO,eAAe,CAAC,MAAM,CAAC;YAClC,KAAK,UAAU;gBACX,OAAO,eAAe,CAAC,MAAM,CAAC;YAClC,KAAK,sBAAsB;gBACvB,OAAO,eAAe,CAAC,MAAM,CAAC;QACtC,CAAC;IACL,CAAC;IAXe,0BAAU,aAWzB,CAAA;AACL,CAAC,EA5CgB,eAAe,+BAAf,eAAe,QA4C/B"}
+{"version":3,"file":"preference-scope.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-scope.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF;;GAEG;AACU,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAErE,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,2DAAO,CAAA;IACP,qDAAI,CAAA;IACJ,+DAAS,CAAA;IACT,yDAAM,CAAA;AACV,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AAED,WAAiB,eAAe;IAC5B,SAAgB,EAAE,CAAC,KAAc;QAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,SAAS,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAFe,kBAAE,KAEjB,CAAA;IAED;;OAEG;IACH,SAAgB,SAAS;QACrB,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAsB,CAAC;IAClH,CAAC;IAFe,yBAAS,YAExB,CAAA;IAED;;OAEG;IACH,SAAgB,iBAAiB;QAC7B,OAAO,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAFe,iCAAiB,oBAEhC,CAAA;IAED,SAAgB,aAAa,CAAC,KAAuB;QACjD,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,IAAI,KAAK,EAAE,CAAC;YACR,KAAK,MAAM,UAAU,IAAI,MAAM,EAAE,CAAC;gBAC9B,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC5C,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAXe,6BAAa,gBAW5B,CAAA;AACL,CAAC,EA/BgB,eAAe,+BAAf,eAAe,QA+B/B"}

package/lib/{browser → common}/preferences/preference-service.d.ts

@@ -1,13 +1,12 @@
-import { Event, Emitter, DisposableCollection, Disposable } from '../../common';
+import { JSONValue } from '@lumino/coreutils';
+import { Disposable, DisposableCollection, Emitter, Event } from '../../common';
 import { Deferred } from '../../common/promise-util';
-import { PreferenceProvider, PreferenceProviderDataChange, PreferenceProviderDataChanges, PreferenceResolveResult } from './preference-provider';
-import { PreferenceSchemaProvider } from './preference-contribution';
 import URI from '../../common/uri';
+import { OverridePreferenceName, PreferenceLanguageOverrideService } from './preference-language-override-service';
+import { PreferenceProvider, PreferenceProviderDataChange, PreferenceProviderDataChanges, PreferenceResolveResult } from './preference-provider';
+import { PreferenceSchemaService } from './preference-schema';
 import { PreferenceScope } from './preference-scope';
 import { PreferenceConfigurations } from './preference-configurations';
-import { JSONValue } from '@lumino/coreutils';
-import { OverridePreferenceName, PreferenceLanguageOverrideService } from './preference-language-override-service';
-export { PreferenceScope };
 /**
  * Representation of a preference change. A preference value can be set to `undefined` for a specific scope.
  * This means that the value from a more general scope will be used.
@@ -23,8 +22,8 @@ export declare class PreferenceChangeImpl implements PreferenceChange {
     protected readonly change: PreferenceProviderDataChange;
     constructor(change: PreferenceProviderDataChange);
     get preferenceName(): string;
-    get newValue(): string;
-    get oldValue(): string;
+    get newValue(): JSONValue | undefined;
+    get oldValue(): JSONValue | undefined;
     get scope(): PreferenceScope;
     get domain(): string[] | undefined;
     affects(resourceUri?: string): boolean;
@@ -225,14 +224,14 @@ export type PreferenceInspectionScope = keyof Omit<PreferenceInspection<unknown>
  * It allows to load them lazily after DI is configured.
  */
 export declare const PreferenceProviderProvider: unique symbol;
-export type PreferenceProviderProvider = (scope: PreferenceScope, uri?: URI) => PreferenceProvider;
+export type PreferenceProviderProvider = (scope: PreferenceScope, uri?: URI) => PreferenceProvider | undefined;
 export declare class PreferenceServiceImpl implements PreferenceService {
     protected readonly onPreferenceChangedEmitter: Emitter<PreferenceChange>;
     readonly onPreferenceChanged: Event<PreferenceChange>;
     protected readonly onPreferencesChangedEmitter: Emitter<PreferenceChanges>;
     readonly onPreferencesChanged: Event<PreferenceChanges>;
     protected readonly toDispose: DisposableCollection;
-    protected readonly schema: PreferenceSchemaProvider;
+    protected readonly schemaService: PreferenceSchemaService;
     protected readonly providerProvider: PreferenceProviderProvider;
     protected readonly configurations: PreferenceConfigurations;
     protected readonly preferenceOverrideService: PreferenceLanguageOverrideService;

package/lib/common/preferences/preference-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-service.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-service.ts"],"names":[],"mappings":"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"}

package/lib/{browser → common}/preferences/preference-service.js

@@ -15,20 +15,19 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreferenceServiceImpl = exports.PreferenceProviderProvider = exports.PreferenceService = exports.PreferenceChangeImpl = exports.PreferenceScope = void 0;
+exports.PreferenceServiceImpl = exports.PreferenceProviderProvider = exports.PreferenceService = exports.PreferenceChangeImpl = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/no-explicit-any */
+const coreutils_1 = require("@lumino/coreutils");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
 const promise_util_1 = require("../../common/promise-util");
-const preference_provider_1 = require("./preference-provider");
-const preference_contribution_1 = require("./preference-contribution");
 const uri_1 = require("../../common/uri");
+const preference_language_override_service_1 = require("./preference-language-override-service");
+const preference_provider_1 = require("./preference-provider");
+const preference_schema_1 = require("./preference-schema");
 const preference_scope_1 = require("./preference-scope");
-Object.defineProperty(exports, "PreferenceScope", { enumerable: true, get: function () { return preference_scope_1.PreferenceScope; } });
 const preference_configurations_1 = require("./preference-configurations");
-const coreutils_1 = require("@lumino/coreutils");
-const preference_language_override_service_1 = require("./preference-language-override-service");
 class PreferenceChangeImpl {
     constructor(change) {
         this.change = (0, common_1.deepFreeze)(change);
@@ -75,11 +74,16 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
     }
     async initializeProviders() {
         try {
-            for (const scope of preference_scope_1.PreferenceScope.getScopes()) {
+            for (const scope of this.schemaService.validScopes) {
                 const provider = this.providerProvider(scope);
-                this.preferenceProviders.set(scope, provider);
-                this.toDispose.push(provider.onDidPreferencesChanged(changes => this.reconcilePreferences(changes)));
-                await provider.ready;
+                if (provider) {
+                    this.preferenceProviders.set(scope, provider);
+                    this.toDispose.push(provider.onDidPreferencesChanged(changes => this.reconcilePreferences(changes)));
+                    await provider.ready;
+                }
+                else {
+                    console.warn(`No preference provider bound for ${preference_scope_1.PreferenceScope[scope]}`);
+                }
             }
             this._ready.resolve();
             this._isReady = true;
@@ -103,49 +107,47 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
     }
     reconcilePreferences(changes) {
         const changesToEmit = {};
-        const acceptChange = (change) => this.getAffectedPreferenceNames(change, preferenceName => changesToEmit[preferenceName] = new PreferenceChangeImpl({ ...change, preferenceName }));
+        const acceptChange = (change) => {
+            this.getAffectedPreferenceNames(change, preferenceName => changesToEmit[preferenceName] = new PreferenceChangeImpl({ ...change, preferenceName }));
+        };
         for (const preferenceName of Object.keys(changes)) {
             let change = changes[preferenceName];
+            const overridden = this.overriddenPreferenceName(change.preferenceName);
             if (change.newValue === undefined) {
-                const overridden = this.overriddenPreferenceName(change.preferenceName);
                 if (overridden) {
                     change = {
                         ...change, newValue: this.doGet(overridden.preferenceName)
                     };
                 }
             }
-            if (this.schema.isValidInScope(preferenceName, preference_scope_1.PreferenceScope.Folder)) {
-                acceptChange(change);
-                continue;
-            }
-            for (const scope of preference_scope_1.PreferenceScope.getReversedScopes()) {
-                if (this.schema.isValidInScope(preferenceName, scope)) {
-                    const provider = this.getProvider(scope);
-                    if (provider) {
-                        const value = provider.get(preferenceName);
-                        if (scope > change.scope && value !== undefined) {
-                            // preference defined in a more specific scope
-                            break;
-                        }
-                        else if (scope === change.scope && change.newValue !== undefined) {
-                            // preference is changed into something other than `undefined`
-                            acceptChange(change);
-                        }
-                        else if (scope < change.scope && change.newValue === undefined && value !== undefined) {
-                            // preference is changed to `undefined`, use the value from a more general scope
-                            change = {
-                                ...change,
-                                newValue: value,
-                                scope
-                            };
+            for (const scope of [...this.schemaService.validScopes].reverse()) {
+                const provider = this.getProvider(scope);
+                if (provider) {
+                    const scopeValue = provider.get(preferenceName);
+                    // Skip if a more specific scope has this preference defined
+                    if (scope > change.scope && scopeValue !== undefined) {
+                        break;
+                    }
+                    // Handle changes in the same scope
+                    if (scope === change.scope) {
+                        const hasNewValue = change.newValue !== undefined || scope === preference_scope_1.PreferenceScope.Default;
+                        const isResetToUndefined = change.newValue === undefined && scopeValue === undefined; // is reset to undefined (no default value)
+                        if (hasNewValue || isResetToUndefined) {
                             acceptChange(change);
+                            break;
                         }
                     }
-                }
-                else if (change.newValue === undefined && change.scope === preference_scope_1.PreferenceScope.Default) {
-                    // preference is removed
-                    acceptChange(change);
-                    break;
+                    // Handle fallback to more general scope when preference is reset
+                    if (scope < change.scope && change.newValue === undefined && scopeValue !== undefined) {
+                        // preference is changed to `undefined`, use the value from a more general scope
+                        change = {
+                            ...change,
+                            newValue: scopeValue,
+                            scope
+                        };
+                        acceptChange(change);
+                        break;
+                    }
                 }
             }
         }
@@ -157,10 +159,20 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
         changedPreferenceNames.forEach(preferenceName => this.onPreferenceChangedEmitter.fire(changesToEmit[preferenceName]));
     }
     getAffectedPreferenceNames(change, accept) {
+        const overridden = this.preferenceOverrideService.overriddenPreferenceName(change.preferenceName);
         accept(change.preferenceName);
-        for (const overridePreferenceName of this.schema.getOverridePreferenceNames(change.preferenceName)) {
-            if (!this.doHas(overridePreferenceName)) {
-                accept(overridePreferenceName);
+        if (!(overridden === null || overridden === void 0 ? void 0 : overridden.overrideIdentifier)) { // changes to overrides never affect other overrides
+            const preference = this.schemaService.getSchemaProperty(change.preferenceName);
+            if (preference && preference.overridable) {
+                for (const overrideId of this.schemaService.overrideIdentifiers) {
+                    const overridePreferenceName = this.preferenceOverrideService.overridePreferenceName({
+                        overrideIdentifier: overrideId,
+                        preferenceName: change.preferenceName
+                    });
+                    if (!this.doHas(overridePreferenceName)) {
+                        accept(overridePreferenceName);
+                    }
+                }
             }
         }
     }
@@ -266,7 +278,7 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
             return [];
         }
         // Scopes in ascending order of scope breadth.
-        const allScopes = preference_scope_1.PreferenceScope.getReversedScopes();
+        const allScopes = [...this.schemaService.validScopes].reverse();
         // Get rid of Default scope. We can't set anything there.
         allScopes.pop();
         const isScopeDefined = (scope) => this.getScopedValueFromInspection(inspection, scope) !== undefined;
@@ -293,15 +305,13 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
     }
     doResolve(preferenceName, defaultValue, resourceUri) {
         const result = {};
-        for (const scope of preference_scope_1.PreferenceScope.getScopes()) {
-            if (this.schema.isValidInScope(preferenceName, scope)) {
-                const provider = this.getProvider(scope);
-                if (provider === null || provider === void 0 ? void 0 : provider.canHandleScope(scope)) {
-                    const { configUri, value } = provider.resolve(preferenceName, resourceUri);
-                    if (value !== undefined) {
-                        result.configUri = configUri;
-                        result.value = preference_provider_1.PreferenceProvider.merge(result.value, value);
-                    }
+        for (const scope of this.schemaService.validScopes) {
+            const provider = this.getProvider(scope);
+            if (provider === null || provider === void 0 ? void 0 : provider.canHandleScope(scope)) {
+                const { configUri, value } = provider.resolve(preferenceName, resourceUri);
+                if (value !== undefined) {
+                    result.configUri = configUri;
+                    result.value = preference_provider_1.PreferenceUtils.merge(result.value, value);
                 }
             }
         }
@@ -315,7 +325,7 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
         if (!provider || !this.configurations.isAnyConfig(sectionName)) {
             return undefined;
         }
-        const configUri = provider.getConfigUri(resourceUri, sectionName);
+        const configUri = provider.getConfigUri && provider.getConfigUri(resourceUri, sectionName);
         if (configUri) {
             return configUri;
         }
@@ -324,9 +334,9 @@ let PreferenceServiceImpl = class PreferenceServiceImpl {
 };
 exports.PreferenceServiceImpl = PreferenceServiceImpl;
 tslib_1.__decorate([
-    (0, inversify_1.inject)(preference_contribution_1.PreferenceSchemaProvider),
-    tslib_1.__metadata("design:type", preference_contribution_1.PreferenceSchemaProvider)
-], PreferenceServiceImpl.prototype, "schema", void 0);
+    (0, inversify_1.inject)(preference_schema_1.PreferenceSchemaService),
+    tslib_1.__metadata("design:type", Object)
+], PreferenceServiceImpl.prototype, "schemaService", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(exports.PreferenceProviderProvider),
     tslib_1.__metadata("design:type", Function)