@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,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,55 +13,66 @@
|
|
|
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 mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { OS } from '@theia/core/lib/common/os';
|
|
18
|
+
import { PreferenceCliContribution } from './preference-cli-contribution.js';
|
|
19
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
22
20
|
const REMOTE_CLI_CONTEXT = {
|
|
23
|
-
platform: { os:
|
|
21
|
+
platform: { os: OS.Type.Linux, arch: 'x64' },
|
|
24
22
|
directory: '/'
|
|
25
23
|
};
|
|
26
24
|
describe('PreferenceCliContribution', () => {
|
|
27
25
|
let contribution;
|
|
28
26
|
beforeEach(() => {
|
|
29
|
-
contribution = new
|
|
30
|
-
contribution.logger = new
|
|
27
|
+
contribution = new PreferenceCliContribution();
|
|
28
|
+
contribution.logger = new MockLogger();
|
|
31
29
|
});
|
|
32
30
|
describe('--set-preference', () => {
|
|
33
31
|
it('parses a single key=value entry as JSON', async () => {
|
|
34
32
|
contribution.setArguments({ setPreference: 'editor.fontSize=14' });
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
34
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([]);
|
|
37
35
|
});
|
|
38
36
|
it('parses string values quoted as JSON strings', async () => {
|
|
39
37
|
contribution.setArguments({ setPreference: 'workbench.colorTheme="Dark+"' });
|
|
40
|
-
|
|
38
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'workbench.colorTheme', value: 'Dark+' }]);
|
|
41
39
|
});
|
|
42
40
|
it('parses object values', async () => {
|
|
43
41
|
contribution.setArguments({ setPreference: 'ai-features.chat.toolConfirmation={"shellExecute":"always_allow"}' });
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
43
|
+
{ preferenceName: 'ai-features.chat.toolConfirmation', value: { shellExecute: 'always_allow' } }
|
|
46
44
|
]);
|
|
47
45
|
});
|
|
48
46
|
it('accepts an array of entries', async () => {
|
|
49
47
|
contribution.setArguments({ setPreference: ['editor.fontSize=12', 'editor.tabSize=2'] });
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
48
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
49
|
+
{ preferenceName: 'editor.fontSize', value: 12 },
|
|
50
|
+
{ preferenceName: 'editor.tabSize', value: 2 }
|
|
53
51
|
]);
|
|
54
52
|
});
|
|
55
53
|
it('decodes base64-prefixed JSON values', async () => {
|
|
56
54
|
const json = JSON.stringify({ nested: true, n: 1 });
|
|
57
55
|
const b64 = Buffer.from(json, 'utf-8').toString('base64');
|
|
58
56
|
contribution.setArguments({ setPreference: `my.pref=base64:${b64}` });
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
58
|
+
{ preferenceName: 'my.pref', value: { nested: true, n: 1 } }
|
|
61
59
|
]);
|
|
62
60
|
});
|
|
63
61
|
it('preserves "=" characters inside the value', async () => {
|
|
64
62
|
contribution.setArguments({ setPreference: 'my.pref="a=b=c"' });
|
|
65
|
-
|
|
63
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'my.pref', value: 'a=b=c' }]);
|
|
64
|
+
});
|
|
65
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', async () => {
|
|
66
|
+
contribution.setArguments({ setPreference: '[typescript].editor.tabSize=4' });
|
|
67
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
68
|
+
{ preferenceName: 'editor.tabSize', value: 4, overrideIdentifier: 'typescript' }
|
|
69
|
+
]);
|
|
70
|
+
});
|
|
71
|
+
it('keeps a nested-object [language] key as a literal preferenceName', async () => {
|
|
72
|
+
contribution.setArguments({ setPreference: '[typescript]={"editor.tabSize":4}' });
|
|
73
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
74
|
+
{ preferenceName: '[typescript]', value: { 'editor.tabSize': 4 } }
|
|
75
|
+
]);
|
|
66
76
|
});
|
|
67
77
|
it('skips entries that do not contain "="', async () => {
|
|
68
78
|
const originalWarn = console.warn;
|
|
@@ -73,7 +83,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
73
83
|
finally {
|
|
74
84
|
console.warn = originalWarn;
|
|
75
85
|
}
|
|
76
|
-
|
|
86
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
77
87
|
});
|
|
78
88
|
it('skips entries whose value is not valid JSON', async () => {
|
|
79
89
|
const originalWarn = console.warn;
|
|
@@ -84,16 +94,16 @@ describe('PreferenceCliContribution', () => {
|
|
|
84
94
|
finally {
|
|
85
95
|
console.warn = originalWarn;
|
|
86
96
|
}
|
|
87
|
-
|
|
97
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
88
98
|
});
|
|
89
99
|
});
|
|
90
100
|
describe('--session-preference', () => {
|
|
91
101
|
it('routes entries into the session preferences bucket', async () => {
|
|
92
102
|
contribution.setArguments({ sessionPreference: 'ai-features.chat.defaultToolConfirmation="always_allow"' });
|
|
93
|
-
|
|
94
|
-
|
|
103
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
104
|
+
{ preferenceName: 'ai-features.chat.defaultToolConfirmation', value: 'always_allow' }
|
|
95
105
|
]);
|
|
96
|
-
|
|
106
|
+
expect(await contribution.getPreferences()).to.deep.equal([]);
|
|
97
107
|
});
|
|
98
108
|
it('supports multiple session entries and base64', async () => {
|
|
99
109
|
const b64 = Buffer.from('{"shellExecute":"always_allow"}', 'utf-8').toString('base64');
|
|
@@ -103,9 +113,15 @@ describe('PreferenceCliContribution', () => {
|
|
|
103
113
|
`ai-features.chat.toolConfirmation=base64:${b64}`
|
|
104
114
|
]
|
|
105
115
|
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
116
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
117
|
+
{ preferenceName: 'ai-features.chat.defaultToolConfirmation', value: 'always_allow' },
|
|
118
|
+
{ preferenceName: 'ai-features.chat.toolConfirmation', value: { shellExecute: 'always_allow' } }
|
|
119
|
+
]);
|
|
120
|
+
});
|
|
121
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', async () => {
|
|
122
|
+
contribution.setArguments({ sessionPreference: '[typescript].editor.tabSize=4' });
|
|
123
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
124
|
+
{ preferenceName: 'editor.tabSize', value: 4, overrideIdentifier: 'typescript' }
|
|
109
125
|
]);
|
|
110
126
|
});
|
|
111
127
|
it('keeps --set-preference and --session-preference independent', async () => {
|
|
@@ -113,13 +129,13 @@ describe('PreferenceCliContribution', () => {
|
|
|
113
129
|
setPreference: 'editor.fontSize=14',
|
|
114
130
|
sessionPreference: 'editor.fontSize=20'
|
|
115
131
|
});
|
|
116
|
-
|
|
117
|
-
|
|
132
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
133
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 20 }]);
|
|
118
134
|
});
|
|
119
135
|
});
|
|
120
136
|
describe('enhanceArgs (remote forwarding)', () => {
|
|
121
137
|
it('returns an empty list when no session prefs are set', () => {
|
|
122
|
-
|
|
138
|
+
expect(contribution.enhanceArgs(REMOTE_CLI_CONTEXT)).to.deep.equal([]);
|
|
123
139
|
});
|
|
124
140
|
it('emits one base64-encoded --session-preference flag per entry', () => {
|
|
125
141
|
contribution.setArguments({
|
|
@@ -129,30 +145,39 @@ describe('PreferenceCliContribution', () => {
|
|
|
129
145
|
]
|
|
130
146
|
});
|
|
131
147
|
const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
|
|
132
|
-
|
|
148
|
+
expect(args).to.have.lengthOf(2);
|
|
133
149
|
for (const arg of args) {
|
|
134
|
-
|
|
150
|
+
expect(arg.startsWith('--session-preference=')).to.be.true;
|
|
135
151
|
const eq = arg.indexOf('=', '--session-preference='.length);
|
|
136
152
|
const key = arg.substring('--session-preference='.length, eq);
|
|
137
153
|
const rawValue = arg.substring(eq + 1);
|
|
138
|
-
|
|
154
|
+
expect(rawValue.startsWith('base64:')).to.be.true;
|
|
139
155
|
const decoded = JSON.parse(Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8'));
|
|
140
156
|
if (key === 'ai-features.chat.defaultToolConfirmation') {
|
|
141
|
-
|
|
157
|
+
expect(decoded).to.equal('always_allow');
|
|
142
158
|
}
|
|
143
159
|
else {
|
|
144
|
-
|
|
160
|
+
expect(decoded).to.deep.equal({ shellExecute: 'always_allow' });
|
|
145
161
|
}
|
|
146
162
|
}
|
|
147
163
|
});
|
|
164
|
+
it('re-encodes language overrides as [languageId].preferenceName', () => {
|
|
165
|
+
contribution.setArguments({ sessionPreference: '[typescript].editor.tabSize=4' });
|
|
166
|
+
const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
|
|
167
|
+
expect(args).to.have.lengthOf(1);
|
|
168
|
+
expect(args[0].startsWith('--session-preference=[typescript].editor.tabSize=base64:')).to.be.true;
|
|
169
|
+
const rawValue = args[0].substring('--session-preference=[typescript].editor.tabSize='.length);
|
|
170
|
+
const decoded = JSON.parse(Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8'));
|
|
171
|
+
expect(decoded).to.equal(4);
|
|
172
|
+
});
|
|
148
173
|
it('does not forward --set-preference values', () => {
|
|
149
174
|
contribution.setArguments({
|
|
150
175
|
setPreference: 'editor.fontSize=14',
|
|
151
176
|
sessionPreference: 'foo="bar"'
|
|
152
177
|
});
|
|
153
178
|
const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
|
|
154
|
-
|
|
155
|
-
|
|
179
|
+
expect(args).to.have.lengthOf(1);
|
|
180
|
+
expect(args[0]).to.match(/^--session-preference=foo=base64:/);
|
|
156
181
|
});
|
|
157
182
|
});
|
|
158
183
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-cli-contribution.spec.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-cli-contribution.spec.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/preferences",
|
|
3
|
-
"version": "1.77.0
|
|
3
|
+
"version": "1.77.0",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.77.0
|
|
7
|
-
"@theia/editor": "1.77.0
|
|
8
|
-
"@theia/filesystem": "1.77.0
|
|
9
|
-
"@theia/monaco": "1.77.0
|
|
7
|
+
"@theia/core": "1.77.0",
|
|
8
|
+
"@theia/editor": "1.77.0",
|
|
9
|
+
"@theia/filesystem": "1.77.0",
|
|
10
|
+
"@theia/monaco": "1.77.0",
|
|
10
11
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
|
-
"@theia/userstorage": "1.77.0
|
|
12
|
-
"@theia/workspace": "1.77.0
|
|
12
|
+
"@theia/userstorage": "1.77.0",
|
|
13
|
+
"@theia/workspace": "1.77.0",
|
|
13
14
|
"async-mutex": "^0.3.2",
|
|
14
15
|
"fast-deep-equal": "^3.1.3",
|
|
15
16
|
"jsonc-parser": "^3.3.1",
|
|
@@ -50,10 +51,18 @@
|
|
|
50
51
|
"watch": "theiaext watch"
|
|
51
52
|
},
|
|
52
53
|
"devDependencies": {
|
|
53
|
-
"@theia/ext-scripts": "1.
|
|
54
|
+
"@theia/ext-scripts": "1.77.0"
|
|
54
55
|
},
|
|
55
56
|
"nyc": {
|
|
56
57
|
"extends": "../../configs/nyc.json"
|
|
57
58
|
},
|
|
58
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "9c6d81590b559ee8a78a7808203674f3127411f1",
|
|
60
|
+
"exports": {
|
|
61
|
+
"./package.json": "./package.json",
|
|
62
|
+
"./lib/browser": "./lib/browser/index.js",
|
|
63
|
+
"./lib/*.json": "./lib/*.json",
|
|
64
|
+
"./lib/*.js": "./lib/*.js",
|
|
65
|
+
"./lib/*": "./lib/*.js",
|
|
66
|
+
"./*": "./*"
|
|
67
|
+
}
|
|
59
68
|
}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
20
|
-
import { SectionPreferenceProvider } from '../common/section-preference-provider';
|
|
20
|
+
import { SectionPreferenceProvider } from '../common/section-preference-provider.js';
|
|
21
21
|
import { PreferenceScope } from '@theia/core';
|
|
22
22
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
23
23
|
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
21
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
22
|
-
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
|
|
22
|
+
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider.js';
|
|
23
23
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
24
24
|
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope, PreferenceUtils, ILogger } from '@theia/core';
|
|
25
25
|
|
|
@@ -107,12 +107,12 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
107
107
|
return this.workspaceService.tryGetRoots().map(root => root.resource.toString());
|
|
108
108
|
}
|
|
109
109
|
|
|
110
|
-
override resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T> {
|
|
110
|
+
override resolve<T>(preferenceName: string, resourceUri?: string, overrideIdentifier?: string): PreferenceResolveResult<T> {
|
|
111
111
|
const result: PreferenceResolveResult<T> = {};
|
|
112
112
|
const groups = this.groupProvidersByConfigName(resourceUri);
|
|
113
113
|
for (const group of groups.values()) {
|
|
114
114
|
for (const provider of group) {
|
|
115
|
-
const { value, configUri } = provider.resolve<T>(preferenceName, resourceUri);
|
|
115
|
+
const { value, configUri } = provider.resolve<T>(preferenceName, resourceUri, overrideIdentifier);
|
|
116
116
|
if (configUri && value !== undefined) {
|
|
117
117
|
result.configUri = configUri;
|
|
118
118
|
result.value = PreferenceUtils.merge(result.value as any, value as any) as any;
|
|
@@ -138,7 +138,7 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
138
138
|
return result;
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
-
async setPreference(preferenceName: string, value: any, resourceUri?: string): Promise<boolean> {
|
|
141
|
+
async setPreference(preferenceName: string, value: any, resourceUri?: string, overrideIdentifier?: string): Promise<boolean> {
|
|
142
142
|
const firstPathFragment = preferenceName.split('.', 1)[0];
|
|
143
143
|
const defaultConfigName = this.configurations.getConfigName();
|
|
144
144
|
const configName = this.configurations.isSectionName(firstPathFragment) ? firstPathFragment : defaultConfigName;
|
|
@@ -168,7 +168,7 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
168
168
|
|
|
169
169
|
// Perfect match, run immediately in case we can bail out early.
|
|
170
170
|
if (nameMatches && domainMatches) {
|
|
171
|
-
if (await candidate.setPreference(preferenceName, value, resourceUri)) {
|
|
171
|
+
if (await candidate.setPreference(preferenceName, value, resourceUri, overrideIdentifier)) {
|
|
172
172
|
return true;
|
|
173
173
|
}
|
|
174
174
|
} else if (nameMatches && pathMatches) { // Right file in the right folder.
|
|
@@ -186,7 +186,7 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
186
186
|
|
|
187
187
|
for (const candidateSet of candidateSets) {
|
|
188
188
|
for (const candidate of candidateSet) {
|
|
189
|
-
if (await candidate.setPreference(preferenceName, value, resourceUri)) {
|
|
189
|
+
if (await candidate.setPreference(preferenceName, value, resourceUri, overrideIdentifier)) {
|
|
190
190
|
return true;
|
|
191
191
|
}
|
|
192
192
|
}
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
import { ListenerList, DisposableCollection, URI, PreferenceScope, Listener } from '@theia/core';
|
|
18
18
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
19
19
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
20
|
-
import { FileContentStatus, PreferenceStorage } from '../common/abstract-resource-preference-provider';
|
|
21
|
-
import { PreferenceTransaction, PreferenceTransactionFactory } from './preference-transaction-manager';
|
|
20
|
+
import { FileContentStatus, PreferenceStorage } from '../common/abstract-resource-preference-provider.js';
|
|
21
|
+
import { PreferenceTransaction, PreferenceTransactionFactory } from './preference-transaction-manager.js';
|
|
22
22
|
|
|
23
23
|
export class FrontendPreferenceStorage implements PreferenceStorage {
|
|
24
24
|
|
package/src/browser/index.ts
CHANGED
|
@@ -15,6 +15,6 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
export * from '@theia/core/lib/browser/preferences';
|
|
18
|
-
export * from './workspace-preference-provider';
|
|
19
|
-
export * from './folders-preferences-provider';
|
|
20
|
-
export * from './folder-preference-provider';
|
|
18
|
+
export * from './workspace-preference-provider.js';
|
|
19
|
+
export * from './folders-preferences-provider.js';
|
|
20
|
+
export * from './folder-preference-provider.js';
|
|
@@ -15,15 +15,15 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { Container, interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
19
|
-
import { WorkspacePreferenceProvider } from './workspace-preference-provider';
|
|
20
|
-
import { WorkspaceFilePreferenceProvider, WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProviderOptions } from './workspace-file-preference-provider';
|
|
21
|
-
import { FoldersPreferencesProvider } from './folders-preferences-provider';
|
|
22
|
-
import { FolderPreferenceProvider, FolderPreferenceProviderFactory, FolderPreferenceProviderFolder } from './folder-preference-provider';
|
|
23
|
-
import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from '../common/section-preference-provider';
|
|
18
|
+
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider.js';
|
|
19
|
+
import { WorkspacePreferenceProvider } from './workspace-preference-provider.js';
|
|
20
|
+
import { WorkspaceFilePreferenceProvider, WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProviderOptions } from './workspace-file-preference-provider.js';
|
|
21
|
+
import { FoldersPreferencesProvider } from './folders-preferences-provider.js';
|
|
22
|
+
import { FolderPreferenceProvider, FolderPreferenceProviderFactory, FolderPreferenceProviderFolder } from './folder-preference-provider.js';
|
|
23
|
+
import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from '../common/section-preference-provider.js';
|
|
24
24
|
import { bindFactory, PreferenceProvider, PreferenceScope } from '@theia/core';
|
|
25
25
|
import { UserStorageUri } from '@theia/userstorage/lib/browser';
|
|
26
|
-
import { UserConfigsPreferenceProvider, UserStorageLocationProvider } from '../common/user-configs-preference-provider';
|
|
26
|
+
import { UserConfigsPreferenceProvider, UserStorageLocationProvider } from '../common/user-configs-preference-provider.js';
|
|
27
27
|
|
|
28
28
|
export function bindWorkspaceFilePreferenceProvider(bind: interfaces.Bind): void {
|
|
29
29
|
bind(WorkspaceFilePreferenceProviderFactory).toFactory(ctx => (options: WorkspaceFilePreferenceProviderOptions) => {
|
|
@@ -16,9 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
|
|
19
|
+
import { CliPreference } from '../common/cli-preferences.js';
|
|
20
|
+
import { PreferenceFrontendContribution } from './preference-frontend-contribution.js';
|
|
19
21
|
|
|
20
22
|
const launchArgs = (values: Record<string, string[]>): LaunchArguments => ({ values, negated: [] });
|
|
21
|
-
import { PreferenceFrontendContribution } from './preference-frontend-contribution';
|
|
22
23
|
|
|
23
24
|
class TestPreferenceFrontendContribution extends PreferenceFrontendContribution {
|
|
24
25
|
|
|
@@ -26,18 +27,18 @@ class TestPreferenceFrontendContribution extends PreferenceFrontendContribution
|
|
|
26
27
|
sessionBackendCalls = 0;
|
|
27
28
|
persistentBackendCalls = 0;
|
|
28
29
|
|
|
29
|
-
resolve(): Promise<{ session: [
|
|
30
|
+
resolve(): Promise<{ session: CliPreference[], persistent: CliPreference[] }> {
|
|
30
31
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
31
32
|
(this as any).launchArgs = { getLaunchArgs: () => this.forwardedArgs };
|
|
32
33
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
33
34
|
(this as any).CliPreferences = {
|
|
34
35
|
getSessionPreferences: async () => {
|
|
35
36
|
this.sessionBackendCalls++;
|
|
36
|
-
return [
|
|
37
|
+
return [{ preferenceName: 'backend.session', value: 1 }] as CliPreference[];
|
|
37
38
|
},
|
|
38
39
|
getPreferences: async () => {
|
|
39
40
|
this.persistentBackendCalls++;
|
|
40
|
-
return [
|
|
41
|
+
return [{ preferenceName: 'backend.persistent', value: 2 }] as CliPreference[];
|
|
41
42
|
}
|
|
42
43
|
};
|
|
43
44
|
return this.resolveCliPreferences();
|
|
@@ -57,8 +58,8 @@ describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
|
|
|
57
58
|
|
|
58
59
|
const result = await contribution.resolve();
|
|
59
60
|
|
|
60
|
-
expect(result.session).to.deep.equal([
|
|
61
|
-
expect(result.persistent).to.deep.equal([
|
|
61
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 1 }]);
|
|
62
|
+
expect(result.persistent).to.deep.equal([{ preferenceName: 'backend.persistent', value: 2 }]);
|
|
62
63
|
expect(contribution.sessionBackendCalls).to.equal(1);
|
|
63
64
|
});
|
|
64
65
|
|
|
@@ -68,8 +69,11 @@ describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
|
|
|
68
69
|
const result = await contribution.resolve();
|
|
69
70
|
|
|
70
71
|
// Process-wide backend values are kept (base) and the forwarded value is added on top.
|
|
71
|
-
expect(result.session).to.deep.equal([
|
|
72
|
-
|
|
72
|
+
expect(result.session).to.deep.equal([
|
|
73
|
+
{ preferenceName: 'backend.session', value: 1 },
|
|
74
|
+
{ preferenceName: 'editor.fontSize', value: 20 }
|
|
75
|
+
]);
|
|
76
|
+
expect(result.persistent).to.deep.equal([{ preferenceName: 'backend.persistent', value: 2 }]);
|
|
73
77
|
expect(contribution.sessionBackendCalls).to.equal(1);
|
|
74
78
|
});
|
|
75
79
|
|
|
@@ -78,8 +82,11 @@ describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
|
|
|
78
82
|
|
|
79
83
|
const result = await contribution.resolve();
|
|
80
84
|
|
|
81
|
-
expect(result.persistent).to.deep.equal([
|
|
82
|
-
|
|
85
|
+
expect(result.persistent).to.deep.equal([
|
|
86
|
+
{ preferenceName: 'backend.persistent', value: 2 },
|
|
87
|
+
{ preferenceName: 'editor.tabSize', value: 2 }
|
|
88
|
+
]);
|
|
89
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 1 }]);
|
|
83
90
|
});
|
|
84
91
|
|
|
85
92
|
it('lets a forwarded value override a same-key backend value', async () => {
|
|
@@ -87,6 +94,19 @@ describe('PreferenceFrontendContribution#resolveCliPreferences', () => {
|
|
|
87
94
|
|
|
88
95
|
const result = await contribution.resolve();
|
|
89
96
|
|
|
90
|
-
expect(result.session).to.deep.equal([
|
|
97
|
+
expect(result.session).to.deep.equal([{ preferenceName: 'backend.session', value: 99 }]);
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it('merges language overrides without colliding with the base preference name', async () => {
|
|
101
|
+
contribution.forwardedArgs = launchArgs({
|
|
102
|
+
'session-preference': ['[typescript].backend.session=4']
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
const result = await contribution.resolve();
|
|
106
|
+
|
|
107
|
+
expect(result.session).to.deep.equal([
|
|
108
|
+
{ preferenceName: 'backend.session', value: 1 },
|
|
109
|
+
{ preferenceName: 'backend.session', value: 4, overrideIdentifier: 'typescript' }
|
|
110
|
+
]);
|
|
91
111
|
});
|
|
92
112
|
});
|
|
@@ -18,7 +18,7 @@ import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
|
|
19
19
|
import { LaunchArguments } from '@theia/core/lib/common/launch-arguments';
|
|
20
20
|
import { WindowLaunchArgs } from '@theia/core/lib/browser/window/window-launch-args';
|
|
21
|
-
import { CliPreferences, CliPreferenceEntry } from '../common/cli-preferences';
|
|
21
|
+
import { CliPreferences, CliPreferenceEntry, CliPreference } from '../common/cli-preferences.js';
|
|
22
22
|
import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
23
23
|
import { ILogger } from '@theia/core';
|
|
24
24
|
|
|
@@ -58,7 +58,7 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
58
58
|
// Log keys only. Values may carry overrides for security-sensitive prefs
|
|
59
59
|
// (e.g. AI tool auto-approval) and should not leak into screenshots or support bundles.
|
|
60
60
|
this.logger.info(`Applied ${session.length} --session-preference value(s):`,
|
|
61
|
-
session.map(
|
|
61
|
+
session.map(entry => CliPreferenceEntry.encodedKey(entry)).join(', '));
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
await this.applyAll(persistent, PreferenceScope.User);
|
|
@@ -74,17 +74,17 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
74
74
|
* second-instance window keeps the process-wide values instead of dropping them, while an attach
|
|
75
75
|
* window still gets its own overrides.
|
|
76
76
|
*/
|
|
77
|
-
protected async resolveCliPreferences(): Promise<{ session: [
|
|
77
|
+
protected async resolveCliPreferences(): Promise<{ session: CliPreference[], persistent: CliPreference[] }> {
|
|
78
78
|
// Fetch both buckets in parallel; both are RPC hops to the same backend and
|
|
79
79
|
// can overlap with the preference service initialising its providers.
|
|
80
80
|
const [session, persistent] = await Promise.all([
|
|
81
81
|
this.CliPreferences.getSessionPreferences().catch(e => {
|
|
82
82
|
this.logger.warn('Failed to fetch --session-preference values:', e);
|
|
83
|
-
return [] as [
|
|
83
|
+
return [] as CliPreference[];
|
|
84
84
|
}),
|
|
85
85
|
this.CliPreferences.getPreferences().catch(e => {
|
|
86
86
|
this.logger.warn('Failed to fetch --set-preference values:', e);
|
|
87
|
-
return [] as [
|
|
87
|
+
return [] as CliPreference[];
|
|
88
88
|
})
|
|
89
89
|
]);
|
|
90
90
|
const forwarded = this.launchArgs.getLaunchArgs();
|
|
@@ -98,13 +98,16 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
98
98
|
};
|
|
99
99
|
}
|
|
100
100
|
|
|
101
|
-
/**
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
101
|
+
/**
|
|
102
|
+
* Overlays `overrides` onto `base`, later entries winning per encoded key
|
|
103
|
+
* (`[override].name` or plain name) while preserving order (base first).
|
|
104
|
+
*/
|
|
105
|
+
protected mergeEntries(base: ReadonlyArray<CliPreference>, overrides: ReadonlyArray<CliPreference>): CliPreference[] {
|
|
106
|
+
const merged = new Map<string, CliPreference>();
|
|
107
|
+
for (const entry of [...base, ...overrides]) {
|
|
108
|
+
merged.set(CliPreferenceEntry.encodedKey(entry), entry);
|
|
106
109
|
}
|
|
107
|
-
return [...merged];
|
|
110
|
+
return [...merged.values()];
|
|
108
111
|
}
|
|
109
112
|
|
|
110
113
|
/**
|
|
@@ -112,12 +115,12 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
112
115
|
* individual write (bad key, invalid scope, etc.) is logged and does not abort the
|
|
113
116
|
* remaining writes, and it is not left as an unhandled promise rejection.
|
|
114
117
|
*/
|
|
115
|
-
protected async applyAll(entries: ReadonlyArray<
|
|
116
|
-
for (const
|
|
118
|
+
protected async applyAll(entries: ReadonlyArray<CliPreference>, scope: PreferenceScope): Promise<void> {
|
|
119
|
+
for (const entry of entries) {
|
|
117
120
|
try {
|
|
118
|
-
await this.preferenceService.set(
|
|
121
|
+
await this.preferenceService.set(entry.preferenceName, entry.value, scope, undefined, entry.overrideIdentifier);
|
|
119
122
|
} catch (e) {
|
|
120
|
-
this.logger.warn(`Failed to apply CLI preference "${
|
|
123
|
+
this.logger.warn(`Failed to apply CLI preference "${CliPreferenceEntry.encodedKey(entry)}" to ${PreferenceScope[scope]} scope:`, e);
|
|
121
124
|
}
|
|
122
125
|
}
|
|
123
126
|
}
|