@theia/core 1.65.0-next.6 → 1.65.0

package/src/browser/preferences/frontend-config-preference-contributions.ts

@@ -0,0 +1,52 @@
+// *****************************************************************************
+// Copyright (C) 2018 Ericsson and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from 'inversify';
+import { PreferenceContribution, PreferenceSchema, PreferenceSchemaService } from '../../common/preferences/preference-schema';
+import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
+import { FrontendApplicationPreferenceConfig } from './preference-contribution';
+import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
+import { PreferenceScope } from '../../common/preferences';
+import { DefaultTheme } from '@theia/application-package/lib/application-props';
+
+@injectable()
+export class FrontendConfigPreferenceContribution implements PreferenceContribution {
+    schema: PreferenceSchema = { scope: PreferenceScope.Folder, properties: {} };
+    async initSchema(service: PreferenceSchemaService): Promise<void> {
+        const config = FrontendApplicationConfigProvider.get();
+        if (FrontendApplicationPreferenceConfig.is(config)) {
+            service.registerOverride('workbench.colorTheme', undefined, DefaultTheme.defaultForOSTheme(config.defaultTheme));
+            if (config.defaultIconTheme) {
+                service.registerOverride('workbench.iconTheme', undefined, config.defaultIconTheme);
+            }
+            try {
+                for (const [key, defaultValue] of Object.entries(config.preferences)) {
+                    if (PreferenceLanguageOverrideService.testOverrideValue(key, defaultValue)) {
+                        for (const [propertyName, value] of Object.entries(defaultValue)) {
+                            service.registerOverride(propertyName, key.substring(1, key.length - 1), value);
+                        }
+                    } else {
+                        // regular configuration override
+                        service.registerOverride(key, undefined, defaultValue);
+                    }
+                }
+            } catch (e) {
+                console.error('Failed to load preferences from frontend configuration.', e);
+            }
+        }
+    }
+
+}

package/src/browser/preferences/index.ts

@@ -14,10 +14,5 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-export * from './preference-service';
-export * from './preference-proxy';
 export * from './preference-contribution';
-export * from './preference-provider';
-export * from './preference-scope';
-export * from './preference-language-override-service';
 export * from './preference-validation-service';

package/src/browser/preferences/preference-contribution.ts

@@ -14,61 +14,27 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import * as Ajv from 'ajv';
-import { inject, injectable, interfaces, named, postConstruct } from 'inversify';
-import { ContributionProvider, bindContributionProvider, Emitter, Event, Disposable } from '../../common';
-import { PreferenceScope } from './preference-scope';
-import { PreferenceProvider, PreferenceProviderDataChange } from './preference-provider';
-import {
-    PreferenceSchema, PreferenceSchemaProperties, PreferenceDataSchema, PreferenceItem, PreferenceSchemaProperty, PreferenceDataProperty
-} from '../../common/preferences/preference-schema';
-import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
+import { interfaces } from 'inversify';
+import { bindContributionProvider, PreferenceProvider } from '../../common';
+import { PreferenceScope, ValidPreferenceScopes } from '../../common/preferences/preference-scope';
 import { FrontendApplicationConfig } from '@theia/application-package/lib/application-props';
