@theia/preferences 1.65.0-next.6 → 1.65.0

package/lib/node/preference-bindings.js

@@ -0,0 +1,33 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2025 STMicroelectronics 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.bindPreferenceProviders = void 0;
+const user_preference_provider_1 = require("../common/user-preference-provider");
+const section_preference_provider_1 = require("../common/section-preference-provider");
+const core_1 = require("@theia/core");
+const user_configs_preference_provider_1 = require("../common/user-configs-preference-provider");
+const env_variables_1 = require("@theia/core/lib/common/env-variables");
+function bindPreferenceProviders(bind) {
+    bind(user_configs_preference_provider_1.UserStorageLocationProvider).toDynamicValue(context => async () => {
+        const env = context.container.get(env_variables_1.EnvVariablesServer);
+        return new core_1.URI(await env.getConfigDirUri());
+    });
+    bind(core_1.PreferenceProvider).to(user_configs_preference_provider_1.UserConfigsPreferenceProvider).inSingletonScope().whenTargetNamed(core_1.PreferenceScope.User);
+    (0, core_1.bindFactory)(bind, user_preference_provider_1.UserPreferenceProviderFactory, user_preference_provider_1.UserPreferenceProvider, section_preference_provider_1.SectionPreferenceProviderUri, section_preference_provider_1.SectionPreferenceProviderSection);
+}
+exports.bindPreferenceProviders = bindPreferenceProviders;
+//# sourceMappingURL=preference-bindings.js.map

