npm - @theia/preferences - Versions diffs - 1.76.0-next.6 → 1.76.0 - Mend

@theia/preferences 1.76.0-next.6 → 1.76.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (60) hide show

package/lib/browser/preference-frontend-contribution.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
 import { CliPreferences } from '../common/cli-preferences';
 import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
 import { ILogger } from '@theia/core';
@@ -6,8 +7,25 @@ export declare class PreferenceFrontendContribution implements FrontendApplicati
     protected readonly CliPreferences: CliPreferences;
     protected readonly preferenceService: PreferenceService;
     protected readonly logger: ILogger;
+    protected readonly launchArgs: WindowLaunchArgs;
     onStart(): void;
     protected applyCliPreferences(): Promise<void>;
+    /**
+     * Resolves the CLI-provided preferences to apply to this window.
+     *
+     * The shared backend reflects the original cold-start launch (it cannot distinguish between
+     * windows), so it supplies the process-wide CLI preferences. A forwarded (second-instance)
+     * window additionally carries its own options, provided by the trusted main process, and layers
+     * them on top, overriding by key. Merging (rather than replacing) means a plain
+     * second-instance window keeps the process-wide values instead of dropping them, while an attach
+     * window still gets its own overrides.
+     */
+    protected resolveCliPreferences(): Promise<{
+        session: [string, unknown][];
+        persistent: [string, unknown][];
+    }>;
+    /** Overlays `overrides` onto `base`, later entries winning per key while preserving order (base first). */
+    protected mergeEntries(base: ReadonlyArray<[string, unknown]>, overrides: ReadonlyArray<[string, unknown]>): [string, unknown][];
     /**
      * Applies a batch of CLI-provided preferences sequentially. A rejection from an
      * individual write (bad key, invalid scope, etc.) is logged and does not abort the

package/lib/browser/preference-frontend-contribution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preference-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;~~AAC1E~~,OAAO,EAAE,~~cAAc~~,EAAE,MAAM,2BAA2B,CAAC;~~AAC3D~~,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,8BAA+B,YAAW,+BAA+B;IAElF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;~~IAEnC~~,OAAO,IAAI,IAAI;cAIC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAmCpD~~;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7G"}
1	+ {"version":3,"file":"preference-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,8BAA+B,YAAW,+BAA+B;IAElF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IAEhD,OAAO,IAAI,IAAI;cAIC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBpD;;;;;;;;;OASG;cACa,qBAAqB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;QAAC,UAAU,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;KAAE,CAAC;IAwBnH,2GAA2G;IAC3G,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;IAQhI;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CAS7G"}

package/lib/browser/preference-frontend-contribution.js CHANGED Viewed

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreferenceFrontendContribution = void 0;
 const tslib_1 = require("tslib");
 const inversify_1 = require("@theia/core/shared/inversify");
+const launch_arguments_1 = require("@theia/core/lib/common/launch-arguments");
+const window_launch_args_1 = require("@theia/core/lib/browser/window/window-launch-args");
 const cli_preferences_1 = require("../common/cli-preferences");
 const preferences_1 = require("@theia/core/lib/common/preferences");
 const core_1 = require("@theia/core");
@@ -26,18 +28,7 @@ let PreferenceFrontendContribution = class PreferenceFrontendContribution {
         this.applyCliPreferences();
     }
     async applyCliPreferences() {
-        // Fetch both buckets in parallel; both are RPC hops to the same backend and
-        // can overlap with the preference service initialising its providers.
-        const [session, persistent] = await Promise.all([
-            this.CliPreferences.getSessionPreferences().catch(e => {
-                this.logger.warn('Failed to fetch --session-preference values:', e);
-                return [];
-            }),
-            this.CliPreferences.getPreferences().catch(e => {
-                this.logger.warn('Failed to fetch --set-preference values:', e);
-                return [];
-            })
-        ]);
+        const { session, persistent } = await this.resolveCliPreferences();
         // `preferenceService.set()` needs the target provider registered in the providers
         // map, which only happens once `initializeProviders()` has walked every scope and
         // resolved `ready`. Writing before that returns `undefined` from `getProvider()`
@@ -55,6 +46,47 @@ let PreferenceFrontendContribution = class PreferenceFrontendContribution {
         }
         await this.applyAll(persistent, preferences_1.PreferenceScope.User);
     }
+    /**
+     * Resolves the CLI-provided preferences to apply to this window.
+     *
+     * The shared backend reflects the original cold-start launch (it cannot distinguish between
+     * windows), so it supplies the process-wide CLI preferences. A forwarded (second-instance)
+     * window additionally carries its own options, provided by the trusted main process, and layers
+     * them on top, overriding by key. Merging (rather than replacing) means a plain
+     * second-instance window keeps the process-wide values instead of dropping them, while an attach
+     * window still gets its own overrides.
+     */
+    async resolveCliPreferences() {
+        // Fetch both buckets in parallel; both are RPC hops to the same backend and
+        // can overlap with the preference service initialising its providers.
+        const [session, persistent] = await Promise.all([
+            this.CliPreferences.getSessionPreferences().catch(e => {
+                this.logger.warn('Failed to fetch --session-preference values:', e);
+                return [];
+            }),
+            this.CliPreferences.getPreferences().catch(e => {
+                this.logger.warn('Failed to fetch --set-preference values:', e);
+                return [];
+            })
+        ]);
+        const forwarded = this.launchArgs.getLaunchArgs();
+        if (forwarded === undefined) {
+            return { session, persistent };
+        }
+        const warn = (message) => this.logger.warn(message);
+        return {
+            session: this.mergeEntries(session, cli_preferences_1.CliPreferenceEntry.parseAll(launch_arguments_1.LaunchArguments.values(forwarded, 'session-preference'), warn)),
+            persistent: this.mergeEntries(persistent, cli_preferences_1.CliPreferenceEntry.parseAll(launch_arguments_1.LaunchArguments.values(forwarded, 'set-preference'), warn))
+        };
+    }
+    /** Overlays `overrides` onto `base`, later entries winning per key while preserving order (base first). */
+    mergeEntries(base, overrides) {
+        const merged = new Map();
+        for (const [key, value] of [...base, ...overrides]) {
+            merged.set(key, value);
+        }
+        return [...merged];
+    }
     /**
      * Applies a batch of CLI-provided preferences sequentially. A rejection from an
      * individual write (bad key, invalid scope, etc.) is logged and does not abort the
@@ -85,6 +117,10 @@ tslib_1.__decorate([
     (0, inversify_1.named)('preferences:PreferenceFrontendContribution'),
     tslib_1.__metadata("design:type", Object)
 ], PreferenceFrontendContribution.prototype, "logger", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(window_launch_args_1.WindowLaunchArgs),
+    tslib_1.__metadata("design:type", Object)
+], PreferenceFrontendContribution.prototype, "launchArgs", void 0);
 exports.PreferenceFrontendContribution = PreferenceFrontendContribution = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], PreferenceFrontendContribution);

package/lib/browser/preference-frontend-contribution.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preference-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,4DAAyE;AAEzE,+~~DAA2D~~;~~AAC3D~~,oEAAwF;AACxF,sCAAsC;AAG/B,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;~~IAUvC~~,OAAO;QACH,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,mBAAmB;QAC/B,4EAA4E;QAC5E,sEAAsE;QACtE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5C,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,CAAC;gBACpE,OAAO,EAAyB,CAAC;YACrC,CAAC,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,CAAC,CAAC,CAAC;gBAChE,OAAO,EAAyB,CAAC;YACrC,CAAC,CAAC;SACL,CAAC,CAAC;~~QAEH~~,~~kFAAkF;QAClF~~,~~kFAAkF;QAClF~~,~~iFAAiF;QACjF~~,~~yDAAyD;QACzD~~,~~MAAM~~,~~IAAI~~,CAAC,~~iBAAiB~~,CAAC,KAAK,CAAC;~~QAEnC~~,~~iFAAiF;QACjF~~,~~gFAAgF;QAChF~~,~~kFAAkF~~;~~QAClF~~,~~qEAAqE~~;~~QACrE~~,MAAM,IAAI,CAAC,~~QAAQ~~,CAAC,~~OAAO~~,~~EAAE~~,~~6BAAe~~,CAAC,OAAO,CAAC,CAAC;~~QACtD~~,IAAI,OAAO,CAAC,MAAM,~~GAAG~~,CAAC,EAAE,CAAC~~;YACrB~~,~~yEAAyE~~;~~YACzE~~,~~wFAAwF;YACxF~~,IAAI,CAAC,~~MAAM~~,CAAC,~~IAAI~~,CAAC,~~WAAW~~,~~OAAO~~,CAAC,MAAM,~~iCAAiC~~,~~EACvE~~,~~OAAO~~,CAAC,~~GAAG~~,CAAC,CAAC,CAAC,CAAC,CAAC,~~EAAE~~,EAAE,~~CAAC~~,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,~~CAAC~~,~~CAAC~~,CAAC~~;QAC5C~~,CAAC;~~QAED~~,MAAM,~~IAAI,~~CAAC,~~QAAQ~~,CAAC,~~UAAU~~,EAAE,~~6BAAe~~,CAAC,~~IAAI~~,CAAC,CAAC;~~IAC1D~~,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,QAAQ,CAAC,OAAyC,EAAE,KAAsB;QACtF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACxD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,GAAG,QAAQ,6BAAe,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACvG,CAAC;QACL,CAAC;IACL,CAAC;CACJ,CAAA;~~AA/DY~~,wEAA8B;AAEpB;IADlB,IAAA,kBAAM,EAAC,gCAAc,CAAC;;sEAC2B;AAG/B;IADlB,IAAA,kBAAM,EAAC,+BAAiB,CAAC;;yEAC8B;AAGrC;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,4CAA4C,CAAC;;8DAClC;~~yCAR1B~~,8BAA8B;IAD1C,IAAA,sBAAU,GAAE;GACA,8BAA8B,~~CA+D1C~~"}
1	+ {"version":3,"file":"preference-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/preference-frontend-contribution.spec.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=preference-frontend-contribution.spec.d.ts.map

package/lib/browser/preference-frontend-contribution.spec.d.ts.map ADDED Viewed

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

package/lib/browser/preference-frontend-contribution.spec.js ADDED Viewed

@@ -0,0 +1,76 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource GmbH 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 });
+const chai_1 = require("chai");
+const launchArgs = (values) => ({ values, negated: [] });
+const preference_frontend_contribution_1 = require("./preference-frontend-contribution");
+class TestPreferenceFrontendContribution extends preference_frontend_contribution_1.PreferenceFrontendContribution {
+    constructor() {
+        super(...arguments);
+        this.sessionBackendCalls = 0;
+        this.persistentBackendCalls = 0;
+    }
+    resolve() {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.launchArgs = { getLaunchArgs: () => this.forwardedArgs };
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.CliPreferences = {
+            getSessionPreferences: async () => {
+                this.sessionBackendCalls++;
+                return [['backend.session', 1]];
+            },
+            getPreferences: async () => {
+                this.persistentBackendCalls++;
+                return [['backend.persistent', 2]];
+            }
+        };
+        return this.resolveCliPreferences();
+    }
+}
+describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
+    let contribution;
+    beforeEach(() => {
+        contribution = new TestPreferenceFrontendContribution();
+    });
+    it('reads preferences from the backend on a cold-start window (no forwarded options)', async () => {
+        contribution.forwardedArgs = undefined;
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result.session).to.deep.equal([['backend.session', 1]]);
+        (0, chai_1.expect)(result.persistent).to.deep.equal([['backend.persistent', 2]]);
+        (0, chai_1.expect)(contribution.sessionBackendCalls).to.equal(1);
+    });
+    it('layers --session-preference from the forwarded options on top of the backend values', async () => {
+        contribution.forwardedArgs = launchArgs({ 'session-preference': ['editor.fontSize=20'], 'attach-container': ['B'] });
+        const result = await contribution.resolve();
+        // Process-wide backend values are kept (base) and the forwarded value is added on top.
+        (0, chai_1.expect)(result.session).to.deep.equal([['backend.session', 1], ['editor.fontSize', 20]]);
+        (0, chai_1.expect)(result.persistent).to.deep.equal([['backend.persistent', 2]]);
+        (0, chai_1.expect)(contribution.sessionBackendCalls).to.equal(1);
+    });
+    it('layers --set-preference from the forwarded options on top of the backend values', async () => {
+        contribution.forwardedArgs = launchArgs({ 'set-preference': ['editor.tabSize=2'] });
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result.persistent).to.deep.equal([['backend.persistent', 2], ['editor.tabSize', 2]]);
+        (0, chai_1.expect)(result.session).to.deep.equal([['backend.session', 1]]);
+    });
+    it('lets a forwarded value override a same-key backend value', async () => {
+        contribution.forwardedArgs = launchArgs({ 'session-preference': ['backend.session=99'] });
+        const result = await contribution.resolve();
+        (0, chai_1.expect)(result.session).to.deep.equal([['backend.session', 99]]);
+    });
+});
+//# sourceMappingURL=preference-frontend-contribution.spec.js.map

package/lib/browser/preference-frontend-contribution.spec.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/lib/browser/preference-frontend-module.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preference-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;~~AAwB3E~~,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,~~CAmCtF~~;;AAED,wBAEG"}
1	+ {"version":3,"file":"preference-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AA0B3E,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,CAqCtF;;AAED,wBAEG"}

package/lib/browser/preference-frontend-module.js CHANGED Viewed

@@ -34,6 +34,8 @@ const preference_open_handler_1 = require("./preference-open-handler");
 const cli_preferences_1 = require("../common/cli-preferences");
 const service_connection_provider_1 = require("@theia/core/lib/browser/messaging/service-connection-provider");
 const preference_frontend_contribution_1 = require("./preference-frontend-contribution");
+const remote_cli_args_contribution_1 = require("@theia/core/lib/common/remote-cli-args-contribution");
+const session_preference_remote_cli_contribution_1 = require("./session-preference-remote-cli-contribution");
 const session_preference_status_bar_contribution_1 = require("./session-preference-status-bar-contribution");
 const preference_layout_1 = require("./util/preference-layout");
 const preference_widget_1 = require("./views/preference-widget");
@@ -59,6 +61,8 @@ function bindPreferences(bind, unbind) {
     bind(cli_preferences_1.CliPreferences).toDynamicValue(ctx => service_connection_provider_1.ServiceConnectionProvider.createProxy(ctx.container, cli_preferences_1.CliPreferencesPath)).inSingletonScope();
     bind(preference_frontend_contribution_1.PreferenceFrontendContribution).toSelf().inSingletonScope();
     bind(browser_1.FrontendApplicationContribution).toService(preference_frontend_contribution_1.PreferenceFrontendContribution);
+    bind(session_preference_remote_cli_contribution_1.SessionPreferenceRemoteCliContribution).toSelf().inSingletonScope();
+    bind(remote_cli_args_contribution_1.RemoteCliArgsContribution).toService(session_preference_remote_cli_contribution_1.SessionPreferenceRemoteCliContribution);
     bind(session_preference_status_bar_contribution_1.SessionPreferenceStatusBarContribution).toSelf().inSingletonScope();
     bind(browser_1.FrontendApplicationContribution).toService(session_preference_status_bar_contribution_1.SessionPreferenceStatusBarContribution);
     bind(browser_1.WidgetStatusBarContribution).toConstantValue((0, browser_1.noopWidgetStatusBarContribution)(preference_widget_1.PreferencesWidget));

package/lib/browser/preference-frontend-module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.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;;~~AA4BhF~~,~~0CAmCC~~;~~AA7DD~~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"}
1	+ {"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"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"}

package/lib/browser/preference-tree-model.d.ts CHANGED Viewed

@@ -15,7 +15,8 @@ export interface PreferenceTreeNodeRow extends Readonly<TreeWidget.NodeRow>, Pre
 export declare enum PreferenceFilterChangeSource {
     Schema = 0,
     Search = 1,
-    Scope = 2
+    Scope = 2,
+    Category = 3
 }
 export interface PreferenceFilterChangeEvent {
     source: PreferenceFilterChangeSource;
@@ -36,6 +37,11 @@ export declare class PreferenceTreeModel extends TreeModelImpl {
     protected _currentRows: Map<string, PreferenceTreeNodeRow>;
     protected _totalVisibleLeaves: number;
     private _suppressSelection;
+    private preservingCategoryFilter;
+    protected _categoryFilterId: string | undefined;
+    protected _initialSelectionApplied: boolean;
+    protected lastSelectionId: string | undefined;
+    get categoryFilterId(): string | undefined;
     get currentRows(): Readonly<Map<string, PreferenceTreeNodeRow>>;
     get totalVisibleLeaves(): number;
     get isFiltered(): boolean;
@@ -45,6 +51,28 @@ export declare class PreferenceTreeModel extends TreeModelImpl {
     protected init(): void;
     protected doInit(): Promise<void>;
     private handleNewSchema;
+    /**
+     * Re-applies the selection after the tree has been rebuilt with new node instances,
+     * e.g. when plugins contribute preferences after startup. The selection state resolves
+     * nodes by id, but the rebuilt node lacks the `selected` flag that drives the tree
+     * highlight. If the selected node is gone from the new schema, falls back to the
+     * default category.
+     */
+    protected restoreSelectionInNewTree(): void;
+    protected applyInitialSelection(): void;
+    /**
+     * Selects the 'Commonly Used' category, the default detail page of the settings editor.
+     * @returns `true` if the category was found and selected.
+     */
+    protected selectDefaultCategory(): boolean;
+    /**
+     * Falls back to the default category when the selected category has no settings left to
+     * show, e.g. after switching to a scope in which none of its settings are valid. Otherwise
+     * the editor would show an empty page for a category the tree no longer lists. Clears the
+     * selection instead if the default category has no settings to show either.
+     */
+    protected ensureSelectedCategoryHasVisibleSettings(): void;
+    protected hasVisibleSettings(categoryId: string): boolean;
     protected updateRows(): void;
     protected updateFilteredRows(source: PreferenceFilterChangeSource): void;
     protected passesCurrentFilters(node: Preference.LeafNode, prefID: string): boolean;