-import { bindPreferenceConfigurations, PreferenceConfigurations } from './preference-configurations';
-export { PreferenceSchema, PreferenceSchemaProperties, PreferenceDataSchema, PreferenceItem, PreferenceSchemaProperty, PreferenceDataProperty };
-import { isObject, Mutable } from '../../common/types';
-import { PreferenceLanguageOverrideService } from './preference-language-override-service';
-import { JSONValue } from '@lumino/coreutils';
-
-/* eslint-disable guard-for-in, @typescript-eslint/no-explicit-any */
-
-export const PreferenceContribution = Symbol('PreferenceContribution');
-
-export const DefaultOverridesPreferenceSchemaId = 'defaultOverrides';
-
-/**
- * A {@link PreferenceContribution} allows adding additional custom preferences.
- * For this, the {@link PreferenceContribution} has to provide a valid JSON Schema specifying which preferences
- * are available including their types and description.
- *
- * ### Example usage
- * ```typescript
- * const MyPreferencesSchema: PreferenceSchema = {
- *     'type': 'object',
- *     '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;
-}
+import { isObject } from '../../common/types';
+import { PreferenceSchemaServiceImpl } from '../../common/preferences/preference-schema-service';
+import { PreferenceContribution, PreferenceSchemaService } from '../../common/preferences/preference-schema';
+import { DefaultsPreferenceProvider } from '../../common/preferences/defaults-preference-provider';
+import { PreferenceLanguageOverrideService } from '../../common/preferences/preference-language-override-service';
+import { FrontendConfigPreferenceContribution } from './frontend-config-preference-contributions';
+import { bindPreferenceConfigurations } from '../../common/preferences/preference-configurations';
 
 export function bindPreferenceSchemaProvider(bind: interfaces.Bind): void {
     bindPreferenceConfigurations(bind);
-    bind(PreferenceSchemaProvider).toSelf().inSingletonScope();
+    bind(ValidPreferenceScopes).toConstantValue([PreferenceScope.Default, PreferenceScope.User, PreferenceScope.Workspace, PreferenceScope.Folder]);
+    bind(PreferenceSchemaServiceImpl).toSelf().inSingletonScope();
+    bind(PreferenceSchemaService).toService(PreferenceSchemaServiceImpl);
+    bind(PreferenceProvider).to(DefaultsPreferenceProvider).inSingletonScope().whenTargetNamed(PreferenceScope.Default);
     bind(PreferenceLanguageOverrideService).toSelf().inSingletonScope();
     bindContributionProvider(bind, PreferenceContribution);
+    bind(PreferenceContribution).to(FrontendConfigPreferenceContribution).inSingletonScope();
 }
 
 /**
@@ -77,6 +43,7 @@ export function bindPreferenceSchemaProvider(bind: interfaces.Bind): void {
  */
 export interface FrontendApplicationPreferenceConfig extends FrontendApplicationConfig {
     preferences: {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         [preferenceName: string]: any
     }
 }
@@ -85,352 +52,3 @@ export namespace FrontendApplicationPreferenceConfig {
         return isObject(config.preferences);
     }
 }
