@theia/preferences 1.45.0 → 1.46.0-next.72

package/src/browser/views/preference-widget-bindings.ts

@@ -1,102 +1,102 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 { createTreeContainer, LabelProviderContribution, WidgetFactory } from '@theia/core/lib/browser';
-import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
-import { Container, interfaces } from '@theia/core/shared/inversify';
-import { PreferenceTreeModel } from '../preference-tree-model';
-import { PreferenceTreeLabelProvider } from '../util/preference-tree-label-provider';
-import { Preference } from '../util/preference-types';
-import { PreferenceArrayInputRenderer, PreferenceArrayInputRendererContribution } from './components/preference-array-input';
-import { PreferenceBooleanInputRenderer, PreferenceBooleanInputRendererContribution } from './components/preference-boolean-input';
-import { PreferenceSingleFilePathInputRenderer, PreferenceSingleFilePathInputRendererContribution } from './components/preference-file-input';
-import { PreferenceJSONLinkRenderer, PreferenceJSONLinkRendererContribution } from './components/preference-json-input';
-import { PreferenceHeaderRenderer, PreferenceNodeRendererFactory } from './components/preference-node-renderer';
-import {
-    DefaultPreferenceNodeRendererCreatorRegistry, PreferenceHeaderRendererContribution, PreferenceNodeRendererContribution, PreferenceNodeRendererCreatorRegistry
-} from './components/preference-node-renderer-creator';
-import { PreferenceNumberInputRenderer, PreferenceNumberInputRendererContribution } from './components/preference-number-input';
-import { PreferenceSelectInputRenderer, PreferenceSelectInputRendererContribution } from './components/preference-select-input';
-import { PreferenceStringInputRenderer, PreferenceStringInputRendererContribution } from './components/preference-string-input';
-import { PreferenceMarkdownRenderer } from './components/preference-markdown-renderer';
-import { PreferencesEditorWidget } from './preference-editor-widget';
-import { PreferencesScopeTabBar } from './preference-scope-tabbar-widget';
-import { PreferencesSearchbarWidget } from './preference-searchbar-widget';
-import { PreferencesTreeWidget } from './preference-tree-widget';
-import { PreferencesWidget } from './preference-widget';
-
-export function bindPreferencesWidgets(bind: interfaces.Bind): void {
-    bind(PreferenceTreeLabelProvider).toSelf().inSingletonScope();
-    bind(LabelProviderContribution).toService(PreferenceTreeLabelProvider);
-    bind(PreferencesWidget)
-        .toDynamicValue(({ container }) => createPreferencesWidgetContainer(container).get(PreferencesWidget))
-        .inSingletonScope();
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: PreferencesWidget.ID,
-        createWidget: () => container.get(PreferencesWidget)
-    })).inSingletonScope();
-
-    bindContributionProvider(bind, PreferenceNodeRendererContribution);
-
-    bind(PreferenceSelectInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceSelectInputRendererContribution).inSingletonScope();
-
-    bind(PreferenceArrayInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceArrayInputRendererContribution).inSingletonScope();
-
-    bind(PreferenceStringInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceStringInputRendererContribution).inSingletonScope();
-
-    bind(PreferenceBooleanInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceBooleanInputRendererContribution).inSingletonScope();
-
-    bind(PreferenceNumberInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceNumberInputRendererContribution).inSingletonScope();
-
-    bind(PreferenceJSONLinkRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceJSONLinkRendererContribution).inSingletonScope();
-
-    bind(PreferenceHeaderRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceHeaderRendererContribution).inSingletonScope();
-
-    bind(PreferenceSingleFilePathInputRenderer).toSelf();
-    bind(PreferenceNodeRendererContribution).to(PreferenceSingleFilePathInputRendererContribution).inSingletonScope();
-
-    bind(DefaultPreferenceNodeRendererCreatorRegistry).toSelf().inSingletonScope();
-    bind(PreferenceNodeRendererCreatorRegistry).toService(DefaultPreferenceNodeRendererCreatorRegistry);
-}
-
-export function createPreferencesWidgetContainer(parent: interfaces.Container): Container {
-    const child = createTreeContainer(parent, {
-        model: PreferenceTreeModel,
-        widget: PreferencesTreeWidget,
-        props: { search: false }
-    });
-    child.bind(PreferencesEditorWidget).toSelf();
-
-    child.bind(PreferencesSearchbarWidget).toSelf();
-    child.bind(PreferencesScopeTabBar).toSelf();
-    child.bind(PreferencesWidget).toSelf();
-
-    child.bind(PreferenceNodeRendererFactory).toFactory(({ container }) => (node: Preference.TreeNode) => {
-        const registry = container.get<PreferenceNodeRendererCreatorRegistry>(PreferenceNodeRendererCreatorRegistry);
-        const creator = registry.getPreferenceNodeRendererCreator(node);
-        return creator.createRenderer(node, container);
-    });
-
-    child.bind(PreferenceMarkdownRenderer).toSelf().inSingletonScope();
-
-    return child;
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 { createTreeContainer, LabelProviderContribution, WidgetFactory } from '@theia/core/lib/browser';
+import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { Container, interfaces } from '@theia/core/shared/inversify';
+import { PreferenceTreeModel } from '../preference-tree-model';
+import { PreferenceTreeLabelProvider } from '../util/preference-tree-label-provider';
+import { Preference } from '../util/preference-types';
+import { PreferenceArrayInputRenderer, PreferenceArrayInputRendererContribution } from './components/preference-array-input';
+import { PreferenceBooleanInputRenderer, PreferenceBooleanInputRendererContribution } from './components/preference-boolean-input';
+import { PreferenceSingleFilePathInputRenderer, PreferenceSingleFilePathInputRendererContribution } from './components/preference-file-input';
+import { PreferenceJSONLinkRenderer, PreferenceJSONLinkRendererContribution } from './components/preference-json-input';
+import { PreferenceHeaderRenderer, PreferenceNodeRendererFactory } from './components/preference-node-renderer';
+import {
+    DefaultPreferenceNodeRendererCreatorRegistry, PreferenceHeaderRendererContribution, PreferenceNodeRendererContribution, PreferenceNodeRendererCreatorRegistry
+} from './components/preference-node-renderer-creator';
+import { PreferenceNumberInputRenderer, PreferenceNumberInputRendererContribution } from './components/preference-number-input';
+import { PreferenceSelectInputRenderer, PreferenceSelectInputRendererContribution } from './components/preference-select-input';
+import { PreferenceStringInputRenderer, PreferenceStringInputRendererContribution } from './components/preference-string-input';
+import { PreferenceMarkdownRenderer } from './components/preference-markdown-renderer';
+import { PreferencesEditorWidget } from './preference-editor-widget';
+import { PreferencesScopeTabBar } from './preference-scope-tabbar-widget';
+import { PreferencesSearchbarWidget } from './preference-searchbar-widget';
+import { PreferencesTreeWidget } from './preference-tree-widget';
+import { PreferencesWidget } from './preference-widget';
+
+export function bindPreferencesWidgets(bind: interfaces.Bind): void {
+    bind(PreferenceTreeLabelProvider).toSelf().inSingletonScope();
+    bind(LabelProviderContribution).toService(PreferenceTreeLabelProvider);
+    bind(PreferencesWidget)
+        .toDynamicValue(({ container }) => createPreferencesWidgetContainer(container).get(PreferencesWidget))
+        .inSingletonScope();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: PreferencesWidget.ID,
+        createWidget: () => container.get(PreferencesWidget)
+    })).inSingletonScope();
+
+    bindContributionProvider(bind, PreferenceNodeRendererContribution);
+
+    bind(PreferenceSelectInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceSelectInputRendererContribution).inSingletonScope();
+
+    bind(PreferenceArrayInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceArrayInputRendererContribution).inSingletonScope();
+
+    bind(PreferenceStringInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceStringInputRendererContribution).inSingletonScope();
+
+    bind(PreferenceBooleanInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceBooleanInputRendererContribution).inSingletonScope();
+
+    bind(PreferenceNumberInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceNumberInputRendererContribution).inSingletonScope();
+
+    bind(PreferenceJSONLinkRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceJSONLinkRendererContribution).inSingletonScope();
+
+    bind(PreferenceHeaderRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceHeaderRendererContribution).inSingletonScope();
+
+    bind(PreferenceSingleFilePathInputRenderer).toSelf();
+    bind(PreferenceNodeRendererContribution).to(PreferenceSingleFilePathInputRendererContribution).inSingletonScope();
+
+    bind(DefaultPreferenceNodeRendererCreatorRegistry).toSelf().inSingletonScope();
+    bind(PreferenceNodeRendererCreatorRegistry).toService(DefaultPreferenceNodeRendererCreatorRegistry);
+}
+
+export function createPreferencesWidgetContainer(parent: interfaces.Container): Container {
+    const child = createTreeContainer(parent, {
+        model: PreferenceTreeModel,
+        widget: PreferencesTreeWidget,
+        props: { search: false }
+    });
+    child.bind(PreferencesEditorWidget).toSelf();
+
+    child.bind(PreferencesSearchbarWidget).toSelf();
+    child.bind(PreferencesScopeTabBar).toSelf();
+    child.bind(PreferencesWidget).toSelf();
+
+    child.bind(PreferenceNodeRendererFactory).toFactory(({ container }) => (node: Preference.TreeNode) => {
+        const registry = container.get<PreferenceNodeRendererCreatorRegistry>(PreferenceNodeRendererCreatorRegistry);
+        const creator = registry.getPreferenceNodeRendererCreator(node);
+        return creator.createRenderer(node, container);
+    });
+
+    child.bind(PreferenceMarkdownRenderer).toSelf().inSingletonScope();
+
+    return child;
+}

