@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
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { OS } from '@theia/core/lib/common/os';
|
|
19
19
|
import { RemoteCliContext } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
20
|
-
import { PreferenceCliContribution } from './preference-cli-contribution';
|
|
20
|
+
import { PreferenceCliContribution } from './preference-cli-contribution.js';
|
|
21
21
|
import { ILogger } from '@theia/core';
|
|
22
22
|
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
23
23
|
|
|
@@ -38,27 +38,27 @@ describe('PreferenceCliContribution', () => {
|
|
|
38
38
|
describe('--set-preference', () => {
|
|
39
39
|
it('parses a single key=value entry as JSON', async () => {
|
|
40
40
|
contribution.setArguments({ setPreference: 'editor.fontSize=14' });
|
|
41
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
41
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
42
42
|
expect(await contribution.getSessionPreferences()).to.deep.equal([]);
|
|
43
43
|
});
|
|
44
44
|
|
|
45
45
|
it('parses string values quoted as JSON strings', async () => {
|
|
46
46
|
contribution.setArguments({ setPreference: 'workbench.colorTheme="Dark+"' });
|
|
47
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
47
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'workbench.colorTheme', value: 'Dark+' }]);
|
|
48
48
|
});
|
|
49
49
|
|
|
50
50
|
it('parses object values', async () => {
|
|
51
51
|
contribution.setArguments({ setPreference: 'ai-features.chat.toolConfirmation={"shellExecute":"always_allow"}' });
|
|
52
52
|
expect(await contribution.getPreferences()).to.deep.equal([
|
|
53
|
-
|
|
53
|
+
{ preferenceName: 'ai-features.chat.toolConfirmation', value: { shellExecute: 'always_allow' } }
|
|
54
54
|
]);
|
|
55
55
|
});
|
|
56
56
|
|
|
57
57
|
it('accepts an array of entries', async () => {
|
|
58
58
|
contribution.setArguments({ setPreference: ['editor.fontSize=12', 'editor.tabSize=2'] });
|
|
59
59
|
expect(await contribution.getPreferences()).to.deep.equal([
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
{ preferenceName: 'editor.fontSize', value: 12 },
|
|
61
|
+
{ preferenceName: 'editor.tabSize', value: 2 }
|
|
62
62
|
]);
|
|
63
63
|
});
|
|
64
64
|
|
|
@@ -67,13 +67,27 @@ describe('PreferenceCliContribution', () => {
|
|
|
67
67
|
const b64 = Buffer.from(json, 'utf-8').toString('base64');
|
|
68
68
|
contribution.setArguments({ setPreference: `my.pref=base64:${b64}` });
|
|
69
69
|
expect(await contribution.getPreferences()).to.deep.equal([
|
|
70
|
-
|
|
70
|
+
{ preferenceName: 'my.pref', value: { nested: true, n: 1 } }
|
|
71
71
|
]);
|
|
72
72
|
});
|
|
73
73
|
|
|
74
74
|
it('preserves "=" characters inside the value', async () => {
|
|
75
75
|
contribution.setArguments({ setPreference: 'my.pref="a=b=c"' });
|
|
76
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
76
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'my.pref', value: 'a=b=c' }]);
|
|
77
|
+
});
|
|
78
|
+
|
|
79
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', async () => {
|
|
80
|
+
contribution.setArguments({ setPreference: '[typescript].editor.tabSize=4' });
|
|
81
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
82
|
+
{ preferenceName: 'editor.tabSize', value: 4, overrideIdentifier: 'typescript' }
|
|
83
|
+
]);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it('keeps a nested-object [language] key as a literal preferenceName', async () => {
|
|
87
|
+
contribution.setArguments({ setPreference: '[typescript]={"editor.tabSize":4}' });
|
|
88
|
+
expect(await contribution.getPreferences()).to.deep.equal([
|
|
89
|
+
{ preferenceName: '[typescript]', value: { 'editor.tabSize': 4 } }
|
|
90
|
+
]);
|
|
77
91
|
});
|
|
78
92
|
|
|
79
93
|
it('skips entries that do not contain "="', async () => {
|
|
@@ -84,7 +98,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
84
98
|
} finally {
|
|
85
99
|
console.warn = originalWarn;
|
|
86
100
|
}
|
|
87
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
101
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
88
102
|
});
|
|
89
103
|
|
|
90
104
|
it('skips entries whose value is not valid JSON', async () => {
|
|
@@ -95,7 +109,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
95
109
|
} finally {
|
|
96
110
|
console.warn = originalWarn;
|
|
97
111
|
}
|
|
98
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
112
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
99
113
|
});
|
|
100
114
|
});
|
|
101
115
|
|
|
@@ -103,7 +117,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
103
117
|
it('routes entries into the session preferences bucket', async () => {
|
|
104
118
|
contribution.setArguments({ sessionPreference: 'ai-features.chat.defaultToolConfirmation="always_allow"' });
|
|
105
119
|
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
106
|
-
|
|
120
|
+
{ preferenceName: 'ai-features.chat.defaultToolConfirmation', value: 'always_allow' }
|
|
107
121
|
]);
|
|
108
122
|
expect(await contribution.getPreferences()).to.deep.equal([]);
|
|
109
123
|
});
|
|
@@ -117,8 +131,15 @@ describe('PreferenceCliContribution', () => {
|
|
|
117
131
|
]
|
|
118
132
|
});
|
|
119
133
|
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
120
|
-
|
|
121
|
-
|
|
134
|
+
{ preferenceName: 'ai-features.chat.defaultToolConfirmation', value: 'always_allow' },
|
|
135
|
+
{ preferenceName: 'ai-features.chat.toolConfirmation', value: { shellExecute: 'always_allow' } }
|
|
136
|
+
]);
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', async () => {
|
|
140
|
+
contribution.setArguments({ sessionPreference: '[typescript].editor.tabSize=4' });
|
|
141
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
142
|
+
{ preferenceName: 'editor.tabSize', value: 4, overrideIdentifier: 'typescript' }
|
|
122
143
|
]);
|
|
123
144
|
});
|
|
124
145
|
|
|
@@ -127,8 +148,8 @@ describe('PreferenceCliContribution', () => {
|
|
|
127
148
|
setPreference: 'editor.fontSize=14',
|
|
128
149
|
sessionPreference: 'editor.fontSize=20'
|
|
129
150
|
});
|
|
130
|
-
expect(await contribution.getPreferences()).to.deep.equal([
|
|
131
|
-
expect(await contribution.getSessionPreferences()).to.deep.equal([
|
|
151
|
+
expect(await contribution.getPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 14 }]);
|
|
152
|
+
expect(await contribution.getSessionPreferences()).to.deep.equal([{ preferenceName: 'editor.fontSize', value: 20 }]);
|
|
132
153
|
});
|
|
133
154
|
});
|
|
134
155
|
|
|
@@ -161,6 +182,16 @@ describe('PreferenceCliContribution', () => {
|
|
|
161
182
|
}
|
|
162
183
|
});
|
|
163
184
|
|
|
185
|
+
it('re-encodes language overrides as [languageId].preferenceName', () => {
|
|
186
|
+
contribution.setArguments({ sessionPreference: '[typescript].editor.tabSize=4' });
|
|
187
|
+
const args = contribution.enhanceArgs(REMOTE_CLI_CONTEXT);
|
|
188
|
+
expect(args).to.have.lengthOf(1);
|
|
189
|
+
expect(args[0].startsWith('--session-preference=[typescript].editor.tabSize=base64:')).to.be.true;
|
|
190
|
+
const rawValue = args[0].substring('--session-preference=[typescript].editor.tabSize='.length);
|
|
191
|
+
const decoded = JSON.parse(Buffer.from(rawValue.substring('base64:'.length), 'base64').toString('utf-8'));
|
|
192
|
+
expect(decoded).to.equal(4);
|
|
193
|
+
});
|
|
194
|
+
|
|
164
195
|
it('does not forward --set-preference values', () => {
|
|
165
196
|
contribution.setArguments({
|
|
166
197
|
setPreference: 'editor.fontSize=14',
|
|
@@ -18,7 +18,7 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import { Argv } from '@theia/core/shared/yargs';
|
|
19
19
|
import { CliContribution } from '@theia/core/lib/node/cli';
|
|
20
20
|
import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
21
|
-
import { CliPreferences, CliPreferenceEntry } from '../common/cli-preferences';
|
|
21
|
+
import { CliPreference, CliPreferences, CliPreferenceEntry } from '../common/cli-preferences.js';
|
|
22
22
|
import { ILogger } from '@theia/core';
|
|
23
23
|
|
|
24
24
|
@injectable()
|
|
@@ -27,17 +27,19 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
|
|
|
27
27
|
@inject(ILogger) @named('preferences:PreferenceCliContribution')
|
|
28
28
|
protected readonly logger: ILogger;
|
|
29
29
|
|
|
30
|
-
protected preferences: [
|
|
31
|
-
protected sessionPreferences: [
|
|
30
|
+
protected preferences: CliPreference[] = [];
|
|
31
|
+
protected sessionPreferences: CliPreference[] = [];
|
|
32
32
|
|
|
33
33
|
configure(conf: Argv<{}>): void {
|
|
34
34
|
conf.option('set-preference', {
|
|
35
35
|
nargs: 1,
|
|
36
|
-
desc: 'sets the specified preference (persisted to user settings)'
|
|
36
|
+
desc: 'sets the specified preference (persisted to user settings). '
|
|
37
|
+
+ 'Language override: \'[languageId].preferenceName=JSONVALUE\' (quote the brackets).'
|
|
37
38
|
});
|
|
38
39
|
conf.option('session-preference', {
|
|
39
40
|
nargs: 1,
|
|
40
|
-
desc: 'sets the specified preference for this process only (in-memory, not persisted)'
|
|
41
|
+
desc: 'sets the specified preference for this process only (in-memory, not persisted). '
|
|
42
|
+
+ 'Language override: \'[languageId].preferenceName=JSONVALUE\' (quote the brackets).'
|
|
41
43
|
});
|
|
42
44
|
}
|
|
43
45
|
|
|
@@ -50,23 +52,24 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
|
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
|
|
53
|
-
protected parseInto(raw: unknown, target: [
|
|
55
|
+
protected parseInto(raw: unknown, target: CliPreference[]): void {
|
|
54
56
|
const entries: string[] = raw instanceof Array ? raw : [raw as string];
|
|
55
57
|
target.push(...CliPreferenceEntry.parseAll(entries, message => this.logger.warn(message)));
|
|
56
58
|
}
|
|
57
59
|
|
|
58
|
-
async getPreferences(): Promise<[
|
|
60
|
+
async getPreferences(): Promise<CliPreference[]> {
|
|
59
61
|
return this.preferences;
|
|
60
62
|
}
|
|
61
63
|
|
|
62
|
-
async getSessionPreferences(): Promise<[
|
|
64
|
+
async getSessionPreferences(): Promise<CliPreference[]> {
|
|
63
65
|
return this.sessionPreferences;
|
|
64
66
|
}
|
|
65
67
|
|
|
66
68
|
/**
|
|
67
69
|
* Forward `--session-preference` values to the remote backend when attaching
|
|
68
70
|
* to a remote (e.g. dev container). Values are base64-encoded JSON to survive
|
|
69
|
-
* shell argument parsing intact.
|
|
71
|
+
* shell argument parsing intact. Language overrides are re-encoded as
|
|
72
|
+
* `[languageId].preferenceName` so the remote CLI can parse them again.
|
|
70
73
|
*/
|
|
71
74
|
enhanceArgs(_context: RemoteCliContext): string[] {
|
|
72
75
|
return this.sessionPreferences.map(entry => CliPreferenceEntry.toArg('session-preference', entry));
|