-
-/**
- * The {@link PreferenceSchemaProvider} collects all {@link PreferenceContribution}s and combines
- * the preference schema provided by these contributions into one collective schema. The preferences which
- * are provided by this {@link PreferenceProvider} are derived from this combined schema.
- */
-@injectable()
-export class PreferenceSchemaProvider extends PreferenceProvider {
-
-    protected readonly preferences: { [name: string]: any } = {};
-    protected readonly combinedSchema: PreferenceDataSchema = { properties: {}, patternProperties: {}, allowComments: true, allowTrailingCommas: true, };
-    protected readonly workspaceSchema: PreferenceDataSchema = { properties: {}, patternProperties: {}, allowComments: true, allowTrailingCommas: true, };
-    protected readonly folderSchema: PreferenceDataSchema = { properties: {}, patternProperties: {}, allowComments: true, allowTrailingCommas: true, };
-
-    @inject(ContributionProvider) @named(PreferenceContribution)
-    protected readonly preferenceContributions: ContributionProvider<PreferenceContribution>;
-
-    @inject(PreferenceConfigurations)
-    protected readonly configurations: PreferenceConfigurations;
-
-    protected readonly onDidPreferenceSchemaChangedEmitter = new Emitter<void>();
-    readonly onDidPreferenceSchemaChanged: Event<void> = this.onDidPreferenceSchemaChangedEmitter.event;
-    protected fireDidPreferenceSchemaChanged(): void {
-        this.onDidPreferenceSchemaChangedEmitter.fire(undefined);
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this.readConfiguredPreferences();
-        this.preferenceContributions.getContributions().forEach(contrib => {
-            this.doSetSchema(contrib.schema);
-        });
-        this.combinedSchema.additionalProperties = false;
-        this._ready.resolve();
-    }
-
-    /**
-     * Register a new overrideIdentifier. Existing identifiers are not replaced.
-     *
-     * Allows overriding existing values while keeping both values in store.
-     * For example to store different editor settings, e.g. "[markdown].editor.autoIndent",
-     * "[json].editor.autoIndent" and "editor.autoIndent"
-     * @param overrideIdentifier the new overrideIdentifier
-     */
-    registerOverrideIdentifier(overrideIdentifier: string): void {
-        if (this.preferenceOverrideService.addOverrideIdentifier(overrideIdentifier)) {
-            this.updateOverridePatternPropertiesKey();
-        }
-    }
-
-    protected readonly overridePatternProperties: Required<Pick<PreferenceDataProperty, 'properties' | 'additionalProperties'>> & PreferenceDataProperty = {
-        type: 'object',
-        description: 'Configure editor settings to be overridden for a language.',
-        errorMessage: 'Unknown Identifier. Use language identifiers',
-        properties: {},
-        additionalProperties: false
-    };
-    protected overridePatternPropertiesKey: string | undefined;
-    protected updateOverridePatternPropertiesKey(): void {
-        const oldKey = this.overridePatternPropertiesKey;
-        const newKey = this.preferenceOverrideService.computeOverridePatternPropertiesKey();
-        if (oldKey === newKey) {
-            return;
-        }
-        if (oldKey) {
-            delete this.combinedSchema.patternProperties[oldKey];
-        }
-        this.overridePatternPropertiesKey = newKey;
-        if (newKey) {
-            this.combinedSchema.patternProperties[newKey] = this.overridePatternProperties;
-        }
-        this.fireDidPreferenceSchemaChanged();
-    }
-
-    protected doUnsetSchema(changes: PreferenceProviderDataChange[]): PreferenceProviderDataChange[] {
-        const inverseChanges: PreferenceProviderDataChange[] = [];
-        for (const change of changes) {
-            const preferenceName = change.preferenceName;
-            const overridden = this.preferenceOverrideService.overriddenPreferenceName(preferenceName);
-            if (overridden) {
-                delete this.overridePatternProperties.properties[`[${overridden.overrideIdentifier}]`];
-                this.removePropFromSchemas(`[${overridden.overrideIdentifier}]`);
-            } else {
-                this.removePropFromSchemas(preferenceName);
-            }
-            const newValue = change.oldValue;
-            const oldValue = change.newValue;
-            const { scope, domain } = change;
-            const inverseChange: Mutable<PreferenceProviderDataChange> = { preferenceName, oldValue, scope, domain };
-            if (typeof newValue === undefined) {
-                delete this.preferences[preferenceName];
-            } else {
-                inverseChange.newValue = newValue;
-                this.preferences[preferenceName] = newValue;
-            }
-            inverseChanges.push(inverseChange);
-        }
-        return inverseChanges;
-    }
-
-    protected validateSchema(schema: PreferenceSchema): void {
-        const ajv = new Ajv();
-        const valid = ajv.validateSchema(schema);
-        if (!valid) {
-            const errors = !!ajv.errors ? ajv.errorsText(ajv.errors) : 'unknown validation error';
-            console.warn('A contributed preference schema has validation issues : ' + errors);
-        }
-    }
-
-    protected doSetSchema(schema: PreferenceSchema): PreferenceProviderDataChange[] {
-        if (FrontendApplicationConfigProvider.get().validatePreferencesSchema) {
-            this.validateSchema(schema);
-        }
-        const scope = PreferenceScope.Default;
-        const domain = this.getDomain();
-        const changes: PreferenceProviderDataChange[] = [];
-        const defaultScope = PreferenceSchema.getDefaultScope(schema);
-        const overridable = schema.overridable || false;
-        for (const [preferenceName, rawSchemaProps] of Object.entries(schema.properties)) {
-            if (this.combinedSchema.properties[preferenceName] && DefaultOverridesPreferenceSchemaId !== schema.id) {
-                console.error('Preference name collision detected in the schema for property: ' + preferenceName);
-            } else {
-                let schemaProps;
-                if (this.combinedSchema.properties[preferenceName] && DefaultOverridesPreferenceSchemaId === schema.id) {
-                    // update existing default value in schema
-                    schemaProps = PreferenceDataProperty.fromPreferenceSchemaProperty(rawSchemaProps, defaultScope);
-                    this.updateSchemaPropsDefault(preferenceName, schemaProps);
-                } else if (!rawSchemaProps.hasOwnProperty('included') || rawSchemaProps.included) {
-                    // add overrides for languages
-                    schemaProps = PreferenceDataProperty.fromPreferenceSchemaProperty(rawSchemaProps, defaultScope);
-                    if (typeof schemaProps.overridable !== 'boolean' && overridable) {
-                        schemaProps.overridable = true;
-                    }
-                    if (schemaProps.overridable) {
-                        this.overridePatternProperties.properties[preferenceName] = schemaProps;
-                    }
-                    this.updateSchemaProps(preferenceName, schemaProps);
-                }
-
-                if (schemaProps !== undefined) {
-                    const schemaDefault = this.getDefaultValue(schemaProps);
-                    const configuredDefault = this.getConfiguredDefault(preferenceName);
-                    if (this.preferenceOverrideService.testOverrideValue(preferenceName, schemaDefault)) {
-                        schemaProps.defaultValue = PreferenceSchemaProperties.is(configuredDefault)
-                            ? PreferenceProvider.merge(schemaDefault, configuredDefault)
-                            : schemaDefault;
-                        if (schemaProps.defaultValue && PreferenceSchemaProperties.is(schemaProps.defaultValue)) {
-                            for (const overriddenPreferenceName in schemaProps.defaultValue) {
-                                const overrideValue = schemaDefault[overriddenPreferenceName];
-                                const overridePreferenceName = `${preferenceName}.${overriddenPreferenceName}`;
-                                changes.push(this.doSetPreferenceValue(overridePreferenceName, overrideValue, { scope, domain }));
-                            }
-                        }
-                    } else {
-                        schemaProps.defaultValue = configuredDefault === undefined ? schemaDefault : configuredDefault;
-                        changes.push(this.doSetPreferenceValue(preferenceName, schemaProps.defaultValue, { scope, domain }));
-                    }
-                }
-            }
-        }
-        return changes;
-    }
-
-    protected doSetPreferenceValue(preferenceName: string, newValue: any, { scope, domain }: {
-        scope: PreferenceScope,
-        domain?: string[]
-    }): PreferenceProviderDataChange {
-        const oldValue = this.preferences[preferenceName];
-        this.preferences[preferenceName] = newValue;
-        return { preferenceName, oldValue, newValue, scope, domain };
-    }
-
-    getDefaultValue(property: PreferenceItem): JSONValue {
-        if (property.defaultValue !== undefined) {
-            return property.defaultValue;
-        }
-        if (property.default !== undefined) {
-            return property.default;
-        }
-        const type = Array.isArray(property.type) ? property.type[0] : property.type;
-        switch (type) {
-            case 'boolean':
-                return false;
-            case 'integer':
-            case 'number':
-                return 0;
-            case 'string':
-                return '';
-            case 'array':
-                return [];
-            case 'object':
-                return {};
-        }
-        // eslint-disable-next-line no-null/no-null
-        return null;
-    }
-
-    protected getConfiguredDefault(preferenceName: string): any {
-        const config = FrontendApplicationConfigProvider.get();
-        if (preferenceName && FrontendApplicationPreferenceConfig.is(config) && preferenceName in config.preferences) {
-            return config.preferences[preferenceName];
-        }
-    }
-
-    getCombinedSchema(): PreferenceDataSchema {
-        return this.combinedSchema;
-    }
-
-    getSchema(scope: PreferenceScope): PreferenceDataSchema {
-        switch (scope) {
-            case PreferenceScope.Default:
-            case PreferenceScope.User:
-                return this.combinedSchema;
-            case PreferenceScope.Workspace:
-                return this.workspaceSchema;
-            case PreferenceScope.Folder:
-                return this.folderSchema;
-        }
-    }
-
-    setSchema(schema: PreferenceSchema): Disposable {
-        const changes = this.doSetSchema(schema);
-        if (!changes.length) {
-            return Disposable.NULL;
-        }
-        this.fireDidPreferenceSchemaChanged();
-        this.emitPreferencesChangedEvent(changes);
-        return Disposable.create(() => {
-            const inverseChanges = this.doUnsetSchema(changes);
-            if (!inverseChanges.length) {
-                return;
-            }
-            this.fireDidPreferenceSchemaChanged();
-            this.emitPreferencesChangedEvent(inverseChanges);
-        });
-    }
-
-    getPreferences(): { [name: string]: any } {
-        return this.preferences;
-    }
-
-    async setPreference(): Promise<boolean> {
-        return false;
-    }
-
-    isValidInScope(preferenceName: string, scope: PreferenceScope): boolean {
-        let property;
-        const overridden = this.preferenceOverrideService.overriddenPreferenceName(preferenceName);
-        if (overridden) {
-            // try from overridden schema
-            property = this.overridePatternProperties[`[${overridden.overrideIdentifier}]`];
-            property = property && property[overridden.preferenceName];
-            if (!property) {
-                // try from overridden identifier
-                property = this.overridePatternProperties[overridden.preferenceName];
-            }
-            if (!property) {
-                // try from overridden value
-                property = this.combinedSchema.properties[overridden.preferenceName];
-            }
-        } else {
-            property = this.combinedSchema.properties[preferenceName];
-        }
-        return property && property.scope! >= scope;
-    }
-
-    *getPreferenceNames(): IterableIterator<string> {
-        for (const preferenceName in this.combinedSchema.properties) {
-            yield preferenceName;
-            for (const overridePreferenceName of this.getOverridePreferenceNames(preferenceName)) {
-                yield overridePreferenceName;
-            }
-        }
-    }
-
-    getOverridePreferenceNames(preferenceName: string): IterableIterator<string> {
-        const preference = this.combinedSchema.properties[preferenceName];
-        if (preference && preference.overridable) {
-            return this.preferenceOverrideService.getOverridePreferenceNames(preferenceName);
-        }
-        return [][Symbol.iterator]();
-    }
-
-    getSchemaProperty(key: string): PreferenceDataProperty | undefined {
-        return this.combinedSchema.properties[key];
-    }
-
-    /**
-     * {@link property} will be assigned to field {@link key} in the schema.
-     * Pass a new object to invalidate old schema.
-     */
-    updateSchemaProperty(key: string, property: PreferenceDataProperty): void {
-        this.updateSchemaProps(key, property);
-        this.fireDidPreferenceSchemaChanged();
-    }
-
-    protected updateSchemaProps(key: string, property: PreferenceDataProperty): void {
-        this.combinedSchema.properties[key] = property;
-
-        switch (property.scope) {
-            case PreferenceScope.Folder:
-                this.folderSchema.properties[key] = property;
-            // Fall through. isValidInScope implies that User ⊃ Workspace ⊃ Folder,
-            // so anything we add to folder should be added to workspace, but not vice versa.
-            case PreferenceScope.Workspace:
-                this.workspaceSchema.properties[key] = property;
-                break;
-        }
-    }
-
-    protected updateSchemaPropsDefault(key: string, property: PreferenceDataProperty): void {
-        this.combinedSchema.properties[key].default = property.default;
-        this.combinedSchema.properties[key].defaultValue = property.defaultValue;
-        if (this.workspaceSchema.properties[key]) {
-            this.workspaceSchema.properties[key].default = property.default;
-            this.workspaceSchema.properties[key].defaultValue = property.defaultValue;
-        }
-        if (this.folderSchema.properties[key]) {
-            this.folderSchema.properties[key].default = property.default;
-            this.folderSchema.properties[key].defaultValue = property.defaultValue;
-        }
-    }
-
-    protected removePropFromSchemas(key: string): void {
-        // If we remove a key from combined, it should also be removed from all narrower scopes.
-        delete this.combinedSchema.properties[key];
-        delete this.workspaceSchema.properties[key];
-        delete this.folderSchema.properties[key];
-    }
-
-    protected readConfiguredPreferences(): void {
-        const config = FrontendApplicationConfigProvider.get();
-        if (FrontendApplicationPreferenceConfig.is(config)) {
-            try {
-                const configuredDefaults = config.preferences;
-                const parsedDefaults = this.getParsedContent(configuredDefaults);
-                Object.assign(this.preferences, parsedDefaults);
-                const scope = PreferenceScope.Default;
-                const domain = this.getDomain();
-                const changes: PreferenceProviderDataChange[] = Object.keys(this.preferences)
-                    .map((key): PreferenceProviderDataChange => ({ preferenceName: key, oldValue: undefined, newValue: this.preferences[key], scope, domain }));
-                this.emitPreferencesChangedEvent(changes);
-            } catch (e) {
-                console.error('Failed to load preferences from frontend configuration.', e);
-            }
-        }
-    }
-
-}

