@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
|
@@ -18,7 +18,7 @@ import { inject, injectable } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
20
20
|
import { WorkspaceService, WorkspaceData } from '@theia/workspace/lib/browser/workspace-service';
|
|
21
|
-
import { AbstractResourcePreferenceProvider } from '../common/abstract-resource-preference-provider';
|
|
21
|
+
import { AbstractResourcePreferenceProvider } from '../common/abstract-resource-preference-provider.js';
|
|
22
22
|
|
|
23
23
|
@injectable()
|
|
24
24
|
export class WorkspaceFilePreferenceProviderOptions {
|
|
@@ -64,7 +64,7 @@ export class WorkspaceFilePreferenceProvider extends AbstractResourcePreferenceP
|
|
|
64
64
|
return {};
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
protected override getPath(preferenceName: string): string[] {
|
|
67
|
+
protected override getPath(preferenceName: string, overrideIdentifier?: string): string[] {
|
|
68
68
|
const firstSegment = preferenceName.split('.', 1)[0];
|
|
69
69
|
const remainder = preferenceName.slice(firstSegment.length + 1);
|
|
70
70
|
if (this.belongsInSection(firstSegment, remainder)) {
|
|
@@ -79,7 +79,7 @@ export class WorkspaceFilePreferenceProvider extends AbstractResourcePreferenceP
|
|
|
79
79
|
}
|
|
80
80
|
return path;
|
|
81
81
|
}
|
|
82
|
-
return ['settings'].concat(super.getPath(preferenceName) ?? []);
|
|
82
|
+
return ['settings'].concat(super.getPath(preferenceName, overrideIdentifier) ?? []);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
/**
|
|
@@ -20,10 +20,10 @@ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify'
|
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
21
|
import { DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
22
22
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
23
|
-
import { WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProvider } from './workspace-file-preference-provider';
|
|
23
|
+
import { WorkspaceFilePreferenceProviderFactory, WorkspaceFilePreferenceProvider } from './workspace-file-preference-provider.js';
|
|
24
24
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
25
25
|
import { Emitter, Event, PreferenceProvider, PreferenceProviderDataChanges, PreferenceProviderProvider, PreferenceScope } from '@theia/core';
|
|
26
|
-
import { JSONObject } from '@theia/core/shared/@lumino/coreutils';
|
|
26
|
+
import { JSONObject, JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
27
27
|
|
|
28
28
|
@injectable()
|
|
29
29
|
export class WorkspacePreferenceProvider implements PreferenceProvider {
|
|
@@ -120,20 +120,19 @@ export class WorkspacePreferenceProvider implements PreferenceProvider {
|
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
get<T>(preferenceName: string, resourceUri: string | undefined = this.ensureResourceUri()): T | undefined {
|
|
123
|
+
get<T>(preferenceName: string, resourceUri: string | undefined = this.ensureResourceUri(), overrideIdentifier?: string): T | undefined {
|
|
124
124
|
const delegate = this.delegate;
|
|
125
|
-
return delegate ? delegate.get<T>(preferenceName, resourceUri) : undefined;
|
|
125
|
+
return delegate ? delegate.get<T>(preferenceName, resourceUri, overrideIdentifier) : undefined;
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
resolve<T>(preferenceName: string, resourceUri: string | undefined = this.ensureResourceUri()): { value?: T, configUri?: URI } {
|
|
128
|
+
resolve<T>(preferenceName: string, resourceUri: string | undefined = this.ensureResourceUri(), overrideIdentifier?: string): { value?: T, configUri?: URI } {
|
|
129
129
|
const delegate = this.delegate;
|
|
130
|
-
return delegate ? delegate.resolve<T>(preferenceName, resourceUri) : {};
|
|
130
|
+
return delegate ? delegate.resolve<T>(preferenceName, resourceUri, overrideIdentifier) : {};
|
|
131
131
|
}
|
|
132
|
-
|
|
133
|
-
async setPreference(preferenceName: string, value: any, resourceUri: string | undefined = this.ensureResourceUri()): Promise<boolean> {
|
|
132
|
+
async setPreference(preferenceName: string, value: JSONValue, resourceUri: string | undefined = this.ensureResourceUri(), overrideIdentifier?: string): Promise<boolean> {
|
|
134
133
|
const delegate = this.delegate;
|
|
135
134
|
if (delegate) {
|
|
136
|
-
return delegate.setPreference(preferenceName, value, resourceUri);
|
|
135
|
+
return delegate.setPreference(preferenceName, value, resourceUri, overrideIdentifier);
|
|
137
136
|
}
|
|
138
137
|
return false;
|
|
139
138
|
}
|
|
@@ -24,14 +24,14 @@ FrontendApplicationConfigProvider.set({});
|
|
|
24
24
|
|
|
25
25
|
import { expect } from 'chai';
|
|
26
26
|
import { Container } from '@theia/core/shared/inversify';
|
|
27
|
-
import { AbstractResourcePreferenceProvider, FileContentStatus, PreferenceStorage, PreferenceStorageFactory } from './abstract-resource-preference-provider';
|
|
27
|
+
import { AbstractResourcePreferenceProvider, FileContentStatus, PreferenceStorage, PreferenceStorageFactory } from './abstract-resource-preference-provider.js';
|
|
28
28
|
import { bindPreferenceService } from '@theia/core/lib/browser/frontend-application-bindings';
|
|
29
29
|
import { bindMockPreferenceProviders } from '@theia/core/lib/browser/preferences/test';
|
|
30
30
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
31
31
|
import { Listener, MessageService, PreferenceSchemaService } from '@theia/core/lib/common';
|
|
32
32
|
import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
|
|
33
33
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
34
|
-
import { PreferenceTransactionFactory } from '../browser/preference-transaction-manager';
|
|
34
|
+
import { PreferenceTransactionFactory } from '../browser/preference-transaction-manager.js';
|
|
35
35
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
36
36
|
import { ILogger } from '@theia/core';
|
|
37
37
|
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
@@ -59,6 +59,8 @@ export interface PreferenceStorage extends Disposable {
|
|
|
59
59
|
export const PreferenceStorageFactory = Symbol('PreferenceStorageFactory');
|
|
60
60
|
export type PreferenceStorageFactory = (uri: URI, scope: PreferenceScope) => PreferenceStorage;
|
|
61
61
|
|
|
62
|
+
const OVERRIDE_PROPERTY = '\\[(.*)\\]$';
|
|
63
|
+
const OVERRIDE_PROPERTY_PATTERN = new RegExp(OVERRIDE_PROPERTY);
|
|
62
64
|
@injectable()
|
|
63
65
|
export abstract class AbstractResourcePreferenceProvider extends PreferenceProviderImpl {
|
|
64
66
|
protected preferenceStorage: PreferenceStorage;
|
|
@@ -149,9 +151,9 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
149
151
|
return this.valid && this.contains(resourceUri) ? this.preferences : {};
|
|
150
152
|
}
|
|
151
153
|
|
|
152
|
-
async setPreference(key: string, value: any, resourceUri?: string): Promise<boolean> {
|
|
154
|
+
async setPreference(key: string, value: any, resourceUri?: string, overrideIdentifier?: string): Promise<boolean> {
|
|
153
155
|
let path: string[] | undefined;
|
|
154
|
-
if (this.toDispose.disposed || !(path = this.getPath(key)) || !this.contains(resourceUri)) {
|
|
156
|
+
if (this.toDispose.disposed || !(path = this.getPath(key, overrideIdentifier)) || !this.contains(resourceUri)) {
|
|
155
157
|
return false;
|
|
156
158
|
}
|
|
157
159
|
return this.doSetPreference(key, path, value);
|
|
@@ -161,10 +163,9 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
161
163
|
return this.preferenceStorage.writeValue(key, path, value);
|
|
162
164
|
}
|
|
163
165
|
|
|
164
|
-
protected getPath(preferenceName: string): string[] | undefined {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
return [this.preferenceOverrideService.markLanguageOverride(asOverride.overrideIdentifier), asOverride.preferenceName];
|
|
166
|
+
protected getPath(preferenceName: string, overrideIdentifier?: string): string[] | undefined {
|
|
167
|
+
if (overrideIdentifier) {
|
|
168
|
+
return [`[${overrideIdentifier}]`, preferenceName];
|
|
168
169
|
}
|
|
169
170
|
return [preferenceName];
|
|
170
171
|
}
|
|
@@ -206,20 +207,31 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
206
207
|
const prefChanges: PreferenceProviderDataChange[] = [];
|
|
207
208
|
const uri = this.getUri();
|
|
208
209
|
for (const prefName of prefNames.values()) {
|
|
210
|
+
let overrideIdentifier: string | undefined;
|
|
211
|
+
let realName = prefName;
|
|
212
|
+
const index = prefName.indexOf('.');
|
|
213
|
+
if (index !== -1) {
|
|
214
|
+
const matches = prefName.substring(0, index).match(OVERRIDE_PROPERTY_PATTERN);
|
|
215
|
+
overrideIdentifier = matches && matches[1] || undefined;
|
|
216
|
+
if (overrideIdentifier) {
|
|
217
|
+
realName = prefName.substring(index + 1);
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
|
|
209
221
|
const oldValue = oldPrefs[prefName];
|
|
210
222
|
const newValue = newPrefs[prefName];
|
|
211
|
-
const schemaProperty = this.schemaProvider.getSchemaProperty(
|
|
223
|
+
const schemaProperty = this.schemaProvider.getSchemaProperty(realName);
|
|
212
224
|
if (schemaProperty && schemaProperty.included) {
|
|
213
225
|
const scope = schemaProperty.scope;
|
|
214
226
|
// do not emit the change event if the change is made out of the defined preference scope
|
|
215
|
-
if (!this.schemaProvider.isValidInScope(
|
|
216
|
-
this.logger.warn(`Preference ${
|
|
227
|
+
if (!this.schemaProvider.isValidInScope(realName, this.getScope())) {
|
|
228
|
+
this.logger.warn(`Preference ${realName} in ${uri} can only be defined in scopes: ${PreferenceScope.getScopeNames(scope).join(', ')}.`);
|
|
217
229
|
continue;
|
|
218
230
|
}
|
|
219
231
|
}
|
|
220
232
|
if (!PreferenceUtils.deepEqual(newValue, oldValue)) {
|
|
221
233
|
prefChanges.push({
|
|
222
|
-
preferenceName:
|
|
234
|
+
preferenceName: realName, newValue, oldValue, scope: this.getScope(), overrideIdentifier, domain: this.getDomain()
|
|
223
235
|
});
|
|
224
236
|
}
|
|
225
237
|
}
|
|
@@ -230,19 +242,6 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
230
242
|
}
|
|
231
243
|
|
|
232
244
|
protected reset(): void {
|
|
233
|
-
|
|
234
|
-
this.preferences = {};
|
|
235
|
-
const changes: PreferenceProviderDataChange[] = [];
|
|
236
|
-
for (const prefName of Object.keys(preferences)) {
|
|
237
|
-
const value = preferences[prefName];
|
|
238
|
-
if (value !== undefined) {
|
|
239
|
-
changes.push({
|
|
240
|
-
preferenceName: prefName, newValue: undefined, oldValue: value, scope: this.getScope(), domain: this.getDomain()
|
|
241
|
-
});
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
if (changes.length > 0) {
|
|
245
|
-
this.emitPreferencesChangedEvent(changes);
|
|
246
|
-
}
|
|
245
|
+
this.handlePreferenceChanges({});
|
|
247
246
|
}
|
|
248
247
|
}
|
|
@@ -15,26 +15,41 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
|
-
import { CliPreferenceEntry } from './cli-preferences';
|
|
18
|
+
import { CliPreference, CliPreferenceEntry } from './cli-preferences.js';
|
|
19
19
|
|
|
20
20
|
describe('CliPreferenceEntry.parse', () => {
|
|
21
21
|
|
|
22
22
|
it('parses a KEY=JSONVALUE assignment', () => {
|
|
23
|
-
expect(CliPreferenceEntry.parse('editor.fontSize=14')).to.deep.equal(
|
|
23
|
+
expect(CliPreferenceEntry.parse('editor.fontSize=14')).to.deep.equal({ preferenceName: 'editor.fontSize', value: 14 });
|
|
24
24
|
});
|
|
25
25
|
|
|
26
26
|
it('parses boolean and string JSON values', () => {
|
|
27
|
-
expect(CliPreferenceEntry.parse('foo.enabled=true')).to.deep.equal(
|
|
28
|
-
expect(CliPreferenceEntry.parse('foo.label="hello"')).to.deep.equal(
|
|
27
|
+
expect(CliPreferenceEntry.parse('foo.enabled=true')).to.deep.equal({ preferenceName: 'foo.enabled', value: true });
|
|
28
|
+
expect(CliPreferenceEntry.parse('foo.label="hello"')).to.deep.equal({ preferenceName: 'foo.label', value: 'hello' });
|
|
29
29
|
});
|
|
30
30
|
|
|
31
31
|
it('keeps "=" characters that are part of the value', () => {
|
|
32
|
-
expect(CliPreferenceEntry.parse('foo.expr="a=b"')).to.deep.equal(
|
|
32
|
+
expect(CliPreferenceEntry.parse('foo.expr="a=b"')).to.deep.equal({ preferenceName: 'foo.expr', value: 'a=b' });
|
|
33
33
|
});
|
|
34
34
|
|
|
35
35
|
it('decodes a base64-encoded value', () => {
|
|
36
36
|
// base64 of the JSON value `42`
|
|
37
|
-
expect(CliPreferenceEntry.parse('foo.num=base64:NDI=')).to.deep.equal(
|
|
37
|
+
expect(CliPreferenceEntry.parse('foo.num=base64:NDI=')).to.deep.equal({ preferenceName: 'foo.num', value: 42 });
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it('splits an encoded language override into preferenceName and overrideIdentifier', () => {
|
|
41
|
+
expect(CliPreferenceEntry.parse('[typescript].editor.tabSize=4')).to.deep.equal({
|
|
42
|
+
preferenceName: 'editor.tabSize',
|
|
43
|
+
value: 4,
|
|
44
|
+
overrideIdentifier: 'typescript'
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it('keeps a nested-object [language] key as a literal preferenceName', () => {
|
|
49
|
+
expect(CliPreferenceEntry.parse('[typescript]={"editor.tabSize":4}')).to.deep.equal({
|
|
50
|
+
preferenceName: '[typescript]',
|
|
51
|
+
value: { 'editor.tabSize': 4 }
|
|
52
|
+
});
|
|
38
53
|
});
|
|
39
54
|
|
|
40
55
|
it('returns undefined when there is no key', () => {
|
|
@@ -52,22 +67,60 @@ describe('CliPreferenceEntry.parse', () => {
|
|
|
52
67
|
describe('parseAll', () => {
|
|
53
68
|
it('parses and filters a list, dropping invalid entries', () => {
|
|
54
69
|
const result = CliPreferenceEntry.parseAll(['a=1', 'bad', 'b="x"']);
|
|
55
|
-
expect(result).to.deep.equal([
|
|
70
|
+
expect(result).to.deep.equal([
|
|
71
|
+
{ preferenceName: 'a', value: 1 },
|
|
72
|
+
{ preferenceName: 'b', value: 'x' }
|
|
73
|
+
]);
|
|
74
|
+
});
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
describe('encodedKey', () => {
|
|
78
|
+
it('returns the plain preference name when there is no override', () => {
|
|
79
|
+
expect(CliPreferenceEntry.encodedKey({ preferenceName: 'editor.fontSize', value: 14 })).to.equal('editor.fontSize');
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it('re-encodes language overrides as [languageId].preferenceName', () => {
|
|
83
|
+
expect(CliPreferenceEntry.encodedKey({
|
|
84
|
+
preferenceName: 'editor.tabSize',
|
|
85
|
+
value: 4,
|
|
86
|
+
overrideIdentifier: 'typescript'
|
|
87
|
+
})).to.equal('[typescript].editor.tabSize');
|
|
56
88
|
});
|
|
57
89
|
});
|
|
58
90
|
|
|
59
91
|
describe('toArg', () => {
|
|
60
92
|
it('formats an entry as a base64-encoded CLI argument', () => {
|
|
61
93
|
// base64 of the JSON value `42`
|
|
62
|
-
expect(CliPreferenceEntry.toArg('session-preference',
|
|
94
|
+
expect(CliPreferenceEntry.toArg('session-preference', { preferenceName: 'foo.num', value: 42 }))
|
|
95
|
+
.to.equal('--session-preference=foo.num=base64:NDI=');
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it('re-encodes language overrides in the CLI key', () => {
|
|
99
|
+
const arg = CliPreferenceEntry.toArg('session-preference', {
|
|
100
|
+
preferenceName: 'editor.tabSize',
|
|
101
|
+
value: 4,
|
|
102
|
+
overrideIdentifier: 'typescript'
|
|
103
|
+
});
|
|
104
|
+
expect(arg.startsWith('--session-preference=[typescript].editor.tabSize=base64:')).to.be.true;
|
|
63
105
|
});
|
|
64
106
|
|
|
65
107
|
it('round-trips a value with shell-special characters through toArg + parse', () => {
|
|
66
|
-
const entry:
|
|
108
|
+
const entry: CliPreference = { preferenceName: 'foo.expr', value: '$HOME && "quoted"' };
|
|
67
109
|
const arg = CliPreferenceEntry.toArg('session-preference', entry);
|
|
68
110
|
// The value part of `--session-preference=<value>` must parse back to the original entry.
|
|
69
111
|
const value = arg.substring('--session-preference='.length);
|
|
70
112
|
expect(CliPreferenceEntry.parse(value)).to.deep.equal(entry);
|
|
71
113
|
});
|
|
114
|
+
|
|
115
|
+
it('round-trips a language override through toArg + parse', () => {
|
|
116
|
+
const entry: CliPreference = {
|
|
117
|
+
preferenceName: 'editor.tabSize',
|
|
118
|
+
value: 4,
|
|
119
|
+
overrideIdentifier: 'typescript'
|
|
120
|
+
};
|
|
121
|
+
const arg = CliPreferenceEntry.toArg('session-preference', entry);
|
|
122
|
+
const value = arg.substring('--session-preference='.length);
|
|
123
|
+
expect(CliPreferenceEntry.parse(value)).to.deep.equal(entry);
|
|
124
|
+
});
|
|
72
125
|
});
|
|
73
126
|
});
|
|
@@ -14,12 +14,25 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
+
import { OVERRIDE_PROPERTY_PATTERN } from '@theia/core';
|
|
18
|
+
|
|
17
19
|
export const CliPreferences = Symbol('CliPreferences');
|
|
18
20
|
export const CliPreferencesPath = '/services/cli-preferences';
|
|
19
21
|
|
|
22
|
+
/**
|
|
23
|
+
* A preference supplied via `--set-preference` or `--session-preference`.
|
|
24
|
+
* Language overrides use the encoded CLI key `[languageId].preferenceName`;
|
|
25
|
+
* {@link CliPreferenceEntry.parse} splits that into `preferenceName` + `overrideIdentifier`.
|
|
26
|
+
*/
|
|
27
|
+
export interface CliPreference {
|
|
28
|
+
preferenceName: string;
|
|
29
|
+
value: unknown;
|
|
30
|
+
overrideIdentifier?: string;
|
|
31
|
+
}
|
|
32
|
+
|
|
20
33
|
export interface CliPreferences {
|
|
21
|
-
getPreferences(): Promise<[
|
|
22
|
-
getSessionPreferences(): Promise<[
|
|
34
|
+
getPreferences(): Promise<CliPreference[]>;
|
|
35
|
+
getSessionPreferences(): Promise<CliPreference[]>;
|
|
23
36
|
}
|
|
24
37
|
|
|
25
38
|
export namespace CliPreferenceEntry {
|
|
@@ -33,13 +46,27 @@ export namespace CliPreferenceEntry {
|
|
|
33
46
|
|
|
34
47
|
const defaultWarn: WarningSink = message => console.warn(message);
|
|
35
48
|
|
|
49
|
+
/**
|
|
50
|
+
* Encodes a {@link CliPreference} back to the CLI key form used by `--set-preference` /
|
|
51
|
+
* `--session-preference` (e.g. `[typescript].editor.tabSize`).
|
|
52
|
+
*/
|
|
53
|
+
export function encodedKey(entry: CliPreference): string {
|
|
54
|
+
return entry.overrideIdentifier ? `[${entry.overrideIdentifier}].${entry.preferenceName}` : entry.preferenceName;
|
|
55
|
+
}
|
|
56
|
+
|
|
36
57
|
/**
|
|
37
58
|
* Parses a single `KEY=JSONVALUE` preference assignment as accepted by `--set-preference`
|
|
38
59
|
* and `--session-preference`. The value may be `base64:`-prefixed (used when forwarding
|
|
39
60
|
* values that must survive shell/URL transport intact). Returns `undefined` (after logging a
|
|
40
61
|
* warning to {@link warn}) when the entry has no key or the value is not valid JSON.
|
|
62
|
+
*
|
|
63
|
+
* Language-override keys (`[languageId].preferenceName`) are split into
|
|
64
|
+
* `preferenceName` + `overrideIdentifier` using the same first-dot +
|
|
65
|
+
* {@link OVERRIDE_PROPERTY_PATTERN} check as resource preference providers.
|
|
66
|
+
* Nested-object CLI keys (`[typescript]={...}`) have no `.` after the brackets and
|
|
67
|
+
* are kept as a literal `preferenceName`.
|
|
41
68
|
*/
|
|
42
|
-
export function parse(entry: string, warn: WarningSink = defaultWarn):
|
|
69
|
+
export function parse(entry: string, warn: WarningSink = defaultWarn): CliPreference | undefined {
|
|
43
70
|
const firstEqualIndex = entry.indexOf('=');
|
|
44
71
|
if (firstEqualIndex <= 0) {
|
|
45
72
|
warn(`Ignoring preference CLI argument "${entry}": expected KEY=JSONVALUE.`);
|
|
@@ -50,7 +77,7 @@ export namespace CliPreferenceEntry {
|
|
|
50
77
|
// Decoding happens inside the `try` so that a malformed `base64:` payload is reported
|
|
51
78
|
// like any other invalid value instead of throwing out of `parse`.
|
|
52
79
|
const value = rawValue.startsWith('base64:') ? decodeBase64(rawValue.substring('base64:'.length)) : rawValue;
|
|
53
|
-
return
|
|
80
|
+
return toCliPreference(entry.substring(0, firstEqualIndex), JSON.parse(value));
|
|
54
81
|
} catch (e) {
|
|
55
82
|
const reason = e instanceof Error ? e.message : String(e);
|
|
56
83
|
warn(`Ignoring preference CLI argument "${entry}": value is not valid JSON (${reason}).`);
|
|
@@ -63,18 +90,19 @@ export namespace CliPreferenceEntry {
|
|
|
63
90
|
* `--<optionName>=<key>=base64:<base64(JSON(value))>`, the inverse of {@link parse}.
|
|
64
91
|
*
|
|
65
92
|
* The value is base64-encoded so it survives shell/URL transport intact (e.g. when the
|
|
66
|
-
* argument is passed to a remote backend over an SSH command line).
|
|
93
|
+
* argument is passed to a remote backend over an SSH command line). Language overrides are
|
|
94
|
+
* re-encoded as `[languageId].preferenceName` so the remote CLI can parse them again.
|
|
67
95
|
*/
|
|
68
|
-
export function toArg(optionName: string,
|
|
69
|
-
return `--${optionName}=${
|
|
96
|
+
export function toArg(optionName: string, entry: CliPreference): string {
|
|
97
|
+
return `--${optionName}=${encodedKey(entry)}=base64:${encodeBase64(JSON.stringify(entry.value))}`;
|
|
70
98
|
}
|
|
71
99
|
|
|
72
100
|
/**
|
|
73
101
|
* Parses a list of `KEY=JSONVALUE` assignments, dropping any invalid entries and reporting
|
|
74
102
|
* them to {@link warn}.
|
|
75
103
|
*/
|
|
76
|
-
export function parseAll(entries: readonly string[], warn: WarningSink = defaultWarn): [
|
|
77
|
-
const result: [
|
|
104
|
+
export function parseAll(entries: readonly string[], warn: WarningSink = defaultWarn): CliPreference[] {
|
|
105
|
+
const result: CliPreference[] = [];
|
|
78
106
|
for (const entry of entries) {
|
|
79
107
|
const parsed = parse(entry, warn);
|
|
80
108
|
if (parsed) {
|
|
@@ -84,6 +112,17 @@ export namespace CliPreferenceEntry {
|
|
|
84
112
|
return result;
|
|
85
113
|
}
|
|
86
114
|
|
|
115
|
+
function toCliPreference(rawKey: string, value: unknown): CliPreference {
|
|
116
|
+
const index = rawKey.indexOf('.');
|
|
117
|
+
if (index !== -1) {
|
|
118
|
+
const matches = rawKey.substring(0, index).match(OVERRIDE_PROPERTY_PATTERN);
|
|
119
|
+
if (matches) {
|
|
120
|
+
return { preferenceName: rawKey.substring(index + 1), value, overrideIdentifier: matches[1] };
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return { preferenceName: rawKey, value };
|
|
124
|
+
}
|
|
125
|
+
|
|
87
126
|
// `Buffer` is available on the backend and is polyfilled into the frontend bundle by the
|
|
88
127
|
// esbuild generator, so a single implementation covers both. It also handles UTF-8 directly,
|
|
89
128
|
// unlike `atob`/`btoa`, which only deal in binary strings.
|
|
@@ -42,8 +42,8 @@ export class JSONCEditor {
|
|
|
42
42
|
content: ''
|
|
43
43
|
}];
|
|
44
44
|
}
|
|
45
|
-
const tabSize = this.preferenceService.get('
|
|
46
|
-
const insertSpaces = this.preferenceService.get('
|
|
45
|
+
const tabSize = this.preferenceService.get('editor.tabSize', { fallback: 4, override: 'json' });
|
|
46
|
+
const insertSpaces = this.preferenceService.get('editor.insertSpaces', { fallback: true, override: 'json' });
|
|
47
47
|
|
|
48
48
|
const jsonCOptions = {
|
|
49
49
|
formattingOptions: {
|
|
@@ -56,7 +56,7 @@ export class JSONCEditor {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
getEOL(): string {
|
|
59
|
-
const eol = this.preferenceService.get('
|
|
59
|
+
const eol = this.preferenceService.get('files.eol', { override: 'json' });
|
|
60
60
|
if (eol && typeof eol === 'string' && eol !== 'auto') {
|
|
61
61
|
return eol;
|
|
62
62
|
}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
|
-
import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
|
|
19
|
+
import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider.js';
|
|
20
20
|
import { PreferenceConfigurations } from '@theia/core';
|
|
21
21
|
|
|
22
22
|
export const SectionPreferenceProviderUri = Symbol('SectionPreferenceProviderUri');
|
|
@@ -64,9 +64,9 @@ export abstract class SectionPreferenceProvider extends AbstractResourcePreferen
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
-
protected override getPath(preferenceName: string): string[] | undefined {
|
|
67
|
+
protected override getPath(preferenceName: string, overrideIdentifier?: string): string[] | undefined {
|
|
68
68
|
if (!this.isSection) {
|
|
69
|
-
return super.getPath(preferenceName);
|
|
69
|
+
return super.getPath(preferenceName, overrideIdentifier);
|
|
70
70
|
}
|
|
71
71
|
if (preferenceName === this.section) {
|
|
72
72
|
return [];
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
|
|
19
19
|
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
|
-
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
21
|
+
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider.js';
|
|
22
22
|
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceUtils, ILogger } from '@theia/core';
|
|
23
23
|
|
|
24
24
|
export const UserStorageLocationProvider = Symbol('UserStorageLocationProvider');
|
|
@@ -80,10 +80,10 @@ export class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
|
80
80
|
return undefined;
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
override resolve<T>(preferenceName: string, resourceUri?: string): PreferenceResolveResult<T> {
|
|
83
|
+
override resolve<T>(preferenceName: string, resourceUri?: string, overrideIdentifier?: string): PreferenceResolveResult<T> {
|
|
84
84
|
const result: PreferenceResolveResult<T> = {};
|
|
85
85
|
for (const provider of this.providers.values()) {
|
|
86
|
-
const { value, configUri } = provider.resolve<T>(preferenceName, resourceUri);
|
|
86
|
+
const { value, configUri } = provider.resolve<T>(preferenceName, resourceUri, overrideIdentifier);
|
|
87
87
|
if (configUri && value !== undefined) {
|
|
88
88
|
result.configUri = configUri;
|
|
89
89
|
result.value = PreferenceUtils.merge(result.value as any, value as any) as any;
|
|
@@ -101,7 +101,7 @@ export class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
|
101
101
|
return result;
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
async setPreference(preferenceName: string, value: any, resourceUri?: string): Promise<boolean> {
|
|
104
|
+
async setPreference(preferenceName: string, value: any, resourceUri?: string, overrideIdentifier?: string): Promise<boolean> {
|
|
105
105
|
const sectionName = preferenceName.split('.', 1)[0];
|
|
106
106
|
const defaultConfigName = this.configurations.getConfigName();
|
|
107
107
|
const configName = this.configurations.isSectionName(sectionName) ? sectionName : defaultConfigName;
|
|
@@ -109,7 +109,7 @@ export class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
|
109
109
|
const setWithConfigName = async (name: string): Promise<boolean> => {
|
|
110
110
|
for (const provider of this.providers.values()) {
|
|
111
111
|
if (this.configurations.getName(provider.getConfigUri()) === name) {
|
|
112
|
-
if (await provider.setPreference(preferenceName, value, resourceUri)) {
|
|
112
|
+
if (await provider.setPreference(preferenceName, value, resourceUri, overrideIdentifier)) {
|
|
113
113
|
return true;
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
|
-
import { SectionPreferenceProvider } from './section-preference-provider';
|
|
19
|
+
import { SectionPreferenceProvider } from './section-preference-provider.js';
|
|
20
20
|
import { PreferenceScope } from '@theia/core';
|
|
21
21
|
|
|
22
22
|
export const UserPreferenceProviderFactory = Symbol('UserPreferenceProviderFactory');
|
|
@@ -21,8 +21,8 @@ import { Event } from '@theia/core/lib/common/event';
|
|
|
21
21
|
import { FileChange } from '@theia/filesystem/lib/common/files';
|
|
22
22
|
import { DiskFileSystemProvider } from '@theia/filesystem/lib/node/disk-file-system-provider';
|
|
23
23
|
import { EncodingService } from '@theia/core/lib/common/encoding-service';
|
|
24
|
-
import { JSONCEditor } from '../common/jsonc-editor';
|
|
25
|
-
import { BackendPreferenceStorage } from './backend-preference-storage';
|
|
24
|
+
import { JSONCEditor } from '../common/jsonc-editor.js';
|
|
25
|
+
import { BackendPreferenceStorage } from './backend-preference-storage.js';
|
|
26
26
|
|
|
27
27
|
class MockDiskFileSystemProvider {
|
|
28
28
|
disposed = false;
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
|
|
17
17
|
import { Listener, ListenerList, URI } from '@theia/core';
|
|
18
18
|
import { JSONValue } from '@theia/core/shared/@lumino/coreutils';
|
|
19
|
-
import { FileContentStatus, PreferenceStorage } from '../common/abstract-resource-preference-provider';
|
|
19
|
+
import { FileContentStatus, PreferenceStorage } from '../common/abstract-resource-preference-provider.js';
|
|
20
20
|
import { EncodingService } from '@theia/core/lib/common/encoding-service';
|
|
21
21
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
22
22
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
-
import debounce
|
|
24
|
-
import { JSONCEditor } from '../common/jsonc-editor';
|
|
23
|
+
import debounce from '@theia/core/shared/lodash.debounce';
|
|
24
|
+
import { JSONCEditor } from '../common/jsonc-editor.js';
|
|
25
25
|
import { DiskFileSystemProvider } from '@theia/filesystem/lib/node/disk-file-system-provider';
|
|
26
26
|
import { UTF8 } from '@theia/core/lib/common/encodings';
|
|
27
27
|
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
18
18
|
import { CliContribution } from '@theia/core/lib/node/cli';
|
|
19
19
|
import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
|
|
20
|
-
import { PreferenceCliContribution } from './preference-cli-contribution';
|
|
20
|
+
import { PreferenceCliContribution } from './preference-cli-contribution.js';
|
|
21
21
|
import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
|
|
22
|
-
import { CliPreferences, CliPreferencesPath } from '../common/cli-preferences';
|
|
23
|
-
import { bindPreferenceProviders } from './preference-bindings';
|
|
24
|
-
import { PreferenceStorageFactory } from '../common/abstract-resource-preference-provider';
|
|
22
|
+
import { CliPreferences, CliPreferencesPath } from '../common/cli-preferences.js';
|
|
23
|
+
import { bindPreferenceProviders } from './preference-bindings.js';
|
|
24
|
+
import { PreferenceStorageFactory } from '../common/abstract-resource-preference-provider.js';
|
|
25
25
|
import { PreferenceScope, URI } from '@theia/core';
|
|
26
|
-
import { BackendPreferenceStorage } from './backend-preference-storage';
|
|
27
|
-
import { JSONCEditor } from '../common/jsonc-editor';
|
|
26
|
+
import { BackendPreferenceStorage } from './backend-preference-storage.js';
|
|
27
|
+
import { JSONCEditor } from '../common/jsonc-editor.js';
|
|
28
28
|
import { EncodingService } from '@theia/core/lib/common/encoding-service';
|
|
29
29
|
import { DiskFileSystemProvider } from '@theia/filesystem/lib/node/disk-file-system-provider';
|
|
30
30
|
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
18
|
-
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
19
|
-
import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from '../common/section-preference-provider';
|
|
18
|
+
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider.js';
|
|
19
|
+
import { SectionPreferenceProviderUri, SectionPreferenceProviderSection } from '../common/section-preference-provider.js';
|
|
20
20
|
import { bindFactory, PreferenceProvider, PreferenceScope, URI } from '@theia/core';
|
|
21
|
-
import { UserConfigsPreferenceProvider, UserStorageLocationProvider } from '../common/user-configs-preference-provider';
|
|
21
|
+
import { UserConfigsPreferenceProvider, UserStorageLocationProvider } from '../common/user-configs-preference-provider.js';
|
|
22
22
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
23
23
|
|
|
24
24
|
export function bindPreferenceProviders(bind: interfaces.Bind): void {
|