@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,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,24 +13,22 @@
|
|
|
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.WorkspacePreferenceProvider = 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
|
-
|
|
25
|
-
|
|
26
|
-
|
|
18
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
20
|
+
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
21
|
+
import { WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProvider } from './workspace-file-preference-provider.js';
|
|
22
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
+
import { Emitter, PreferenceProviderProvider, PreferenceScope } from '@theia/core';
|
|
27
24
|
let WorkspacePreferenceProvider = class WorkspacePreferenceProvider {
|
|
28
25
|
constructor() {
|
|
29
|
-
this.onDidPreferencesChangedEmitter = new
|
|
26
|
+
this.onDidPreferencesChangedEmitter = new Emitter();
|
|
30
27
|
this.onDidPreferencesChanged = this.onDidPreferencesChangedEmitter.event;
|
|
31
|
-
this.toDisposeOnEnsureDelegateUpToDate = new
|
|
32
|
-
this._ready = new
|
|
28
|
+
this.toDisposeOnEnsureDelegateUpToDate = new DisposableCollection();
|
|
29
|
+
this._ready = new Deferred();
|
|
33
30
|
this.ready = this._ready.promise;
|
|
34
|
-
this.disposables = new
|
|
31
|
+
this.disposables = new DisposableCollection();
|
|
35
32
|
}
|
|
36
33
|
init() {
|
|
37
34
|
this.workspaceService.ready.then(() => {
|
|
@@ -71,7 +68,7 @@ let WorkspacePreferenceProvider = class WorkspacePreferenceProvider {
|
|
|
71
68
|
// If this provider has not yet declared itself ready, it should do so when the new delegate is ready.
|
|
72
69
|
delegate.ready.then(() => this._ready.resolve(), () => { });
|
|
73
70
|
}
|
|
74
|
-
if (delegate instanceof
|
|
71
|
+
if (delegate instanceof WorkspaceFilePreferenceProvider) {
|
|
75
72
|
this.toDisposeOnEnsureDelegateUpToDate.pushAll([
|
|
76
73
|
delegate,
|
|
77
74
|
delegate.onDidPreferencesChanged(changes => this.onDidPreferencesChangedEmitter.fire(changes))
|
|
@@ -85,27 +82,27 @@ let WorkspacePreferenceProvider = class WorkspacePreferenceProvider {
|
|
|
85
82
|
return undefined;
|
|
86
83
|
}
|
|
87
84
|
if (!this.workspaceService.isMultiRootWorkspaceOpened) {
|
|
88
|
-
return this.preferenceProviderProvider(
|
|
85
|
+
return this.preferenceProviderProvider(PreferenceScope.Folder);
|
|
89
86
|
}
|
|
90
|
-
if (this._delegate instanceof
|
|
87
|
+
if (this._delegate instanceof WorkspaceFilePreferenceProvider && this._delegate.getConfigUri().isEqual(workspace.resource)) {
|
|
91
88
|
return this._delegate;
|
|
92
89
|
}
|
|
93
90
|
return this.workspaceFileProviderFactory({
|
|
94
91
|
workspaceUri: workspace.resource
|
|
95
92
|
});
|
|
96
93
|
}
|
|
97
|
-
get(preferenceName, resourceUri = this.ensureResourceUri()) {
|
|
94
|
+
get(preferenceName, resourceUri = this.ensureResourceUri(), overrideIdentifier) {
|
|
98
95
|
const delegate = this.delegate;
|
|
99
|
-
return delegate ? delegate.get(preferenceName, resourceUri) : undefined;
|
|
96
|
+
return delegate ? delegate.get(preferenceName, resourceUri, overrideIdentifier) : undefined;
|
|
100
97
|
}
|
|
101
|
-
resolve(preferenceName, resourceUri = this.ensureResourceUri()) {
|
|
98
|
+
resolve(preferenceName, resourceUri = this.ensureResourceUri(), overrideIdentifier) {
|
|
102
99
|
const delegate = this.delegate;
|
|
103
|
-
return delegate ? delegate.resolve(preferenceName, resourceUri) : {};
|
|
100
|
+
return delegate ? delegate.resolve(preferenceName, resourceUri, overrideIdentifier) : {};
|
|
104
101
|
}
|
|
105
|
-
async setPreference(preferenceName, value, resourceUri = this.ensureResourceUri()) {
|
|
102
|
+
async setPreference(preferenceName, value, resourceUri = this.ensureResourceUri(), overrideIdentifier) {
|
|
106
103
|
const delegate = this.delegate;
|
|
107
104
|
if (delegate) {
|
|
108
|
-
return delegate.setPreference(preferenceName, value, resourceUri);
|
|
105
|
+
return delegate.setPreference(preferenceName, value, resourceUri, overrideIdentifier);
|
|
109
106
|
}
|
|
110
107
|
return false;
|
|
111
108
|
}
|
|
@@ -120,26 +117,20 @@ let WorkspacePreferenceProvider = class WorkspacePreferenceProvider {
|
|
|
120
117
|
return undefined;
|
|
121
118
|
}
|
|
122
119
|
};
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
(0, inversify_1.inject)(workspace_service_1.WorkspaceService),
|
|
126
|
-
tslib_1.__metadata("design:type", workspace_service_1.WorkspaceService)
|
|
120
|
+
__decorate([
|
|
121
|
+
inject(WorkspaceService)
|
|
127
122
|
], WorkspacePreferenceProvider.prototype, "workspaceService", void 0);
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
tslib_1.__metadata("design:type", Function)
|
|
123
|
+
__decorate([
|
|
124
|
+
inject(WorkspaceFilePreferenceProviderFactory)
|
|
131
125
|
], WorkspacePreferenceProvider.prototype, "workspaceFileProviderFactory", void 0);
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
tslib_1.__metadata("design:type", Function)
|
|
126
|
+
__decorate([
|
|
127
|
+
inject(PreferenceProviderProvider)
|
|
135
128
|
], WorkspacePreferenceProvider.prototype, "preferenceProviderProvider", void 0);
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
tslib_1.__metadata("design:type", Function),
|
|
139
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
140
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
129
|
+
__decorate([
|
|
130
|
+
postConstruct()
|
|
141
131
|
], WorkspacePreferenceProvider.prototype, "init", null);
|
|
142
|
-
|
|
143
|
-
|
|
132
|
+
WorkspacePreferenceProvider = __decorate([
|
|
133
|
+
injectable()
|
|
144
134
|
], WorkspacePreferenceProvider);
|
|
135
|
+
export { WorkspacePreferenceProvider };
|
|
145
136
|
//# sourceMappingURL=workspace-preference-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-preference-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-preference-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace-preference-provider.js","sourceRoot":"","sources":["../../src/browser/workspace-preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,9 +56,9 @@ export declare abstract class AbstractResourcePreferenceProvider extends Prefere
|
|
|
56
56
|
getPreferences(resourceUri?: string): {
|
|
57
57
|
[key: string]: any;
|
|
58
58
|
};
|
|
59
|
-
setPreference(key: string, value: any, resourceUri?: string): Promise<boolean>;
|
|
59
|
+
setPreference(key: string, value: any, resourceUri?: string, overrideIdentifier?: string): Promise<boolean>;
|
|
60
60
|
protected doSetPreference(key: string, path: string[], value: JSONValue): Promise<boolean>;
|
|
61
|
-
protected getPath(preferenceName: string): string[] | undefined;
|
|
61
|
+
protected getPath(preferenceName: string, overrideIdentifier?: string): string[] | undefined;
|
|
62
62
|
protected readPreferencesFromFile(): Promise<void>;
|
|
63
63
|
protected readPreferencesFromContent(content: string): void;
|
|
64
64
|
protected parse(content: string): any;
|
|
@@ -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,OAAO,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAA;CAClB;AACD;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACjD;;;;;;OAMG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5E;;;OAGG;IACH,sBAAsB,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACnF;;OAEG;IACH,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,wBAAwB,eAAqC,CAAC;AAC3E,MAAM,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,KAAK,iBAAiB,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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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2018 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,27 +13,27 @@
|
|
|
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.AbstractResourcePreferenceProvider = exports.PreferenceStorageFactory = void 0;
|
|
19
|
-
const tslib_1 = require("tslib");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
20
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
21
18
|
/* eslint-disable no-null/no-null */
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
19
|
+
import * as jsoncparser from 'jsonc-parser';
|
|
20
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
21
|
+
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
22
|
+
import { PreferenceProviderImpl, PreferenceScope, PreferenceSchemaService, PreferenceConfigurations, PreferenceUtils, PreferenceLanguageOverrideService } from '@theia/core/lib/common';
|
|
23
|
+
import URI from '@theia/core/lib/common/uri';
|
|
24
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
25
|
+
import { Emitter, ILogger } from '@theia/core';
|
|
29
26
|
;
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
export const PreferenceStorageFactory = Symbol('PreferenceStorageFactory');
|
|
28
|
+
const OVERRIDE_PROPERTY = '\\[(.*)\\]$';
|
|
29
|
+
const OVERRIDE_PROPERTY_PATTERN = new RegExp(OVERRIDE_PROPERTY);
|
|
30
|
+
let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvider extends PreferenceProviderImpl {
|
|
32
31
|
constructor() {
|
|
33
32
|
super(...arguments);
|
|
34
33
|
this.preferences = {};
|
|
35
34
|
this._fileExists = false;
|
|
36
|
-
this.loading = new
|
|
37
|
-
this.onDidChangeValidityEmitter = new
|
|
35
|
+
this.loading = new Deferred();
|
|
36
|
+
this.onDidChangeValidityEmitter = new Emitter();
|
|
38
37
|
}
|
|
39
38
|
set fileExists(exists) {
|
|
40
39
|
if (exists !== this._fileExists) {
|
|
@@ -50,7 +49,7 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
50
49
|
}
|
|
51
50
|
async doInit() {
|
|
52
51
|
const uri = this.getUri();
|
|
53
|
-
this.toDispose.push(
|
|
52
|
+
this.toDispose.push(Disposable.create(() => this.loading.reject(new Error(`Preference provider for '${uri}' was disposed.`))));
|
|
54
53
|
this.preferenceStorage = this.preferenceStorageFactory(uri, this.getScope());
|
|
55
54
|
this.toDispose.push(this.preferenceStorage);
|
|
56
55
|
this.preferenceStorage.onDidChangeFileContent(async ({ content, fileOK }) => {
|
|
@@ -63,7 +62,7 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
63
62
|
this._ready.resolve();
|
|
64
63
|
this.loading.resolve();
|
|
65
64
|
this.toDispose.pushAll([
|
|
66
|
-
|
|
65
|
+
Disposable.create(() => this.reset()),
|
|
67
66
|
]);
|
|
68
67
|
}
|
|
69
68
|
get valid() {
|
|
@@ -83,15 +82,15 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
83
82
|
if (!domain) {
|
|
84
83
|
return true;
|
|
85
84
|
}
|
|
86
|
-
const resourcePath = new
|
|
87
|
-
return domain.some(uri => new
|
|
85
|
+
const resourcePath = new URI(resourceUri).path;
|
|
86
|
+
return domain.some(uri => new URI(uri).path.relativity(resourcePath) >= 0);
|
|
88
87
|
}
|
|
89
88
|
getPreferences(resourceUri) {
|
|
90
89
|
return this.valid && this.contains(resourceUri) ? this.preferences : {};
|
|
91
90
|
}
|
|
92
|
-
async setPreference(key, value, resourceUri) {
|
|
91
|
+
async setPreference(key, value, resourceUri, overrideIdentifier) {
|
|
93
92
|
let path;
|
|
94
|
-
if (this.toDispose.disposed || !(path = this.getPath(key)) || !this.contains(resourceUri)) {
|
|
93
|
+
if (this.toDispose.disposed || !(path = this.getPath(key, overrideIdentifier)) || !this.contains(resourceUri)) {
|
|
95
94
|
return false;
|
|
96
95
|
}
|
|
97
96
|
return this.doSetPreference(key, path, value);
|
|
@@ -99,10 +98,9 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
99
98
|
doSetPreference(key, path, value) {
|
|
100
99
|
return this.preferenceStorage.writeValue(key, path, value);
|
|
101
100
|
}
|
|
102
|
-
getPath(preferenceName) {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
return [this.preferenceOverrideService.markLanguageOverride(asOverride.overrideIdentifier), asOverride.preferenceName];
|
|
101
|
+
getPath(preferenceName, overrideIdentifier) {
|
|
102
|
+
if (overrideIdentifier) {
|
|
103
|
+
return [`[${overrideIdentifier}]`, preferenceName];
|
|
106
104
|
}
|
|
107
105
|
return [preferenceName];
|
|
108
106
|
}
|
|
@@ -141,20 +139,30 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
141
139
|
const prefChanges = [];
|
|
142
140
|
const uri = this.getUri();
|
|
143
141
|
for (const prefName of prefNames.values()) {
|
|
142
|
+
let overrideIdentifier;
|
|
143
|
+
let realName = prefName;
|
|
144
|
+
const index = prefName.indexOf('.');
|
|
145
|
+
if (index !== -1) {
|
|
146
|
+
const matches = prefName.substring(0, index).match(OVERRIDE_PROPERTY_PATTERN);
|
|
147
|
+
overrideIdentifier = matches && matches[1] || undefined;
|
|
148
|
+
if (overrideIdentifier) {
|
|
149
|
+
realName = prefName.substring(index + 1);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
144
152
|
const oldValue = oldPrefs[prefName];
|
|
145
153
|
const newValue = newPrefs[prefName];
|
|
146
|
-
const schemaProperty = this.schemaProvider.getSchemaProperty(
|
|
154
|
+
const schemaProperty = this.schemaProvider.getSchemaProperty(realName);
|
|
147
155
|
if (schemaProperty && schemaProperty.included) {
|
|
148
156
|
const scope = schemaProperty.scope;
|
|
149
157
|
// do not emit the change event if the change is made out of the defined preference scope
|
|
150
|
-
if (!this.schemaProvider.isValidInScope(
|
|
151
|
-
this.logger.warn(`Preference ${
|
|
158
|
+
if (!this.schemaProvider.isValidInScope(realName, this.getScope())) {
|
|
159
|
+
this.logger.warn(`Preference ${realName} in ${uri} can only be defined in scopes: ${PreferenceScope.getScopeNames(scope).join(', ')}.`);
|
|
152
160
|
continue;
|
|
153
161
|
}
|
|
154
162
|
}
|
|
155
|
-
if (!
|
|
163
|
+
if (!PreferenceUtils.deepEqual(newValue, oldValue)) {
|
|
156
164
|
prefChanges.push({
|
|
157
|
-
preferenceName:
|
|
165
|
+
preferenceName: realName, newValue, oldValue, scope: this.getScope(), overrideIdentifier, domain: this.getDomain()
|
|
158
166
|
});
|
|
159
167
|
}
|
|
160
168
|
}
|
|
@@ -163,51 +171,30 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
163
171
|
}
|
|
164
172
|
}
|
|
165
173
|
reset() {
|
|
166
|
-
|
|
167
|
-
this.preferences = {};
|
|
168
|
-
const changes = [];
|
|
169
|
-
for (const prefName of Object.keys(preferences)) {
|
|
170
|
-
const value = preferences[prefName];
|
|
171
|
-
if (value !== undefined) {
|
|
172
|
-
changes.push({
|
|
173
|
-
preferenceName: prefName, newValue: undefined, oldValue: value, scope: this.getScope(), domain: this.getDomain()
|
|
174
|
-
});
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
if (changes.length > 0) {
|
|
178
|
-
this.emitPreferencesChangedEvent(changes);
|
|
179
|
-
}
|
|
174
|
+
this.handlePreferenceChanges({});
|
|
180
175
|
}
|
|
181
176
|
};
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
(0, inversify_1.inject)(common_1.PreferenceSchemaService),
|
|
185
|
-
tslib_1.__metadata("design:type", Object)
|
|
177
|
+
__decorate([
|
|
178
|
+
inject(PreferenceSchemaService)
|
|
186
179
|
], AbstractResourcePreferenceProvider.prototype, "schemaProvider", void 0);
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
tslib_1.__metadata("design:type", common_1.PreferenceConfigurations)
|
|
180
|
+
__decorate([
|
|
181
|
+
inject(PreferenceConfigurations)
|
|
190
182
|
], AbstractResourcePreferenceProvider.prototype, "configurations", void 0);
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
tslib_1.__metadata("design:type", common_1.PreferenceLanguageOverrideService)
|
|
183
|
+
__decorate([
|
|
184
|
+
inject(PreferenceLanguageOverrideService)
|
|
194
185
|
], AbstractResourcePreferenceProvider.prototype, "preferenceOverrideService", void 0);
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
tslib_1.__metadata("design:type", Function)
|
|
186
|
+
__decorate([
|
|
187
|
+
inject(PreferenceStorageFactory)
|
|
198
188
|
], AbstractResourcePreferenceProvider.prototype, "preferenceStorageFactory", void 0);
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
tslib_1.__metadata("design:type", Object)
|
|
189
|
+
__decorate([
|
|
190
|
+
inject(ILogger),
|
|
191
|
+
named('preferences:AbstractResourcePreferenceProvider')
|
|
203
192
|
], AbstractResourcePreferenceProvider.prototype, "logger", void 0);
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
tslib_1.__metadata("design:type", Function),
|
|
207
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
208
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
193
|
+
__decorate([
|
|
194
|
+
postConstruct()
|
|
209
195
|
], AbstractResourcePreferenceProvider.prototype, "init", null);
|
|
210
|
-
|
|
211
|
-
|
|
196
|
+
AbstractResourcePreferenceProvider = __decorate([
|
|
197
|
+
injectable()
|
|
212
198
|
], AbstractResourcePreferenceProvider);
|
|
199
|
+
export { AbstractResourcePreferenceProvider };
|
|
213
200
|
//# sourceMappingURL=abstract-resource-preference-provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.js","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.ts"],"names":[],"mappings":"
|
|
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,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EACH,sBAAsB,EAAE,eAAe,EAAgC,uBAAuB,EAC9F,wBAAwB,EAAE,eAAe,EAAE,iCAAiC,EAE/E,MAAM,wBAAwB,CAAC;AAChC,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAS,OAAO,EAAE,MAAM,aAAa,CAAC;AA2BrD,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAG3E,MAAM,iBAAiB,GAAG,aAAa,CAAC;AACxC,MAAM,yBAAyB,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEzD,IAAe,kCAAkC,GAAjD,MAAe,kCAAmC,SAAQ,sBAAsB;IAAhF;;QAGO,gBAAW,GAAwB,EAAE,CAAC;QACtC,gBAAW,GAAG,KAAK,CAAC;QACX,YAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QACzB,+BAA0B,GAAG,IAAI,OAAO,EAAW,CAAC;IAgL3E,CAAC;IA9KG,IAAI,UAAU,CAAC,MAAe;QAC1B,IAAI,MAAM,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9B,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC;YAC1B,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;IAED,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IACjD,CAAC;IAeS,IAAI;QACV,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/H,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;YACxE,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;YACzB,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;YACzC,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC,uDAAuD;YAC/F,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAEvB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;SACxC,CAAC,CAAC;IACP,CAAC;IAKD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAIQ,YAAY,CAAC,WAAoB;QACtC,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAChF,CAAC;IAED,QAAQ,CAAC,WAA+B;QACpC,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QAC/C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,cAAc,CAAC,WAAoB;QAC/B,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,KAAU,EAAE,WAAoB,EAAE,kBAA2B;QAC1F,IAAI,IAA0B,CAAC;QAC/B,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5G,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAES,eAAe,CAAC,GAAW,EAAE,IAAc,EAAE,KAAgB;QACnE,OAAO,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAES,OAAO,CAAC,cAAsB,EAAE,kBAA2B;QACjE,IAAI,kBAAkB,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,kBAAkB,GAAG,EAAE,cAAc,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,CAAC,cAAc,CAAC,CAAC;IAC5B,CAAC;IAES,uBAAuB;QAC7B,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC9C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IAEP,CAAC;IACS,0BAA0B,CAAC,OAAe;QAChD,IAAI,iBAAiB,CAAC;QACtB,IAAI,CAAC;YACD,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAAC,MAAM,CAAC;YACL,iBAAiB,GAAG,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACnE,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,OAAe;QAC3B,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,eAAe,GAAG,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC9C,CAAC;IAES,uBAAuB,CAAC,QAAgC;QAC9D,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACrD,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAChF,MAAM,WAAW,GAAmC,EAAE,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,IAAI,kBAAsC,CAAC;YAC3C,IAAI,QAAQ,GAAG,QAAQ,CAAC;YACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC9E,kBAAkB,GAAG,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC;gBACxD,IAAI,kBAAkB,EAAE,CAAC;oBACrB,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;YAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACpC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACvE,IAAI,cAAc,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;gBACnC,yFAAyF;gBACzF,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;oBACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,OAAO,GAAG,mCAAmC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACxI,SAAS;gBACb,CAAC;YACL,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACjD,WAAW,CAAC,IAAI,CAAC;oBACb,cAAc,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,kBAAkB,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE;iBACrH,CAAC,CAAC;YACP,CAAC;QACL,CAAC;QAED,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC;QAClD,CAAC;IACL,CAAC;IAES,KAAK;QACX,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AAlKsB;IADlB,MAAM,CAAC,uBAAuB,CAAC;0EAC2B;AAExC;IADlB,MAAM,CAAC,wBAAwB,CAAC;0EAC2B;AAEzC;IADlB,MAAM,CAAC,iCAAiC,CAAC;qFACsC;AAE7D;IADlB,MAAM,CAAC,wBAAwB,CAAC;oFACqC;AAGnD;IADlB,MAAM,CAAC,OAAO,CAAC;IAAE,KAAK,CAAC,gDAAgD,CAAC;kEACtC;AAGzB;IADT,aAAa,EAAE;8DAGf;AAlCiB,kCAAkC;IADvD,UAAU,EAAE;GACS,kCAAkC,CAsLvD"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2021 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,30 +13,29 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
16
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
19
|
-
|
|
20
|
-
const disableJSDOM =
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
17
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
18
|
+
const disableJSDOM = enableJSDOM();
|
|
19
|
+
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
20
|
+
FrontendApplicationConfigProvider.set({});
|
|
21
|
+
import { expect } from 'chai';
|
|
22
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
23
|
+
import { AbstractResourcePreferenceProvider, PreferenceStorageFactory } from './abstract-resource-preference-provider.js';
|
|
24
|
+
import { bindPreferenceService } from '@theia/core/lib/browser/frontend-application-bindings';
|
|
25
|
+
import { bindMockPreferenceProviders } from '@theia/core/lib/browser/preferences/test';
|
|
26
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
27
|
+
import { Listener, MessageService, PreferenceSchemaService } from '@theia/core/lib/common';
|
|
28
|
+
import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
|
|
29
|
+
import { EditorManager } from '@theia/editor/lib/browser';
|
|
30
|
+
import { PreferenceTransactionFactory } from '../browser/preference-transaction-manager.js';
|
|
31
|
+
import { ILogger } from '@theia/core';
|
|
32
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
35
33
|
disableJSDOM();
|
|
36
34
|
class MockPreferenceStorage {
|
|
37
35
|
constructor() {
|
|
38
|
-
this.onDidChangeFileContent =
|
|
36
|
+
this.onDidChangeFileContent = Listener.None;
|
|
39
37
|
this.disposed = false;
|
|
40
|
-
this.releaseContent = new
|
|
38
|
+
this.releaseContent = new Deferred();
|
|
41
39
|
}
|
|
42
40
|
writeValue(key, path, value) {
|
|
43
41
|
throw new Error('Method not implemented.');
|
|
@@ -51,7 +49,7 @@ class MockPreferenceStorage {
|
|
|
51
49
|
}
|
|
52
50
|
}
|
|
53
51
|
const mockSchemaProvider = { getSchemaProperty: () => undefined };
|
|
54
|
-
class LessAbstractPreferenceProvider extends
|
|
52
|
+
class LessAbstractPreferenceProvider extends AbstractResourcePreferenceProvider {
|
|
55
53
|
getUri() { }
|
|
56
54
|
getScope() { }
|
|
57
55
|
}
|
|
@@ -60,22 +58,22 @@ describe('AbstractResourcePreferenceProvider', () => {
|
|
|
60
58
|
let preferenceStorage;
|
|
61
59
|
beforeEach(() => {
|
|
62
60
|
preferenceStorage = new MockPreferenceStorage();
|
|
63
|
-
const testContainer = new
|
|
64
|
-
testContainer.bind(
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
testContainer.rebind(
|
|
68
|
-
testContainer.bind(
|
|
69
|
-
testContainer.bind(
|
|
70
|
-
testContainer.bind(
|
|
71
|
-
testContainer.bind(
|
|
72
|
-
testContainer.bind(
|
|
61
|
+
const testContainer = new Container();
|
|
62
|
+
testContainer.bind(ILogger).to(MockLogger).inSingletonScope();
|
|
63
|
+
bindPreferenceService(testContainer.bind.bind(testContainer));
|
|
64
|
+
bindMockPreferenceProviders(testContainer.bind.bind(testContainer), testContainer.unbind.bind(testContainer));
|
|
65
|
+
testContainer.rebind(PreferenceSchemaService).toConstantValue(mockSchemaProvider);
|
|
66
|
+
testContainer.bind(PreferenceStorageFactory).toFactory(() => () => preferenceStorage);
|
|
67
|
+
testContainer.bind(MessageService).toConstantValue(undefined);
|
|
68
|
+
testContainer.bind(MonacoWorkspace).toConstantValue(undefined);
|
|
69
|
+
testContainer.bind(EditorManager).toConstantValue(undefined);
|
|
70
|
+
testContainer.bind(PreferenceTransactionFactory).toConstantValue(undefined);
|
|
73
71
|
provider = testContainer.resolve(LessAbstractPreferenceProvider);
|
|
74
72
|
});
|
|
75
73
|
it('should not store any preferences before it is ready.', async () => {
|
|
76
|
-
const resolveWhenFinished = new
|
|
74
|
+
const resolveWhenFinished = new Deferred();
|
|
77
75
|
const errorIfReadyFirst = provider.ready.then(() => Promise.reject());
|
|
78
|
-
|
|
76
|
+
expect(provider.get('editor.fontSize')).to.be.undefined;
|
|
79
77
|
resolveWhenFinished.resolve();
|
|
80
78
|
preferenceStorage.releaseContent.resolve(); // Allow the initialization to run
|
|
81
79
|
// This promise would reject if the provider had declared itself ready before we resolve `resolveWhenFinished`
|
|
@@ -84,12 +82,12 @@ describe('AbstractResourcePreferenceProvider', () => {
|
|
|
84
82
|
it('should report values in file when `ready` resolves.', async () => {
|
|
85
83
|
preferenceStorage.releaseContent.resolve();
|
|
86
84
|
await provider.ready;
|
|
87
|
-
|
|
85
|
+
expect(provider.get('editor.fontSize')).to.equal(20); // The value provided by the mock FileService implementation.
|
|
88
86
|
});
|
|
89
87
|
it('disposes its preference storage when the provider is disposed', () => {
|
|
90
|
-
|
|
88
|
+
expect(preferenceStorage.disposed).to.be.false;
|
|
91
89
|
provider.dispose();
|
|
92
|
-
|
|
90
|
+
expect(preferenceStorage.disposed).to.be.true;
|
|
93
91
|
});
|
|
94
92
|
});
|
|
95
93
|
//# sourceMappingURL=abstract-resource-preference-provider.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.spec.js","sourceRoot":"","sources":["../../src/common/abstract-resource-preference-provider.spec.ts"],"names":[],"mappings":"
|
|
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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"}
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
export declare const CliPreferences: unique symbol;
|
|
2
2
|
export declare const CliPreferencesPath = "/services/cli-preferences";
|
|
3
|
+
/**
|
|
4
|
+
* A preference supplied via `--set-preference` or `--session-preference`.
|
|
5
|
+
* Language overrides use the encoded CLI key `[languageId].preferenceName`;
|
|
6
|
+
* {@link CliPreferenceEntry.parse} splits that into `preferenceName` + `overrideIdentifier`.
|
|
7
|
+
*/
|
|
8
|
+
export interface CliPreference {
|
|
9
|
+
preferenceName: string;
|
|
10
|
+
value: unknown;
|
|
11
|
+
overrideIdentifier?: string;
|
|
12
|
+
}
|
|
3
13
|
export interface CliPreferences {
|
|
4
|
-
getPreferences(): Promise<[
|
|
5
|
-
getSessionPreferences(): Promise<[
|
|
14
|
+
getPreferences(): Promise<CliPreference[]>;
|
|
15
|
+
getSessionPreferences(): Promise<CliPreference[]>;
|
|
6
16
|
}
|
|
7
17
|
export declare namespace CliPreferenceEntry {
|
|
8
18
|
/**
|
|
@@ -11,25 +21,37 @@ export declare namespace CliPreferenceEntry {
|
|
|
11
21
|
* themselves. Defaults to `console.warn`.
|
|
12
22
|
*/
|
|
13
23
|
type WarningSink = (message: string) => void;
|
|
24
|
+
/**
|
|
25
|
+
* Encodes a {@link CliPreference} back to the CLI key form used by `--set-preference` /
|
|
26
|
+
* `--session-preference` (e.g. `[typescript].editor.tabSize`).
|
|
27
|
+
*/
|
|
28
|
+
function encodedKey(entry: CliPreference): string;
|
|
14
29
|
/**
|
|
15
30
|
* Parses a single `KEY=JSONVALUE` preference assignment as accepted by `--set-preference`
|
|
16
31
|
* and `--session-preference`. The value may be `base64:`-prefixed (used when forwarding
|
|
17
32
|
* values that must survive shell/URL transport intact). Returns `undefined` (after logging a
|
|
18
33
|
* warning to {@link warn}) when the entry has no key or the value is not valid JSON.
|
|
34
|
+
*
|
|
35
|
+
* Language-override keys (`[languageId].preferenceName`) are split into
|
|
36
|
+
* `preferenceName` + `overrideIdentifier` using the same first-dot +
|
|
37
|
+
* {@link OVERRIDE_PROPERTY_PATTERN} check as resource preference providers.
|
|
38
|
+
* Nested-object CLI keys (`[typescript]={...}`) have no `.` after the brackets and
|
|
39
|
+
* are kept as a literal `preferenceName`.
|
|
19
40
|
*/
|
|
20
|
-
function parse(entry: string, warn?: WarningSink):
|
|
41
|
+
function parse(entry: string, warn?: WarningSink): CliPreference | undefined;
|
|
21
42
|
/**
|
|
22
43
|
* Formats a preference entry as a CLI argument of the form
|
|
23
44
|
* `--<optionName>=<key>=base64:<base64(JSON(value))>`, the inverse of {@link parse}.
|
|
24
45
|
*
|
|
25
46
|
* The value is base64-encoded so it survives shell/URL transport intact (e.g. when the
|
|
26
|
-
* argument is passed to a remote backend over an SSH command line).
|
|
47
|
+
* argument is passed to a remote backend over an SSH command line). Language overrides are
|
|
48
|
+
* re-encoded as `[languageId].preferenceName` so the remote CLI can parse them again.
|
|
27
49
|
*/
|
|
28
|
-
function toArg(optionName: string,
|
|
50
|
+
function toArg(optionName: string, entry: CliPreference): string;
|
|
29
51
|
/**
|
|
30
52
|
* Parses a list of `KEY=JSONVALUE` assignments, dropping any invalid entries and reporting
|
|
31
53
|
* them to {@link warn}.
|
|
32
54
|
*/
|
|
33
|
-
function parseAll(entries: readonly string[], warn?: WarningSink): [
|
|
55
|
+
function parseAll(entries: readonly string[], warn?: WarningSink): CliPreference[];
|
|
34
56
|
}
|
|
35
57
|
//# sourceMappingURL=cli-preferences.d.ts.map
|