package/src/browser/preferences/preference-proxy.spec.ts

@@ -24,14 +24,10 @@ import * as assert from 'assert';
 import { Container } from 'inversify';
 import { bindPreferenceService } from '../frontend-application-bindings';
 import { bindMockPreferenceProviders, MockPreferenceProvider } from './test';
-import { PreferenceService, PreferenceServiceImpl } from './preference-service';
-import { PreferenceSchemaProvider, PreferenceSchema } from './preference-contribution';
-import { PreferenceScope } from './preference-scope';
-import { PreferenceProvider } from './preference-provider';
+import { PreferenceScope } from '../../common/preferences/preference-scope';
 import { FrontendApplicationConfigProvider } from '../frontend-application-config-provider';
-import { PreferenceProxyOptions, PreferenceProxy, PreferenceChangeEvent, createPreferenceProxy } from './preference-proxy';
-import { PreferenceProxyFactory } from './injectable-preference-proxy';
-import { waitForEvent } from '../../common/promise-util';
+import { PreferenceProxyOptions, PreferenceProxy, PreferenceChangeEvent, createPreferenceProxy } from '../../common/preferences/preference-proxy';
+import { PreferenceProxyFactory } from '../../common/preferences/injectable-preference-proxy';
 
 disableJSDOM();
 