package/lib/node/preference-bindings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"preference-bindings.js","sourceRoot":"","sources":["../../src/node/preference-bindings.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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;;;AAGhF,iFAA2G;AAC3G,uFAAuH;AACvH,sCAAoF;AACpF,iGAAwH;AACxH,wEAA0E;AAE1E,SAAgB,uBAAuB,CAAC,IAAqB;IACzD,IAAI,CAAC,8DAA2B,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;QACnE,MAAM,GAAG,GAAuB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,kCAAkB,CAAC,CAAC;QAC1E,OAAO,IAAI,UAAG,CAAC,MAAM,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,yBAAkB,CAAC,CAAC,EAAE,CAAC,gEAA6B,CAAC,CAAC,gBAAgB,EAAE,CAAC,eAAe,CAAC,sBAAe,CAAC,IAAI,CAAC,CAAC;IACpH,IAAA,kBAAW,EAAC,IAAI,EAAE,wDAA6B,EAAE,iDAAsB,EAAE,0DAA4B,EAAE,8DAAgC,CAAC,CAAC;AAC7I,CAAC;AAPD,0DAOC"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@theia/preferences",
-  "version": "1.65.0-next.6+4384a9461",
+  "version": "1.65.0",
   "description": "Theia - Preferences Extension",
   "dependencies": {
-    "@theia/core": "1.65.0-next.6+4384a9461",
-    "@theia/editor": "1.65.0-next.6+4384a9461",
-    "@theia/filesystem": "1.65.0-next.6+4384a9461",
-    "@theia/monaco": "1.65.0-next.6+4384a9461",
+    "@theia/core": "1.65.0",
+    "@theia/editor": "1.65.0",
+    "@theia/filesystem": "1.65.0",
+    "@theia/monaco": "1.65.0",
     "@theia/monaco-editor-core": "1.96.302",
-    "@theia/userstorage": "1.65.0-next.6+4384a9461",
-    "@theia/workspace": "1.65.0-next.6+4384a9461",
+    "@theia/userstorage": "1.65.0",
+    "@theia/workspace": "1.65.0",
     "async-mutex": "^0.3.1",
     "fast-deep-equal": "^3.1.3",
     "jsonc-parser": "^2.2.0",
@@ -50,10 +50,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.64.0"
+    "@theia/ext-scripts": "1.65.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "4384a946123dd1b41e65708e58928fc1af707c8d"
+  "gitHead": "500dfc80cee94fd2a623b5fb59b22d5a575247c2"
 }

package/src/browser/folder-preference-provider.ts

@@ -16,9 +16,10 @@
 
 import { inject, injectable } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
-import { PreferenceScope } from '@theia/core/lib/browser';
 import { FileStat } from '@theia/filesystem/lib/common/files';
-import { SectionPreferenceProvider } from './section-preference-provider';
+import { SectionPreferenceProvider } from '../common/section-preference-provider';
+import { PreferenceScope } from '@theia/core';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 
 export const FolderPreferenceProviderFactory = Symbol('FolderPreferenceProviderFactory');
 export interface FolderPreferenceProviderFactory {
@@ -33,6 +34,8 @@ export interface FolderPreferenceProviderOptions {
 
 @injectable()
 export class FolderPreferenceProvider extends SectionPreferenceProvider {
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
 
     @inject(FolderPreferenceProviderFolder) protected readonly folder: FileStat;
 

package/src/browser/folders-preferences-provider.ts

@@ -18,14 +18,13 @@
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
-import { PreferenceProvider, PreferenceResolveResult, PreferenceScope } from '@theia/core/lib/browser/preferences';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
 import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
 import { FileStat } from '@theia/filesystem/lib/common/files';
+import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope, PreferenceUtils } from '@theia/core';
 
 @injectable()
-export class FoldersPreferencesProvider extends PreferenceProvider {
+export class FoldersPreferencesProvider extends PreferenceProviderImpl {
 
     @inject(WorkspaceService)
     protected readonly workspaceService: WorkspaceService;
@@ -113,7 +112,7 @@ export class FoldersPreferencesProvider extends PreferenceProvider {
                 const { value, configUri } = provider.resolve<T>(preferenceName, resourceUri);
                 if (configUri && value !== undefined) {
                     result.configUri = configUri;
-                    result.value = PreferenceProvider.merge(result.value as any, value as any) as any;
+                    result.value = PreferenceUtils.merge(result.value as any, value as any) as any;
                     break;
                 }
             }
@@ -128,7 +127,7 @@ export class FoldersPreferencesProvider extends PreferenceProvider {
             for (const provider of group) {
                 if (provider.getConfigUri(resourceUri)) {
                     const preferences = provider.getPreferences();
-                    result = PreferenceProvider.merge(result, preferences) as any;
+                    result = PreferenceUtils.merge(result, preferences) as any;
                     break;
                 }
             }

package/src/browser/frontend-preference-storage.ts

@@ -0,0 +1,72 @@
+// *****************************************************************************
+// Copyright (C) 2025 STMicroelectronics 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 { ListenerList, DisposableCollection, URI, PreferenceScope, Listener } from '@theia/core';
+import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { FileContentStatus, PreferenceStorage } from '../common/abstract-resource-preference-provider';
+import { PreferenceTransaction, PreferenceTransactionFactory } from './preference-transaction-manager';
+
+export class FrontendPreferenceStorage implements PreferenceStorage {
+
+    protected readonly onDidChangeFileContentListeners = new ListenerList<FileContentStatus, Promise<boolean>>();
+    protected transaction: PreferenceTransaction | undefined;
+
+    protected readonly toDispose = new DisposableCollection();
+
+    constructor(
+        protected readonly transactionFactory: PreferenceTransactionFactory,
+        protected readonly fileService: FileService,
+        protected readonly uri: URI,
+        protected readonly scope: PreferenceScope
+    ) {
+
+        this.fileService.watch(uri);
+        this.fileService.onDidFilesChange(e => {
+            if (e.contains(uri)) {
+                this.read().then(content => this.onDidChangeFileContentListeners.invoke({ content, fileOK: true }, () => { }))
+                    .catch(() => this.onDidChangeFileContentListeners.invoke({ content: '', fileOK: false }, () => { }));
+            }
+        });
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    writeValue(key: string, path: string[], value: JSONValue): Promise<boolean> {
+        if (!this.transaction?.open) {
+            const current = this.transaction;
+            this.transaction = this.transactionFactory({
+                getScope: () => this.scope,
+                getConfigUri: () => this.uri
+            }, current?.result);
+            this.transaction.onWillConclude(async status => {
+                if (status) {
+                    const content = await this.read();
+                    await Listener.await({ content, fileOK: true }, this.onDidChangeFileContentListeners);
+                }
+            });
+            this.toDispose.push(this.transaction);
+        }
+        return this.transaction.enqueueAction(key, path, value);
+    }
+
+    onDidChangeFileContent: Listener.Registration<FileContentStatus, Promise<boolean>> = this.onDidChangeFileContentListeners.registration;
+    async read(): Promise<string> {
+        return (await this.fileService.read(this.uri)).value;
+    }
+}

package/src/browser/index.ts

@@ -15,9 +15,6 @@
 // *****************************************************************************
 
 export * from '@theia/core/lib/browser/preferences';
-export * from './abstract-resource-preference-provider';
-export * from './user-preference-provider';
 export * from './workspace-preference-provider';
 export * from './folders-preferences-provider';
 export * from './folder-preference-provider';
-export * from './user-configs-preference-provider';

package/src/browser/monaco-jsonc-editor.ts

@@ -33,9 +33,9 @@ export class MonacoJSONCEditor {
 
     getEditOperations(model: MonacoEditorModel, path: jsoncparser.JSONPath, value: unknown): monaco.editor.IIdentifiedSingleEditOperation[] {
         const textModel = model.textEditorModel;
-        const content = model.getText().trim();
+        const content = model.getText();
         // Everything is already undefined - no need for changes.
-        if (!content && value === undefined) {
+        if (!content.trim() && value === undefined) {
             return [];
         }
         // Delete the entire document.

package/src/browser/preference-bindings.ts

@@ -1,5 +1,5 @@
 // *****************************************************************************
-// Copyright (C) 2018 Ericsson and others.
+// Copyright (C) 2025 STMicroelectronics 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
@@ -15,14 +15,15 @@
 // *****************************************************************************
 
 import { Container, interfaces } from '@theia/core/shared/inversify';
-import { PreferenceProvider, PreferenceScope } from '@theia/core/lib/browser/preferences';
-import { UserPreferenceProvider, UserPreferenceProviderFactory } from './user-preference-provider';
+import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
 import { WorkspacePreferenceProvider } from './workspace-preference-provider';
 import { WorkspaceFilePreferenceProvider, WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProviderOptions } from './workspace-file-preference-provider';
 import { FoldersPreferencesProvider } from './folders-preferences-provider';
 import { FolderPreferenceProvider, FolderPreferenceProviderFactory, FolderPreferenceProviderFolder } from './folder-preference-provider';
-import { UserConfigsPreferenceProvider } from './user-configs-preference-provider';
-import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from './section-preference-provider';
+import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from '../common/section-preference-provider';
+import { bindFactory, PreferenceProvider, PreferenceScope } from '@theia/core';
+import { UserStorageUri } from '@theia/userstorage/lib/browser';
+import { UserConfigsPreferenceProvider, UserStorageLocationProvider } from '../common/user-configs-preference-provider';
 
 export function bindWorkspaceFilePreferenceProvider(bind: interfaces.Bind): void {
     bind(WorkspaceFilePreferenceProviderFactory).toFactory(ctx => (options: WorkspaceFilePreferenceProviderOptions) => {
@@ -34,32 +35,12 @@ export function bindWorkspaceFilePreferenceProvider(bind: interfaces.Bind): void
     });
 }
 
-export function bindFactory<F, C>(bind: interfaces.Bind,
-    factoryId: interfaces.ServiceIdentifier<F>,
-    constructor: interfaces.Newable<C>,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ...parameterBindings: interfaces.ServiceIdentifier<any>[]): void {
-    bind(factoryId).toFactory(ctx =>
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (...args: any[]) => {
-            const child = new Container({ defaultScope: 'Singleton' });
-            child.parent = ctx.container;
-            for (let i = 0; i < parameterBindings.length; i++) {
-                child.bind(parameterBindings[i]).toConstantValue(args[i]);
-            }
-            child.bind(constructor).to(constructor);
-            return child.get(constructor);
-        }
-    );
-}
-
 export function bindPreferenceProviders(bind: interfaces.Bind, unbind: interfaces.Unbind): void {
-    unbind(PreferenceProvider);
-
     bind(PreferenceProvider).to(UserConfigsPreferenceProvider).inSingletonScope().whenTargetNamed(PreferenceScope.User);
     bind(PreferenceProvider).to(WorkspacePreferenceProvider).inSingletonScope().whenTargetNamed(PreferenceScope.Workspace);
     bind(PreferenceProvider).to(FoldersPreferencesProvider).inSingletonScope().whenTargetNamed(PreferenceScope.Folder);
     bindWorkspaceFilePreferenceProvider(bind);
+    bind(UserStorageLocationProvider).toConstantValue(() => UserStorageUri);
     bindFactory(bind, UserPreferenceProviderFactory, UserPreferenceProvider, SectionPreferenceProviderUri, SectionPreferenceProviderSection);
     bindFactory(bind, FolderPreferenceProviderFactory, FolderPreferenceProvider, SectionPreferenceProviderUri, SectionPreferenceProviderSection, FolderPreferenceProviderFolder);
 }

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

@@ -17,7 +17,7 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { CliPreferences } from '../common/cli-preferences';
-import { PreferenceService, PreferenceScope } from '@theia/core/lib/browser/preferences/preference-service';
+import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
 
 @injectable()
 export class PreferenceFrontendContribution implements FrontendApplicationContribution {

package/src/browser/preference-frontend-module.ts

@@ -34,6 +34,10 @@ import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/ser
 import { PreferenceFrontendContribution } from './preference-frontend-contribution';
 import { PreferenceLayoutProvider } from './util/preference-layout';
 import { PreferencesWidget } from './views/preference-widget';
+import { PreferenceStorageFactory } from '../common/abstract-resource-preference-provider';
+import { FrontendPreferenceStorage } from './frontend-preference-storage';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { PreferenceScope, URI } from '@theia/core';
 
 export function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind): void {
     bindPreferenceProviders(bind, unbind);
@@ -56,6 +60,12 @@ export function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind
     bind(MonacoJSONCEditor).toSelf().inSingletonScope();
     bind(PreferenceTransaction).toSelf();
     bind(PreferenceTransactionFactory).toFactory(preferenceTransactionFactoryCreator);
+    bind(PreferenceStorageFactory).toFactory(({ container }) => (uri: URI, scope: PreferenceScope) => new FrontendPreferenceStorage(
+        container.get(PreferenceTransactionFactory),
+        container.get(FileService),
+        uri,
+        scope
+    ));
 
     bind(CliPreferences).toDynamicValue(ctx => ServiceConnectionProvider.createProxy<CliPreferences>(ctx.container, CliPreferencesPath)).inSingletonScope();
     bind(PreferenceFrontendContribution).toSelf().inSingletonScope();

package/src/browser/preference-transaction-manager.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { CancellationError, Emitter, Event, MaybePromise, MessageService, nls, WaitUntilEvent } from '@theia/core';
+import { CancellationError, Listener, ListenerList, MaybePromise, MessageService, nls } from '@theia/core';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
 import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
@@ -26,10 +26,6 @@ import { MonacoJSONCEditor } from './monaco-jsonc-editor';
 import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
 
-export interface OnWillConcludeEvent<T> extends WaitUntilEvent {
-    status: T | false;
-}
-
 @injectable()
 /**
  * Represents a batch of interactions with an underlying resource.
@@ -54,14 +50,12 @@ export abstract class Transaction<Arguments extends unknown[], Result = unknown,
      * The transaction will self-dispose when the queue is empty, once at least one action has been processed.
      */
     protected readonly queue = new Mutex(new CancellationError());
-    protected readonly onWillConcludeEmitter = new Emitter<OnWillConcludeEvent<Status>>();
+    protected readonly onWillConcludeListeners = new ListenerList<(Status | false), Promise<void>>();
     /**
      * An event fired when the transaction is wrapping up.
      * Consumers can call `waitUntil` on the event to delay the resolution of the `result` Promise.
      */
-    get onWillConclude(): Event<OnWillConcludeEvent<Status>> {
-        return this.onWillConcludeEmitter.event;
-    }
+    onWillConclude = this.onWillConcludeListeners.registration;
 
     protected status = new Deferred<Status>();
     /**
@@ -141,9 +135,8 @@ export abstract class Transaction<Arguments extends unknown[], Result = unknown,
                 this._open = false;
                 this.queue.cancel();
                 const result = await this.tearDown();
-                const status = this.status.state === 'unresolved' || this.status.state === 'rejected' ? false : await this.status.promise;
-                await WaitUntilEvent.fire(this.onWillConcludeEmitter, { status });
-                this.onWillConcludeEmitter.dispose();
+                const status: Status | boolean = (this.status.state === 'unresolved' || this.status.state === 'rejected') ? false : await this.status.promise;
+                await Listener.await(status, this.onWillConcludeListeners);
                 this._result.resolve(result);
             } catch {
                 this._result.resolve(false);
@@ -179,12 +172,13 @@ export interface PreferenceContext {
     getConfigUri(): URI;
     getScope(): PreferenceScope;
 }
+
 export const PreferenceContext = Symbol('PreferenceContext');
 export const PreferenceTransactionPreludeProvider = Symbol('PreferenceTransactionPreludeProvider');
 export type PreferenceTransactionPreludeProvider = () => Promise<unknown>;
 
 @injectable()
-export class PreferenceTransaction extends Transaction<[string, string[], unknown], boolean> {
+export class PreferenceTransaction extends Transaction<[string, string[], unknown], boolean, boolean> {
     reference: IReference<MonacoEditorModel> | undefined;
     @inject(PreferenceContext) protected readonly context: PreferenceContext;
     @inject(PreferenceTransactionPreludeProvider) protected readonly prelude?: PreferenceTransactionPreludeProvider;
@@ -285,3 +279,4 @@ export const preferenceTransactionFactoryCreator: interfaces.FactoryCreator<Pref
         child.bind(PreferenceTransactionPreludeProvider).toConstantValue(() => waitFor);
         return child.get(PreferenceTransaction);
     };
+

package/src/browser/preference-tree-model.ts

@@ -21,14 +21,11 @@ import {
     CompositeTreeNode,
     TopDownTreeIterator,
     TreeNode,
-    PreferenceSchemaProvider,
-    PreferenceDataProperty,
     NodeProps,
     ExpandableTreeNode,
     SelectableTreeNode,
-    PreferenceService,
 } from '@theia/core/lib/browser';
-import { Emitter } from '@theia/core';
+import { Emitter, PreferenceDataProperty, PreferenceSchemaService, PreferenceService } from '@theia/core';
 import { PreferencesSearchbarWidget } from './views/preference-searchbar-widget';
 import { PreferenceTreeGenerator } from './util/preference-tree-generator';
 import * as fuzzy from '@theia/core/shared/fuzzy';
@@ -57,7 +54,7 @@ export interface PreferenceFilterChangeEvent {
 @injectable()
 export class PreferenceTreeModel extends TreeModelImpl {
 
-    @inject(PreferenceSchemaProvider) protected readonly schemaProvider: PreferenceSchemaProvider;
+    @inject(PreferenceSchemaService) protected readonly schemaProvider: PreferenceSchemaService;
     @inject(PreferencesSearchbarWidget) protected readonly filterInput: PreferencesSearchbarWidget;
     @inject(PreferenceTreeGenerator) protected readonly treeGenerator: PreferenceTreeGenerator;
     @inject(PreferencesScopeTabBar) protected readonly scopeTracker: PreferencesScopeTabBar;
@@ -86,8 +83,8 @@ export class PreferenceTreeModel extends TreeModelImpl {
         return this._isFiltered;
     }
 
-    get propertyList(): { [key: string]: PreferenceDataProperty; } {
-        return this.schemaProvider.getCombinedSchema().properties;
+    get propertyList(): ReadonlyMap<string, PreferenceDataProperty> {
+        return this.schemaProvider.getSchemaProperties();
     }
 
     get currentScope(): Preference.SelectedScopeDetails {

package/src/browser/preferences-contribution.ts

@@ -14,28 +14,23 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { injectable, inject, named, optional } from '@theia/core/shared/inversify';
-import { MenuModelRegistry, CommandRegistry, nls } from '@theia/core';
+import { injectable, inject, optional } from '@theia/core/shared/inversify';
+import { MenuModelRegistry, CommandRegistry, nls, PreferenceScope, PreferenceService } from '@theia/core';
 import {
     CommonMenus,
     AbstractViewContribution,
     CommonCommands,
     KeybindingRegistry,
     Widget,
-    PreferenceScope,
-    PreferenceProvider,
-    PreferenceService,
     QuickInputService,
     QuickPickItem,
     isFirefox,
-    PreferenceSchemaProvider,
 } from '@theia/core/lib/browser';
 import { isOSX } from '@theia/core/lib/common/os';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { EditorManager, EditorWidget } from '@theia/editor/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { PreferencesWidget } from './views/preference-widget';
-import { WorkspacePreferenceProvider } from './workspace-preference-provider';
 import { Preference, PreferencesCommands, PreferenceMenus } from './util/preference-types';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -46,14 +41,12 @@ import { FileStat } from '@theia/filesystem/lib/common/files';
 export class PreferencesContribution extends AbstractViewContribution<PreferencesWidget> {
 
     @inject(FileService) protected readonly fileService: FileService;
-    @inject(PreferenceProvider) @named(PreferenceScope.Workspace) protected readonly workspacePreferenceProvider: WorkspacePreferenceProvider;
     @inject(EditorManager) protected readonly editorManager: EditorManager;
     @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
     @inject(ClipboardService) protected readonly clipboardService: ClipboardService;
     @inject(PreferencesWidget) protected readonly scopeTracker: PreferencesWidget;
     @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
     @inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
-    @inject(PreferenceSchemaProvider) protected readonly schema: PreferenceSchemaProvider;
 
     constructor() {
         super({

package/src/browser/preferences-json-schema-contribution.ts

@@ -17,20 +17,17 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { JsonSchemaRegisterContext, JsonSchemaContribution, JsonSchemaDataStore } from '@theia/core/lib/browser/json-schema-store';
-import { PreferenceSchemaProvider } from '@theia/core/lib/browser/preferences/preference-contribution';
-import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
-import { PreferenceScope } from '@theia/core/lib/browser';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { PreferenceSchemaService, PreferenceConfigurations, PreferenceScope } from '@theia/core';
+import { UserStorageUri } from '@theia/userstorage/lib/browser';
 
 const PREFERENCE_URI_PREFIX = 'vscode://schemas/settings/';
-const USER_STORAGE_PREFIX = 'user-storage:/';
 
 @injectable()
 export class PreferencesJsonSchemaContribution implements JsonSchemaContribution {
-    protected serializeSchema = (scope: PreferenceScope) => JSON.stringify(this.schemaProvider.getSchema(scope));
 
-    @inject(PreferenceSchemaProvider)
-    protected readonly schemaProvider: PreferenceSchemaProvider;
+    @inject(PreferenceSchemaService)
+    protected readonly schemaProvider: PreferenceSchemaService;
 
     @inject(PreferenceConfigurations)
     protected readonly preferenceConfigurations: PreferenceConfigurations;
@@ -47,39 +44,39 @@ export class PreferencesJsonSchemaContribution implements JsonSchemaContribution
         this.registerSchema(PreferenceScope.Workspace, context);
         this.registerSchema(PreferenceScope.Folder, context);
 
+        context.registerSchema({
+            fileMatch: `file://**/${this.preferenceConfigurations.getConfigName()}.json`,
+            url: this.getSchemaURIForScope(PreferenceScope.Folder).toString()
+        });
+
+        context.registerSchema({
+            fileMatch: UserStorageUri.resolve(this.preferenceConfigurations.getConfigName() + '.json').toString(),
+            url: this.getSchemaURIForScope(PreferenceScope.User).toString()
+        });
+
         this.workspaceService.updateSchema('settings', { $ref: this.getSchemaURIForScope(PreferenceScope.Workspace).toString() });
-        this.schemaProvider.onDidPreferenceSchemaChanged(() => this.updateInMemoryResources());
+        this.schemaProvider.onDidChangeSchema(() => this.updateInMemoryResources());
     }
 
     protected registerSchema(scope: PreferenceScope, context: JsonSchemaRegisterContext): void {
         const scopeStr = PreferenceScope[scope].toLowerCase();
         const uri = new URI(PREFERENCE_URI_PREFIX + scopeStr);
 
-        this.jsonSchemaData.setSchema(uri, this.serializeSchema(scope));
-
-        context.registerSchema({
-            fileMatch: this.getFileMatch(scopeStr),
-            url: uri.toString()
-        });
+        this.jsonSchemaData.setSchema(uri, (this.schemaProvider.getJSONSchema(scope)));
     }
 
     protected updateInMemoryResources(): void {
         this.jsonSchemaData.setSchema(this.getSchemaURIForScope(PreferenceScope.Default),
-            this.serializeSchema(+PreferenceScope.Default));
+            (this.schemaProvider.getJSONSchema(PreferenceScope.Default)));
         this.jsonSchemaData.setSchema(this.getSchemaURIForScope(PreferenceScope.User),
-            this.serializeSchema(+PreferenceScope.User));
+            this.schemaProvider.getJSONSchema(PreferenceScope.User));
         this.jsonSchemaData.setSchema(this.getSchemaURIForScope(PreferenceScope.Workspace),
-            this.serializeSchema(+PreferenceScope.Workspace));
+            this.schemaProvider.getJSONSchema(PreferenceScope.Workspace));
         this.jsonSchemaData.setSchema(this.getSchemaURIForScope(PreferenceScope.Folder),
-            this.serializeSchema(+PreferenceScope.Folder));
+            this.schemaProvider.getJSONSchema(PreferenceScope.Folder));
     }
 
     protected getSchemaURIForScope(scope: PreferenceScope): URI {
         return new URI(PREFERENCE_URI_PREFIX + PreferenceScope[scope].toLowerCase());
     }
-
-    protected getFileMatch(scope: string): string[] {
-        const baseName = this.preferenceConfigurations.getConfigName() + '.json';
-        return [baseName, new URI(USER_STORAGE_PREFIX + scope).resolve(baseName).toString()];
-    }
 }

package/src/browser/util/preference-scope-command-manager.ts

@@ -15,9 +15,9 @@
 // *****************************************************************************
 
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { PreferenceScope, LabelProvider, codicon } from '@theia/core/lib/browser';
+import { LabelProvider, codicon } from '@theia/core/lib/browser';
 import { FileStat } from '@theia/filesystem/lib/common/files';
-import { CommandRegistry, MenuModelRegistry, Command } from '@theia/core/lib/common';
+import { CommandRegistry, MenuModelRegistry, Command, PreferenceScope } from '@theia/core/lib/common';
 import { Preference, PreferenceMenus } from './preference-types';
 
 /**

package/src/browser/util/preference-tree-generator.ts

@@ -15,9 +15,8 @@
 // *****************************************************************************
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { CompositeTreeNode, PreferenceSchemaProvider, OVERRIDE_PROPERTY_PATTERN, PreferenceDataProperty } from '@theia/core/lib/browser';
-import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
-import { Emitter } from '@theia/core';
+import { CompositeTreeNode } from '@theia/core/lib/browser';
+import { Emitter, OVERRIDE_PROPERTY_PATTERN, PreferenceConfigurations, PreferenceDataProperty, PreferenceSchemaService } from '@theia/core';
 import debounce = require('@theia/core/shared/lodash.debounce');
 import { Preference } from './preference-types';
 import { COMMONLY_USED_SECTION_PREFIX, PreferenceLayoutProvider } from './preference-layout';
@@ -35,7 +34,7 @@ export interface CreatePreferencesGroupOptions {
 @injectable()
 export class PreferenceTreeGenerator {
 
-    @inject(PreferenceSchemaProvider) protected readonly schemaProvider: PreferenceSchemaProvider;
+    @inject(PreferenceSchemaService) protected readonly schemaProvider: PreferenceSchemaService;
     @inject(PreferenceConfigurations) protected readonly preferenceConfigs: PreferenceConfigurations;
     @inject(PreferenceLayoutProvider) protected readonly layoutProvider: PreferenceLayoutProvider;
     @inject(PreferenceTreeLabelProvider) protected readonly labelProvider: PreferenceTreeLabelProvider;
@@ -57,15 +56,13 @@ export class PreferenceTreeGenerator {
     }
 
     protected async doInit(): Promise<void> {
-        await this.schemaProvider.ready;
-        this.schemaProvider.onDidPreferenceSchemaChanged(() => this.handleChangedSchema());
+        this.schemaProvider.onDidChangeSchema(() => this.handleChangedSchema());
         this.handleChangedSchema();
     }
 
     generateTree(): CompositeTreeNode {
         this._idCache.clear();
-        const preferencesSchema = this.schemaProvider.getCombinedSchema();
-        const propertyNames = Object.keys(preferencesSchema.properties);
+        const properties = this.schemaProvider.getSchemaProperties();
         const groups = new Map<string, Preference.CompositeTreeNode>();
         const root = this.createRootNode();
 
@@ -88,12 +85,11 @@ export class PreferenceTreeGenerator {
             });
         }
         for (const preference of commonlyUsedLayout.settings ?? []) {
-            if (preference in preferencesSchema.properties) {
-                this.createLeafNode(preference, commonlyUsed, preferencesSchema.properties[preference]);
+            if (preference in properties) {
+                this.createLeafNode(preference, commonlyUsed, properties.get(preference)!);
             }
         }
-        for (const propertyName of propertyNames) {
-            const property = preferencesSchema.properties[propertyName];
+        for (const [propertyName, property] of properties.entries()) {
             if (!property.hidden && !property.deprecationMessage && !this.preferenceConfigs.isSectionName(propertyName) && !OVERRIDE_PROPERTY_PATTERN.test(propertyName)) {
                 if (property.owner) {
                     this.createPluginLeafNode(propertyName, property, root, groups);