@theia/core 1.65.0-next.6 → 1.65.0

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

@@ -18,12 +18,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreferenceLanguageOverrideService = exports.getOverridePattern = exports.OVERRIDE_PROPERTY_PATTERN = exports.OverridePreferenceName = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("inversify");
-const common_1 = require("../../common");
-const preference_schema_1 = require("../../common/preferences/preference-schema");
+const types_1 = require("../types");
+const preference_schema_1 = require("./preference-schema");
+const strings_1 = require("../strings");
 var OverridePreferenceName;
 (function (OverridePreferenceName) {
     function is(arg) {
-        return (0, common_1.isObject)(arg) && 'preferenceName' in arg && 'overrideIdentifier' in arg;
+        return (0, types_1.isObject)(arg) && 'preferenceName' in arg && 'overrideIdentifier' in arg;
     }
     OverridePreferenceName.is = is;
 })(OverridePreferenceName || (exports.OverridePreferenceName = OverridePreferenceName = {}));
@@ -32,11 +33,8 @@ exports.OVERRIDE_PROPERTY_PATTERN = new RegExp(OVERRIDE_PROPERTY);
 const getOverridePattern = (identifier) => `\\[(${identifier})\\]$`;
 exports.getOverridePattern = getOverridePattern;
 let PreferenceLanguageOverrideService = class PreferenceLanguageOverrideService {
-    constructor() {
-        this.overrideIdentifiers = new Set();
-    }
-    testOverrideValue(name, value) {
-        return preference_schema_1.PreferenceSchemaProperties.is(value) && exports.OVERRIDE_PROPERTY_PATTERN.test(name);
+    static testOverrideValue(name, value) {
+        return (0, types_1.isObject)(value) && exports.OVERRIDE_PROPERTY_PATTERN.test(name);
     }
     /**
      * @param overrideIdentifier the language id associated for a language override, e.g. `typescript`
@@ -61,7 +59,7 @@ let PreferenceLanguageOverrideService = class PreferenceLanguageOverrideService
         }
         const matches = name.substring(0, index).match(exports.OVERRIDE_PROPERTY_PATTERN);
         const overrideIdentifier = matches && matches[1];
-        if (!overrideIdentifier || !this.overrideIdentifiers.has(overrideIdentifier)) {
+        if (!overrideIdentifier || !this.preferenceSchemaService.overrideIdentifiers.has(overrideIdentifier)) {
             return undefined;
         }
         const preferenceName = name.substring(index + 1);
@@ -69,39 +67,25 @@ let PreferenceLanguageOverrideService = class PreferenceLanguageOverrideService
     }
     computeOverridePatternPropertiesKey() {
         let param = '';
-        for (const overrideIdentifier of this.overrideIdentifiers) {
+        for (const overrideIdentifier of this.preferenceSchemaService.overrideIdentifiers) {
             if (param.length) {
                 param += '|';
             }
-            param += new RegExp((0, common_1.escapeRegExpCharacters)(overrideIdentifier)).source;
+            param += new RegExp((0, strings_1.escapeRegExpCharacters)(overrideIdentifier)).source;
         }
         return param.length ? (0, exports.getOverridePattern)(param) : undefined;
     }
     *getOverridePreferenceNames(preferenceName) {
-        for (const overrideIdentifier of this.overrideIdentifiers) {
+        for (const overrideIdentifier of this.preferenceSchemaService.overrideIdentifiers) {
             yield this.overridePreferenceName({ preferenceName, overrideIdentifier });
         }
     }
-    /**
-     * @param overrideIdentifier
-     * @returns true if the addition caused a change, i.e. if the identifier was not already present in the set of identifiers, false otherwise.
-     */
-    addOverrideIdentifier(overrideIdentifier) {
-        const alreadyPresent = this.overrideIdentifiers.has(overrideIdentifier);
-        if (!alreadyPresent) {
-            this.overrideIdentifiers.add(overrideIdentifier);
-        }
-        return !alreadyPresent;
-    }
-    /**
-     * @param overrideIdentifier
-     * @returns true if the deletion caused a change, i.e. if the identifier was present in the set, false otherwise.
-     */
-    removeOverrideIdentifier(overrideIdentifier) {
-        return this.overrideIdentifiers.delete(overrideIdentifier);
-    }
 };
 exports.PreferenceLanguageOverrideService = PreferenceLanguageOverrideService;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(preference_schema_1.PreferenceSchemaService),
+    tslib_1.__metadata("design:type", Object)
+], PreferenceLanguageOverrideService.prototype, "preferenceSchemaService", void 0);
 exports.PreferenceLanguageOverrideService = PreferenceLanguageOverrideService = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], PreferenceLanguageOverrideService);

