@theia/preferences 1.77.0-next.99 → 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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-preferences.d.ts","sourceRoot":"","sources":["../../src/common/cli-preferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-preferences.d.ts","sourceRoot":"","sources":["../../src/common/cli-preferences.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC3B,cAAc,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAC3C,qBAAqB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;CACrD;AAED,yBAAiB,kBAAkB,CAAC;IAEhC;;;;OAIG;IACH,KAAY,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAIpD;;;OAGG;IACH,SAAgB,UAAU,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAEvD;IAED;;;;;;;;;;;OAWG;IACH,SAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,GAAE,WAAyB,GAAG,aAAa,GAAG,SAAS,CAiB/F;IAED;;;;;;;OAOG;IACH,SAAgB,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,CAEtE;IAED;;;OAGG;IACH,SAAgB,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,WAAyB,GAAG,aAAa,EAAE,CASrG;CAwBJ"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2024 Typefox and others.
|
|
4
3
|
//
|
|
@@ -14,18 +13,31 @@
|
|
|
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
|
-
var CliPreferenceEntry;
|
|
16
|
+
import { OVERRIDE_PROPERTY_PATTERN } from '@theia/core';
|
|
17
|
+
export const CliPreferences = Symbol('CliPreferences');
|
|
18
|
+
export const CliPreferencesPath = '/services/cli-preferences';
|
|
19
|
+
export var CliPreferenceEntry;
|
|
22
20
|
(function (CliPreferenceEntry) {
|
|
23
21
|
const defaultWarn = message => console.warn(message);
|
|
22
|
+
/**
|
|
23
|
+
* Encodes a {@link CliPreference} back to the CLI key form used by `--set-preference` /
|
|
24
|
+
* `--session-preference` (e.g. `[typescript].editor.tabSize`).
|
|
25
|
+
*/
|
|
26
|
+
function encodedKey(entry) {
|
|
27
|
+
return entry.overrideIdentifier ? `[${entry.overrideIdentifier}].${entry.preferenceName}` : entry.preferenceName;
|
|
28
|
+
}
|
|
29
|
+
CliPreferenceEntry.encodedKey = encodedKey;
|
|
24
30
|
/**
|
|
25
31
|
* Parses a single `KEY=JSONVALUE` preference assignment as accepted by `--set-preference`
|
|
26
32
|
* and `--session-preference`. The value may be `base64:`-prefixed (used when forwarding
|
|
27
33
|
* values that must survive shell/URL transport intact). Returns `undefined` (after logging a
|
|
28
34
|
* warning to {@link warn}) when the entry has no key or the value is not valid JSON.
|
|
35
|
+
*
|
|
36
|
+
* Language-override keys (`[languageId].preferenceName`) are split into
|
|
37
|
+
* `preferenceName` + `overrideIdentifier` using the same first-dot +
|
|
38
|
+
* {@link OVERRIDE_PROPERTY_PATTERN} check as resource preference providers.
|
|
39
|
+
* Nested-object CLI keys (`[typescript]={...}`) have no `.` after the brackets and
|
|
40
|
+
* are kept as a literal `preferenceName`.
|
|
29
41
|
*/
|
|
30
42
|
function parse(entry, warn = defaultWarn) {
|
|
31
43
|
const firstEqualIndex = entry.indexOf('=');
|
|
@@ -38,7 +50,7 @@ var CliPreferenceEntry;
|
|
|
38
50
|
// Decoding happens inside the `try` so that a malformed `base64:` payload is reported
|
|
39
51
|
// like any other invalid value instead of throwing out of `parse`.
|
|
40
52
|
const value = rawValue.startsWith('base64:') ? decodeBase64(rawValue.substring('base64:'.length)) : rawValue;
|
|
41
|
-
return
|
|
53
|
+
return toCliPreference(entry.substring(0, firstEqualIndex), JSON.parse(value));
|
|
42
54
|
}
|
|
43
55
|
catch (e) {
|
|
44
56
|
const reason = e instanceof Error ? e.message : String(e);
|
|
@@ -52,10 +64,11 @@ var CliPreferenceEntry;
|
|
|
52
64
|
* `--<optionName>=<key>=base64:<base64(JSON(value))>`, the inverse of {@link parse}.
|
|
53
65
|
*
|
|
54
66
|
* The value is base64-encoded so it survives shell/URL transport intact (e.g. when the
|
|
55
|
-
* argument is passed to a remote backend over an SSH command line).
|
|
67
|
+
* argument is passed to a remote backend over an SSH command line). Language overrides are
|
|
68
|
+
* re-encoded as `[languageId].preferenceName` so the remote CLI can parse them again.
|
|
56
69
|
*/
|
|
57
|
-
function toArg(optionName,
|
|
58
|
-
return `--${optionName}=${
|
|
70
|
+
function toArg(optionName, entry) {
|
|
71
|
+
return `--${optionName}=${encodedKey(entry)}=base64:${encodeBase64(JSON.stringify(entry.value))}`;
|
|
59
72
|
}
|
|
60
73
|
CliPreferenceEntry.toArg = toArg;
|
|
61
74
|
/**
|
|
@@ -73,6 +86,16 @@ var CliPreferenceEntry;
|
|
|
73
86
|
return result;
|
|
74
87
|
}
|
|
75
88
|
CliPreferenceEntry.parseAll = parseAll;
|
|
89
|
+
function toCliPreference(rawKey, value) {
|
|
90
|
+
const index = rawKey.indexOf('.');
|
|
91
|
+
if (index !== -1) {
|
|
92
|
+
const matches = rawKey.substring(0, index).match(OVERRIDE_PROPERTY_PATTERN);
|
|
93
|
+
if (matches) {
|
|
94
|
+
return { preferenceName: rawKey.substring(index + 1), value, overrideIdentifier: matches[1] };
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return { preferenceName: rawKey, value };
|
|
98
|
+
}
|
|
76
99
|
// `Buffer` is available on the backend and is polyfilled into the frontend bundle by the
|
|
77
100
|
// esbuild generator, so a single implementation covers both. It also handles UTF-8 directly,
|
|
78
101
|
// unlike `atob`/`btoa`, which only deal in binary strings.
|
|
@@ -82,5 +105,5 @@ var CliPreferenceEntry;
|
|
|
82
105
|
function encodeBase64(value) {
|
|
83
106
|
return Buffer.from(value, 'utf-8').toString('base64');
|
|
84
107
|
}
|
|
85
|
-
})(CliPreferenceEntry || (
|
|
108
|
+
})(CliPreferenceEntry || (CliPreferenceEntry = {}));
|
|
86
109
|
//# sourceMappingURL=cli-preferences.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-preferences.js","sourceRoot":"","sources":["../../src/common/cli-preferences.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-preferences.js","sourceRoot":"","sources":["../../src/common/cli-preferences.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,50 +13,96 @@
|
|
|
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
|
-
const cli_preferences_1 = require("./cli-preferences");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import { CliPreferenceEntry } from './cli-preferences.js';
|
|
20
18
|
describe('CliPreferenceEntry.parse', () => {
|
|
21
19
|
it('parses a KEY=JSONVALUE assignment', () => {
|
|
22
|
-
|
|
20
|
+
expect(CliPreferenceEntry.parse('editor.fontSize=14')).to.deep.equal({ preferenceName: 'editor.fontSize', value: 14 });
|
|
23
21
|
});
|
|
24
22
|
it('parses boolean and string JSON values', () => {
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
expect(CliPreferenceEntry.parse('foo.enabled=true')).to.deep.equal({ preferenceName: 'foo.enabled', value: true });
|
|
24
|
+
expect(CliPreferenceEntry.parse('foo.label="hello"')).to.deep.equal({ preferenceName: 'foo.label', value: 'hello' });
|
|
27
25
|
});
|
|
28
26
|
it('keeps "=" characters that are part of the value', () => {
|
|
29
|
-
|
|
27
|
+
expect(CliPreferenceEntry.parse('foo.expr="a=b"')).to.deep.equal({ preferenceName: 'foo.expr', value: 'a=b' });
|
|
30
28
|
});
|
|
31
29
|
it('decodes a base64-encoded value', () => {
|
|
32
30
|
// base64 of the JSON value `42`
|
|
33
|
-
|
|
31
|
+
expect(CliPreferenceEntry.parse('foo.num=base64:NDI=')).to.deep.equal({ preferenceName: 'foo.num', value: 42 });
|
|
32
|
+
});
|
|
33
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', () => {
|
|
34
|
+
expect(CliPreferenceEntry.parse('[typescript].editor.tabSize=4')).to.deep.equal({
|
|
35
|
+
preferenceName: 'editor.tabSize',
|
|
36
|
+
value: 4,
|
|
37
|
+
overrideIdentifier: 'typescript'
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
it('keeps a nested-object [language] key as a literal preferenceName', () => {
|
|
41
|
+
expect(CliPreferenceEntry.parse('[typescript]={"editor.tabSize":4}')).to.deep.equal({
|
|
42
|
+
preferenceName: '[typescript]',
|
|
43
|
+
value: { 'editor.tabSize': 4 }
|
|
44
|
+
});
|
|
34
45
|
});
|
|
35
46
|
it('returns undefined when there is no key', () => {
|
|
36
|
-
|
|
47
|
+
expect(CliPreferenceEntry.parse('=1')).to.be.undefined;
|
|
37
48
|
});
|
|
38
49
|
it('returns undefined when there is no "="', () => {
|
|
39
|
-
|
|
50
|
+
expect(CliPreferenceEntry.parse('noequals')).to.be.undefined;
|
|
40
51
|
});
|
|
41
52
|
it('returns undefined for an invalid JSON value', () => {
|
|
42
|
-
|
|
53
|
+
expect(CliPreferenceEntry.parse('foo.bar=not json')).to.be.undefined;
|
|
43
54
|
});
|
|
44
55
|
describe('parseAll', () => {
|
|
45
56
|
it('parses and filters a list, dropping invalid entries', () => {
|
|
46
|
-
const result =
|
|
47
|
-
|
|
57
|
+
const result = CliPreferenceEntry.parseAll(['a=1', 'bad', 'b="x"']);
|
|
58
|
+
expect(result).to.deep.equal([
|
|
59
|
+
{ preferenceName: 'a', value: 1 },
|
|
60
|
+
{ preferenceName: 'b', value: 'x' }
|
|
61
|
+
]);
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
describe('encodedKey', () => {
|
|
65
|
+
it('returns the plain preference name when there is no override', () => {
|
|
66
|
+
expect(CliPreferenceEntry.encodedKey({ preferenceName: 'editor.fontSize', value: 14 })).to.equal('editor.fontSize');
|
|
67
|
+
});
|
|
68
|
+
it('re-encodes language overrides as [languageId].preferenceName', () => {
|
|
69
|
+
expect(CliPreferenceEntry.encodedKey({
|
|
70
|
+
preferenceName: 'editor.tabSize',
|
|
71
|
+
value: 4,
|
|
72
|
+
overrideIdentifier: 'typescript'
|
|
73
|
+
})).to.equal('[typescript].editor.tabSize');
|
|
48
74
|
});
|
|
49
75
|
});
|
|
50
76
|
describe('toArg', () => {
|
|
51
77
|
it('formats an entry as a base64-encoded CLI argument', () => {
|
|
52
78
|
// base64 of the JSON value `42`
|
|
53
|
-
|
|
79
|
+
expect(CliPreferenceEntry.toArg('session-preference', { preferenceName: 'foo.num', value: 42 }))
|
|
80
|
+
.to.equal('--session-preference=foo.num=base64:NDI=');
|
|
81
|
+
});
|
|
82
|
+
it('re-encodes language overrides in the CLI key', () => {
|
|
83
|
+
const arg = CliPreferenceEntry.toArg('session-preference', {
|
|
84
|
+
preferenceName: 'editor.tabSize',
|
|
85
|
+
value: 4,
|
|
86
|
+
overrideIdentifier: 'typescript'
|
|
87
|
+
});
|
|
88
|
+
expect(arg.startsWith('--session-preference=[typescript].editor.tabSize=base64:')).to.be.true;
|
|
54
89
|
});
|
|
55
90
|
it('round-trips a value with shell-special characters through toArg + parse', () => {
|
|
56
|
-
const entry =
|
|
57
|
-
const arg =
|
|
91
|
+
const entry = { preferenceName: 'foo.expr', value: '$HOME && "quoted"' };
|
|
92
|
+
const arg = CliPreferenceEntry.toArg('session-preference', entry);
|
|
58
93
|
// The value part of `--session-preference=<value>` must parse back to the original entry.
|
|
59
94
|
const value = arg.substring('--session-preference='.length);
|
|
60
|
-
|
|
95
|
+
expect(CliPreferenceEntry.parse(value)).to.deep.equal(entry);
|
|
96
|
+
});
|
|
97
|
+
it('round-trips a language override through toArg + parse', () => {
|
|
98
|
+
const entry = {
|
|
99
|
+
preferenceName: 'editor.tabSize',
|
|
100
|
+
value: 4,
|
|
101
|
+
overrideIdentifier: 'typescript'
|
|
102
|
+
};
|
|
103
|
+
const arg = CliPreferenceEntry.toArg('session-preference', entry);
|
|
104
|
+
const value = arg.substring('--session-preference='.length);
|
|
105
|
+
expect(CliPreferenceEntry.parse(value)).to.deep.equal(entry);
|
|
61
106
|
});
|
|
62
107
|
});
|
|
63
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-preferences.spec.js","sourceRoot":"","sources":["../../src/common/cli-preferences.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-preferences.spec.js","sourceRoot":"","sources":["../../src/common/cli-preferences.spec.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,oDAAoD;AACpD,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,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAiB,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEzE,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IAEtC,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACzC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3H,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACnH,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IACzH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACvD,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACnH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACtC,gCAAgC;QAChC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IACpH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACtF,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YAC5E,cAAc,EAAE,gBAAgB;YAChC,KAAK,EAAE,CAAC;YACR,kBAAkB,EAAE,YAAY;SACnC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QACxE,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;YAChF,cAAc,EAAE,cAAc;YAC9B,KAAK,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE;SACjC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACnD,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC3D,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;YACpE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACzB,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE;gBACjC,EAAE,cAAc,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE;aACtC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACnE,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACxH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;YACpE,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC;gBACjC,cAAc,EAAE,gBAAgB;gBAChC,KAAK,EAAE,CAAC;gBACR,kBAAkB,EAAE,YAAY;aACnC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YACzD,gCAAgC;YAChC,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,cAAc,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;iBAC3F,EAAE,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACpD,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,oBAAoB,EAAE;gBACvD,cAAc,EAAE,gBAAgB;gBAChC,KAAK,EAAE,CAAC;gBACR,kBAAkB,EAAE,YAAY;aACnC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,0DAA0D,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAClG,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;YAC/E,MAAM,KAAK,GAAkB,EAAE,cAAc,EAAE,UAAU,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC;YACxF,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAClE,0FAA0F;YAC1F,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC7D,MAAM,KAAK,GAAkB;gBACzB,cAAc,EAAE,gBAAgB;gBAChC,KAAK,EAAE,CAAC;gBACR,kBAAkB,EAAE,YAAY;aACnC,CAAC;YACF,MAAM,GAAG,GAAG,kBAAkB,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2021 Ericsson 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 core_1 = require("@theia/core");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import * as jsoncparser from 'jsonc-parser';
|
|
18
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
19
|
+
import { isWindows, PreferenceService } from '@theia/core';
|
|
23
20
|
let JSONCEditor = class JSONCEditor {
|
|
24
21
|
setValue(model, path, value) {
|
|
25
22
|
const edits = this.getEditOperations(model, path, value);
|
|
@@ -38,8 +35,8 @@ let JSONCEditor = class JSONCEditor {
|
|
|
38
35
|
content: ''
|
|
39
36
|
}];
|
|
40
37
|
}
|
|
41
|
-
const tabSize = this.preferenceService.get('
|
|
42
|
-
const insertSpaces = this.preferenceService.get('
|
|
38
|
+
const tabSize = this.preferenceService.get('editor.tabSize', { fallback: 4, override: 'json' });
|
|
39
|
+
const insertSpaces = this.preferenceService.get('editor.insertSpaces', { fallback: true, override: 'json' });
|
|
43
40
|
const jsonCOptions = {
|
|
44
41
|
formattingOptions: {
|
|
45
42
|
insertSpaces,
|
|
@@ -50,19 +47,18 @@ let JSONCEditor = class JSONCEditor {
|
|
|
50
47
|
return jsoncparser.modify(content, path, value, jsonCOptions);
|
|
51
48
|
}
|
|
52
49
|
getEOL() {
|
|
53
|
-
const eol = this.preferenceService.get('
|
|
50
|
+
const eol = this.preferenceService.get('files.eol', { override: 'json' });
|
|
54
51
|
if (eol && typeof eol === 'string' && eol !== 'auto') {
|
|
55
52
|
return eol;
|
|
56
53
|
}
|
|
57
|
-
return
|
|
54
|
+
return isWindows ? '\r\n' : '\n';
|
|
58
55
|
}
|
|
59
56
|
};
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
(0, inversify_1.inject)(core_1.PreferenceService),
|
|
63
|
-
tslib_1.__metadata("design:type", Object)
|
|
57
|
+
__decorate([
|
|
58
|
+
inject(PreferenceService)
|
|
64
59
|
], JSONCEditor.prototype, "preferenceService", void 0);
|
|
65
|
-
|
|
66
|
-
|
|
60
|
+
JSONCEditor = __decorate([
|
|
61
|
+
injectable()
|
|
67
62
|
], JSONCEditor);
|
|
63
|
+
export { JSONCEditor };
|
|
68
64
|
//# sourceMappingURL=jsonc-editor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonc-editor.js","sourceRoot":"","sources":["../../src/common/jsonc-editor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jsonc-editor.js","sourceRoot":"","sources":["../../src/common/jsonc-editor.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGpD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAIpB,QAAQ,CAAC,KAAa,EAAE,IAA0B,EAAE,KAAgB;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACzD,OAAO,WAAW,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IAES,iBAAiB,CAAC,OAAe,EAAE,IAA0B,EAAE,KAAgB;QACrF,yDAAyD;QACzD,IAAI,CAAC,OAAO,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,8BAA8B;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,CAAC;oBACJ,MAAM,EAAE,CAAC;oBACT,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,OAAO,EAAE,EAAE;iBACd,CAAC,CAAC;QACP,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAChG,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE7G,MAAM,YAAY,GAAG;YACjB,iBAAiB,EAAE;gBACf,YAAY;gBACZ,OAAO;gBACP,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;aACrB;SACJ,CAAC;QACF,OAAO,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAClE,CAAC;IAED,MAAM;QACF,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1E,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnD,OAAO,GAAG,CAAC;QACf,CAAC;QACD,OAAO,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;CACJ,CAAA;AAxCsB;IADlB,MAAM,CAAC,iBAAiB,CAAC;sDAC8B;AAF/C,WAAW;IADvB,UAAU,EAAE;GACA,WAAW,CA0CvB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
|
-
import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
|
|
2
|
+
import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider.js';
|
|
3
3
|
import { PreferenceConfigurations } from '@theia/core';
|
|
4
4
|
export declare const SectionPreferenceProviderUri: unique symbol;
|
|
5
5
|
export declare const SectionPreferenceProviderSection: unique symbol;
|
|
@@ -15,6 +15,6 @@ export declare abstract class SectionPreferenceProvider extends AbstractResource
|
|
|
15
15
|
private get isSection();
|
|
16
16
|
protected getUri(): URI;
|
|
17
17
|
protected parse(content: string): any;
|
|
18
|
-
protected getPath(preferenceName: string): string[] | undefined;
|
|
18
|
+
protected getPath(preferenceName: string, overrideIdentifier?: string): string[] | undefined;
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=section-preference-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/section-preference-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kCAAkC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"section-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/section-preference-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,eAAO,MAAM,4BAA4B,eAAyC,CAAC;AACnF,eAAO,MAAM,gCAAgC,eAA6C,CAAC;AAE3F;;;GAGG;AACH,8BACsB,yBAA0B,SAAQ,kCAAkC;IAEtF,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE5B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IAEtE,OAAO,CAAC,UAAU,CAAC,CAAU;IAE7B,OAAO,KAAK,SAAS,GAKpB;IAED,SAAS,CAAC,MAAM,IAAI,GAAG;cAIJ,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;cAgB3B,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;CAYxG"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2019 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,20 +13,17 @@
|
|
|
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
|
|
22
|
-
const
|
|
23
|
-
const core_1 = require("@theia/core");
|
|
24
|
-
exports.SectionPreferenceProviderUri = Symbol('SectionPreferenceProviderUri');
|
|
25
|
-
exports.SectionPreferenceProviderSection = Symbol('SectionPreferenceProviderSection');
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
|
+
import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider.js';
|
|
19
|
+
import { PreferenceConfigurations } from '@theia/core';
|
|
20
|
+
export const SectionPreferenceProviderUri = Symbol('SectionPreferenceProviderUri');
|
|
21
|
+
export const SectionPreferenceProviderSection = Symbol('SectionPreferenceProviderSection');
|
|
26
22
|
/**
|
|
27
23
|
* This class encapsulates the logic of using separate files for some workspace configuration like 'launch.json' or 'tasks.json'.
|
|
28
24
|
* Anything that is not a contributed section will be in the main config file.
|
|
29
25
|
*/
|
|
30
|
-
let SectionPreferenceProvider = class SectionPreferenceProvider extends
|
|
26
|
+
let SectionPreferenceProvider = class SectionPreferenceProvider extends AbstractResourcePreferenceProvider {
|
|
31
27
|
get isSection() {
|
|
32
28
|
if (typeof this._isSection === 'undefined') {
|
|
33
29
|
this._isSection = this.preferenceConfigurations.isSectionName(this.section);
|
|
@@ -52,9 +48,9 @@ let SectionPreferenceProvider = class SectionPreferenceProvider extends abstract
|
|
|
52
48
|
return prefs;
|
|
53
49
|
}
|
|
54
50
|
}
|
|
55
|
-
getPath(preferenceName) {
|
|
51
|
+
getPath(preferenceName, overrideIdentifier) {
|
|
56
52
|
if (!this.isSection) {
|
|
57
|
-
return super.getPath(preferenceName);
|
|
53
|
+
return super.getPath(preferenceName, overrideIdentifier);
|
|
58
54
|
}
|
|
59
55
|
if (preferenceName === this.section) {
|
|
60
56
|
return [];
|
|
@@ -65,20 +61,17 @@ let SectionPreferenceProvider = class SectionPreferenceProvider extends abstract
|
|
|
65
61
|
return undefined;
|
|
66
62
|
}
|
|
67
63
|
};
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
(0, inversify_1.inject)(exports.SectionPreferenceProviderUri),
|
|
71
|
-
tslib_1.__metadata("design:type", uri_1.default)
|
|
64
|
+
__decorate([
|
|
65
|
+
inject(SectionPreferenceProviderUri)
|
|
72
66
|
], SectionPreferenceProvider.prototype, "uri", void 0);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
tslib_1.__metadata("design:type", String)
|
|
67
|
+
__decorate([
|
|
68
|
+
inject(SectionPreferenceProviderSection)
|
|
76
69
|
], SectionPreferenceProvider.prototype, "section", void 0);
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
tslib_1.__metadata("design:type", core_1.PreferenceConfigurations)
|
|
70
|
+
__decorate([
|
|
71
|
+
inject(PreferenceConfigurations)
|
|
80
72
|
], SectionPreferenceProvider.prototype, "preferenceConfigurations", void 0);
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
SectionPreferenceProvider = __decorate([
|
|
74
|
+
injectable()
|
|
83
75
|
], SectionPreferenceProvider);
|
|
76
|
+
export { SectionPreferenceProvider };
|
|
84
77
|
//# sourceMappingURL=section-preference-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section-preference-provider.js","sourceRoot":"","sources":["../../src/common/section-preference-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"section-preference-provider.js","sourceRoot":"","sources":["../../src/common/section-preference-provider.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,kCAAkC,EAAE,MAAM,4CAA4C,CAAC;AAChG,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC;AACnF,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAE3F;;;GAGG;AAEI,IAAe,yBAAyB,GAAxC,MAAe,yBAA0B,SAAQ,kCAAkC;IAUtF,IAAY,SAAS;QACjB,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;YACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAES,MAAM;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACD,8DAA8D;IAC3C,KAAK,CAAC,OAAe;QACpC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,OAAO,SAAS,CAAC;YACrB,CAAC;YACD,MAAM,MAAM,GAA6B,EAExC,CAAC;YACF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAEkB,OAAO,CAAC,cAAsB,EAAE,kBAA2B;QAC1E,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,cAAc,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,IAAI,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;YAChD,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAA;AA/CsB;IADlB,MAAM,CAAC,4BAA4B,CAAC;sDACT;AAET;IADlB,MAAM,CAAC,gCAAgC,CAAC;0DACN;AAEhB;IADlB,MAAM,CAAC,wBAAwB,CAAC;2EACqC;AANpD,yBAAyB;IAD9C,UAAU,EAAE;GACS,yBAAyB,CAiD9C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
|
-
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
2
|
+
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider.js';
|
|
3
3
|
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, ILogger } from '@theia/core';
|
|
4
4
|
export declare const UserStorageLocationProvider: unique symbol;
|
|
5
5
|
/**
|
|
@@ -15,11 +15,11 @@ export declare class UserConfigsPreferenceProvider extends PreferenceProviderImp
|
|
|
15
15
|
protected doInit(): Promise<void>;
|
|
16
16
|
protected createProviders(userStorageLocation: URI): void;
|
|
17
17
|
getConfigUri(resourceUri?: string, sectionName?: string): URI | undefined;
|
|
18
|
-
resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T>;
|
|
18
|
+
resolve<T>(preferenceName: string, resourceUri?: string, overrideIdentifier?: string): PreferenceResolveResult<T>;
|
|
19
19
|
getPreferences(resourceUri?: string): {
|
|
20
20
|
[p: string]: any;
|
|
21
21
|
};
|
|
22
|
-
setPreference(preferenceName: string, value: any, resourceUri?: string): Promise<boolean>;
|
|
22
|
+
setPreference(preferenceName: string, value: any, resourceUri?: string, overrideIdentifier?: string): Promise<boolean>;
|
|
23
23
|
protected createProvider(uri: URI, sectionName: string): UserPreferenceProvider;
|
|
24
24
|
}
|
|
25
25
|
//# sourceMappingURL=user-configs-preference-provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-configs-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"user-configs-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAC9G,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAmB,OAAO,EAAE,MAAM,aAAa,CAAC;AAElI,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF;;GAEG;AACH,qBACa,6BAA8B,SAAQ,sBAAsB;IAGrE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,6BAA6B,CAAC;IAGlE,OAAO,CAAC,2BAA2B,CAAqB;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,SAAS,sCAA6C;IAGzE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvC,SAAS,CAAC,eAAe,CAAC,mBAAmB,EAAE,GAAG,GAAG,IAAI;IAWhD,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAA4C,GAAG,GAAG,GAAG,SAAS;IAU9G,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC;IAY1H,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IASpD,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAwB5H,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,sBAAsB;CAMlF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2019 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,18 +13,16 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
exports.UserConfigsPreferenceProvider = exports.UserStorageLocationProvider = void 0;
|
|
19
|
-
const tslib_1 = require("tslib");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
20
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
19
|
+
import { UserPreferenceProviderFactory } from '../common/user-preference-provider.js';
|
|
20
|
+
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceUtils, ILogger } from '@theia/core';
|
|
21
|
+
export const UserStorageLocationProvider = Symbol('UserStorageLocationProvider');
|
|
25
22
|
/**
|
|
26
23
|
* Binds together preference section prefs providers for user-level preferences.
|
|
27
24
|
*/
|
|
28
|
-
let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends
|
|
25
|
+
let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
29
26
|
constructor() {
|
|
30
27
|
super(...arguments);
|
|
31
28
|
this.providers = new Map();
|
|
@@ -61,13 +58,13 @@ let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends
|
|
|
61
58
|
}
|
|
62
59
|
return undefined;
|
|
63
60
|
}
|
|
64
|
-
resolve(preferenceName, resourceUri) {
|
|
61
|
+
resolve(preferenceName, resourceUri, overrideIdentifier) {
|
|
65
62
|
const result = {};
|
|
66
63
|
for (const provider of this.providers.values()) {
|
|
67
|
-
const { value, configUri } = provider.resolve(preferenceName, resourceUri);
|
|
64
|
+
const { value, configUri } = provider.resolve(preferenceName, resourceUri, overrideIdentifier);
|
|
68
65
|
if (configUri && value !== undefined) {
|
|
69
66
|
result.configUri = configUri;
|
|
70
|
-
result.value =
|
|
67
|
+
result.value = PreferenceUtils.merge(result.value, value);
|
|
71
68
|
}
|
|
72
69
|
}
|
|
73
70
|
return result;
|
|
@@ -76,18 +73,18 @@ let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends
|
|
|
76
73
|
let result = {};
|
|
77
74
|
for (const provider of this.providers.values()) {
|
|
78
75
|
const preferences = provider.getPreferences();
|
|
79
|
-
result =
|
|
76
|
+
result = PreferenceUtils.merge(result, preferences);
|
|
80
77
|
}
|
|
81
78
|
return result;
|
|
82
79
|
}
|
|
83
|
-
async setPreference(preferenceName, value, resourceUri) {
|
|
80
|
+
async setPreference(preferenceName, value, resourceUri, overrideIdentifier) {
|
|
84
81
|
const sectionName = preferenceName.split('.', 1)[0];
|
|
85
82
|
const defaultConfigName = this.configurations.getConfigName();
|
|
86
83
|
const configName = this.configurations.isSectionName(sectionName) ? sectionName : defaultConfigName;
|
|
87
84
|
const setWithConfigName = async (name) => {
|
|
88
85
|
for (const provider of this.providers.values()) {
|
|
89
86
|
if (this.configurations.getName(provider.getConfigUri()) === name) {
|
|
90
|
-
if (await provider.setPreference(preferenceName, value, resourceUri)) {
|
|
87
|
+
if (await provider.setPreference(preferenceName, value, resourceUri, overrideIdentifier)) {
|
|
91
88
|
return true;
|
|
92
89
|
}
|
|
93
90
|
}
|
|
@@ -109,31 +106,24 @@ let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends
|
|
|
109
106
|
return provider;
|
|
110
107
|
}
|
|
111
108
|
};
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
(0, inversify_1.inject)(user_preference_provider_1.UserPreferenceProviderFactory),
|
|
115
|
-
tslib_1.__metadata("design:type", Function)
|
|
109
|
+
__decorate([
|
|
110
|
+
inject(UserPreferenceProviderFactory)
|
|
116
111
|
], UserConfigsPreferenceProvider.prototype, "providerFactory", void 0);
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
tslib_1.__metadata("design:type", Function)
|
|
112
|
+
__decorate([
|
|
113
|
+
inject(UserStorageLocationProvider)
|
|
120
114
|
], UserConfigsPreferenceProvider.prototype, "userStorageLocationProvider", void 0);
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
tslib_1.__metadata("design:type", core_1.PreferenceConfigurations)
|
|
115
|
+
__decorate([
|
|
116
|
+
inject(PreferenceConfigurations)
|
|
124
117
|
], UserConfigsPreferenceProvider.prototype, "configurations", void 0);
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
tslib_1.__metadata("design:type", Object)
|
|
118
|
+
__decorate([
|
|
119
|
+
inject(ILogger),
|
|
120
|
+
named('preferences:UserConfigsPreferenceProvider')
|
|
129
121
|
], UserConfigsPreferenceProvider.prototype, "logger", void 0);
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
tslib_1.__metadata("design:type", Function),
|
|
133
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
134
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
122
|
+
__decorate([
|
|
123
|
+
postConstruct()
|
|
135
124
|
], UserConfigsPreferenceProvider.prototype, "init", null);
|
|
136
|
-
|
|
137
|
-
|
|
125
|
+
UserConfigsPreferenceProvider = __decorate([
|
|
126
|
+
injectable()
|
|
138
127
|
], UserConfigsPreferenceProvider);
|
|
128
|
+
export { UserConfigsPreferenceProvider };
|
|
139
129
|
//# sourceMappingURL=user-configs-preference-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-configs-preference-provider.js","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-configs-preference-provider.js","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"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"}
|