@@ -56,8 +84,17 @@ export declare class PreferenceTreeModel extends TreeModelImpl {
     protected withSuppressedSelection(fn: () => void): void;
     getNodeFromPreferenceId(id: string): Preference.TreeNode | undefined;
     /**
+     * Returns the id of the nearest composite (category) ancestor of `node`,
+     * inclusive of `node` itself. Returns `undefined` if no category ancestor is found.
+     */
+    protected categoryIdForSelection(node: TreeNode): string | undefined;
+    /**
+     * Selects `node` to mirror the editor's scroll position in the tree. Unlike an explicit
+     * selection, this does not change the category filter: scrolling must never narrow the
+     * settings editor, only an explicit selection may.
      * @returns true if selection changed, false otherwise
      */
     selectIfNotSelected(node: SelectableTreeNode): boolean;
+    protected selectPreservingCategoryFilter(node: SelectableTreeNode): void;
 }
 //# sourceMappingURL=preference-tree-model.d.ts.map

package/lib/browser/preference-tree-model.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preference-tree-model.d.ts","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,QAAQ,EACR,SAAS,EAET,kBAAkB,EACrB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1G,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;~~AAG~~/C,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,uBAAuB;IAChG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;CAC7B;AACD,oBAAY,4BAA4B;IACpC,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;~~CACR~~;AACD,MAAM,WAAW,2BAA2B;IACxC,MAAM,EAAE,4BAA4B,CAAA;CACvC;AAED,qBACa,mBAAoB,SAAQ,aAAa;IAEjB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,uBAAuB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,uBAAuB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAEnF,SAAS,CAAC,QAAQ,CAAC,0BAA0B,uCAA8C;IAC3F,QAAQ,CAAC,eAAe,qCAAyC;IAEjE,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAM;IACzC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAM;IAC3C,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAM;IAC1C,SAAS,CAAC,aAAa,EAAE,MAAM,CAA0C;IACzE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IACvC,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;IACvE,SAAS,CAAC,mBAAmB,SAAK;IAClC,OAAO,CAAC,kBAAkB,CAAS;~~IAEnC~~,IAAI,WAAW,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAE9D;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,YAAY,IAAI,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAE9D;IAED,IAAI,YAAY,IAAI,UAAU,CAAC,oBAAoB,CAElD;IAED,IAAI,eAAe,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAE9C;cAGkB,IAAI,IAAI,IAAI;cAIf,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAgCvC~~,OAAO,CAAC,eAAe;~~IAQvB~~,SAAS,CAAC,UAAU,IAAI,IAAI;IA4B5B,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,4BAA4B,GAAG,IAAI;IAKxE,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;cAyB/D,uBAAuB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,IAAI,kBAAkB;IAItF,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAgBrD,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI;IAgBvD,SAAS,CAAC,SAAS,IAAI,IAAI;IAUlB,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,IAAI;IAM7D,SAAS,CAAC,uBAAuB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IASvD,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,UAAU,CAAC,QAAQ,GAAG,SAAS;IAKpE~~;;OAEG~~;IACH,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO;~~CASzD~~"}
1	+ {"version":3,"file":"preference-tree-model.d.ts","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"names":[],"mappings":"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"}

package/lib/browser/preference-tree-model.js CHANGED Viewed

@@ -26,11 +26,14 @@ const fuzzy = require("@theia/core/shared/fuzzy");
 const preference_scope_tabbar_widget_1 = require("./views/preference-scope-tabbar-widget");
 const preference_types_1 = require("./util/preference-types");
 const preference_layout_1 = require("./util/preference-layout");
+/** Node id of the 'Commonly Used' group, see `PreferenceTreeGenerator`. */
+const COMMONLY_USED_NODE_ID = `${preference_layout_1.COMMONLY_USED_SECTION_PREFIX}@${preference_layout_1.COMMONLY_USED_SECTION_PREFIX}`;
 var PreferenceFilterChangeSource;
 (function (PreferenceFilterChangeSource) {
     PreferenceFilterChangeSource[PreferenceFilterChangeSource["Schema"] = 0] = "Schema";
     PreferenceFilterChangeSource[PreferenceFilterChangeSource["Search"] = 1] = "Search";
     PreferenceFilterChangeSource[PreferenceFilterChangeSource["Scope"] = 2] = "Scope";
+    PreferenceFilterChangeSource[PreferenceFilterChangeSource["Category"] = 3] = "Category";
 })(PreferenceFilterChangeSource || (exports.PreferenceFilterChangeSource = PreferenceFilterChangeSource = {}));
 let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelImpl {
     constructor() {
@@ -45,6 +48,11 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
         this._currentRows = new Map();
         this._totalVisibleLeaves = 0;
         this._suppressSelection = false;
+        this.preservingCategoryFilter = false;
+        this._initialSelectionApplied = false;
+    }
+    get categoryFilterId() {
+        return this._categoryFilterId;
     }
     get currentRows() {
         return this._currentRows;
@@ -70,24 +78,45 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
     async doInit() {
         super.init();
         this.toDispose.pushAll([
+            this.onSelectionChanged(selectionEvent => {
+                this.lastSelectionId = selectionEvent[0]?.id;
+                if (this.preservingCategoryFilter) {
+                    return;
+                }
+                const node = selectionEvent[0];
+                const newId = node ? this.categoryIdForSelection(node) : undefined;
+                if (newId !== this._categoryFilterId) {
+                    this._categoryFilterId = newId;
+                    this.updateFilteredRows(PreferenceFilterChangeSource.Category);
+                }
+            }),
             this.treeGenerator.onSchemaChanged(newTree => this.handleNewSchema(newTree)),
             this.scopeTracker.onScopeChanged(scopeDetails => {
                 this._currentScope = scopeDetails.scope;
                 this.updateFilteredRows(PreferenceFilterChangeSource.Scope);
+                this.ensureSelectedCategoryHasVisibleSettings();
             }),
             this.filterInput.onFilterChanged(newSearchTerm => {
                 this.lastSearchedTags = Array.from(newSearchTerm.matchAll(/@tag:([^\s]+)/g)).map(match => match[0].slice(5));
                 const newSearchTermWithoutTags = newSearchTerm.replace(/@tag:[^\s]+/g, '');
                 this.lastSearchedLiteral = newSearchTermWithoutTags;
                 this.lastSearchedFuzzy = newSearchTermWithoutTags.replace(/\s/g, '');
+                const wasFiltered = this._isFiltered;
                 this._isFiltered = newSearchTerm.length > 2;
-                if (this.isFiltered) {
+                if (this._isFiltered) {
+                    // Search results span all categories: drop the category filter and the
+                    // now-stale selection so the tree matches the shown results.
+                    this._categoryFilterId = undefined;
+                    this.clearSelection();
                     this.expandAll();
                 }
                 else if (browser_1.CompositeTreeNode.is(this.root)) {
                     const root = this.root;
                     // Avoid intermediate selection events while collapsing.
                     this.withSuppressedSelection(() => this.collapseAll(root));
+                    if (wasFiltered) {
+                        this.selectDefaultCategory();
+                    }
                 }
                 this.updateFilteredRows(PreferenceFilterChangeSource.Search);
             }),
@@ -101,10 +130,88 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
     }
     handleNewSchema(newRoot) {
         this.root = newRoot;
+        if (this._categoryFilterId && !this.getNode(this._categoryFilterId)) {
+            this._categoryFilterId = undefined;
+        }
         if (this.isFiltered) {
             this.expandAll();
         }
         this.updateFilteredRows(PreferenceFilterChangeSource.Schema);
+        this.restoreSelectionInNewTree();
+        this.ensureSelectedCategoryHasVisibleSettings();
+        this.applyInitialSelection();
+    }
+    /**
+     * Re-applies the selection after the tree has been rebuilt with new node instances,
+     * e.g. when plugins contribute preferences after startup. The selection state resolves
+     * nodes by id, but the rebuilt node lacks the `selected` flag that drives the tree
+     * highlight. If the selected node is gone from the new schema, falls back to the
+     * default category.
+     */
+    restoreSelectionInNewTree() {
+        if (!this.lastSelectionId) {
+            return;
+        }
+        const node = this.getNode(this.lastSelectionId);
+        if (node && browser_1.SelectableTreeNode.is(node)) {
+            if (!node.selected) {
+                this.selectPreservingCategoryFilter(node);
+            }
+        }
+        else {
+            this.clearSelection();
+            this._initialSelectionApplied = false;
+        }
+    }
+    applyInitialSelection() {
+        if (this._initialSelectionApplied) {
+            return;
+        }
+        if (this.selectedNodes.length > 0) {
+            // Something is already selected, e.g. by the user before the schema change.
+            this._initialSelectionApplied = true;
+            return;
+        }
+        if (this._isFiltered) {
+            // A search (e.g. restored on startup) is active; the default selection is
+            // applied when it is cleared instead.
+            return;
+        }
+        if (this.selectDefaultCategory()) {
+            this._initialSelectionApplied = true;
+        }
+    }
+    /**
+     * Selects the 'Commonly Used' category, the default detail page of the settings editor.
+     * @returns `true` if the category was found and selected.
+     */
+    selectDefaultCategory() {
+        const commonlyUsed = this.getNode(COMMONLY_USED_NODE_ID);
+        if (commonlyUsed && browser_1.SelectableTreeNode.is(commonlyUsed)) {
+            this.selectNode(commonlyUsed);
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Falls back to the default category when the selected category has no settings left to
+     * show, e.g. after switching to a scope in which none of its settings are valid. Otherwise
+     * the editor would show an empty page for a category the tree no longer lists. Clears the
+     * selection instead if the default category has no settings to show either.
+     */
+    ensureSelectedCategoryHasVisibleSettings() {
+        if (!this._categoryFilterId || this.hasVisibleSettings(this._categoryFilterId)) {
+            return;
+        }
+        if (this.hasVisibleSettings(COMMONLY_USED_NODE_ID)) {
+            this.selectDefaultCategory();
+        }
+        else {
+            this.clearSelection();
+        }
+    }
+    hasVisibleSettings(categoryId) {
+        return !!this._currentRows.get(categoryId)?.visibleChildren;
     }
     updateRows() {
         const root = this.root;
@@ -220,17 +327,43 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
         return node && preference_types_1.Preference.TreeNode.is(node) ? node : undefined;
     }
     /**
+     * Returns the id of the nearest composite (category) ancestor of `node`,
+     * inclusive of `node` itself. Returns `undefined` if no category ancestor is found.
+     */
+    categoryIdForSelection(node) {
+        let current = node;
+        while (current) {
+            if (preference_types_1.Preference.TreeNode.is(current) && preference_types_1.Preference.CompositeTreeNode.is(current)) {
+                return current.id;
+            }
+            current = current.parent;
+        }
+        return undefined;
+    }
+    /**
+     * Selects `node` to mirror the editor's scroll position in the tree. Unlike an explicit
+     * selection, this does not change the category filter: scrolling must never narrow the
+     * settings editor, only an explicit selection may.
      * @returns true if selection changed, false otherwise
      */
     selectIfNotSelected(node) {
         const currentlySelected = this.selectedNodes[0];
         if (!node.selected || node !== currentlySelected) {
-            node.selected = true;
-            this.selectNode(node);
+            this.selectPreservingCategoryFilter(node);
             return true;
         }
         return false;
     }
+    selectPreservingCategoryFilter(node) {
+        this.preservingCategoryFilter = true;
+        try {
+            node.selected = true;
+            this.selectNode(node);
+        }
+        finally {
+            this.preservingCategoryFilter = false;
+        }
+    }
 };
 exports.PreferenceTreeModel = PreferenceTreeModel;
 tslib_1.__decorate([

package/lib/browser/preference-tree-model.js.map CHANGED Viewed

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

package/lib/browser/preference-tree-model.spec.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=preference-tree-model.spec.d.ts.map

package/lib/browser/preference-tree-model.spec.d.ts.map ADDED Viewed

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