@theia/core 1.65.0-next.6 → 1.65.1

package/lib/browser/preferences/preference-proxy.spec.js

@@ -22,20 +22,20 @@ const assert = require("assert");
 const inversify_1 = require("inversify");
 const frontend_application_bindings_1 = require("../frontend-application-bindings");
 const test_1 = require("./test");
-const preference_service_1 = require("./preference-service");
-const preference_contribution_1 = require("./preference-contribution");
-const preference_scope_1 = require("./preference-scope");
-const preference_provider_1 = require("./preference-provider");
+const preference_scope_1 = require("../../common/preferences/preference-scope");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
-const preference_proxy_1 = require("./preference-proxy");
-const injectable_preference_proxy_1 = require("./injectable-preference-proxy");
-const promise_util_1 = require("../../common/promise-util");
+const preference_proxy_1 = require("../../common/preferences/preference-proxy");
+const injectable_preference_proxy_1 = require("../../common/preferences/injectable-preference-proxy");
 disableJSDOM();
 process.on('unhandledRejection', (reason, promise) => {
     console.error(reason);
     throw reason;
 });
 const chai_1 = require("chai");
+const preference_provider_1 = require("../../common/preferences/preference-provider");
+const preference_schema_1 = require("../../common/preferences/preference-schema");
+const preferences_1 = require("../../common/preferences");
+const promise_util_1 = require("../../common/promise-util");
 let testContainer;
 function createTestContainer() {
     const result = new inversify_1.Container();
@@ -55,8 +55,8 @@ describe('Preference Proxy', () => {
     });
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(preference_contribution_1.PreferenceSchemaProvider);
-        prefService = testContainer.get(preference_service_1.PreferenceService);
+        prefSchema = testContainer.get(preference_schema_1.PreferenceSchemaService);
+        prefService = testContainer.get(preferences_1.PreferenceService);
         getProvider(preference_scope_1.PreferenceScope.User).markReady();
         getProvider(preference_scope_1.PreferenceScope.Workspace).markReady();
         getProvider(preference_scope_1.PreferenceScope.Folder).markReady();
@@ -81,25 +81,26 @@ describe('Preference Proxy', () => {
         describe(testDescription, () => {
             function getProxy(schema, options) {
                 const s = schema || {
+                    scope: preference_scope_1.PreferenceScope.Folder,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo'
+                            default: 'foo'
                         }
                     }
                 };
                 if (testOptions.asyncSchema) {
                     const promisedSchema = new Promise(resolve => setTimeout(() => {
-                        prefSchema.setSchema(s);
+                        prefSchema.addSchema(s);
                         resolve(s);
-                    }, 1000));
+                    }, 500));
                     const proxy = testOptions.useFactory
                         ? testContainer.get(injectable_preference_proxy_1.PreferenceProxyFactory)(promisedSchema, options)
                         : (0, preference_proxy_1.createPreferenceProxy)(prefService, promisedSchema, options);
                     return { proxy, promisedSchema };
                 }
                 else {
-                    prefSchema.setSchema(s);
+                    prefSchema.addSchema(s);
                     const proxy = testOptions.useFactory
                         ? testContainer.get(injectable_preference_proxy_1.PreferenceProxyFactory)(s, options)
                         : (0, preference_proxy_1.createPreferenceProxy)(prefService, s, options);
@@ -122,6 +123,7 @@ describe('Preference Proxy', () => {
                     (0, chai_1.expect)(Object.keys(proxy).length).to.equal(0);
                     // Once the schema is resolved, operations should be working:
                     await promisedSchema;
+                    changed = 0;
                     (0, chai_1.expect)(proxy['my.pref']).to.equal('bar');
                     (0, chai_1.expect)(Object.keys(proxy)).members(['my.pref']);
                     await getProvider(preference_scope_1.PreferenceScope.User).setPreference('my.pref', 'fizz');
@@ -161,6 +163,7 @@ describe('Preference Proxy', () => {
                 if (promisedSchema) {
                     await promisedSchema;
                 }
+                await (0, promise_util_1.waitForEvent)(prefService.onPreferenceChanged, 500);
                 let theChange;
                 proxy.onPreferenceChanged(change => {
                     (0, chai_1.expect)(theChange).to.equal(undefined);
@@ -181,10 +184,11 @@ describe('Preference Proxy', () => {
             });
             it("should not forward changes that don't match the proxy's language override", async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: preference_scope_1.PreferenceScope.User,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo',
+                            default: 'foo',
                             overridable: true,
                         }
                     }
@@ -195,7 +199,7 @@ describe('Preference Proxy', () => {
                 prefSchema.registerOverrideIdentifier('swift');
                 prefSchema.registerOverrideIdentifier('typescript');
                 // The service will emit events related to updating the overrides - those are irrelevant
-                await (0, promise_util_1.waitForEvent)(prefService.onPreferencesChanged, 500);
+                await (0, promise_util_1.waitForEvent)(prefService.onPreferenceChanged, 500);
                 prefService.onPreferencesChanged(() => changeEventsEmittedByService++);
                 proxy.onPreferenceChanged(() => changeEventsEmittedByProxy++);
                 await prefService.set(prefService.overridePreferenceName({ overrideIdentifier: 'swift', preferenceName: 'my.pref' }), 'boo', preference_scope_1.PreferenceScope.User);
@@ -213,10 +217,11 @@ describe('Preference Proxy', () => {
             });
             it('`affects` should only return `true` if the language overrides match', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: preference_scope_1.PreferenceScope.User,
                     properties: {
                         'my.pref': {
                             type: 'string',
-                            defaultValue: 'foo',
+                            default: 'foo',
                             overridable: true,
                         }
                     }
@@ -240,6 +245,7 @@ describe('Preference Proxy', () => {
             });
             it('toJSON with deep', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: preference_scope_1.PreferenceScope.Default,
                     properties: {
                         'foo.baz': {
                             type: 'number',
@@ -262,7 +268,8 @@ 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: {
@@ -275,6 +282,7 @@ describe('Preference Proxy', () => {
             });
             it('get nested default', async () => {
                 const { proxy, promisedSchema } = getProxy({
+                    scope: preference_scope_1.PreferenceScope.Default,
                     properties: {
                         'foo': {
                             'anyOf': [

package/lib/browser/preferences/preference-proxy.spec.js.map

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

package/lib/browser/preferences/preference-schema-provider.spec.js

@@ -20,8 +20,9 @@ let disableJSDOM = (0, jsdom_1.enableJSDOM)();
 const assert = require("assert");
 const inversify_1 = require("inversify");
 const frontend_application_bindings_1 = require("../frontend-application-bindings");
-const preference_contribution_1 = require("./preference-contribution");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
+const preference_schema_1 = require("../../common/preferences/preference-schema");
+const preferences_1 = require("../../common/preferences");
 disableJSDOM();
 process.on('unhandledRejection', (reason, promise) => {
     console.error(reason);
@@ -50,6 +51,7 @@ const EDITOR_INSERT_SPACES_PROPERTIES = {
 };
 describe('Preference Schema Provider', () => {
     let prefSchema;
+    let prefDefaults;
     before(() => {
         disableJSDOM = (0, jsdom_1.enableJSDOM)();
         frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({
@@ -64,53 +66,38 @@ describe('Preference Schema Provider', () => {
     });
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(preference_contribution_1.PreferenceSchemaProvider);
+        prefSchema = testContainer.get(preference_schema_1.PreferenceSchemaService);
+        await prefSchema.ready;
+        prefSchema.registerOverrideIdentifier('typescript');
+        const providerProvider = testContainer.get(preferences_1.PreferenceProviderProvider);
+        prefDefaults = providerProvider(preferences_1.PreferenceScope.Default);
+        await prefDefaults.ready;
     });
     it('Should load all preferences specified in the frontend config.', () => {
-        assert.strictEqual(prefSchema.get('editor.fontSize'), 20);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
+        assert.strictEqual(prefDefaults.get('editor.fontSize'), 20);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.fontSize'), 24);
     });
     it('Should favor the default specified in the package.json over a default registered by a schema', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 ...EDITOR_FONT_SIZE_PROPERTIES
             }
         });
-        assert.strictEqual(prefSchema.get('editor.fontSize'), 20);
+        assert.strictEqual(prefDefaults.get('editor.fontSize'), 20);
     });
     it('Should merge language-specific overrides from schemas and the package.json', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
             properties: {
                 ...EDITOR_FONT_SIZE_PROPERTIES,
                 ...EDITOR_INSERT_SPACES_PROPERTIES,
-                '[typescript]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
-                }
-            }
-        });
-        assert.strictEqual(prefSchema.get('editor.insertSpaces'), true);
-        assert.strictEqual(prefSchema.get('[typescript].editor.insertSpaces'), false);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
-    });
-    it('Should favor package.json specifications in the merge process', () => {
-        prefSchema.setSchema({
-            properties: {
-                ...EDITOR_FONT_SIZE_PROPERTIES,
-                ...EDITOR_INSERT_SPACES_PROPERTIES,
-                '[typescript]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false,
-                        'editor.fontSize': 36,
-                    }
-                }
-            }
+            },
+            scope: preferences_1.PreferenceScope.Default
         });
-        assert.strictEqual(prefSchema.get('[typescript].editor.insertSpaces'), false);
-        assert.strictEqual(prefSchema.get('[typescript].editor.fontSize'), 24);
+        prefSchema.registerOverride('editor.insertSpaces', 'typescript', false);
+        assert.strictEqual(prefDefaults.get('editor.insertSpaces'), true);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.insertSpaces'), false);
+        assert.strictEqual(prefDefaults.get('[typescript].editor.fontSize'), 24);
     });
 });
 //# sourceMappingURL=preference-schema-provider.spec.js.map

package/lib/browser/preferences/preference-schema-provider.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"preference-schema-provider.spec.js","sourceRoot":"","sources":["../../../src/browser/preferences/preference-schema-provider.spec.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,yCAA4C;AAE5C,IAAI,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC;AAEjC,iCAAiC;AACjC,yCAAsC;AACtC,oFAAyE;AACzE,uEAAiG;AACjG,kGAA4F;AAE5F,YAAY,EAAE,CAAC;AAEf,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;IACjD,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACtB,MAAM,MAAM,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,sCAAsC;AACtC,IAAI,aAAwB,CAAC;AAE7B,SAAS,mBAAmB;IACxB,MAAM,MAAM,GAAG,IAAI,qBAAS,EAAE,CAAC;IAC/B,IAAA,qDAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,2BAA2B,GAA+B;IAC5D,iBAAiB,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,IAAI;KACpB;CACJ,CAAC;AACF,MAAM,+BAA+B,GAA+B;IAChE,qBAAqB,EAAE;QACnB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,IAAI;KACpB;CACJ,CAAC;AAEF,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IACxC,IAAI,UAAoC,CAAC;IAEzC,MAAM,CAAC,GAAG,EAAE;QACR,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC;QAC7B,wEAAiC,CAAC,GAAG,CAAC;YAClC,WAAW,EAAE;gBACT,iBAAiB,EAAE,EAAE;gBACrB,cAAc,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE;aAC5C;SACJ,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,EAAE;QACP,YAAY,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,aAAa,GAAG,mBAAmB,EAAE,CAAC;QACtC,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,kDAAwB,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,8BAA8B,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8FAA8F,EAAE,GAAG,EAAE;QACpG,UAAU,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE;gBACR,GAAG,2BAA2B;aACjC;SACJ,CAAC,CAAC;QAEH,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;QAClF,UAAU,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE;gBACR,GAAG,2BAA2B;gBAC9B,GAAG,+BAA+B;gBAClC,cAAc,EAAE;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE;wBACL,qBAAqB,EAAE,KAAK;qBAC/B;iBACJ;aACJ;SACJ,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,CAAC;QAChE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,8BAA8B,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACrE,UAAU,CAAC,SAAS,CAAC;YACjB,UAAU,EAAE;gBACR,GAAG,2BAA2B;gBAC9B,GAAG,+BAA+B;gBAClC,cAAc,EAAE;oBACZ,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE;wBACL,qBAAqB,EAAE,KAAK;wBAC5B,iBAAiB,EAAE,EAAE;qBACxB;iBACJ;aACJ;SACJ,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,kCAAkC,CAAC,EAAE,KAAK,CAAC,CAAC;QAC9E,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,8BAA8B,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"preference-schema-provider.spec.js","sourceRoot":"","sources":["../../../src/browser/preferences/preference-schema-provider.spec.ts"],"names":[],"mappings":"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"}

package/lib/browser/preferences/preference-service.spec.js

@@ -20,14 +20,12 @@ const jsdom_1 = require("../test/jsdom");
 let disableJSDOM = (0, jsdom_1.enableJSDOM)();
 const assert = require("assert");
 const inversify_1 = require("inversify");
-const frontend_application_bindings_1 = require("../frontend-application-bindings");
-const test_1 = require("./test");
-const preference_service_1 = require("./preference-service");
-const preference_contribution_1 = require("./preference-contribution");
-const preference_scope_1 = require("./preference-scope");
-const preference_provider_1 = require("./preference-provider");
+const preferences_1 = require("../../common/preferences");
+const preference_schema_1 = require("../../common/preferences/preference-schema");
 const frontend_application_config_provider_1 = require("../frontend-application-config-provider");
-const preference_proxy_1 = require("./preference-proxy");
+const test_1 = require("./test");
+const preference_proxy_1 = require("../../common/preferences/preference-proxy");
+const frontend_application_bindings_1 = require("../frontend-application-bindings");
 disableJSDOM();
 process.on('unhandledRejection', (reason, promise) => {
     console.error(reason);
@@ -53,11 +51,11 @@ describe('Preference Service', () => {
     });
     beforeEach(async () => {
         testContainer = createTestContainer();
-        prefSchema = testContainer.get(preference_contribution_1.PreferenceSchemaProvider);
-        prefService = testContainer.get(preference_service_1.PreferenceService);
-        getProvider(preference_scope_1.PreferenceScope.User).markReady();
-        getProvider(preference_scope_1.PreferenceScope.Workspace).markReady();
-        getProvider(preference_scope_1.PreferenceScope.Folder).markReady();
+        prefSchema = testContainer.get(preference_schema_1.PreferenceSchemaService);
+        prefService = testContainer.get(preferences_1.PreferenceService);
+        getProvider(preferences_1.PreferenceScope.User).markReady();
+        getProvider(preferences_1.PreferenceScope.Workspace).markReady();
+        getProvider(preferences_1.PreferenceScope.Folder).markReady();
         console.log('before ready');
         try {
             await prefService.ready;
@@ -70,20 +68,20 @@ describe('Preference Service', () => {
     afterEach(() => {
     });
     function getProvider(scope) {
-        return testContainer.getNamed(preference_provider_1.PreferenceProvider, scope);
+        return testContainer.getNamed(preferences_1.PreferenceProvider, scope);
     }
     it('should return the preference from the more specific scope (user > workspace)', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.number': {
                     type: 'number',
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
-        const workspaceProvider = getProvider(preference_scope_1.PreferenceScope.Workspace);
-        const folderProvider = getProvider(preference_scope_1.PreferenceScope.Folder);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
+        const workspaceProvider = getProvider(preferences_1.PreferenceScope.Workspace);
+        const folderProvider = getProvider(preferences_1.PreferenceScope.Folder);
         userProvider.setPreference('test.number', 1);
         expect(prefService.get('test.number')).equals(1);
         workspaceProvider.setPreference('test.number', 0);
@@ -95,18 +93,18 @@ describe('Preference Service', () => {
         expect(prefService.get('test.number')).equals(0);
     });
     it('should throw a TypeError if the preference (reference object) is modified', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.immutable': {
                     type: 'array',
                     items: {
                         type: 'string'
                     },
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
         userProvider.setPreference('test.immutable', [
             'test', 'test', 'test'
         ]);
@@ -117,16 +115,16 @@ describe('Preference Service', () => {
         }
     });
     it('should still report the more specific preference even though the less specific one changed', () => {
-        prefSchema.setSchema({
+        prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.Folder,
             properties: {
                 'test.number': {
                     type: 'number',
-                    scope: 'resource'
                 }
             }
         });
-        const userProvider = getProvider(preference_scope_1.PreferenceScope.User);
-        const workspaceProvider = getProvider(preference_scope_1.PreferenceScope.Workspace);
+        const userProvider = getProvider(preferences_1.PreferenceScope.User);
+        const workspaceProvider = getProvider(preferences_1.PreferenceScope.Workspace);
         userProvider.setPreference('test.number', 1);
         workspaceProvider.setPreference('test.number', 0);
         expect(prefService.get('test.number')).equals(0);
@@ -137,21 +135,17 @@ describe('Preference Service', () => {
         const events = [];
         prefService.onPreferenceChanged(event => events.push(event));
         prefSchema.registerOverrideIdentifier('go');
-        const toUnset = prefSchema.setSchema({
+        const toUnset = prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.insertSpaces': {
                     type: 'boolean',
                     default: true,
                     overridable: true
-                },
-                '[go]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
                 }
             }
         });
+        prefSchema.registerOverride('editor.insertSpaces', 'go', false);
         assert.deepStrictEqual([], events.map(e => ({
             preferenceName: e.preferenceName,
             newValue: e.newValue,
@@ -165,8 +159,8 @@ describe('Preference Service', () => {
             newValue: e.newValue,
             oldValue: e.oldValue
         })), 'events after unset in the same tick');
-        assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after');
-        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), undefined, 'get after overridden');
+        assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after'); // removing the schema does not removes the default value
+        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), false, 'get after overridden'); // but not the override
         assert.deepStrictEqual([], events.map(e => ({
             preferenceName: e.preferenceName,
             newValue: e.newValue,
@@ -176,21 +170,17 @@ describe('Preference Service', () => {
     it('should fire events if preference schema is unset in another tick', async () => {
         prefSchema.registerOverrideIdentifier('go');
         let pending = new Promise(resolve => prefService.onPreferencesChanged(resolve));
-        const toUnset = prefSchema.setSchema({
+        const toUnset = prefSchema.addSchema({
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.insertSpaces': {
                     type: 'boolean',
                     default: true,
                     overridable: true
-                },
-                '[go]': {
-                    type: 'object',
-                    default: {
-                        'editor.insertSpaces': false
-                    }
                 }
             }
         });
+        prefSchema.registerOverride('editor.insertSpaces', 'go', false);
         let changes = await pending;
         assert.deepStrictEqual([{
                 preferenceName: 'editor.insertSpaces',
@@ -222,16 +212,17 @@ describe('Preference Service', () => {
             return { preferenceName, newValue, oldValue };
         }), 'events after');
         assert.strictEqual(prefService.get('editor.insertSpaces'), undefined, 'get after');
-        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), undefined, 'get after overridden');
+        assert.strictEqual(prefService.get('[go].editor.insertSpaces'), false, 'get after overridden');
     });
     function prepareServices(options) {
-        prefSchema.setSchema(options && options.schema || {
+        prefSchema.addSchema(options && options.schema || {
+            scope: preferences_1.PreferenceScope.User,
             properties: {
                 'editor.tabSize': {
                     type: 'number',
+                    default: 4,
                     description: '',
                     overridable: true,
-                    default: 4
                 }
             }
         });
@@ -242,9 +233,9 @@ describe('Preference Service', () => {
         const DUMMY_URI = 'dummy_uri';
         async function generateAndCheckValues(preferences, globalValue, workspaceValue, workspaceFolderValue) {
             var _a, _b;
-            await preferences.set(TAB_SIZE, globalValue, preference_scope_1.PreferenceScope.User);
-            await preferences.set(TAB_SIZE, workspaceValue, preference_scope_1.PreferenceScope.Workspace);
-            await preferences.set(TAB_SIZE, workspaceFolderValue, preference_scope_1.PreferenceScope.Folder, DUMMY_URI);
+            await preferences.set(TAB_SIZE, globalValue, preferences_1.PreferenceScope.User);
+            await preferences.set(TAB_SIZE, workspaceValue, preferences_1.PreferenceScope.Workspace);
+            await preferences.set(TAB_SIZE, workspaceFolderValue, preferences_1.PreferenceScope.Folder, DUMMY_URI);
             const expectedValue = (_b = (_a = workspaceFolderValue !== null && workspaceFolderValue !== void 0 ? workspaceFolderValue : workspaceValue) !== null && _a !== void 0 ? _a : globalValue) !== null && _b !== void 0 ? _b : 4;
             checkValues(preferences, globalValue, workspaceValue, workspaceFolderValue, expectedValue);
         }
@@ -299,11 +290,8 @@ describe('Preference Service', () => {
     });
     describe('overridden preferences', () => {
         it('get #0', () => {
-            const { preferences, schema } = prepareServices();
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            expect(preferences.get('editor.tabSize')).to.equal(4);
-            expect(preferences.get('[json].editor.tabSize')).to.equal(undefined);
-            schema.registerOverrideIdentifier('json');
+            const { preferences } = prepareServices();
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -312,7 +300,7 @@ describe('Preference Service', () => {
             schema.registerOverrideIdentifier('json');
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(4);
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -321,7 +309,7 @@ describe('Preference Service', () => {
             schema.registerOverrideIdentifier('json');
             expect(preferences.get('editor.tabSize')).to.equal(4);
             expect(preferences.get('[json].editor.tabSize')).to.equal(4);
-            preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             expect(preferences.get('editor.tabSize')).to.equal(2);
             expect(preferences.get('[json].editor.tabSize')).to.equal(2);
         });
@@ -362,7 +350,7 @@ describe('Preference Service', () => {
                 workspaceFolderValue: undefined,
                 value: 2
             };
-            preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.ok(!preferences.has('[json].editor.tabSize'));
             schema.registerOverrideIdentifier('json');
@@ -385,7 +373,7 @@ describe('Preference Service', () => {
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.ok(!preferences.has('[json].editor.tabSize'));
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual(expected, preferences.inspect('editor.tabSize'));
             assert.deepStrictEqual({
                 ...expected,
@@ -399,8 +387,8 @@ describe('Preference Service', () => {
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: '[json].editor.tabSize',
                     newValue: 2
@@ -417,7 +405,7 @@ describe('Preference Service', () => {
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
             schema.registerOverrideIdentifier('json');
-            await preferences.set('editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 2, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: 'editor.tabSize',
                     newValue: 2
@@ -433,12 +421,12 @@ describe('Preference Service', () => {
             const { preferences, schema } = prepareServices();
             schema.registerOverrideIdentifier('json');
             schema.registerOverrideIdentifier('javascript');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             const events = [];
-            const proxy = (0, preference_proxy_1.createPreferenceProxy)(preferences, schema.getCombinedSchema(), { overrideIdentifier: 'json' });
+            const proxy = (0, preference_proxy_1.createPreferenceProxy)(preferences, schema.getJSONSchema(preferences_1.PreferenceScope.Folder), { overrideIdentifier: 'json' });
             proxy.onPreferenceChanged(event => events.push(event));
-            await preferences.set('[javascript].editor.tabSize', 4, preference_scope_1.PreferenceScope.User);
+            await preferences.set('[javascript].editor.tabSize', 4, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([], events.map(e => ({
                 preferenceName: e.preferenceName,
                 newValue: e.newValue
@@ -447,11 +435,11 @@ describe('Preference Service', () => {
         it('onPreferenceChanged #3', async () => {
             const { preferences, schema } = prepareServices();
             schema.registerOverrideIdentifier('json');
-            preferences.set('[json].editor.tabSize', 2, preference_scope_1.PreferenceScope.User);
-            await preferences.set('editor.tabSize', 3, preference_scope_1.PreferenceScope.User);
+            preferences.set('[json].editor.tabSize', 2, preferences_1.PreferenceScope.User);
+            await preferences.set('editor.tabSize', 3, preferences_1.PreferenceScope.User);
             const events = [];
             preferences.onPreferenceChanged(event => events.push(event));
-            await preferences.set('[json].editor.tabSize', undefined, preference_scope_1.PreferenceScope.User);
+            await preferences.set('[json].editor.tabSize', undefined, preferences_1.PreferenceScope.User);
             assert.deepStrictEqual([{
                     preferenceName: '[json].editor.tabSize',
                     newValue: 3
@@ -463,6 +451,7 @@ describe('Preference Service', () => {
         it('defaultOverrides [go].editor.formatOnSave', () => {
             const { preferences, schema } = prepareServices({
                 schema: {
+                    scope: preferences_1.PreferenceScope.Folder,
                     properties: {
                         'editor.insertSpaces': {
                             type: 'boolean',
@@ -482,20 +471,8 @@ describe('Preference Service', () => {
             assert.strictEqual(false, preferences.get('editor.formatOnSave'));
             assert.strictEqual(undefined, preferences.get('[go].editor.formatOnSave'));
             schema.registerOverrideIdentifier('go');
-            schema.setSchema({
-                id: 'defaultOverrides',
-                title: 'Default Configuration Overrides',
-                properties: {
-                    '[go]': {
-                        type: 'object',
-                        default: {
-                            'editor.insertSpaces': false,
-                            'editor.formatOnSave': true
-                        },
-                        description: 'Configure editor settings to be overridden for go language.'
-                    }
-                }
-            });
+            prefSchema.registerOverride('editor.insertSpaces', 'go', false);
+            prefSchema.registerOverride('editor.formatOnSave', 'go', true);
             assert.strictEqual(true, preferences.get('editor.insertSpaces'));
             assert.strictEqual(false, preferences.get('[go].editor.insertSpaces'));
             assert.strictEqual(false, preferences.get('editor.formatOnSave'));