@theia/preferences 1.75.0-next.8 → 1.75.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/preference-frontend-contribution.d.ts +2 -0
- package/lib/browser/preference-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/preference-frontend-contribution.js +10 -4
- package/lib/browser/preference-frontend-contribution.js.map +1 -1
- package/lib/browser/preference-tree-model.d.ts.map +1 -1
- package/lib/browser/preference-tree-model.js +4 -0
- package/lib/browser/preference-tree-model.js.map +1 -1
- package/lib/browser/preferences-contribution.d.ts +2 -1
- package/lib/browser/preferences-contribution.d.ts.map +1 -1
- package/lib/browser/preferences-contribution.js +10 -10
- package/lib/browser/preferences-contribution.js.map +1 -1
- package/lib/browser/views/components/preference-markdown-renderer.d.ts +2 -1
- package/lib/browser/views/components/preference-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/views/components/preference-markdown-renderer.js +6 -1
- package/lib/browser/views/components/preference-markdown-renderer.js.map +1 -1
- package/lib/browser/views/components/preference-node-renderer-creator.d.ts +2 -1
- package/lib/browser/views/components/preference-node-renderer-creator.d.ts.map +1 -1
- package/lib/browser/views/components/preference-node-renderer-creator.js +6 -1
- package/lib/browser/views/components/preference-node-renderer-creator.js.map +1 -1
- package/lib/browser/views/components/preference-select-input.d.ts +1 -1
- package/lib/browser/views/components/preference-select-input.d.ts.map +1 -1
- package/lib/browser/views/preference-searchbar-widget.d.ts +1 -1
- package/lib/browser/views/preference-searchbar-widget.d.ts.map +1 -1
- package/lib/browser/views/preference-searchbar-widget.js +9 -17
- package/lib/browser/views/preference-searchbar-widget.js.map +1 -1
- package/lib/browser/views/preference-tree-widget.js +7 -8
- package/lib/browser/views/preference-tree-widget.js.map +1 -1
- package/lib/common/abstract-resource-preference-provider.d.ts +2 -1
- package/lib/common/abstract-resource-preference-provider.d.ts.map +1 -1
- package/lib/common/abstract-resource-preference-provider.js +6 -1
- package/lib/common/abstract-resource-preference-provider.js.map +1 -1
- package/lib/common/abstract-resource-preference-provider.spec.js +3 -0
- package/lib/common/abstract-resource-preference-provider.spec.js.map +1 -1
- package/lib/node/preference-cli-contribution.d.ts +2 -0
- package/lib/node/preference-cli-contribution.d.ts.map +1 -1
- package/lib/node/preference-cli-contribution.js +8 -2
- package/lib/node/preference-cli-contribution.js.map +1 -1
- package/lib/node/preference-cli-contribution.spec.js +2 -0
- package/lib/node/preference-cli-contribution.spec.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/preference-frontend-contribution.ts +9 -5
- package/src/browser/preference-tree-model.ts +4 -0
- package/src/browser/preferences-contribution.ts +11 -7
- package/src/browser/views/components/preference-markdown-renderer.ts +6 -3
- package/src/browser/views/components/preference-node-renderer-creator.ts +5 -2
- package/src/common/abstract-resource-preference-provider.spec.ts +3 -0
- package/src/common/abstract-resource-preference-provider.ts +6 -3
- package/src/node/preference-cli-contribution.spec.ts +3 -0
- package/src/node/preference-cli-contribution.ts +7 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-tree-widget.js","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"preference-tree-widget.js","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"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,4DAAiF;AACjF,qDAMiC;AACjC,kDAAmD;AACnD,oEAA+G;AAC/G,+DAAsD;AAG/C,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,oBAAU;IAA9C;;QAGO,8BAAyB,GAAY,IAAI,CAAC;IAqExD,CAAC;;aAvEU,OAAE,GAAG,kBAAkB,AAArB,CAAsB;IAStB,IAAI;QACT,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,uBAAqB,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,CAAC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAEQ,YAAY;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,IAAI,OAAO,CAAC,eAAe,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACtD,CAAC;QACL,CAAC;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAES,aAAa,CAAC,IAAyB;QAC7C,IAAI,6BAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,OAAO,4BAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChI,CAAC;IACL,CAAC;IAEkB,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAyB;QACpG,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3E,CAAC;IAEkB,UAAU,CAAC,IAAc,EAAE,KAA8B;QACxE,IAAI,CAAC,kBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,iCAAK,SAAS,EAAE,iCAAuB,aAClD,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,EACvC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,IAC9B,CAAC;QACP,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAEkB,qBAAqB,CAAC,IAAc,EAAE,KAA8B;QACnF,IAAI,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YACrD,OAAO,gCAAK,SAAS,EAAC,yBAAyB,GAAG,CAAC;QACvD,CAAC;QACD,OAAO,KAAK,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAEkB,UAAU,CAAC,IAAc;QACxC,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,8BAA8B,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,eAAe,KAAK,SAAS;YACzF,CAAC,CAAC,GAAG,QAAQ,KAAK,eAAe,GAAG;YACpC,CAAC,CAAC,QAAQ,CAAC;QACf,OAAO,8BAA8B,CAAC;IAC1C,CAAC;;AAvEQ,sDAAqB;AAMiB;IAA9C,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCAA0B,2CAAmB;oDAAC;AACpC;IAArC,IAAA,kBAAM,EAAC,mBAAS,CAAC;;wDAAyC;AAGlD;IADR,IAAA,yBAAa,GAAE;;;;iDASf;gCAlBQ,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAwEjC"}
|
|
@@ -2,7 +2,7 @@ import { Disposable } from '@theia/core/lib/common/disposable';
|
|
|
2
2
|
import { PreferenceProviderImpl, PreferenceScope, PreferenceSchemaService, PreferenceConfigurations, PreferenceLanguageOverrideService, Listener } from '@theia/core/lib/common';
|
|
3
3
|
import URI from '@theia/core/lib/common/uri';
|
|
4
4
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
5
|
-
import { Emitter, Event } from '@theia/core';
|
|
5
|
+
import { Emitter, Event, ILogger } from '@theia/core';
|
|
6
6
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
7
7
|
export interface FileContentStatus {
|
|
8
8
|
content: string;
|
|
@@ -44,6 +44,7 @@ export declare abstract class AbstractResourcePreferenceProvider extends Prefere
|
|
|
44
44
|
protected readonly configurations: PreferenceConfigurations;
|
|
45
45
|
protected readonly preferenceOverrideService: PreferenceLanguageOverrideService;
|
|
46
46
|
protected readonly preferenceStorageFactory: PreferenceStorageFactory;
|
|
47
|
+
protected readonly logger: ILogger;
|
|
47
48
|
protected init(): void;
|
|
48
49
|
protected doInit(): Promise<void>;
|
|
49
50
|
protected abstract getUri(): URI;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EACH,sBAAsB,EAAE,eAAe,EAAgC,uBAAuB,EAC9F,wBAAwB,EAAmB,iCAAiC,EAC5E,QAAQ,EACX,MAAM,wBAAwB,CAAC;AAChC,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-resource-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -148,7 +148,7 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
148
148
|
const scope = schemaProperty.scope;
|
|
149
149
|
// do not emit the change event if the change is made out of the defined preference scope
|
|
150
150
|
if (!this.schemaProvider.isValidInScope(prefName, this.getScope())) {
|
|
151
|
-
|
|
151
|
+
this.logger.warn(`Preference ${prefName} in ${uri} can only be defined in scopes: ${common_1.PreferenceScope.getScopeNames(scope).join(', ')}.`);
|
|
152
152
|
continue;
|
|
153
153
|
}
|
|
154
154
|
}
|
|
@@ -196,6 +196,11 @@ tslib_1.__decorate([
|
|
|
196
196
|
(0, inversify_1.inject)(exports.PreferenceStorageFactory),
|
|
197
197
|
tslib_1.__metadata("design:type", Function)
|
|
198
198
|
], AbstractResourcePreferenceProvider.prototype, "preferenceStorageFactory", void 0);
|
|
199
|
+
tslib_1.__decorate([
|
|
200
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
201
|
+
(0, inversify_1.named)('preferences:AbstractResourcePreferenceProvider'),
|
|
202
|
+
tslib_1.__metadata("design:type", Object)
|
|
203
|
+
], AbstractResourcePreferenceProvider.prototype, "logger", void 0);
|
|
199
204
|
tslib_1.__decorate([
|
|
200
205
|
(0, inversify_1.postConstruct)(),
|
|
201
206
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.js","sourceRoot":"","sources":["../../src/common/abstract-resource-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,uDAAuD;AACvD,oCAAoC;AAEpC,4CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"abstract-resource-preference-provider.js","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,8 @@ const common_1 = require("@theia/core/lib/common");
|
|
|
30
30
|
const monaco_workspace_1 = require("@theia/monaco/lib/browser/monaco-workspace");
|
|
31
31
|
const browser_1 = require("@theia/editor/lib/browser");
|
|
32
32
|
const preference_transaction_manager_1 = require("../browser/preference-transaction-manager");
|
|
33
|
+
const core_1 = require("@theia/core");
|
|
34
|
+
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
33
35
|
disableJSDOM();
|
|
34
36
|
class MockPreferenceStorage {
|
|
35
37
|
constructor() {
|
|
@@ -59,6 +61,7 @@ describe('AbstractResourcePreferenceProvider', () => {
|
|
|
59
61
|
beforeEach(() => {
|
|
60
62
|
preferenceStorage = new MockPreferenceStorage();
|
|
61
63
|
const testContainer = new inversify_1.Container();
|
|
64
|
+
testContainer.bind(core_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
|
|
62
65
|
(0, frontend_application_bindings_1.bindPreferenceService)(testContainer.bind.bind(testContainer));
|
|
63
66
|
(0, test_1.bindMockPreferenceProviders)(testContainer.bind.bind(testContainer), testContainer.unbind.bind(testContainer));
|
|
64
67
|
testContainer.rebind(common_1.PreferenceSchemaService).toConstantValue(mockSchemaProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.spec.js","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.spec.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,uDAAuD;AAEvD,8DAAiE;AACjE,MAAM,YAAY,GAAG,IAAA,mBAAW,GAAE,CAAC;AAEnC,uHAAiH;AACjH,wEAAiC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AAE1C,+BAA8B;AAC9B,4DAAyD;AACzD,mGAA6J;AAC7J,yGAA8F;AAC9F,mEAAuF;AACvF,sEAA+D;AAC/D,mDAA2F;AAC3F,iFAA6E;AAC7E,uDAA0D;AAC1D,8FAAyF;
|
|
1
|
+
{"version":3,"file":"abstract-resource-preference-provider.spec.js","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,9 @@ import { Argv } from '@theia/core/shared/yargs';
|
|
|
2
2
|
import { CliContribution } from '@theia/core/lib/node/cli';
|
|
3
3
|
import { RemoteCliContext, RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
4
4
|
import { CliPreferences } from '../common/cli-preferences';
|
|
5
|
+
import { ILogger } from '@theia/core';
|
|
5
6
|
export declare class PreferenceCliContribution implements CliContribution, CliPreferences, RemoteCliContribution {
|
|
7
|
+
protected readonly logger: ILogger;
|
|
6
8
|
protected preferences: [string, unknown][];
|
|
7
9
|
protected sessionPreferences: [string, unknown][];
|
|
8
10
|
configure(conf: Argv<{}>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-cli-contribution.d.ts","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC9G,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,yBAA0B,YAAW,eAAe,EAAE,cAAc,EAAE,qBAAqB;IAGpG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAChD,SAAS,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAM;IAEvD,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI;IAW/B,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IASjD,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI;IAqB9D,cAAc,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI9C,qBAAqB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAI3D;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;CAOpD"}
|
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
exports.PreferenceCliContribution = void 0;
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
|
+
const core_1 = require("@theia/core");
|
|
21
22
|
let PreferenceCliContribution = class PreferenceCliContribution {
|
|
22
23
|
constructor() {
|
|
23
24
|
this.preferences = [];
|
|
@@ -46,7 +47,7 @@ let PreferenceCliContribution = class PreferenceCliContribution {
|
|
|
46
47
|
for (const entry of entries) {
|
|
47
48
|
const firstEqualIndex = entry.indexOf('=');
|
|
48
49
|
if (firstEqualIndex <= 0) {
|
|
49
|
-
|
|
50
|
+
this.logger.warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
|
|
50
51
|
continue;
|
|
51
52
|
}
|
|
52
53
|
let rawValue = entry.substring(firstEqualIndex + 1);
|
|
@@ -58,7 +59,7 @@ let PreferenceCliContribution = class PreferenceCliContribution {
|
|
|
58
59
|
}
|
|
59
60
|
catch (e) {
|
|
60
61
|
const reason = e instanceof Error ? e.message : String(e);
|
|
61
|
-
|
|
62
|
+
this.logger.warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
|
|
62
63
|
}
|
|
63
64
|
}
|
|
64
65
|
}
|
|
@@ -81,6 +82,11 @@ let PreferenceCliContribution = class PreferenceCliContribution {
|
|
|
81
82
|
}
|
|
82
83
|
};
|
|
83
84
|
exports.PreferenceCliContribution = PreferenceCliContribution;
|
|
85
|
+
tslib_1.__decorate([
|
|
86
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
87
|
+
(0, inversify_1.named)('preferences:PreferenceCliContribution'),
|
|
88
|
+
tslib_1.__metadata("design:type", Object)
|
|
89
|
+
], PreferenceCliContribution.prototype, "logger", void 0);
|
|
84
90
|
exports.PreferenceCliContribution = PreferenceCliContribution = tslib_1.__decorate([
|
|
85
91
|
(0, inversify_1.injectable)()
|
|
86
92
|
], PreferenceCliContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-cli-contribution.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"preference-cli-contribution.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
18
18
|
const chai_1 = require("chai");
|
|
19
19
|
const os_1 = require("@theia/core/lib/common/os");
|
|
20
20
|
const preference_cli_contribution_1 = require("./preference-cli-contribution");
|
|
21
|
+
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
21
22
|
const REMOTE_CLI_CONTEXT = {
|
|
22
23
|
platform: { os: os_1.OS.Type.Linux, arch: 'x64' },
|
|
23
24
|
directory: '/'
|
|
@@ -26,6 +27,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
26
27
|
let contribution;
|
|
27
28
|
beforeEach(() => {
|
|
28
29
|
contribution = new preference_cli_contribution_1.PreferenceCliContribution();
|
|
30
|
+
contribution.logger = new mock_logger_1.MockLogger();
|
|
29
31
|
});
|
|
30
32
|
describe('--set-preference', () => {
|
|
31
33
|
it('parses a single key=value entry as JSON', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-cli-contribution.spec.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,+BAA8B;AAC9B,kDAA+C;AAE/C,+EAA0E;AAE1E,MAAM,kBAAkB,GAAqB;IACzC,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;IAC5C,SAAS,EAAE,GAAG;CACjB,CAAC;AAEF,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAEvC,IAAI,YAAuC,CAAC;IAE5C,UAAU,CAAC,GAAG,EAAE;QACZ,YAAY,GAAG,IAAI,uDAAyB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-cli-contribution.spec.js","sourceRoot":"","sources":["../../src/node/preference-cli-contribution.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,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,+BAA8B;AAC9B,kDAA+C;AAE/C,+EAA0E;AAE1E,yEAAqE;AAErE,MAAM,kBAAkB,GAAqB;IACzC,QAAQ,EAAE,EAAE,EAAE,EAAE,OAAE,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE;IAC5C,SAAS,EAAE,GAAG;CACjB,CAAC;AAEF,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IAEvC,IAAI,YAAuC,CAAC;IAE5C,UAAU,CAAC,GAAG,EAAE;QACZ,YAAY,GAAG,IAAI,uDAAyB,EAAE,CAAC;QAC9C,YAA+C,CAAC,MAAM,GAAG,IAAI,wBAAU,EAAE,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACrD,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,oBAAoB,EAAE,CAAC,CAAC;YACnE,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACrF,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,8BAA8B,EAAE,CAAC,CAAC;YAC7E,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YAClC,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,mEAAmE,EAAE,CAAC,CAAC;YAClH,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtD,CAAC,mCAAmC,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;aAC1E,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;YACzC,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,oBAAoB,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACzF,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtD,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBACvB,CAAC,gBAAgB,EAAE,CAAC,CAAC;aACxB,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACpD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1D,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,kBAAkB,GAAG,EAAE,EAAE,CAAC,CAAC;YACtE,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtD,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;aACtC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACvD,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,iBAAiB,EAAE,CAAC,CAAC;YAChE,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACtF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAClC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,GAAkC,CAAC,CAAC;YACxD,IAAI,CAAC;gBACD,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,UAAU,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;YACrF,CAAC;oBAAS,CAAC;gBACP,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC;YAChC,CAAC;YACD,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAClC,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,GAAkC,CAAC,CAAC;YACxD,IAAI,CAAC;gBACD,YAAY,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,EAAE,CAAC,CAAC;YAC5F,CAAC;oBAAS,CAAC;gBACP,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC;YAChC,CAAC;YACD,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAClC,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAChE,YAAY,CAAC,YAAY,CAAC,EAAE,iBAAiB,EAAE,yDAAyD,EAAE,CAAC,CAAC;YAC5G,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC7D,CAAC,0CAA0C,EAAE,cAAc,CAAC;aAC/D,CAAC,CAAC;YACH,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACvF,YAAY,CAAC,YAAY,CAAC;gBACtB,iBAAiB,EAAE;oBACf,yDAAyD;oBACzD,4CAA4C,GAAG,EAAE;iBACpD;aACJ,CAAC,CAAC;YACH,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC7D,CAAC,0CAA0C,EAAE,cAAc,CAAC;gBAC5D,CAAC,mCAAmC,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;aAC1E,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;YACzE,YAAY,CAAC,YAAY,CAAC;gBACtB,aAAa,EAAE,oBAAoB;gBACnC,iBAAiB,EAAE,oBAAoB;aAC1C,CAAC,CAAC;YACH,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACrF,IAAA,aAAM,EAAC,MAAM,YAAY,CAAC,qBAAqB,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC7C,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC3D,IAAA,aAAM,EAAC,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;YACpE,YAAY,CAAC,YAAY,CAAC;gBACtB,iBAAiB,EAAE;oBACf,yDAAyD;oBACzD,mEAAmE;iBACtE;aACJ,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAC1D,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACrB,IAAA,aAAM,EAAC,GAAG,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;gBAC3D,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC9D,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACvC,IAAA,aAAM,EAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;gBAClD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC1G,IAAI,GAAG,KAAK,0CAA0C,EAAE,CAAC;oBACrD,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACJ,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,CAAC;gBACpE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;YAChD,YAAY,CAAC,YAAY,CAAC;gBACtB,aAAa,EAAE,oBAAoB;gBACnC,iBAAiB,EAAE,WAAW;aACjC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,YAAY,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;YAC1D,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACjC,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/preferences",
|
|
3
|
-
"version": "1.75.0
|
|
3
|
+
"version": "1.75.0",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.75.0
|
|
7
|
-
"@theia/editor": "1.75.0
|
|
8
|
-
"@theia/filesystem": "1.75.0
|
|
9
|
-
"@theia/monaco": "1.75.0
|
|
6
|
+
"@theia/core": "1.75.0",
|
|
7
|
+
"@theia/editor": "1.75.0",
|
|
8
|
+
"@theia/filesystem": "1.75.0",
|
|
9
|
+
"@theia/monaco": "1.75.0",
|
|
10
10
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
|
-
"@theia/userstorage": "1.75.0
|
|
12
|
-
"@theia/workspace": "1.75.0
|
|
11
|
+
"@theia/userstorage": "1.75.0",
|
|
12
|
+
"@theia/workspace": "1.75.0",
|
|
13
13
|
"async-mutex": "^0.3.2",
|
|
14
14
|
"fast-deep-equal": "^3.1.3",
|
|
15
15
|
"jsonc-parser": "^3.3.1",
|
|
@@ -50,10 +50,10 @@
|
|
|
50
50
|
"watch": "theiaext watch"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@theia/ext-scripts": "1.
|
|
53
|
+
"@theia/ext-scripts": "1.75.0"
|
|
54
54
|
},
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "6d8e911f05f0fd9a13d76797e79b21ee3f038bc2"
|
|
59
59
|
}
|
|
@@ -14,10 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
|
|
19
19
|
import { CliPreferences } from '../common/cli-preferences';
|
|
20
20
|
import { PreferenceService, PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
21
|
+
import { ILogger } from '@theia/core';
|
|
21
22
|
|
|
22
23
|
@injectable()
|
|
23
24
|
export class PreferenceFrontendContribution implements FrontendApplicationContribution {
|
|
@@ -27,6 +28,9 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
27
28
|
@inject(PreferenceService)
|
|
28
29
|
protected readonly preferenceService: PreferenceService;
|
|
29
30
|
|
|
31
|
+
@inject(ILogger) @named('preferences:PreferenceFrontendContribution')
|
|
32
|
+
protected readonly logger: ILogger;
|
|
33
|
+
|
|
30
34
|
onStart(): void {
|
|
31
35
|
this.applyCliPreferences();
|
|
32
36
|
}
|
|
@@ -36,11 +40,11 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
36
40
|
// can overlap with the preference service initialising its providers.
|
|
37
41
|
const [session, persistent] = await Promise.all([
|
|
38
42
|
this.CliPreferences.getSessionPreferences().catch(e => {
|
|
39
|
-
|
|
43
|
+
this.logger.warn('Failed to fetch --session-preference values:', e);
|
|
40
44
|
return [] as [string, unknown][];
|
|
41
45
|
}),
|
|
42
46
|
this.CliPreferences.getPreferences().catch(e => {
|
|
43
|
-
|
|
47
|
+
this.logger.warn('Failed to fetch --set-preference values:', e);
|
|
44
48
|
return [] as [string, unknown][];
|
|
45
49
|
})
|
|
46
50
|
]);
|
|
@@ -59,7 +63,7 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
59
63
|
if (session.length > 0) {
|
|
60
64
|
// Log keys only. Values may carry overrides for security-sensitive prefs
|
|
61
65
|
// (e.g. AI tool auto-approval) and should not leak into screenshots or support bundles.
|
|
62
|
-
|
|
66
|
+
this.logger.info(`Applied ${session.length} --session-preference value(s):`,
|
|
63
67
|
session.map(([k]) => k).join(', '));
|
|
64
68
|
}
|
|
65
69
|
|
|
@@ -76,7 +80,7 @@ export class PreferenceFrontendContribution implements FrontendApplicationContri
|
|
|
76
80
|
try {
|
|
77
81
|
await this.preferenceService.set(key, value, scope);
|
|
78
82
|
} catch (e) {
|
|
79
|
-
|
|
83
|
+
this.logger.warn(`Failed to apply CLI preference "${key}" to ${PreferenceScope[scope]} scope:`, e);
|
|
80
84
|
}
|
|
81
85
|
}
|
|
82
86
|
}
|
|
@@ -178,6 +178,10 @@ export class PreferenceTreeModel extends TreeModelImpl {
|
|
|
178
178
|
if (!this.schemaProvider.isValidInScope(prefID, this._currentScope)) {
|
|
179
179
|
return false;
|
|
180
180
|
}
|
|
181
|
+
// Hidden preferences (e.g. AI preferences moved to the AI Configuration view) must not surface in search.
|
|
182
|
+
if (node.preference.data.hidden) {
|
|
183
|
+
return false;
|
|
184
|
+
}
|
|
181
185
|
if (!this._isFiltered) {
|
|
182
186
|
return true;
|
|
183
187
|
}
|
|
@@ -44,7 +44,6 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
44
44
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
45
45
|
@inject(PreferenceService) protected readonly preferenceService: PreferenceService;
|
|
46
46
|
@inject(ClipboardService) protected readonly clipboardService: ClipboardService;
|
|
47
|
-
@inject(PreferencesWidget) protected readonly scopeTracker: PreferencesWidget;
|
|
48
47
|
@inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
|
|
49
48
|
@inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
|
|
50
49
|
|
|
@@ -58,6 +57,10 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
58
57
|
});
|
|
59
58
|
}
|
|
60
59
|
|
|
60
|
+
protected get currentScope(): Preference.SelectedScopeDetails {
|
|
61
|
+
return this.tryGetWidget()?.currentScope ?? Preference.DEFAULT_SCOPE;
|
|
62
|
+
}
|
|
63
|
+
|
|
61
64
|
override registerCommands(commands: CommandRegistry): void {
|
|
62
65
|
commands.registerCommand(CommonCommands.OPEN_PREFERENCES, {
|
|
63
66
|
execute: async (query?: string) => {
|
|
@@ -93,7 +96,8 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
93
96
|
isEnabled: Preference.EditorCommandArgs.is,
|
|
94
97
|
isVisible: Preference.EditorCommandArgs.is,
|
|
95
98
|
execute: ({ id }: Preference.EditorCommandArgs) => {
|
|
96
|
-
|
|
99
|
+
const { scope, uri } = this.currentScope;
|
|
100
|
+
return this.preferenceService.set(id, undefined, Number(scope), uri);
|
|
97
101
|
}
|
|
98
102
|
});
|
|
99
103
|
commands.registerCommand(PreferencesCommands.OPEN_USER_PREFERENCES, {
|
|
@@ -113,9 +117,9 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
113
117
|
commands.registerCommand(PreferencesCommands.OPEN_FOLDER_PREFERENCES, {
|
|
114
118
|
isEnabled: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
115
119
|
isVisible: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
116
|
-
execute: () => this.openFolderPreferences(root => {
|
|
117
|
-
this.openView({ activate: true });
|
|
118
|
-
|
|
120
|
+
execute: () => this.openFolderPreferences(async root => {
|
|
121
|
+
const widget = await this.openView({ activate: true });
|
|
122
|
+
widget.setScope(root.resource);
|
|
119
123
|
})
|
|
120
124
|
});
|
|
121
125
|
commands.registerCommand(PreferencesCommands.OPEN_USER_PREFERENCES_JSON, {
|
|
@@ -178,7 +182,7 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
178
182
|
}
|
|
179
183
|
|
|
180
184
|
protected async openPreferencesJSON(opener: string | PreferencesWidget): Promise<void> {
|
|
181
|
-
const { scope, activeScopeIsFolder, uri } = this.
|
|
185
|
+
const { scope, activeScopeIsFolder, uri } = this.currentScope;
|
|
182
186
|
const scopeID = Number(scope);
|
|
183
187
|
let preferenceId = '';
|
|
184
188
|
if (typeof opener === 'string') {
|
|
@@ -217,7 +221,7 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
217
221
|
protected async openFolderPreferences(callback: (root: FileStat) => unknown): Promise<void> {
|
|
218
222
|
const roots = this.workspaceService.tryGetRoots();
|
|
219
223
|
if (roots.length === 1) {
|
|
220
|
-
callback(roots[0]);
|
|
224
|
+
await callback(roots[0]);
|
|
221
225
|
} else {
|
|
222
226
|
const items: QuickPickItem[] = roots.map(root => ({
|
|
223
227
|
label: root.name,
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { PreferenceTreeModel } from '../../preference-tree-model';
|
|
19
19
|
import { PreferenceTreeLabelProvider } from '../../util/preference-tree-label-provider';
|
|
20
20
|
import * as markdownit from '@theia/core/shared/markdown-it';
|
|
21
21
|
import * as markdownitemoji from '@theia/core/shared/markdown-it-emoji';
|
|
22
|
-
import { CommandRegistry } from '@theia/core';
|
|
22
|
+
import { CommandRegistry, ILogger } from '@theia/core';
|
|
23
23
|
|
|
24
24
|
@injectable()
|
|
25
25
|
export class PreferenceMarkdownRenderer {
|
|
@@ -31,6 +31,9 @@ export class PreferenceMarkdownRenderer {
|
|
|
31
31
|
@inject(CommandRegistry)
|
|
32
32
|
protected readonly commandRegistry: CommandRegistry;
|
|
33
33
|
|
|
34
|
+
@inject(ILogger) @named('preferences:PreferenceMarkdownRenderer')
|
|
35
|
+
protected readonly logger: ILogger;
|
|
36
|
+
|
|
34
37
|
protected _renderer?: markdownit;
|
|
35
38
|
|
|
36
39
|
render(text: string): string {
|
|
@@ -72,7 +75,7 @@ export class PreferenceMarkdownRenderer {
|
|
|
72
75
|
return `<span class="command-link" title="${id}">${name}</span>`;
|
|
73
76
|
}
|
|
74
77
|
// If nothing was found, print a warning
|
|
75
|
-
|
|
78
|
+
this.logger.warn(`Linked preference "${id}" not found.`);
|
|
76
79
|
}
|
|
77
80
|
return inlineCode ? inlineCode(tokens, idx, options, env, self) : '';
|
|
78
81
|
};
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { ContributionProvider, Disposable, Emitter, Event, Prioritizeable } from '@theia/core';
|
|
17
|
+
import { ContributionProvider, Disposable, Emitter, Event, Prioritizeable, ILogger } from '@theia/core';
|
|
18
18
|
import { inject, injectable, interfaces, named } from '@theia/core/shared/inversify';
|
|
19
19
|
import { Preference } from '../../util/preference-types';
|
|
20
20
|
import { PreferenceHeaderRenderer, PreferenceNodeRenderer } from './preference-node-renderer';
|
|
@@ -45,6 +45,9 @@ export class DefaultPreferenceNodeRendererCreatorRegistry implements PreferenceN
|
|
|
45
45
|
protected readonly onDidChangeEmitter = new Emitter<void>();
|
|
46
46
|
readonly onDidChange = this.onDidChangeEmitter.event;
|
|
47
47
|
|
|
48
|
+
@inject(ILogger) @named('preferences:DefaultPreferenceNodeRendererCreatorRegistry')
|
|
49
|
+
protected readonly logger: ILogger;
|
|
50
|
+
|
|
48
51
|
constructor(
|
|
49
52
|
@inject(ContributionProvider) @named(PreferenceNodeRendererContribution)
|
|
50
53
|
protected readonly contributionProvider: ContributionProvider<PreferenceNodeRendererContribution>
|
|
@@ -57,7 +60,7 @@ export class DefaultPreferenceNodeRendererCreatorRegistry implements PreferenceN
|
|
|
57
60
|
|
|
58
61
|
registerPreferenceNodeRendererCreator(creator: PreferenceNodeRendererCreator): Disposable {
|
|
59
62
|
if (this._creators.has(creator.id)) {
|
|
60
|
-
|
|
63
|
+
this.logger.warn(`A preference node renderer creator ${creator.id} is already registered.`);
|
|
61
64
|
return Disposable.NULL;
|
|
62
65
|
}
|
|
63
66
|
this._creators.set(creator.id, creator);
|
|
@@ -33,6 +33,8 @@ import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
|
|
|
33
33
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
34
34
|
import { PreferenceTransactionFactory } from '../browser/preference-transaction-manager';
|
|
35
35
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
36
|
+
import { ILogger } from '@theia/core';
|
|
37
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
36
38
|
|
|
37
39
|
disableJSDOM();
|
|
38
40
|
|
|
@@ -65,6 +67,7 @@ describe('AbstractResourcePreferenceProvider', () => {
|
|
|
65
67
|
beforeEach(() => {
|
|
66
68
|
preferenceStorage = new MockPreferenceStorage();
|
|
67
69
|
const testContainer = new Container();
|
|
70
|
+
testContainer.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
68
71
|
bindPreferenceService(testContainer.bind.bind(testContainer));
|
|
69
72
|
bindMockPreferenceProviders(testContainer.bind.bind(testContainer), testContainer.unbind.bind(testContainer));
|
|
70
73
|
testContainer.rebind(<any>PreferenceSchemaService).toConstantValue(mockSchemaProvider);
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
/* eslint-disable no-null/no-null */
|
|
19
19
|
|
|
20
20
|
import * as jsoncparser from 'jsonc-parser';
|
|
21
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
21
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
22
22
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
23
23
|
import {
|
|
24
24
|
PreferenceProviderImpl, PreferenceScope, PreferenceProviderDataChange, PreferenceSchemaService,
|
|
@@ -27,7 +27,7 @@ import {
|
|
|
27
27
|
} from '@theia/core/lib/common';
|
|
28
28
|
import URI from '@theia/core/lib/common/uri';
|
|
29
29
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
30
|
-
import { Emitter, Event } from '@theia/core';
|
|
30
|
+
import { Emitter, Event, ILogger } from '@theia/core';
|
|
31
31
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
32
32
|
export interface FileContentStatus {
|
|
33
33
|
content: string;
|
|
@@ -88,6 +88,9 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
88
88
|
@inject(PreferenceStorageFactory)
|
|
89
89
|
protected readonly preferenceStorageFactory: PreferenceStorageFactory;
|
|
90
90
|
|
|
91
|
+
@inject(ILogger) @named('preferences:AbstractResourcePreferenceProvider')
|
|
92
|
+
protected readonly logger: ILogger;
|
|
93
|
+
|
|
91
94
|
@postConstruct()
|
|
92
95
|
protected init(): void {
|
|
93
96
|
this.doInit();
|
|
@@ -210,7 +213,7 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
210
213
|
const scope = schemaProperty.scope;
|
|
211
214
|
// do not emit the change event if the change is made out of the defined preference scope
|
|
212
215
|
if (!this.schemaProvider.isValidInScope(prefName, this.getScope())) {
|
|
213
|
-
|
|
216
|
+
this.logger.warn(`Preference ${prefName} in ${uri} can only be defined in scopes: ${PreferenceScope.getScopeNames(scope).join(', ')}.`);
|
|
214
217
|
continue;
|
|
215
218
|
}
|
|
216
219
|
}
|
|
@@ -18,6 +18,8 @@ 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
20
|
import { PreferenceCliContribution } from './preference-cli-contribution';
|
|
21
|
+
import { ILogger } from '@theia/core';
|
|
22
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
21
23
|
|
|
22
24
|
const REMOTE_CLI_CONTEXT: RemoteCliContext = {
|
|
23
25
|
platform: { os: OS.Type.Linux, arch: 'x64' },
|
|
@@ -30,6 +32,7 @@ describe('PreferenceCliContribution', () => {
|
|
|
30
32
|
|
|
31
33
|
beforeEach(() => {
|
|
32
34
|
contribution = new PreferenceCliContribution();
|
|
35
|
+
(contribution as unknown as { logger: ILogger }).logger = new MockLogger();
|
|
33
36
|
});
|
|
34
37
|
|
|
35
38
|
describe('--set-preference', () => {
|
|
@@ -14,15 +14,19 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
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
21
|
import { CliPreferences } from '../common/cli-preferences';
|
|
22
|
+
import { ILogger } from '@theia/core';
|
|
22
23
|
|
|
23
24
|
@injectable()
|
|
24
25
|
export class PreferenceCliContribution implements CliContribution, CliPreferences, RemoteCliContribution {
|
|
25
26
|
|
|
27
|
+
@inject(ILogger) @named('preferences:PreferenceCliContribution')
|
|
28
|
+
protected readonly logger: ILogger;
|
|
29
|
+
|
|
26
30
|
protected preferences: [string, unknown][] = [];
|
|
27
31
|
protected sessionPreferences: [string, unknown][] = [];
|
|
28
32
|
|
|
@@ -51,7 +55,7 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
|
|
|
51
55
|
for (const entry of entries) {
|
|
52
56
|
const firstEqualIndex = entry.indexOf('=');
|
|
53
57
|
if (firstEqualIndex <= 0) {
|
|
54
|
-
|
|
58
|
+
this.logger.warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
|
|
55
59
|
continue;
|
|
56
60
|
}
|
|
57
61
|
let rawValue = entry.substring(firstEqualIndex + 1);
|
|
@@ -62,7 +66,7 @@ export class PreferenceCliContribution implements CliContribution, CliPreference
|
|
|
62
66
|
target.push([entry.substring(0, firstEqualIndex), JSON.parse(rawValue)]);
|
|
63
67
|
} catch (e) {
|
|
64
68
|
const reason = e instanceof Error ? e.message : String(e);
|
|
65
|
-
|
|
69
|
+
this.logger.warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
|
|
66
70
|
}
|
|
67
71
|
}
|
|
68
72
|
}
|