@@ -41,6 +37,10 @@ process.on('unhandledRejection', (reason, promise) => {
 });
 
 import { expect } from 'chai';
+import { PreferenceProvider } from '../../common/preferences/preference-provider';
+import { PreferenceSchema, PreferenceSchemaService } from '../../common/preferences/preference-schema';
+import { PreferenceService, PreferenceServiceImpl } from '../../common/preferences';
+import { waitForEvent } from '../../common/promise-util';
 let testContainer: Container;
 
 function createTestContainer(): Container {
@@ -52,7 +52,7 @@ function createTestContainer(): Container {
 
 describe('Preference Proxy', () => {
     let prefService: PreferenceServiceImpl;
-    let prefSchema: PreferenceSchemaProvider;
+    let prefSchema: PreferenceSchemaService;
 
     before(() => {
         disableJSDOM = enableJSDOM();
@@ -65,7 +65,7 @@ describe('Preference Proxy', () => {
 
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(PreferenceSchemaProvider);
+        prefSchema = testContainer.get(PreferenceSchemaService);
         prefService = testContainer.get<PreferenceService>(PreferenceService) as PreferenceServiceImpl;
         getProvider(PreferenceScope.User).markReady();
         getProvider(PreferenceScope.Workspace).markReady();
@@ -100,24 +100,25 @@ describe('Preference Proxy', () => {
                 promisedSchema?: Promise<PreferenceSchema>
             } {
                 const s: PreferenceSchema = schema || {
+                    scope: PreferenceScope.Folder,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo'
+                            default: 'foo'
                         }
                     }
                 };
                 if (testOptions.asyncSchema) {
                     const promisedSchema = new Promise<PreferenceSchema>(resolve => setTimeout(() => {
-                        prefSchema.setSchema(s);
+                        prefSchema.addSchema(s);
                         resolve(s);
-                    }, 1000));
+                    }, 500));
                     const proxy = testOptions.useFactory
                         ? testContainer.get<PreferenceProxyFactory>(PreferenceProxyFactory)(promisedSchema, options)
                         : createPreferenceProxy(prefService, promisedSchema, options);
                     return { proxy, promisedSchema };
                 } else {
-                    prefSchema.setSchema(s);
+                    prefSchema.addSchema(s);
                     const proxy = testOptions.useFactory
                         ? testContainer.get<PreferenceProxyFactory>(PreferenceProxyFactory)(s, options)
                         : createPreferenceProxy(prefService, s, options);
@@ -141,6 +142,7 @@ describe('Preference Proxy', () => {
                     expect(Object.keys(proxy).length).to.equal(0);
                     // Once the schema is resolved, operations should be working:
                     await promisedSchema!;
+                    changed = 0;
                     expect(proxy['my.pref']).to.equal('bar');
                     expect(Object.keys(proxy)).members(['my.pref']);
                     await getProvider(PreferenceScope.User).setPreference('my.pref', 'fizz');
@@ -185,6 +187,7 @@ describe('Preference Proxy', () => {
                 if (promisedSchema) {
                     await promisedSchema;
                 }
+                await waitForEvent(prefService.onPreferenceChanged, 500);
                 let theChange: PreferenceChangeEvent<{ [key: string]: any }>;
                 proxy.onPreferenceChanged(change => {
                     expect(theChange).to.equal(undefined);
@@ -208,10 +211,11 @@ describe('Preference Proxy', () => {
 
             it("should not forward changes that don't match the proxy's language override", async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: PreferenceScope.User,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo',
+                            default: 'foo',
                             overridable: true,
                         }
                     }
@@ -222,7 +226,8 @@ describe('Preference Proxy', () => {
                 prefSchema.registerOverrideIdentifier('swift');
                 prefSchema.registerOverrideIdentifier('typescript');
                 // The service will emit events related to updating the overrides - those are irrelevant
-                await waitForEvent(prefService.onPreferencesChanged, 500);
+                await waitForEvent(prefService.onPreferenceChanged, 500);
+
                 prefService.onPreferencesChanged(() => changeEventsEmittedByService++);
                 proxy.onPreferenceChanged(() => changeEventsEmittedByProxy++);
                 await prefService.set(prefService.overridePreferenceName({ overrideIdentifier: 'swift', preferenceName: 'my.pref' }), 'boo', PreferenceScope.User);
@@ -241,10 +246,11 @@ describe('Preference Proxy', () => {
 
             it('`affects` should only return `true` if the language overrides match', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: PreferenceScope.User,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo',
+                            default: 'foo',
                             overridable: true,
                         }
                     }
@@ -268,6 +274,7 @@ describe('Preference Proxy', () => {
 
             it('toJSON with deep', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: PreferenceScope.Default,
                     properties: {
                         'foo.baz': {
                             type: 'number',
@@ -290,7 +297,9 @@ describe('Preference Proxy', () => {
                 if (promisedSchema) {
                     await promisedSchema;
                 }
-                assert.deepStrictEqual(JSON.stringify(proxy, undefined, 2), JSON.stringify({
+
+                const result = JSON.stringify(proxy, undefined, 2);
+                assert.equal(result, JSON.stringify({
                     foo: {
                         baz: 4,
                         bar: {
@@ -304,6 +313,7 @@ describe('Preference Proxy', () => {
 
             it('get nested default', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: PreferenceScope.Default,
                     properties: {
                         'foo': {
                             'anyOf': [