package/src/browser/views/preference-widget.tsx

@@ -1,117 +1,117 @@
-// *****************************************************************************
-// Copyright (C) 2020 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 { postConstruct, injectable, inject } from '@theia/core/shared/inversify';
-import { Panel, Widget, Message, StatefulWidget, PreferenceScope, codicon } from '@theia/core/lib/browser';
-import { PreferencesEditorState, PreferencesEditorWidget } from './preference-editor-widget';
-import { PreferencesTreeWidget } from './preference-tree-widget';
-import { PreferencesSearchbarState, PreferencesSearchbarWidget } from './preference-searchbar-widget';
-import { PreferencesScopeTabBar, PreferencesScopeTabBarState } from './preference-scope-tabbar-widget';
-import { Preference } from '../util/preference-types';
-import URI from '@theia/core/lib/common/uri';
-import { nls } from '@theia/core/lib/common/nls';
-
-interface PreferencesWidgetState {
-    scopeTabBarState: PreferencesScopeTabBarState,
-    editorState: PreferencesEditorState,
-    searchbarWidgetState: PreferencesSearchbarState,
-}
-
-@injectable()
-export class PreferencesWidget extends Panel implements StatefulWidget {
-    /**
-     * The widget `id`.
-     */
-    static readonly ID = 'settings_widget';
-    /**
-     * The widget `label` which is used for display purposes.
-     */
-    static readonly LABEL = nls.localizeByDefault('Settings');
-
-    @inject(PreferencesEditorWidget) protected readonly editorWidget: PreferencesEditorWidget;
-    @inject(PreferencesTreeWidget) protected readonly treeWidget: PreferencesTreeWidget;
-    @inject(PreferencesSearchbarWidget) protected readonly searchbarWidget: PreferencesSearchbarWidget;
-    @inject(PreferencesScopeTabBar) protected readonly tabBarWidget: PreferencesScopeTabBar;
-
-    get currentScope(): Preference.SelectedScopeDetails {
-        return this.tabBarWidget.currentScope;
-    }
-
-    setSearchTerm(query: string): Promise<void> {
-        return this.searchbarWidget.updateSearchTerm(query);
-    }
-
-    setScope(scope: PreferenceScope.User | PreferenceScope.Workspace | URI): void {
-        this.tabBarWidget.setScope(scope);
-    }
-
-    protected override onResize(msg: Widget.ResizeMessage): void {
-        super.onResize(msg);
-        if (msg.width < 600 && this.treeWidget && !this.treeWidget.isHidden) {
-            this.treeWidget.hide();
-            this.editorWidget.addClass('full-pane');
-        } else if (msg.width >= 600 && this.treeWidget && this.treeWidget.isHidden) {
-            this.treeWidget.show();
-            this.editorWidget.removeClass('full-pane');
-        }
-    }
-
-    protected override onActivateRequest(msg: Message): void {
-        super.onActivateRequest(msg);
-        this.searchbarWidget.focus();
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this.id = PreferencesWidget.ID;
-        this.title.label = PreferencesWidget.LABEL;
-        this.title.closable = true;
-        this.addClass('theia-settings-container');
-        this.title.iconClass = codicon('settings');
-
-        this.searchbarWidget.addClass('preferences-searchbar-widget');
-        this.addWidget(this.searchbarWidget);
-
-        this.tabBarWidget.addClass('preferences-tabbar-widget');
-        this.addWidget(this.tabBarWidget);
-
-        this.treeWidget.addClass('preferences-tree-widget');
-        this.addWidget(this.treeWidget);
-
-        this.editorWidget.addClass('preferences-editor-widget');
-        this.addWidget(this.editorWidget);
-
-        this.update();
-    }
-
-    getPreviewNode(): Node | undefined {
-        return this.node;
-    }
-
-    storeState(): PreferencesWidgetState {
-        return {
-            scopeTabBarState: this.tabBarWidget.storeState(),
-            editorState: this.editorWidget.storeState(),
-            searchbarWidgetState: this.searchbarWidget.storeState(),
-        };
-    }
-
-    restoreState(state: PreferencesWidgetState): void {
-        this.tabBarWidget.restoreState(state.scopeTabBarState);
-        this.editorWidget.restoreState(state.editorState);
-        this.searchbarWidget.restoreState(state.searchbarWidgetState);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 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 { postConstruct, injectable, inject } from '@theia/core/shared/inversify';
+import { Panel, Widget, Message, StatefulWidget, PreferenceScope, codicon } from '@theia/core/lib/browser';
+import { PreferencesEditorState, PreferencesEditorWidget } from './preference-editor-widget';
+import { PreferencesTreeWidget } from './preference-tree-widget';
+import { PreferencesSearchbarState, PreferencesSearchbarWidget } from './preference-searchbar-widget';
+import { PreferencesScopeTabBar, PreferencesScopeTabBarState } from './preference-scope-tabbar-widget';
+import { Preference } from '../util/preference-types';
+import URI from '@theia/core/lib/common/uri';
+import { nls } from '@theia/core/lib/common/nls';
+
+interface PreferencesWidgetState {
+    scopeTabBarState: PreferencesScopeTabBarState,
+    editorState: PreferencesEditorState,
+    searchbarWidgetState: PreferencesSearchbarState,
+}
+
+@injectable()
+export class PreferencesWidget extends Panel implements StatefulWidget {
+    /**
+     * The widget `id`.
+     */
+    static readonly ID = 'settings_widget';
+    /**
+     * The widget `label` which is used for display purposes.
+     */
+    static readonly LABEL = nls.localizeByDefault('Settings');
+
+    @inject(PreferencesEditorWidget) protected readonly editorWidget: PreferencesEditorWidget;
+    @inject(PreferencesTreeWidget) protected readonly treeWidget: PreferencesTreeWidget;
+    @inject(PreferencesSearchbarWidget) protected readonly searchbarWidget: PreferencesSearchbarWidget;
+    @inject(PreferencesScopeTabBar) protected readonly tabBarWidget: PreferencesScopeTabBar;
+
+    get currentScope(): Preference.SelectedScopeDetails {
+        return this.tabBarWidget.currentScope;
+    }
+
+    setSearchTerm(query: string): Promise<void> {
+        return this.searchbarWidget.updateSearchTerm(query);
+    }
+
+    setScope(scope: PreferenceScope.User | PreferenceScope.Workspace | URI): void {
+        this.tabBarWidget.setScope(scope);
+    }
+
+    protected override onResize(msg: Widget.ResizeMessage): void {
+        super.onResize(msg);
+        if (msg.width < 600 && this.treeWidget && !this.treeWidget.isHidden) {
+            this.treeWidget.hide();
+            this.editorWidget.addClass('full-pane');
+        } else if (msg.width >= 600 && this.treeWidget && this.treeWidget.isHidden) {
+            this.treeWidget.show();
+            this.editorWidget.removeClass('full-pane');
+        }
+    }
+
+    protected override onActivateRequest(msg: Message): void {
+        super.onActivateRequest(msg);
+        this.searchbarWidget.focus();
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.id = PreferencesWidget.ID;
+        this.title.label = PreferencesWidget.LABEL;
+        this.title.closable = true;
+        this.addClass('theia-settings-container');
+        this.title.iconClass = codicon('settings');
+
+        this.searchbarWidget.addClass('preferences-searchbar-widget');
+        this.addWidget(this.searchbarWidget);
+
+        this.tabBarWidget.addClass('preferences-tabbar-widget');
+        this.addWidget(this.tabBarWidget);
+
+        this.treeWidget.addClass('preferences-tree-widget');
+        this.addWidget(this.treeWidget);
+
+        this.editorWidget.addClass('preferences-editor-widget');
+        this.addWidget(this.editorWidget);
+
+        this.update();
+    }
+
+    getPreviewNode(): Node | undefined {
+        return this.node;
+    }
+
+    storeState(): PreferencesWidgetState {
+        return {
+            scopeTabBarState: this.tabBarWidget.storeState(),
+            editorState: this.editorWidget.storeState(),
+            searchbarWidgetState: this.searchbarWidget.storeState(),
+        };
+    }
+
+    restoreState(state: PreferencesWidgetState): void {
+        this.tabBarWidget.restoreState(state.scopeTabBarState);
+        this.editorWidget.restoreState(state.editorState);
+        this.searchbarWidget.restoreState(state.searchbarWidgetState);
+    }
+}

package/src/browser/workspace-file-preference-provider.ts

@@ -1,100 +1,100 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { inject, injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { PreferenceScope } from '@theia/core/lib/browser/preferences';
-import { WorkspaceService, WorkspaceData } from '@theia/workspace/lib/browser/workspace-service';
-import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
-
-@injectable()
-export class WorkspaceFilePreferenceProviderOptions {
-    workspaceUri: URI;
-}
-
-export const WorkspaceFilePreferenceProviderFactory = Symbol('WorkspaceFilePreferenceProviderFactory');
-export type WorkspaceFilePreferenceProviderFactory = (options: WorkspaceFilePreferenceProviderOptions) => WorkspaceFilePreferenceProvider;
-
-@injectable()
-export class WorkspaceFilePreferenceProvider extends AbstractResourcePreferenceProvider {
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(WorkspaceFilePreferenceProviderOptions)
-    protected readonly options: WorkspaceFilePreferenceProviderOptions;
-
-    protected sectionsInsideSettings = new Set<string>();
-
-    protected getUri(): URI {
-        return this.options.workspaceUri;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected override parse(content: string): any {
-        const data = super.parse(content);
-        if (WorkspaceData.is(data)) {
-            const settings = { ...data.settings };
-            for (const key of this.configurations.getSectionNames().filter(name => name !== 'settings')) {
-                // If the user has written configuration inside the "settings" object, we will respect that.
-                if (settings[key]) {
-                    this.sectionsInsideSettings.add(key);
-                }
-                // Favor sections outside the "settings" object to agree with VSCode behavior
-                if (data[key]) {
-                    settings[key] = data[key];
-                    this.sectionsInsideSettings.delete(key);
-                }
-            }
-            return settings;
-        }
-        return {};
-    }
-
-    protected override getPath(preferenceName: string): string[] {
-        const firstSegment = preferenceName.split('.', 1)[0];
-        const remainder = preferenceName.slice(firstSegment.length + 1);
-        if (this.belongsInSection(firstSegment, remainder)) {
-            // Default to writing sections outside the "settings" object.
-            const path = [firstSegment];
-            if (remainder) {
-                path.push(remainder);
-            }
-            // If the user has already written this section inside the "settings" object, modify it there.
-            if (this.sectionsInsideSettings.has(firstSegment)) {
-                path.unshift('settings');
-            }
-            return path;
-        }
-        return ['settings'].concat(super.getPath(preferenceName) ?? []);
-    }
-
-    /**
-     * @returns `true` if `firstSegment` is a section name (e.g. `tasks`, `launch`)
-     */
-    protected belongsInSection(firstSegment: string, remainder: string): boolean {
-        return this.configurations.isSectionName(firstSegment);
-    }
-
-    getScope(): PreferenceScope {
-        return PreferenceScope.Workspace;
-    }
-
-    override getDomain(): string[] {
-        // workspace file is treated as part of the workspace
-        return this.workspaceService.tryGetRoots().map(r => r.resource.toString()).concat([this.options.workspaceUri.toString()]);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { inject, injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { PreferenceScope } from '@theia/core/lib/browser/preferences';
+import { WorkspaceService, WorkspaceData } from '@theia/workspace/lib/browser/workspace-service';
+import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
+
+@injectable()
+export class WorkspaceFilePreferenceProviderOptions {
+    workspaceUri: URI;
+}
+
+export const WorkspaceFilePreferenceProviderFactory = Symbol('WorkspaceFilePreferenceProviderFactory');
+export type WorkspaceFilePreferenceProviderFactory = (options: WorkspaceFilePreferenceProviderOptions) => WorkspaceFilePreferenceProvider;
+
+@injectable()
+export class WorkspaceFilePreferenceProvider extends AbstractResourcePreferenceProvider {
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(WorkspaceFilePreferenceProviderOptions)
+    protected readonly options: WorkspaceFilePreferenceProviderOptions;
+
+    protected sectionsInsideSettings = new Set<string>();
+
+    protected getUri(): URI {
+        return this.options.workspaceUri;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected override parse(content: string): any {
+        const data = super.parse(content);
+        if (WorkspaceData.is(data)) {
+            const settings = { ...data.settings };
+            for (const key of this.configurations.getSectionNames().filter(name => name !== 'settings')) {
+                // If the user has written configuration inside the "settings" object, we will respect that.
+                if (settings[key]) {
+                    this.sectionsInsideSettings.add(key);
+                }
+                // Favor sections outside the "settings" object to agree with VSCode behavior
+                if (data[key]) {
+                    settings[key] = data[key];
+                    this.sectionsInsideSettings.delete(key);
+                }
+            }
+            return settings;
+        }
+        return {};
+    }
+
+    protected override getPath(preferenceName: string): string[] {
+        const firstSegment = preferenceName.split('.', 1)[0];
+        const remainder = preferenceName.slice(firstSegment.length + 1);
+        if (this.belongsInSection(firstSegment, remainder)) {
+            // Default to writing sections outside the "settings" object.
+            const path = [firstSegment];
+            if (remainder) {
+                path.push(remainder);
+            }
+            // If the user has already written this section inside the "settings" object, modify it there.
+            if (this.sectionsInsideSettings.has(firstSegment)) {
+                path.unshift('settings');
+            }
+            return path;
+        }
+        return ['settings'].concat(super.getPath(preferenceName) ?? []);
+    }
+
+    /**
+     * @returns `true` if `firstSegment` is a section name (e.g. `tasks`, `launch`)
+     */
+    protected belongsInSection(firstSegment: string, remainder: string): boolean {
+        return this.configurations.isSectionName(firstSegment);
+    }
+
+    getScope(): PreferenceScope {
+        return PreferenceScope.Workspace;
+    }
+
+    override getDomain(): string[] {
+        // workspace file is treated as part of the workspace
+        return this.workspaceService.tryGetRoots().map(r => r.resource.toString()).concat([this.options.workspaceUri.toString()]);
+    }
+}