@theia/preferences 1.77.0-next.95 → 1.77.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.
- package/lib/browser/folder-preference-provider.d.ts +1 -1
- package/lib/browser/folder-preference-provider.d.ts.map +1 -1
- package/lib/browser/folder-preference-provider.js +17 -23
- package/lib/browser/folder-preference-provider.js.map +1 -1
- package/lib/browser/folders-preferences-provider.d.ts +3 -3
- package/lib/browser/folders-preferences-provider.d.ts.map +1 -1
- package/lib/browser/folders-preferences-provider.js +30 -40
- package/lib/browser/folders-preferences-provider.js.map +1 -1
- package/lib/browser/frontend-preference-storage.d.ts +2 -2
- package/lib/browser/frontend-preference-storage.d.ts.map +1 -1
- package/lib/browser/frontend-preference-storage.js +5 -9
- package/lib/browser/frontend-preference-storage.js.map +1 -1
- package/lib/browser/index.d.ts +3 -3
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +4 -7
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/monaco-jsonc-editor.js +10 -14
- package/lib/browser/monaco-jsonc-editor.js.map +1 -1
- package/lib/browser/package.spec.d.ts +1 -0
- package/lib/browser/package.spec.js +1 -1
- package/lib/browser/package.spec.js.map +1 -1
- package/lib/browser/preference-bindings.js +23 -27
- package/lib/browser/preference-bindings.js.map +1 -1
- package/lib/browser/preference-frontend-contribution.d.ts +9 -6
- package/lib/browser/preference-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/preference-frontend-contribution.js +34 -38
- package/lib/browser/preference-frontend-contribution.js.map +1 -1
- package/lib/browser/preference-frontend-contribution.spec.js +30 -16
- package/lib/browser/preference-frontend-contribution.spec.js.map +1 -1
- package/lib/browser/preference-frontend-module.d.ts +1 -1
- package/lib/browser/preference-frontend-module.d.ts.map +1 -1
- package/lib/browser/preference-frontend-module.js +51 -54
- package/lib/browser/preference-frontend-module.js.map +1 -1
- package/lib/browser/preference-open-handler.d.ts +1 -1
- package/lib/browser/preference-open-handler.d.ts.map +1 -1
- package/lib/browser/preference-open-handler.js +10 -14
- package/lib/browser/preference-open-handler.js.map +1 -1
- package/lib/browser/preference-transaction-manager.d.ts +2 -2
- package/lib/browser/preference-transaction-manager.d.ts.map +1 -1
- package/lib/browser/preference-transaction-manager.js +49 -63
- package/lib/browser/preference-transaction-manager.js.map +1 -1
- package/lib/browser/preference-tree-model.d.ts +4 -4
- package/lib/browser/preference-tree-model.d.ts.map +1 -1
- package/lib/browser/preference-tree-model.js +48 -59
- package/lib/browser/preference-tree-model.js.map +1 -1
- package/lib/browser/preference-tree-model.spec.js +84 -86
- package/lib/browser/preference-tree-model.spec.js.map +1 -1
- package/lib/browser/preferences-contribution.d.ts +2 -2
- package/lib/browser/preferences-contribution.d.ts.map +1 -1
- package/lib/browser/preferences-contribution.js +76 -86
- package/lib/browser/preferences-contribution.js.map +1 -1
- package/lib/browser/preferences-json-schema-contribution.js +34 -41
- package/lib/browser/preferences-json-schema-contribution.js.map +1 -1
- package/lib/browser/preferences-monaco-contribution.js +1 -4
- package/lib/browser/preferences-monaco-contribution.js.map +1 -1
- package/lib/browser/session-preference-remote-cli-contribution.js +13 -17
- package/lib/browser/session-preference-remote-cli-contribution.js.map +1 -1
- package/lib/browser/session-preference-remote-cli-contribution.spec.js +8 -10
- package/lib/browser/session-preference-remote-cli-contribution.spec.js.map +1 -1
- package/lib/browser/session-preference-status-bar-contribution.js +34 -43
- package/lib/browser/session-preference-status-bar-contribution.js.map +1 -1
- package/lib/browser/util/preference-layout.js +74 -77
- package/lib/browser/util/preference-layout.js.map +1 -1
- package/lib/browser/util/preference-layout.spec.js +6 -8
- package/lib/browser/util/preference-layout.spec.js.map +1 -1
- package/lib/browser/util/preference-scope-command-manager.js +19 -25
- package/lib/browser/util/preference-scope-command-manager.js.map +1 -1
- package/lib/browser/util/preference-tree-generator.d.ts +3 -3
- package/lib/browser/util/preference-tree-generator.d.ts.map +1 -1
- package/lib/browser/util/preference-tree-generator.js +31 -41
- package/lib/browser/util/preference-tree-generator.js.map +1 -1
- package/lib/browser/util/preference-tree-label-provider.d.ts +2 -2
- package/lib/browser/util/preference-tree-label-provider.d.ts.map +1 -1
- package/lib/browser/util/preference-tree-label-provider.js +14 -18
- package/lib/browser/util/preference-tree-label-provider.js.map +1 -1
- package/lib/browser/util/preference-tree-label-provider.spec.js +21 -23
- package/lib/browser/util/preference-tree-label-provider.spec.js.map +1 -1
- package/lib/browser/util/preference-types.js +27 -30
- package/lib/browser/util/preference-types.js.map +1 -1
- package/lib/browser/views/components/preference-array-input.d.ts +3 -3
- package/lib/browser/views/components/preference-array-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-array-input.js +17 -20
- package/lib/browser/views/components/preference-array-input.js.map +1 -1
- package/lib/browser/views/components/preference-boolean-input.d.ts +3 -3
- package/lib/browser/views/components/preference-boolean-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-boolean-input.js +14 -17
- package/lib/browser/views/components/preference-boolean-input.js.map +1 -1
- package/lib/browser/views/components/preference-file-input.d.ts +4 -4
- package/lib/browser/views/components/preference-file-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-file-input.js +23 -27
- package/lib/browser/views/components/preference-file-input.js.map +1 -1
- package/lib/browser/views/components/preference-json-input.d.ts +3 -3
- package/lib/browser/views/components/preference-json-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-json-input.js +18 -22
- package/lib/browser/views/components/preference-json-input.js.map +1 -1
- package/lib/browser/views/components/preference-markdown-renderer.d.ts +2 -2
- package/lib/browser/views/components/preference-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/views/components/preference-markdown-renderer.js +20 -27
- package/lib/browser/views/components/preference-markdown-renderer.js.map +1 -1
- package/lib/browser/views/components/preference-node-renderer-creator.d.ts +2 -2
- package/lib/browser/views/components/preference-node-renderer-creator.d.ts.map +1 -1
- package/lib/browser/views/components/preference-node-renderer-creator.js +31 -36
- package/lib/browser/views/components/preference-node-renderer-creator.js.map +1 -1
- package/lib/browser/views/components/preference-node-renderer.d.ts +6 -6
- package/lib/browser/views/components/preference-node-renderer.d.ts.map +1 -1
- package/lib/browser/views/components/preference-node-renderer.js +70 -90
- package/lib/browser/views/components/preference-node-renderer.js.map +1 -1
- package/lib/browser/views/components/preference-null-input.d.ts +3 -3
- package/lib/browser/views/components/preference-null-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-null-input.js +12 -15
- package/lib/browser/views/components/preference-null-input.js.map +1 -1
- package/lib/browser/views/components/preference-number-input.d.ts +3 -3
- package/lib/browser/views/components/preference-number-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-number-input.js +29 -32
- package/lib/browser/views/components/preference-number-input.js.map +1 -1
- package/lib/browser/views/components/preference-select-input.d.ts +3 -3
- package/lib/browser/views/components/preference-select-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-select-input.js +23 -26
- package/lib/browser/views/components/preference-select-input.js.map +1 -1
- package/lib/browser/views/components/preference-string-input.d.ts +3 -3
- package/lib/browser/views/components/preference-string-input.d.ts.map +1 -1
- package/lib/browser/views/components/preference-string-input.js +14 -17
- package/lib/browser/views/components/preference-string-input.js.map +1 -1
- package/lib/browser/views/preference-editor-widget.d.ts +5 -5
- package/lib/browser/views/preference-editor-widget.d.ts.map +1 -1
- package/lib/browser/views/preference-editor-widget.js +65 -78
- package/lib/browser/views/preference-editor-widget.js.map +1 -1
- package/lib/browser/views/preference-scope-tabbar-widget.d.ts +2 -2
- package/lib/browser/views/preference-scope-tabbar-widget.d.ts.map +1 -1
- package/lib/browser/views/preference-scope-tabbar-widget.js +51 -63
- package/lib/browser/views/preference-scope-tabbar-widget.js.map +1 -1
- package/lib/browser/views/preference-searchbar-widget.js +23 -30
- package/lib/browser/views/preference-searchbar-widget.js.map +1 -1
- package/lib/browser/views/preference-tree-widget.d.ts +3 -3
- package/lib/browser/views/preference-tree-widget.d.ts.map +1 -1
- package/lib/browser/views/preference-tree-widget.js +23 -31
- package/lib/browser/views/preference-tree-widget.js.map +1 -1
- package/lib/browser/views/preference-widget-bindings.js +60 -64
- package/lib/browser/views/preference-widget-bindings.js.map +1 -1
- package/lib/browser/views/preference-widget.d.ts +5 -5
- package/lib/browser/views/preference-widget.d.ts.map +1 -1
- package/lib/browser/views/preference-widget.js +24 -34
- package/lib/browser/views/preference-widget.js.map +1 -1
- package/lib/browser/workspace-file-preference-provider.d.ts +2 -2
- package/lib/browser/workspace-file-preference-provider.d.ts.map +1 -1
- package/lib/browser/workspace-file-preference-provider.js +21 -26
- package/lib/browser/workspace-file-preference-provider.js.map +1 -1
- package/lib/browser/workspace-preference-provider.d.ts +5 -5
- package/lib/browser/workspace-preference-provider.d.ts.map +1 -1
- package/lib/browser/workspace-preference-provider.js +31 -40
- package/lib/browser/workspace-preference-provider.js.map +1 -1
- package/lib/common/abstract-resource-preference-provider.d.ts +2 -2
- package/lib/common/abstract-resource-preference-provider.d.ts.map +1 -1
- package/lib/common/abstract-resource-preference-provider.js +55 -68
- package/lib/common/abstract-resource-preference-provider.js.map +1 -1
- package/lib/common/abstract-resource-preference-provider.spec.js +34 -36
- package/lib/common/abstract-resource-preference-provider.spec.js.map +1 -1
- package/lib/common/cli-preferences.d.ts +28 -6
- package/lib/common/cli-preferences.d.ts.map +1 -1
- package/lib/common/cli-preferences.js +34 -11
- package/lib/common/cli-preferences.js.map +1 -1
- package/lib/common/cli-preferences.spec.js +63 -18
- package/lib/common/cli-preferences.spec.js.map +1 -1
- package/lib/common/jsonc-editor.js +13 -17
- package/lib/common/jsonc-editor.js.map +1 -1
- package/lib/common/section-preference-provider.d.ts +2 -2
- package/lib/common/section-preference-provider.d.ts.map +1 -1
- package/lib/common/section-preference-provider.js +18 -25
- package/lib/common/section-preference-provider.js.map +1 -1
- package/lib/common/user-configs-preference-provider.d.ts +3 -3
- package/lib/common/user-configs-preference-provider.d.ts.map +1 -1
- package/lib/common/user-configs-preference-provider.js +26 -36
- package/lib/common/user-configs-preference-provider.js.map +1 -1
- package/lib/common/user-preference-provider.d.ts +1 -1
- package/lib/common/user-preference-provider.d.ts.map +1 -1
- package/lib/common/user-preference-provider.js +10 -13
- package/lib/common/user-preference-provider.js.map +1 -1
- package/lib/node/backend-preference-storage.d.ts +2 -2
- package/lib/node/backend-preference-storage.d.ts.map +1 -1
- package/lib/node/backend-preference-storage.js +12 -16
- package/lib/node/backend-preference-storage.js.map +1 -1
- package/lib/node/backend-preference-storage.spec.js +10 -12
- package/lib/node/backend-preference-storage.spec.js.map +1 -1
- package/lib/node/preference-backend-module.js +23 -25
- package/lib/node/preference-backend-module.js.map +1 -1
- package/lib/node/preference-bindings.js +11 -14
- package/lib/node/preference-bindings.js.map +1 -1
- package/lib/node/preference-cli-contribution.d.ts +8 -7
- package/lib/node/preference-cli-contribution.d.ts.map +1 -1
- package/lib/node/preference-cli-contribution.js +18 -19
- package/lib/node/preference-cli-contribution.js.map +1 -1
- package/lib/node/preference-cli-contribution.spec.js +63 -38
- package/lib/node/preference-cli-contribution.spec.js.map +1 -1
- package/package.json +18 -9
- package/src/browser/folder-preference-provider.ts +1 -1
- package/src/browser/folders-preferences-provider.ts +6 -6
- package/src/browser/frontend-preference-storage.ts +2 -2
- package/src/browser/index.ts +3 -3
- package/src/browser/preference-bindings.ts +7 -7
- package/src/browser/preference-frontend-contribution.spec.ts +31 -11
- package/src/browser/preference-frontend-contribution.ts +18 -15
- package/src/browser/preference-frontend-module.ts +18 -18
- package/src/browser/preference-open-handler.ts +1 -1
- package/src/browser/preference-transaction-manager.ts +2 -2
- package/src/browser/preference-tree-model.spec.ts +6 -6
- package/src/browser/preference-tree-model.ts +5 -5
- package/src/browser/preferences-contribution.ts +2 -2
- package/src/browser/preferences-json-schema-contribution.ts +1 -1
- package/src/browser/session-preference-remote-cli-contribution.spec.ts +3 -3
- package/src/browser/session-preference-remote-cli-contribution.ts +1 -1
- package/src/browser/session-preference-status-bar-contribution.ts +2 -2
- package/src/browser/util/preference-layout.spec.ts +1 -1
- package/src/browser/util/preference-layout.ts +1 -1
- package/src/browser/util/preference-scope-command-manager.ts +1 -1
- package/src/browser/util/preference-tree-generator.ts +4 -4
- package/src/browser/util/preference-tree-label-provider.spec.ts +4 -4
- package/src/browser/util/preference-tree-label-provider.ts +2 -2
- package/src/browser/views/components/preference-array-input.ts +3 -3
- package/src/browser/views/components/preference-boolean-input.ts +3 -3
- package/src/browser/views/components/preference-file-input.ts +5 -5
- package/src/browser/views/components/preference-json-input.ts +3 -3
- package/src/browser/views/components/preference-markdown-renderer.ts +2 -2
- package/src/browser/views/components/preference-node-renderer-creator.ts +2 -2
- package/src/browser/views/components/preference-node-renderer.ts +7 -7
- package/src/browser/views/components/preference-null-input.ts +3 -3
- package/src/browser/views/components/preference-number-input.ts +3 -3
- package/src/browser/views/components/preference-select-input.ts +3 -3
- package/src/browser/views/components/preference-string-input.ts +3 -3
- package/src/browser/views/preference-editor-widget.ts +10 -10
- package/src/browser/views/preference-scope-tabbar-widget.tsx +2 -2
- package/src/browser/views/preference-searchbar-widget.tsx +1 -1
- package/src/browser/views/preference-tree-widget.tsx +3 -3
- package/src/browser/views/preference-widget-bindings.ts +19 -19
- package/src/browser/views/preference-widget.tsx +5 -5
- package/src/browser/workspace-file-preference-provider.ts +3 -3
- package/src/browser/workspace-preference-provider.ts +8 -9
- package/src/common/abstract-resource-preference-provider.spec.ts +2 -2
- package/src/common/abstract-resource-preference-provider.ts +23 -24
- package/src/common/cli-preferences.spec.ts +62 -9
- package/src/common/cli-preferences.ts +48 -9
- package/src/common/jsonc-editor.ts +3 -3
- package/src/common/section-preference-provider.ts +3 -3
- package/src/common/user-configs-preference-provider.ts +5 -5
- package/src/common/user-preference-provider.ts +1 -1
- package/src/node/backend-preference-storage.spec.ts +2 -2
- package/src/node/backend-preference-storage.ts +3 -3
- package/src/node/preference-backend-module.ts +6 -6
- package/src/node/preference-bindings.ts +3 -3
- package/src/node/preference-cli-contribution.spec.ts +46 -15
- package/src/node/preference-cli-contribution.ts +12 -9
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
|
|
2
2
|
import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
|
|
3
|
-
import { CliPreferences } from '../common/cli-preferences';
|
|
3
|
+
import { CliPreferences, CliPreference } from '../common/cli-preferences.js';
|
|
4
4
|
import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
5
5
|
import { ILogger } from '@theia/core';
|
|
6
6
|
export declare class PreferenceFrontendContribution implements FrontendApplicationContribution {
|
|
@@ -21,16 +21,19 @@ export declare class PreferenceFrontendContribution implements FrontendApplicati
|
|
|
21
21
|
* window still gets its own overrides.
|
|
22
22
|
*/
|
|
23
23
|
protected resolveCliPreferences(): Promise<{
|
|
24
|
-
session: [
|
|
25
|
-
persistent: [
|
|
24
|
+
session: CliPreference[];
|
|
25
|
+
persistent: CliPreference[];
|
|
26
26
|
}>;
|
|
27
|
-
/**
|
|
28
|
-
|
|
27
|
+
/**
|
|
28
|
+
* Overlays `overrides` onto `base`, later entries winning per encoded key
|
|
29
|
+
* (`[override].name` or plain name) while preserving order (base first).
|
|
30
|
+
*/
|
|
31
|
+
protected mergeEntries(base: ReadonlyArray<CliPreference>, overrides: ReadonlyArray<CliPreference>): CliPreference[];
|
|
29
32
|
/**
|
|
30
33
|
* Applies a batch of CLI-provided preferences sequentially. A rejection from an
|
|
31
34
|
* individual write (bad key, invalid scope, etc.) is logged and does not abort the
|
|
32
35
|
* remaining writes, and it is not left as an unhandled promise rejection.
|
|
33
36
|
*/
|
|
34
|
-
protected applyAll(entries: ReadonlyArray<
|
|
37
|
+
protected applyAll(entries: ReadonlyArray<CliPreference>, scope: PreferenceScope): Promise<void>;
|
|
35
38
|
}
|
|
36
39
|
//# sourceMappingURL=preference-frontend-contribution.d.ts.map
|
|
@@ -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;AAE1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,cAAc,EAAsB,MAAM,
|
|
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,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjG,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,aAAa,EAAE,CAAC;QAAC,UAAU,EAAE,aAAa,EAAE,CAAA;KAAE,CAAC;IAwB3G;;;OAGG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,aAAa,EAAE;IAQpH;;;;OAIG;cACa,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;CASzG"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2024 Typefox and others.
|
|
4
3
|
//
|
|
@@ -14,15 +13,13 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const preferences_1 = require("@theia/core/lib/common/preferences");
|
|
25
|
-
const core_1 = require("@theia/core");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
|
|
19
|
+
import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
|
|
20
|
+
import { CliPreferences, CliPreferenceEntry } from '../common/cli-preferences.js';
|
|
21
|
+
import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
22
|
+
import { ILogger } from '@theia/core';
|
|
26
23
|
let PreferenceFrontendContribution = class PreferenceFrontendContribution {
|
|
27
24
|
onStart() {
|
|
28
25
|
this.applyCliPreferences();
|
|
@@ -38,13 +35,13 @@ let PreferenceFrontendContribution = class PreferenceFrontendContribution {
|
|
|
38
35
|
// appears in both `--session-preference` and `--set-preference`, the persistent
|
|
39
36
|
// write in the next block sees a settled session provider (and correctly triggers
|
|
40
37
|
// `evictSessionOverride`) rather than racing with the session write.
|
|
41
|
-
await this.applyAll(session,
|
|
38
|
+
await this.applyAll(session, PreferenceScope.Session);
|
|
42
39
|
if (session.length > 0) {
|
|
43
40
|
// Log keys only. Values may carry overrides for security-sensitive prefs
|
|
44
41
|
// (e.g. AI tool auto-approval) and should not leak into screenshots or support bundles.
|
|
45
|
-
this.logger.info(`Applied ${session.length} --session-preference value(s):`, session.map(
|
|
42
|
+
this.logger.info(`Applied ${session.length} --session-preference value(s):`, session.map(entry => CliPreferenceEntry.encodedKey(entry)).join(', '));
|
|
46
43
|
}
|
|
47
|
-
await this.applyAll(persistent,
|
|
44
|
+
await this.applyAll(persistent, PreferenceScope.User);
|
|
48
45
|
}
|
|
49
46
|
/**
|
|
50
47
|
* Resolves the CLI-provided preferences to apply to this window.
|
|
@@ -75,17 +72,20 @@ let PreferenceFrontendContribution = class PreferenceFrontendContribution {
|
|
|
75
72
|
}
|
|
76
73
|
const warn = (message) => this.logger.warn(message);
|
|
77
74
|
return {
|
|
78
|
-
session: this.mergeEntries(session,
|
|
79
|
-
persistent: this.mergeEntries(persistent,
|
|
75
|
+
session: this.mergeEntries(session, CliPreferenceEntry.parseAll(LaunchArguments.values(forwarded, 'session-preference'), warn)),
|
|
76
|
+
persistent: this.mergeEntries(persistent, CliPreferenceEntry.parseAll(LaunchArguments.values(forwarded, 'set-preference'), warn))
|
|
80
77
|
};
|
|
81
78
|
}
|
|
82
|
-
/**
|
|
79
|
+
/**
|
|
80
|
+
* Overlays `overrides` onto `base`, later entries winning per encoded key
|
|
81
|
+
* (`[override].name` or plain name) while preserving order (base first).
|
|
82
|
+
*/
|
|
83
83
|
mergeEntries(base, overrides) {
|
|
84
84
|
const merged = new Map();
|
|
85
|
-
for (const
|
|
86
|
-
merged.set(
|
|
85
|
+
for (const entry of [...base, ...overrides]) {
|
|
86
|
+
merged.set(CliPreferenceEntry.encodedKey(entry), entry);
|
|
87
87
|
}
|
|
88
|
-
return [...merged];
|
|
88
|
+
return [...merged.values()];
|
|
89
89
|
}
|
|
90
90
|
/**
|
|
91
91
|
* Applies a batch of CLI-provided preferences sequentially. A rejection from an
|
|
@@ -93,35 +93,31 @@ let PreferenceFrontendContribution = class PreferenceFrontendContribution {
|
|
|
93
93
|
* remaining writes, and it is not left as an unhandled promise rejection.
|
|
94
94
|
*/
|
|
95
95
|
async applyAll(entries, scope) {
|
|
96
|
-
for (const
|
|
96
|
+
for (const entry of entries) {
|
|
97
97
|
try {
|
|
98
|
-
await this.preferenceService.set(
|
|
98
|
+
await this.preferenceService.set(entry.preferenceName, entry.value, scope, undefined, entry.overrideIdentifier);
|
|
99
99
|
}
|
|
100
100
|
catch (e) {
|
|
101
|
-
this.logger.warn(`Failed to apply CLI preference "${
|
|
101
|
+
this.logger.warn(`Failed to apply CLI preference "${CliPreferenceEntry.encodedKey(entry)}" to ${PreferenceScope[scope]} scope:`, e);
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
105
|
};
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
(0, inversify_1.inject)(cli_preferences_1.CliPreferences),
|
|
109
|
-
tslib_1.__metadata("design:type", Object)
|
|
106
|
+
__decorate([
|
|
107
|
+
inject(CliPreferences)
|
|
110
108
|
], PreferenceFrontendContribution.prototype, "CliPreferences", void 0);
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
tslib_1.__metadata("design:type", Object)
|
|
109
|
+
__decorate([
|
|
110
|
+
inject(PreferenceService)
|
|
114
111
|
], PreferenceFrontendContribution.prototype, "preferenceService", void 0);
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
tslib_1.__metadata("design:type", Object)
|
|
112
|
+
__decorate([
|
|
113
|
+
inject(ILogger),
|
|
114
|
+
named('preferences:PreferenceFrontendContribution')
|
|
119
115
|
], PreferenceFrontendContribution.prototype, "logger", void 0);
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
tslib_1.__metadata("design:type", Object)
|
|
116
|
+
__decorate([
|
|
117
|
+
inject(WindowLaunchArgs)
|
|
123
118
|
], PreferenceFrontendContribution.prototype, "launchArgs", void 0);
|
|
124
|
-
|
|
125
|
-
|
|
119
|
+
PreferenceFrontendContribution = __decorate([
|
|
120
|
+
injectable()
|
|
126
121
|
], PreferenceFrontendContribution);
|
|
122
|
+
export { PreferenceFrontendContribution };
|
|
127
123
|
//# sourceMappingURL=preference-frontend-contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH and others.
|
|
4
3
|
//
|
|
@@ -14,11 +13,10 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { PreferenceFrontendContribution } from './preference-frontend-contribution.js';
|
|
19
18
|
const launchArgs = (values) => ({ values, negated: [] });
|
|
20
|
-
|
|
21
|
-
class TestPreferenceFrontendContribution extends preference_frontend_contribution_1.PreferenceFrontendContribution {
|
|
19
|
+
class TestPreferenceFrontendContribution extends PreferenceFrontendContribution {
|
|
22
20
|
constructor() {
|
|
23
21
|
super(...arguments);
|
|
24
22
|
this.sessionBackendCalls = 0;
|
|
@@ -31,11 +29,11 @@ class TestPreferenceFrontendContribution extends preference_frontend_contributio
|
|
|
31
29
|
this.CliPreferences = {
|
|
32
30
|
getSessionPreferences: async () => {
|
|
33
31
|
this.sessionBackendCalls++;
|
|
34
|
-
return [
|
|
32
|
+
return [{ preferenceName: 'backend.session', value: 1 }];
|
|
35
33
|
},
|
|
36
34
|
getPreferences: async () => {
|
|
37
35
|
this.persistentBackendCalls++;
|
|
38
|
-
return [
|
|
36
|
+
return [{ preferenceName: 'backend.persistent', value: 2 }];
|
|
39
37
|
}
|
|
40
38
|
};
|
|
41
39
|
return this.resolveCliPreferences();
|
|
@@ -49,28 +47,44 @@ describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
|
|
|
49
47
|
it('reads preferences from the backend on a cold-start window (no forwarded options)', async () => {
|
|
50
48
|
contribution.forwardedArgs = undefined;
|
|
51
49
|
const result = await contribution.resolve();
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 1 }]);
|
|
51
|
+
expect(result.persistent).to.deep.equal([{ preferenceName: 'backend.persistent', value: 2 }]);
|
|
52
|
+
expect(contribution.sessionBackendCalls).to.equal(1);
|
|
55
53
|
});
|
|
56
54
|
it('layers --session-preference from the forwarded options on top of the backend values', async () => {
|
|
57
55
|
contribution.forwardedArgs = launchArgs({ 'session-preference': ['editor.fontSize=20'], 'attach-container': ['B'] });
|
|
58
56
|
const result = await contribution.resolve();
|
|
59
57
|
// Process-wide backend values are kept (base) and the forwarded value is added on top.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
expect(result.session).to.deep.equal([
|
|
59
|
+
{ preferenceName: 'backend.session', value: 1 },
|
|
60
|
+
{ preferenceName: 'editor.fontSize', value: 20 }
|
|
61
|
+
]);
|
|
62
|
+
expect(result.persistent).to.deep.equal([{ preferenceName: 'backend.persistent', value: 2 }]);
|
|
63
|
+
expect(contribution.sessionBackendCalls).to.equal(1);
|
|
63
64
|
});
|
|
64
65
|
it('layers --set-preference from the forwarded options on top of the backend values', async () => {
|
|
65
66
|
contribution.forwardedArgs = launchArgs({ 'set-preference': ['editor.tabSize=2'] });
|
|
66
67
|
const result = await contribution.resolve();
|
|
67
|
-
|
|
68
|
-
|
|
68
|
+
expect(result.persistent).to.deep.equal([
|
|
69
|
+
{ preferenceName: 'backend.persistent', value: 2 },
|
|
70
|
+
{ preferenceName: 'editor.tabSize', value: 2 }
|
|
71
|
+
]);
|
|
72
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 1 }]);
|
|
69
73
|
});
|
|
70
74
|
it('lets a forwarded value override a same-key backend value', async () => {
|
|
71
75
|
contribution.forwardedArgs = launchArgs({ 'session-preference': ['backend.session=99'] });
|
|
72
76
|
const result = await contribution.resolve();
|
|
73
|
-
|
|
77
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 99 }]);
|
|
78
|
+
});
|
|
79
|
+
it('merges language overrides without colliding with the base preference name', async () => {
|
|
80
|
+
contribution.forwardedArgs = launchArgs({
|
|
81
|
+
'session-preference': ['[typescript].backend.session=4']
|
|
82
|
+
});
|
|
83
|
+
const result = await contribution.resolve();
|
|
84
|
+
expect(result.session).to.deep.equal([
|
|
85
|
+
{ preferenceName: 'backend.session', value: 1 },
|
|
86
|
+
{ preferenceName: 'backend.session', value: 4, overrideIdentifier: 'typescript' }
|
|
87
|
+
]);
|
|
74
88
|
});
|
|
75
89
|
});
|
|
76
90
|
//# sourceMappingURL=preference-frontend-contribution.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-frontend-contribution.spec.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-frontend-contribution.spec.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-contribution.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import '../../src/browser/style/index.css';
|
|
2
|
-
import './preferences-monaco-contribution';
|
|
2
|
+
import './preferences-monaco-contribution.js';
|
|
3
3
|
import { ContainerModule, interfaces } from '@theia/core/shared/inversify';
|
|
4
4
|
export declare function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind): void;
|
|
5
5
|
declare const _default: ContainerModule;
|
|
@@ -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,
|
|
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,sCAAsC,CAAC;AAC9C,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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,60 +13,58 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
(
|
|
47
|
-
(
|
|
48
|
-
bind
|
|
49
|
-
bind(
|
|
50
|
-
(
|
|
51
|
-
bind(
|
|
52
|
-
bind(
|
|
53
|
-
bind(
|
|
54
|
-
bind(
|
|
55
|
-
bind(
|
|
56
|
-
bind(
|
|
57
|
-
bind(
|
|
58
|
-
bind(
|
|
59
|
-
bind(
|
|
60
|
-
bind(
|
|
61
|
-
bind(
|
|
62
|
-
bind(
|
|
63
|
-
bind(
|
|
64
|
-
bind(
|
|
65
|
-
bind(
|
|
66
|
-
bind(
|
|
67
|
-
bind(browser_1.FrontendApplicationContribution).toService(session_preference_status_bar_contribution_1.SessionPreferenceStatusBarContribution);
|
|
68
|
-
bind(browser_1.WidgetStatusBarContribution).toConstantValue((0, browser_1.noopWidgetStatusBarContribution)(preference_widget_1.PreferencesWidget));
|
|
16
|
+
import '../../src/browser/style/index.css';
|
|
17
|
+
import './preferences-monaco-contribution.js';
|
|
18
|
+
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
19
|
+
import { bindViewContribution, FrontendApplicationContribution, noopWidgetStatusBarContribution, OpenHandler, WidgetStatusBarContribution } from '@theia/core/lib/browser';
|
|
20
|
+
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
21
|
+
import { PreferenceTreeGenerator } from './util/preference-tree-generator.js';
|
|
22
|
+
import { bindPreferenceProviders } from './preference-bindings.js';
|
|
23
|
+
import { bindPreferencesWidgets } from './views/preference-widget-bindings.js';
|
|
24
|
+
import { PreferencesContribution } from './preferences-contribution.js';
|
|
25
|
+
import { PreferenceScopeCommandManager } from './util/preference-scope-command-manager.js';
|
|
26
|
+
import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
|
|
27
|
+
import { PreferencesJsonSchemaContribution } from './preferences-json-schema-contribution.js';
|
|
28
|
+
import { MonacoJSONCEditor } from './monaco-jsonc-editor.js';
|
|
29
|
+
import { PreferenceTransaction, PreferenceTransactionFactory, preferenceTransactionFactoryCreator } from './preference-transaction-manager.js';
|
|
30
|
+
import { PreferenceOpenHandler } from './preference-open-handler.js';
|
|
31
|
+
import { CliPreferences, CliPreferencesPath } from '../common/cli-preferences.js';
|
|
32
|
+
import { ServiceConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
|
|
33
|
+
import { PreferenceFrontendContribution } from './preference-frontend-contribution.js';
|
|
34
|
+
import { RemoteCliArgsContribution } from '@theia/core/lib/common/remote-cli-args-contribution';
|
|
35
|
+
import { SessionPreferenceRemoteCliContribution } from './session-preference-remote-cli-contribution.js';
|
|
36
|
+
import { SessionPreferenceStatusBarContribution } from './session-preference-status-bar-contribution.js';
|
|
37
|
+
import { PreferenceLayoutProvider } from './util/preference-layout.js';
|
|
38
|
+
import { PreferencesWidget } from './views/preference-widget.js';
|
|
39
|
+
import { PreferenceStorageFactory } from '../common/abstract-resource-preference-provider.js';
|
|
40
|
+
import { FrontendPreferenceStorage } from './frontend-preference-storage.js';
|
|
41
|
+
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
42
|
+
export function bindPreferences(bind, unbind) {
|
|
43
|
+
bindPreferenceProviders(bind, unbind);
|
|
44
|
+
bindPreferencesWidgets(bind);
|
|
45
|
+
bind(PreferenceTreeGenerator).toSelf().inSingletonScope();
|
|
46
|
+
bind(PreferenceLayoutProvider).toSelf().inSingletonScope();
|
|
47
|
+
bindViewContribution(bind, PreferencesContribution);
|
|
48
|
+
bind(PreferenceOpenHandler).toSelf().inSingletonScope();
|
|
49
|
+
bind(OpenHandler).toService(PreferenceOpenHandler);
|
|
50
|
+
bind(PreferenceScopeCommandManager).toSelf().inSingletonScope();
|
|
51
|
+
bind(TabBarToolbarContribution).toService(PreferencesContribution);
|
|
52
|
+
bind(PreferencesJsonSchemaContribution).toSelf().inSingletonScope();
|
|
53
|
+
bind(JsonSchemaContribution).toService(PreferencesJsonSchemaContribution);
|
|
54
|
+
bind(MonacoJSONCEditor).toSelf().inSingletonScope();
|
|
55
|
+
bind(PreferenceTransaction).toSelf();
|
|
56
|
+
bind(PreferenceTransactionFactory).toFactory(preferenceTransactionFactoryCreator);
|
|
57
|
+
bind(PreferenceStorageFactory).toFactory(({ container }) => (uri, scope) => new FrontendPreferenceStorage(container.get(PreferenceTransactionFactory), container.get(FileService), uri, scope));
|
|
58
|
+
bind(CliPreferences).toDynamicValue(ctx => ServiceConnectionProvider.createProxy(ctx.container, CliPreferencesPath)).inSingletonScope();
|
|
59
|
+
bind(PreferenceFrontendContribution).toSelf().inSingletonScope();
|
|
60
|
+
bind(FrontendApplicationContribution).toService(PreferenceFrontendContribution);
|
|
61
|
+
bind(SessionPreferenceRemoteCliContribution).toSelf().inSingletonScope();
|
|
62
|
+
bind(RemoteCliArgsContribution).toService(SessionPreferenceRemoteCliContribution);
|
|
63
|
+
bind(SessionPreferenceStatusBarContribution).toSelf().inSingletonScope();
|
|
64
|
+
bind(FrontendApplicationContribution).toService(SessionPreferenceStatusBarContribution);
|
|
65
|
+
bind(WidgetStatusBarContribution).toConstantValue(noopWidgetStatusBarContribution(PreferencesWidget));
|
|
69
66
|
}
|
|
70
|
-
|
|
67
|
+
export default new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
71
68
|
bindPreferences(bind, unbind);
|
|
72
69
|
});
|
|
73
70
|
//# sourceMappingURL=preference-frontend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OpenHandler } from '@theia/core/lib/browser';
|
|
2
2
|
import URI from '@theia/core/lib/common/uri';
|
|
3
|
-
import { PreferencesContribution } from './preferences-contribution';
|
|
3
|
+
import { PreferencesContribution } from './preferences-contribution.js';
|
|
4
4
|
export declare class PreferenceOpenHandler implements OpenHandler {
|
|
5
5
|
readonly id = "preference";
|
|
6
6
|
protected readonly preferencesContribution: PreferencesContribution;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-open-handler.d.ts","sourceRoot":"","sources":["../../src/browser/preference-open-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAkB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"preference-open-handler.d.ts","sourceRoot":"","sources":["../../src/browser/preference-open-handler.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAkB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAExE,qBACa,qBAAsB,YAAW,WAAW;IAErD,QAAQ,CAAC,EAAE,gBAAgB;IAG3B,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAIrB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBzC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,12 +13,10 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
|
-
const preferences_contribution_1 = require("./preferences-contribution");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { animationFrame } from '@theia/core/lib/browser';
|
|
18
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
19
|
+
import { PreferencesContribution } from './preferences-contribution.js';
|
|
23
20
|
let PreferenceOpenHandler = class PreferenceOpenHandler {
|
|
24
21
|
constructor() {
|
|
25
22
|
this.id = 'preference';
|
|
@@ -35,7 +32,7 @@ let PreferenceOpenHandler = class PreferenceOpenHandler {
|
|
|
35
32
|
if (element.classList.contains('hidden')) {
|
|
36
33
|
// We clear the search term as we have clicked on a hidden preference
|
|
37
34
|
await preferencesWidget.setSearchTerm('');
|
|
38
|
-
await
|
|
35
|
+
await animationFrame();
|
|
39
36
|
}
|
|
40
37
|
element.scrollIntoView({
|
|
41
38
|
block: 'center'
|
|
@@ -46,12 +43,11 @@ let PreferenceOpenHandler = class PreferenceOpenHandler {
|
|
|
46
43
|
return false;
|
|
47
44
|
}
|
|
48
45
|
};
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
(0, inversify_1.inject)(preferences_contribution_1.PreferencesContribution),
|
|
52
|
-
tslib_1.__metadata("design:type", preferences_contribution_1.PreferencesContribution)
|
|
46
|
+
__decorate([
|
|
47
|
+
inject(PreferencesContribution)
|
|
53
48
|
], PreferenceOpenHandler.prototype, "preferencesContribution", void 0);
|
|
54
|
-
|
|
55
|
-
|
|
49
|
+
PreferenceOpenHandler = __decorate([
|
|
50
|
+
injectable()
|
|
56
51
|
], PreferenceOpenHandler);
|
|
52
|
+
export { PreferenceOpenHandler };
|
|
57
53
|
//# sourceMappingURL=preference-open-handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-open-handler.js","sourceRoot":"","sources":["../../src/browser/preference-open-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-open-handler.js","sourceRoot":"","sources":["../../src/browser/preference-open-handler.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,OAAO,EAAE,cAAc,EAAe,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAGjE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAEM,OAAE,GAAG,YAAY,CAAC;IA4B/B,CAAC;IAvBG,SAAS,CAAC,GAAQ;QACd,OAAO,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAQ;QACf,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,CAAC;QACxE,MAAM,QAAQ,GAAG,oBAAoB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,0CAA0C,CAAC;QACnG,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,OAAO,YAAY,WAAW,EAAE,CAAC;YACjC,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvC,qEAAqE;gBACrE,MAAM,iBAAiB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,cAAc,EAAE,CAAC;YAC3B,CAAC;YACD,OAAO,CAAC,cAAc,CAAC;gBACnB,KAAK,EAAE,QAAQ;aAClB,CAAC,CAAC;YACH,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ,CAAA;AAzBsB;IADlB,MAAM,CAAC,uBAAuB,CAAC;sEACoC;AAL3D,qBAAqB;IADjC,UAAU,EAAE;GACA,qBAAqB,CA8BjC"}
|
|
@@ -6,9 +6,9 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
6
6
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
7
7
|
import { Mutex } from 'async-mutex';
|
|
8
8
|
import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
|
|
9
|
-
import { MonacoJSONCEditor } from './monaco-jsonc-editor';
|
|
9
|
+
import { MonacoJSONCEditor } from './monaco-jsonc-editor.js';
|
|
10
10
|
import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
|
|
11
|
-
import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
|
|
11
|
+
import { IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle.js';
|
|
12
12
|
export declare abstract class Transaction<Arguments extends unknown[], Result = unknown, Status = unknown> {
|
|
13
13
|
protected _open: boolean;
|
|
14
14
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqB,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AACpH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAsB,UAAU,EAAwB,MAAM,8BAA8B,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqB,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAO,OAAO,EAAE,MAAM,aAAa,CAAC;AACpH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAsB,UAAU,EAAwB,MAAM,8BAA8B,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,KAAK,EAAkB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,2DAA2D,CAAC;AAEvF,8BAIsB,WAAW,CAAC,SAAS,SAAS,OAAO,EAAE,EAAE,MAAM,GAAG,OAAO,EAAE,MAAM,GAAG,OAAO;IAC7F,SAAS,CAAC,KAAK,UAAQ;IACvB;;;OAGG;IACH,IAAI,IAAI,IAAI,OAAO,CAElB;IACD,SAAS,CAAC,OAAO,2BAAkC;IACnD;;OAEG;IACH,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,CAEpC;IACD;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,QAAsC;IAC9D,SAAS,CAAC,QAAQ,CAAC,uBAAuB,8CAAuD;IACjG;;;OAGG;IACH,cAAc,uDAA6C;IAE3D,SAAS,CAAC,MAAM,mBAA0B;IAC1C;;;OAGG;IACH,SAAS,CAAC,KAAK,UAAS;IAGxB,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYjC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnF;;OAEG;IACG,aAAa,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC;IAuBhE,SAAS,CAAC,eAAe,IAAI,IAAI;cAYjB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAezC,OAAO,IAAI,IAAI;IAIf;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC;IAChD;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;IAChE;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM,CAAC;CACtD;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,IAAI,GAAG,CAAC;IACpB,QAAQ,IAAI,eAAe,CAAC;CAC/B;AAED,eAAO,MAAM,iBAAiB,eAA8B,CAAC;AAC7D,eAAO,MAAM,oCAAoC,eAAiD,CAAC;AACnG,MAAM,MAAM,oCAAoC,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1E,qBACa,qBAAsB,SAAQ,WAAW,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;IACjG,SAAS,EAAE,UAAU,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,oCAAoC,CAAC;IAChF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;cAEV,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAKhC,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAkBzC;;OAEG;cACa,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;cAqBrC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;cAgBlE,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;CAe/C;AAED,MAAM,WAAW,4BAA4B;IACzC,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC;CACnF;AACD,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AAEnF,eAAO,MAAM,mCAAmC,EAAE,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAM5F,CAAC"}
|