@theia/preferences 1.36.0-next.35 → 1.36.0-next.38
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/folders-preferences-provider.d.ts +2 -1
- package/lib/browser/folders-preferences-provider.d.ts.map +1 -1
- package/lib/browser/folders-preferences-provider.js +7 -4
- package/lib/browser/folders-preferences-provider.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/folders-preferences-provider.ts +5 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
|
-
import { PreferenceProvider, PreferenceResolveResult } from '@theia/core/lib/browser/preferences
|
|
2
|
+
import { PreferenceProvider, PreferenceResolveResult, PreferenceScope } from '@theia/core/lib/browser/preferences';
|
|
3
3
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
4
4
|
import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
|
|
5
5
|
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
|
|
@@ -19,6 +19,7 @@ export declare class FoldersPreferencesProvider extends PreferenceProvider {
|
|
|
19
19
|
[p: string]: any;
|
|
20
20
|
};
|
|
21
21
|
setPreference(preferenceName: string, value: any, resourceUri?: string): Promise<boolean>;
|
|
22
|
+
canHandleScope(scope: PreferenceScope): boolean;
|
|
22
23
|
protected groupProvidersByConfigName(resourceUri?: string): Map<string, FolderPreferenceProvider[]>;
|
|
23
24
|
protected getFolderProviders(resourceUri?: string): FolderPreferenceProvider[];
|
|
24
25
|
protected createProvider(uri: URI, section: string, folder: FileStat): FolderPreferenceProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folders-preferences-provider.d.ts","sourceRoot":"","sources":["../../src/browser/folders-preferences-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"folders-preferences-provider.d.ts","sourceRoot":"","sources":["../../src/browser/folders-preferences-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACnH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+DAA+D,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,qBACa,0BAA2B,SAAQ,kBAAkB;IAG9D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,+BAA+B,EAAE,+BAA+B,CAAC;IAGpF,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAE5D,SAAS,CAAC,QAAQ,CAAC,SAAS,wCAA+C;cAG3D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAarC,SAAS,CAAC,eAAe,IAAI,IAAI;IAyBxB,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAA4C,GAAG,GAAG,GAAG,SAAS;IAU9G,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAA4C,GAAG,GAAG,GAAG,SAAS;IAUxH,SAAS,IAAI,MAAM,EAAE;IAIrB,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC;IAgB7F,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAepD,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyDtF,cAAc,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO;IAIxD,SAAS,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,EAAE,CAAC;IAenG,SAAS,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,wBAAwB,EAAE;IAsB9E,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,wBAAwB;CAOlG"}
|
|
@@ -28,11 +28,11 @@ exports.FoldersPreferencesProvider = void 0;
|
|
|
28
28
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
29
29
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
30
30
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
31
|
-
const
|
|
31
|
+
const preferences_1 = require("@theia/core/lib/browser/preferences");
|
|
32
32
|
const workspace_service_1 = require("@theia/workspace/lib/browser/workspace-service");
|
|
33
33
|
const preference_configurations_1 = require("@theia/core/lib/browser/preferences/preference-configurations");
|
|
34
34
|
const folder_preference_provider_1 = require("./folder-preference-provider");
|
|
35
|
-
let FoldersPreferencesProvider = class FoldersPreferencesProvider extends
|
|
35
|
+
let FoldersPreferencesProvider = class FoldersPreferencesProvider extends preferences_1.PreferenceProvider {
|
|
36
36
|
constructor() {
|
|
37
37
|
super(...arguments);
|
|
38
38
|
this.providers = new Map();
|
|
@@ -100,7 +100,7 @@ let FoldersPreferencesProvider = class FoldersPreferencesProvider extends prefer
|
|
|
100
100
|
const { value, configUri } = provider.resolve(preferenceName, resourceUri);
|
|
101
101
|
if (configUri && value !== undefined) {
|
|
102
102
|
result.configUri = configUri;
|
|
103
|
-
result.value =
|
|
103
|
+
result.value = preferences_1.PreferenceProvider.merge(result.value, value);
|
|
104
104
|
break;
|
|
105
105
|
}
|
|
106
106
|
}
|
|
@@ -114,7 +114,7 @@ let FoldersPreferencesProvider = class FoldersPreferencesProvider extends prefer
|
|
|
114
114
|
for (const provider of group) {
|
|
115
115
|
if (provider.getConfigUri(resourceUri)) {
|
|
116
116
|
const preferences = provider.getPreferences();
|
|
117
|
-
result =
|
|
117
|
+
result = preferences_1.PreferenceProvider.merge(result, preferences);
|
|
118
118
|
break;
|
|
119
119
|
}
|
|
120
120
|
}
|
|
@@ -174,6 +174,9 @@ let FoldersPreferencesProvider = class FoldersPreferencesProvider extends prefer
|
|
|
174
174
|
}
|
|
175
175
|
return false;
|
|
176
176
|
}
|
|
177
|
+
canHandleScope(scope) {
|
|
178
|
+
return this.workspaceService.isMultiRootWorkspaceOpened && scope === preferences_1.PreferenceScope.Folder || scope === preferences_1.PreferenceScope.Workspace;
|
|
179
|
+
}
|
|
177
180
|
groupProvidersByConfigName(resourceUri) {
|
|
178
181
|
const groups = new Map();
|
|
179
182
|
const providers = this.getFolderProviders(resourceUri);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"folders-preferences-provider.js","sourceRoot":"","sources":["../../src/browser/folders-preferences-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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,uDAAuD;AAEvD,4DAAiF;AACjF,oDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"folders-preferences-provider.js","sourceRoot":"","sources":["../../src/browser/folders-preferences-provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/preferences",
|
|
3
|
-
"version": "1.36.0-next.
|
|
3
|
+
"version": "1.36.0-next.38+f3819b2a8",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.36.0-next.
|
|
7
|
-
"@theia/editor": "1.36.0-next.
|
|
8
|
-
"@theia/filesystem": "1.36.0-next.
|
|
9
|
-
"@theia/monaco": "1.36.0-next.
|
|
6
|
+
"@theia/core": "1.36.0-next.38+f3819b2a8",
|
|
7
|
+
"@theia/editor": "1.36.0-next.38+f3819b2a8",
|
|
8
|
+
"@theia/filesystem": "1.36.0-next.38+f3819b2a8",
|
|
9
|
+
"@theia/monaco": "1.36.0-next.38+f3819b2a8",
|
|
10
10
|
"@theia/monaco-editor-core": "1.72.3",
|
|
11
|
-
"@theia/userstorage": "1.36.0-next.
|
|
12
|
-
"@theia/workspace": "1.36.0-next.
|
|
11
|
+
"@theia/userstorage": "1.36.0-next.38+f3819b2a8",
|
|
12
|
+
"@theia/workspace": "1.36.0-next.38+f3819b2a8",
|
|
13
13
|
"async-mutex": "^0.3.1",
|
|
14
14
|
"jsonc-parser": "^2.2.0",
|
|
15
15
|
"p-debounce": "^2.1.0"
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"nyc": {
|
|
53
53
|
"extends": "../../configs/nyc.json"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "f3819b2a8954c1ec1c6c674c4479fddbaf0be3ea"
|
|
56
56
|
}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
|
|
19
19
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
|
-
import { PreferenceProvider, PreferenceResolveResult } from '@theia/core/lib/browser/preferences
|
|
21
|
+
import { PreferenceProvider, PreferenceResolveResult, PreferenceScope } from '@theia/core/lib/browser/preferences';
|
|
22
22
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
23
23
|
import { PreferenceConfigurations } from '@theia/core/lib/browser/preferences/preference-configurations';
|
|
24
24
|
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
|
|
@@ -189,6 +189,10 @@ export class FoldersPreferencesProvider extends PreferenceProvider {
|
|
|
189
189
|
return false;
|
|
190
190
|
}
|
|
191
191
|
|
|
192
|
+
override canHandleScope(scope: PreferenceScope): boolean {
|
|
193
|
+
return this.workspaceService.isMultiRootWorkspaceOpened && scope === PreferenceScope.Folder || scope === PreferenceScope.Workspace;
|
|
194
|
+
}
|
|
195
|
+
|
|
192
196
|
protected groupProvidersByConfigName(resourceUri?: string): Map<string, FolderPreferenceProvider[]> {
|
|
193
197
|
const groups = new Map<string, FolderPreferenceProvider[]>();
|
|
194
198
|
const providers = this.getFolderProviders(resourceUri);
|