package/lib/common/preferences/preference-language-override-service.js.map

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

package/lib/common/preferences/preference-provider-impl.d.ts

@@ -0,0 +1,52 @@
+import { JSONObject } from '@lumino/coreutils';
+import URI from '../../common/uri';
+import { DisposableCollection, Emitter, Event } from '../../common';
+import { Deferred } from '../../common/promise-util';
+import { PreferenceScope } from './preference-scope';
+import { PreferenceProvider, PreferenceProviderDataChange, PreferenceProviderDataChanges, PreferenceResolveResult } from './preference-provider';
+export declare abstract class PreferenceProviderBase {
+    protected readonly onDidPreferencesChangedEmitter: Emitter<PreferenceProviderDataChanges>;
+    readonly onDidPreferencesChanged: Event<PreferenceProviderDataChanges>;
+    protected readonly toDispose: DisposableCollection;
+    protected deferredChanges: PreferenceProviderDataChanges | undefined;
+    constructor();
+    /**
+     * Informs the listeners that one or more preferences of this provider are changed.
+     * The listeners are able to find what was changed from the emitted event.
+     */
+    protected emitPreferencesChangedEvent(changes: PreferenceProviderDataChanges | PreferenceProviderDataChange[]): Promise<boolean>;
+    protected mergePreferenceProviderDataChange(change: PreferenceProviderDataChange): void;
+    protected fireDidPreferencesChanged: () => Promise<boolean>;
+    dispose(): void;
+}
+/**
+ * The {@link PreferenceProvider} is used to store and retrieve preference values. A {@link PreferenceProvider} does not operate in a global scope but is
+ * configured for one or more {@link PreferenceScope}s. The (default implementation for the) {@link PreferenceService} aggregates all {@link PreferenceProvider}s and
+ * serves as a common facade for manipulating preference values.
+ */
+export declare abstract class PreferenceProviderImpl extends PreferenceProviderBase implements PreferenceProvider {
+    protected readonly _ready: Deferred<void>;
+    constructor();
+    get<T>(preferenceName: string, resourceUri?: string): T | undefined;
+    resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
+    abstract getPreferences(resourceUri?: string): JSONObject;
+    abstract setPreference(key: string, value: unknown, resourceUri?: string): Promise<boolean>;
+    /**
+     * Resolved when the preference provider is ready to provide preferences
+     * It should be resolved by subclasses.
+     */
+    get ready(): Promise<void>;
+    /**
+     * Retrieve the domain for this provider.
+     *
+     * @returns the domain or `undefined` if this provider is suitable for all domains.
+     */
+    getDomain(): string[] | undefined;
+    getConfigUri(resourceUri?: string, sectionName?: string): URI | undefined;
+    getContainingConfigUri?(resourceUri?: string, sectionName?: string): URI | undefined;
+    protected getParsedContent(jsonData: unknown): {
+        [key: string]: unknown;
+    };
+    canHandleScope(scope: PreferenceScope): boolean;
+}
+//# sourceMappingURL=preference-provider-impl.d.ts.map

package/lib/common/preferences/preference-provider-impl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider-impl.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider-impl.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAA+C,MAAM,cAAc,CAAC;AACjH,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAE,6BAA6B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEjJ,8BAAsB,sBAAsB;IAExC,SAAS,CAAC,QAAQ,CAAC,8BAA8B,yCAAgD;IACjG,QAAQ,CAAC,uBAAuB,EAAE,KAAK,CAAC,6BAA6B,CAAC,CAA6C;IAEnH,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;IAE1D,SAAS,CAAC,eAAe,EAAE,6BAA6B,GAAG,SAAS,CAAC;;IAMrE;;;OAGG;IACH,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,6BAA6B,GAAG,4BAA4B,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAahI,SAAS,CAAC,iCAAiC,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI;IAkBvF,SAAS,CAAC,yBAAyB,yBAQ7B;IAEN,OAAO,IAAI,IAAI;CAIlB;AAED;;;;GAIG;AACH,8BACsB,sBAAuB,SAAQ,sBAAuB,YAAW,kBAAkB;IAErG,SAAS,CAAC,QAAQ,CAAC,MAAM,iBAAwB;;IAMjD,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAInE,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC;IAWpF,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU;IACzD,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAE3F;;;OAGG;IACH,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAEzB;IAED;;;;OAIG;IACH,SAAS,IAAI,MAAM,EAAE,GAAG,SAAS;IAIjC,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;IAIzE,sBAAsB,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;IAEpF,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE;IAiBzE,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;CAGlD"}

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

@@ -15,36 +15,17 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreferenceProvider = exports.PreferenceProviderDataChange = void 0;
+exports.PreferenceProviderImpl = exports.PreferenceProviderBase = void 0;
 const tslib_1 = require("tslib");
-/* eslint-disable @typescript-eslint/no-explicit-any */
 const debounce = require("p-debounce");
 const inversify_1 = require("inversify");
-const coreutils_1 = require("@lumino/coreutils");
-const uri_1 = require("../../common/uri");
 const common_1 = require("../../common");
 const promise_util_1 = require("../../common/promise-util");
-const preference_language_override_service_1 = require("./preference-language-override-service");
-var PreferenceProviderDataChange;
-(function (PreferenceProviderDataChange) {
-    function affects(change, resourceUri) {
-        const resourcePath = resourceUri && new uri_1.default(resourceUri).path;
-        const domain = change.domain;
-        return !resourcePath || !domain || domain.some(uri => new uri_1.default(uri).path.relativity(resourcePath) >= 0);
-    }
-    PreferenceProviderDataChange.affects = affects;
-})(PreferenceProviderDataChange || (exports.PreferenceProviderDataChange = PreferenceProviderDataChange = {}));
-/**
- * The {@link PreferenceProvider} is used to store and retrieve preference values. A {@link PreferenceProvider} does not operate in a global scope but is
- * configured for one or more {@link PreferenceScope}s. The (default implementation for the) {@link PreferenceService} aggregates all {@link PreferenceProvider}s and
- * serves as a common facade for manipulating preference values.
- */
-let PreferenceProvider = class PreferenceProvider {
+class PreferenceProviderBase {
     constructor() {
         this.onDidPreferencesChangedEmitter = new common_1.Emitter();
         this.onDidPreferencesChanged = this.onDidPreferencesChangedEmitter.event;
         this.toDispose = new common_1.DisposableCollection();
-        this._ready = new promise_util_1.Deferred();
         this.fireDidPreferencesChanged = debounce(() => {
             const changes = this.deferredChanges;
             this.deferredChanges = undefined;
@@ -56,9 +37,6 @@ let PreferenceProvider = class PreferenceProvider {
         }, 0);
         this.toDispose.push(this.onDidPreferencesChangedEmitter);
     }
-    dispose() {
-        this.toDispose.dispose();
-    }
     /**
      * Informs the listeners that one or more preferences of this provider are changed.
      * The listeners are able to find what was changed from the emitted event.
@@ -95,33 +73,29 @@ let PreferenceProvider = class PreferenceProvider {
             Object.assign(current, { newValue, scope, domain });
         }
     }
-    /**
-     * Retrieve the stored value for the given preference and resource URI.
-     *
-     * @param preferenceName the preference identifier.
-     * @param resourceUri the uri of the resource for which the preference is stored. This is used to retrieve
-     * a potentially different value for the same preference for different resources, for example `files.encoding`.
-     *
-     * @returns the value stored for the given preference and resourceUri if it exists, otherwise `undefined`.
-     */
+    dispose() {
+        this.toDispose.dispose();
+    }
+}
+exports.PreferenceProviderBase = PreferenceProviderBase;
+/**
+ * The {@link PreferenceProvider} is used to store and retrieve preference values. A {@link PreferenceProvider} does not operate in a global scope but is
+ * configured for one or more {@link PreferenceScope}s. The (default implementation for the) {@link PreferenceService} aggregates all {@link PreferenceProvider}s and
+ * serves as a common facade for manipulating preference values.
+ */
+let PreferenceProviderImpl = class PreferenceProviderImpl extends PreferenceProviderBase {
+    constructor() {
+        super();
+        this._ready = new promise_util_1.Deferred();
+    }
     get(preferenceName, resourceUri) {
         return this.resolve(preferenceName, resourceUri).value;
     }
-    /**
-     * Resolve the value for the given preference and resource URI.
-     *
-     * @param preferenceName the preference identifier.
-     * @param resourceUri the URI of the resource for which this provider should resolve the preference. This is used to retrieve
-     * a potentially different value for the same preference for different resources, for example `files.encoding`.
-     *
-     * @returns an object containing the value stored for the given preference and resourceUri if it exists,
-     * otherwise `undefined`.
-     */
     resolve(preferenceName, resourceUri) {
         const value = this.getPreferences(resourceUri)[preferenceName];
         if (value !== undefined) {
             return {
-                value,
+                value: value,
                 configUri: this.getConfigUri(resourceUri)
             };
         }
@@ -142,58 +116,16 @@ let PreferenceProvider = class PreferenceProvider {
     getDomain() {
         return undefined;
     }
-    /**
-     * Retrieve the configuration URI for the given resource URI.
-     * @param resourceUri the uri of the resource or `undefined`.
-     * @param sectionName the section to return the URI for, e.g. `tasks` or `launch`. Defaults to settings.
-     *
-     * @returns the corresponding resource URI or `undefined` if there is no valid URI.
-     */
     getConfigUri(resourceUri, sectionName) {
         return undefined;
     }
-    static merge(source, target) {
-        if (source === undefined || !coreutils_1.JSONExt.isObject(source)) {
-            return coreutils_1.JSONExt.deepCopy(target);
-        }
-        if (coreutils_1.JSONExt.isPrimitive(target)) {
-            return {};
-        }
-        for (const key of Object.keys(target)) {
-            const value = target[key];
-            if (key in source) {
-                if (coreutils_1.JSONExt.isObject(source[key]) && coreutils_1.JSONExt.isObject(value)) {
-                    this.merge(source[key], value);
-                    continue;
-                }
-                else if (coreutils_1.JSONExt.isArray(source[key]) && coreutils_1.JSONExt.isArray(value)) {
-                    source[key] = [...coreutils_1.JSONExt.deepCopy(source[key]), ...coreutils_1.JSONExt.deepCopy(value)];
-                    continue;
-                }
-            }
-            source[key] = coreutils_1.JSONExt.deepCopy(value);
-        }
-        return source;
-    }
-    /**
-     * Handles deep equality with the possibility of `undefined`
-     */
-    static deepEqual(a, b) {
-        if (a === b) {
-            return true;
-        }
-        if (a === undefined || b === undefined) {
-            return false;
-        }
-        return coreutils_1.JSONExt.deepEqual(a, b);
-    }
     getParsedContent(jsonData) {
         const preferences = {};
         if (!(0, common_1.isObject)(jsonData)) {
             return preferences;
         }
         for (const [preferenceName, preferenceValue] of Object.entries(jsonData)) {
-            if (this.preferenceOverrideService.testOverrideValue(preferenceName, preferenceValue)) {
+            if (common_1.PreferenceLanguageOverrideService.testOverrideValue(preferenceName, preferenceValue)) {
                 for (const [overriddenPreferenceName, overriddenValue] of Object.entries(preferenceValue)) {
                     preferences[`${preferenceName}.${overriddenPreferenceName}`] = overriddenValue;
                 }
@@ -208,13 +140,9 @@ let PreferenceProvider = class PreferenceProvider {
         return true;
     }
 };
-exports.PreferenceProvider = PreferenceProvider;
-tslib_1.__decorate([
-    (0, inversify_1.inject)(preference_language_override_service_1.PreferenceLanguageOverrideService),
-    tslib_1.__metadata("design:type", preference_language_override_service_1.PreferenceLanguageOverrideService)
-], PreferenceProvider.prototype, "preferenceOverrideService", void 0);
-exports.PreferenceProvider = PreferenceProvider = tslib_1.__decorate([
+exports.PreferenceProviderImpl = PreferenceProviderImpl;
+exports.PreferenceProviderImpl = PreferenceProviderImpl = tslib_1.__decorate([
     (0, inversify_1.injectable)(),
     tslib_1.__metadata("design:paramtypes", [])
-], PreferenceProvider);
-//# sourceMappingURL=preference-provider.js.map
+], PreferenceProviderImpl);
+//# sourceMappingURL=preference-provider-impl.js.map

package/lib/common/preferences/preference-provider-impl.js.map

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

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

@@ -1,9 +1,8 @@
-import { JSONValue } from '@lumino/coreutils';
-import URI from '../../common/uri';
-import { Disposable, DisposableCollection, Emitter, Event } from '../../common';
-import { Deferred } from '../../common/promise-util';
-import { PreferenceScope } from './preference-scope';
-import { PreferenceLanguageOverrideService } from './preference-language-override-service';
+import { JSONObject, JSONValue } from '@lumino/coreutils';
+import { Event } from '../event';
+import { PreferenceScope } from '../preferences/preference-scope';
+import { URI } from '../uri';
+import { Disposable } from 'vscode-languageserver-protocol';
 export interface PreferenceProviderDataChange {
     /**
      * The name of the changed preference.
@@ -12,11 +11,11 @@ export interface PreferenceProviderDataChange {
     /**
      * The new value of the changed preference.
      */
-    readonly newValue?: any;
+    readonly newValue?: JSONValue;
     /**
      * The old value of the changed preference.
      */
-    readonly oldValue?: any;
+    readonly oldValue?: JSONValue;
     /**
      * The {@link PreferenceScope} of the changed preference.
      */
@@ -29,34 +28,22 @@ export interface PreferenceProviderDataChange {
 export declare namespace PreferenceProviderDataChange {
     function affects(change: PreferenceProviderDataChange, resourceUri?: string): boolean;
 }
-export interface PreferenceProviderDataChanges {
-    [preferenceName: string]: PreferenceProviderDataChange;
-}
 export interface PreferenceResolveResult<T> {
     configUri?: URI;
     value?: T;
 }
-/**
- * The {@link PreferenceProvider} is used to store and retrieve preference values. A {@link PreferenceProvider} does not operate in a global scope but is
- * configured for one or more {@link PreferenceScope}s. The (default implementation for the) {@link PreferenceService} aggregates all {@link PreferenceProvider}s and
- * serves as a common facade for manipulating preference values.
- */
-export declare abstract class PreferenceProvider implements Disposable {
-    protected readonly preferenceOverrideService: PreferenceLanguageOverrideService;
-    protected readonly onDidPreferencesChangedEmitter: Emitter<PreferenceProviderDataChanges>;
+export interface PreferenceProviderDataChanges {
+    [preferenceName: string]: PreferenceProviderDataChange;
+}
+export declare const PreferenceProvider: unique symbol;
+export interface PreferenceProvider extends Disposable {
     readonly onDidPreferencesChanged: Event<PreferenceProviderDataChanges>;
-    protected readonly toDispose: DisposableCollection;
-    protected readonly _ready: Deferred<void>;
-    constructor();
-    dispose(): void;
-    protected deferredChanges: PreferenceProviderDataChanges | undefined;
+    ready: Promise<void>;
     /**
-     * Informs the listeners that one or more preferences of this provider are changed.
-     * The listeners are able to find what was changed from the emitted event.
+     * Whether t
+     * @param scope the scope to handle
      */
-    protected emitPreferencesChangedEvent(changes: PreferenceProviderDataChanges | PreferenceProviderDataChange[]): Promise<boolean>;
-    protected mergePreferenceProviderDataChange(change: PreferenceProviderDataChange): void;
-    protected fireDidPreferencesChanged: () => Promise<boolean>;
+    canHandleScope(scope: PreferenceScope): boolean;
     /**
      * Retrieve the stored value for the given preference and resource URI.
      *
@@ -67,20 +54,6 @@ export declare abstract class PreferenceProvider implements Disposable {
      * @returns the value stored for the given preference and resourceUri if it exists, otherwise `undefined`.
      */
     get<T>(preferenceName: string, resourceUri?: string): T | undefined;
-    /**
-     * Resolve the value for the given preference and resource URI.
-     *
-     * @param preferenceName the preference identifier.
-     * @param resourceUri the URI of the resource for which this provider should resolve the preference. This is used to retrieve
-     * a potentially different value for the same preference for different resources, for example `files.encoding`.
-     *
-     * @returns an object containing the value stored for the given preference and resourceUri if it exists,
-     * otherwise `undefined`.
-     */
-    resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
-    abstract getPreferences(resourceUri?: string): {
-        [p: string]: any;
-    };
     /**
      * Stores a new value for the given preference key in the provider.
      * @param key the preference key (typically the name).
@@ -92,18 +65,18 @@ export declare abstract class PreferenceProvider implements Disposable {
      * await on `this.emitPreferencesChangedEvent(...)` or
      * `this.pendingChanges` if changes are fired indirectly.
      */
-    abstract setPreference(key: string, value: any, resourceUri?: string): Promise<boolean>;
-    /**
-     * Resolved when the preference provider is ready to provide preferences
-     * It should be resolved by subclasses.
-     */
-    get ready(): Promise<void>;
+    setPreference(key: string, value: JSONValue, resourceUri?: string): Promise<boolean>;
     /**
-     * Retrieve the domain for this provider.
+     * Resolve the value for the given preference and resource URI.
+     *
+     * @param preferenceName the preference identifier.
+     * @param resourceUri the URI of the resource for which this provider should resolve the preference. This is used to retrieve
+     * a potentially different value for the same preference for different resources, for example `files.encoding`.
      *
-     * @returns the domain or `undefined` if this provider is suitable for all domains.
+     * @returns an object containing the value stored for the given preference and resourceUri if it exists,
+     * otherwise `undefined`.
      */
-    getDomain(): string[] | undefined;
+    resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
     /**
      * Retrieve the configuration URI for the given resource URI.
      * @param resourceUri the uri of the resource or `undefined`.
@@ -111,7 +84,7 @@ export declare abstract class PreferenceProvider implements Disposable {
      *
      * @returns the corresponding resource URI or `undefined` if there is no valid URI.
      */
-    getConfigUri(resourceUri?: string, sectionName?: string): URI | undefined;
+    getConfigUri?(resourceUri?: string, sectionName?: string): URI | undefined;
     /**
      * Retrieves the first valid configuration URI contained by the given resource.
      * @param resourceUri the uri of the container resource or `undefined`.
@@ -120,14 +93,16 @@ export declare abstract class PreferenceProvider implements Disposable {
      * if there is no valid configuration URI at all.
      */
     getContainingConfigUri?(resourceUri?: string, sectionName?: string): URI | undefined;
-    static merge(source: JSONValue | undefined, target: JSONValue): JSONValue;
+    /**
+     * Return a JSONObject with all preferences stored in this preference provider
+     */
+    getPreferences(resourceUri?: string): JSONObject;
+}
+export declare namespace PreferenceUtils {
+    function merge(source: JSONValue | undefined, target: JSONValue): JSONValue;
     /**
      * Handles deep equality with the possibility of `undefined`
      */
-    static deepEqual(a: JSONValue | undefined, b: JSONValue | undefined): boolean;
-    protected getParsedContent(jsonData: any): {
-        [key: string]: any;
-    };
-    canHandleScope(scope: PreferenceScope): boolean;
+    function deepEqual(a: JSONValue | undefined, b: JSONValue | undefined): boolean;
 }
 //# sourceMappingURL=preference-provider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,MAAM,WAAW,4BAA4B;IACzC;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC;IAC9B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CAC9B;AAED,yBAAiB,4BAA4B,CAAC;IAC1C,SAAgB,OAAO,CAAC,MAAM,EAAE,4BAA4B,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAI3F;CACJ;AAED,MAAM,WAAW,uBAAuB,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,KAAK,CAAC,EAAE,CAAC,CAAA;CACZ;AAED,MAAM,WAAW,6BAA6B;IAC1C,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,CAAC;CAC1D;AACD,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAE/D,MAAM,WAAW,kBAAmB,SAAQ,UAAU;IAClD,QAAQ,CAAC,uBAAuB,EAAE,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACvE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IAEpB;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC;IAEhD;;;;;;;;OAQG;IACH,GAAG,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC;IACpE;;;;;;;;;;OAUG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IACpF;;;;;;;;;OASG;IACH,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAErF;;;;;;OAMG;IACH,YAAY,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAC3E;;;;;;OAMG;IACH,sBAAsB,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAErF;;OAEG;IACH,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;CACpD;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,SAAS,CAqBjF;IAED;;OAEG;IACH,SAAgB,SAAS,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAIrF;CAEJ"}

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

@@ -0,0 +1,71 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2023 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PreferenceUtils = exports.PreferenceProvider = exports.PreferenceProviderDataChange = void 0;
+const coreutils_1 = require("@lumino/coreutils");
+const uri_1 = require("../uri");
+var PreferenceProviderDataChange;
+(function (PreferenceProviderDataChange) {
+    function affects(change, resourceUri) {
+        const resourcePath = resourceUri && new uri_1.URI(resourceUri).path;
+        const domain = change.domain;
+        return !resourcePath || !domain || domain.some(uri => new uri_1.URI(uri).path.relativity(resourcePath) >= 0);
+    }
+    PreferenceProviderDataChange.affects = affects;
+})(PreferenceProviderDataChange || (exports.PreferenceProviderDataChange = PreferenceProviderDataChange = {}));
+exports.PreferenceProvider = Symbol('PreferenceProvider');
+var PreferenceUtils;
+(function (PreferenceUtils) {
+    function merge(source, target) {
+        if (source === undefined || !coreutils_1.JSONExt.isObject(source)) {
+            return coreutils_1.JSONExt.deepCopy(target);
+        }
+        if (coreutils_1.JSONExt.isPrimitive(target)) {
+            return {};
+        }
+        for (const [key, value] of Object.entries(target)) {
+            if (key in source) {
+                const sourceValue = source[key];
+                if (coreutils_1.JSONExt.isObject(sourceValue) && coreutils_1.JSONExt.isObject(value)) {
+                    merge(sourceValue, value);
+                    continue;
+                }
+                else if (coreutils_1.JSONExt.isArray(sourceValue) && coreutils_1.JSONExt.isArray(value)) {
+                    source[key] = [...coreutils_1.JSONExt.deepCopy(sourceValue), ...coreutils_1.JSONExt.deepCopy(value)];
+                    continue;
+                }
+            }
+            source[key] = coreutils_1.JSONExt.deepCopy(value);
+        }
+        return source;
+    }
+    PreferenceUtils.merge = merge;
+    /**
+     * Handles deep equality with the possibility of `undefined`
+     */
+    function deepEqual(a, b) {
+        if (a === b) {
+            return true;
+        }
+        if (a === undefined || b === undefined) {
+            return false;
+        }
+        return coreutils_1.JSONExt.deepEqual(a, b);
+    }
+    PreferenceUtils.deepEqual = deepEqual;
+})(PreferenceUtils || (exports.PreferenceUtils = PreferenceUtils = {}));
+//# sourceMappingURL=preference-provider.js.map

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

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

package/lib/common/preferences/preference-provider.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.spec.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.spec.ts"],"names":[],"mappings":""}

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

@@ -17,17 +17,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const preference_provider_1 = require("./preference-provider");
 const { expect } = require('chai');
-describe('PreferenceProvider', () => {
+describe('PreferenceProviderImpl', () => {
     it('should preserve extra source fields on merge', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [], 'compounds': [] }, { 'configurations': [] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [], 'compounds': [] }, { 'configurations': [] });
         expect(result).deep.equals({ 'configurations': [], 'compounds': [] });
     });
     it('should preserve extra target fields on merge', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [] }, { 'configurations': [], 'compounds': [] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [] }, { 'configurations': [], 'compounds': [] });
         expect(result).deep.equals({ 'configurations': [], 'compounds': [] });
     });
     it('should merge array values', () => {
-        const result = preference_provider_1.PreferenceProvider.merge({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }], 'compounds': [] }, { 'configurations': [{ 'name': 'test2' }] });
+        const result = preference_provider_1.PreferenceUtils.merge({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }], 'compounds': [] }, { 'configurations': [{ 'name': 'test2' }] });
         expect(result).deep.equals({ 'configurations': [{ 'name': 'test1', 'request': 'launch' }, { 'name': 'test2' }], 'compounds': [] });
     });
 });

package/lib/common/preferences/preference-provider.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-provider.spec.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-provider.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,+DAAwD;AAExD,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACpC,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACpD,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1G,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACjC,MAAM,MAAM,GAAG,qCAAe,CAAC,KAAK,CAChC,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,EACjF,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAC9C,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,CAAC;IACvI,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

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

@@ -1,6 +1,6 @@
 import { Disposable, Event, MaybePromise } from '../../common';
 import { PreferenceService } from './preference-service';
-import { PreferenceSchema } from './preference-contribution';
+import { IJSONSchema } from '../../common/json-schema';
 /**
  * It is worth explaining the type for `PreferenceChangeEvent`:
  *
@@ -147,5 +147,5 @@ export interface PreferenceProxyOptions {
  *
  * @deprecated @since 1.23.0 use `PreferenceProxyFactory` instead.
  */
-export declare function createPreferenceProxy<T>(preferences: PreferenceService, promisedSchema: MaybePromise<PreferenceSchema>, options?: PreferenceProxyOptions): PreferenceProxy<T>;
+export declare function createPreferenceProxy<T>(preferences: PreferenceService, promisedSchema: MaybePromise<IJSONSchema>, options?: PreferenceProxyOptions): PreferenceProxy<T>;
 //# sourceMappingURL=preference-proxy.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preference-proxy.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-proxy.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAY,YAAY,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAEH;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI;IACnC,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACvE,GAAG;KACC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG;QACd,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC;QAC3B,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB;;WAEG;QAEH,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5B;CACJ,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACrC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,mBAAmB,CAAC,CAAC;IAClC,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,GAAG;QACvC,cAAc,EAAE,CAAC,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAC9B,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CACvD;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAC/G,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AACvE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,eAAe,CAAC,CAAC,CAAC,CA8LxK"}