@theia/preferences 1.73.0-next.2 → 1.73.0-next.24
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 +6 -1
- package/lib/browser/folders-preferences-provider.js.map +1 -1
- package/lib/browser/preference-transaction-manager.d.ts +2 -1
- package/lib/browser/preference-transaction-manager.d.ts.map +1 -1
- package/lib/browser/preference-transaction-manager.js +6 -1
- package/lib/browser/preference-transaction-manager.js.map +1 -1
- package/lib/common/user-configs-preference-provider.d.ts +2 -1
- package/lib/common/user-configs-preference-provider.d.ts.map +1 -1
- package/lib/common/user-configs-preference-provider.js +6 -1
- package/lib/common/user-configs-preference-provider.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/folders-preferences-provider.ts +6 -3
- package/src/browser/preference-transaction-manager.ts +5 -3
- package/src/common/user-configs-preference-provider.ts +6 -3
|
@@ -2,11 +2,12 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
2
2
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
3
3
|
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
|
|
4
4
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
5
|
-
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope } from '@theia/core';
|
|
5
|
+
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope, ILogger } from '@theia/core';
|
|
6
6
|
export declare class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
7
7
|
protected readonly workspaceService: WorkspaceService;
|
|
8
8
|
protected readonly folderPreferenceProviderFactory: FolderPreferenceProviderFactory;
|
|
9
9
|
protected readonly configurations: PreferenceConfigurations;
|
|
10
|
+
protected readonly logger: ILogger;
|
|
10
11
|
protected readonly providers: Map<string, FolderPreferenceProvider>;
|
|
11
12
|
protected init(): void;
|
|
12
13
|
protected doInit(): Promise<void>;
|
|
@@ -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,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,eAAe,EAAmB,MAAM,aAAa,CAAC;
|
|
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,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,8BAA8B,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,eAAe,EAAmB,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnJ,qBACa,0BAA2B,SAAQ,sBAAsB;IAGlE,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;IAG5D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,SAAS,wCAA+C;IAG3E,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC,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"}
|
|
@@ -37,7 +37,7 @@ let FoldersPreferencesProvider = class FoldersPreferencesProvider extends core_1
|
|
|
37
37
|
this.workspaceService.onWorkspaceChanged(() => this.updateProviders());
|
|
38
38
|
const readyPromises = [];
|
|
39
39
|
for (const provider of this.providers.values()) {
|
|
40
|
-
readyPromises.push(provider.ready.catch(e =>
|
|
40
|
+
readyPromises.push(provider.ready.catch(e => this.logger.error(e)));
|
|
41
41
|
}
|
|
42
42
|
Promise.all(readyPromises).then(() => this._ready.resolve());
|
|
43
43
|
}
|
|
@@ -225,6 +225,11 @@ tslib_1.__decorate([
|
|
|
225
225
|
(0, inversify_1.inject)(core_1.PreferenceConfigurations),
|
|
226
226
|
tslib_1.__metadata("design:type", core_1.PreferenceConfigurations)
|
|
227
227
|
], FoldersPreferencesProvider.prototype, "configurations", void 0);
|
|
228
|
+
tslib_1.__decorate([
|
|
229
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
230
|
+
(0, inversify_1.named)('preferences:FoldersPreferencesProvider'),
|
|
231
|
+
tslib_1.__metadata("design:type", Object)
|
|
232
|
+
], FoldersPreferencesProvider.prototype, "logger", void 0);
|
|
228
233
|
tslib_1.__decorate([
|
|
229
234
|
(0, inversify_1.postConstruct)(),
|
|
230
235
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,uDAAuD;AAEvD,
|
|
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,gFAAgF;AAChF,gFAAgF;;;;AAEhF,uDAAuD;AAEvD,4DAAwF;AACxF,oDAA6C;AAC7C,sFAAkF;AAClF,6EAAyG;AAEzG,sCAAmJ;AAG5I,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,6BAAsB;IAA/D;;QAcgB,cAAS,GAAG,IAAI,GAAG,EAAoC,CAAC;IA6M/E,CAAC;IA1Ma,IAAI;QACV,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;QAElC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAEvE,MAAM,aAAa,GAAoB,EAAE,CAAC;QAC1C,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC;IAES,eAAe;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACtD,KAAK,MAAM,UAAU,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC;oBACvG,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;oBAC1F,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACzC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;wBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;wBACrE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;oBAC7C,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3B,QAAQ,CAAC,OAAO,EAAE,CAAC;YACvB,CAAC;QACL,CAAC;IACL,CAAC;IAEQ,YAAY,CAAC,WAAoB,EAAE,cAAsB,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE;QACjG,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACrD,IAAI,SAAS,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,WAAW,EAAE,CAAC;gBACtE,OAAO,SAAS,CAAC;YACrB,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,sBAAsB,CAAC,WAAoB,EAAE,cAAsB,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE;QAC3G,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YAC1D,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1C,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,WAAW,EAAE,CAAC;gBAC3F,OAAO,SAAS,CAAC;YACrB,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,SAAS;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrF,CAAC;IAEQ,OAAO,CAAI,cAAsB,EAAE,WAAoB;QAC5D,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;QAC5D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YAClC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;gBAC3B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAI,cAAc,EAAE,WAAW,CAAC,CAAC;gBAC9E,IAAI,SAAS,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC7B,MAAM,CAAC,KAAK,GAAG,sBAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAY,EAAE,KAAY,CAAQ,CAAC;oBAC/E,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,cAAc,CAAC,WAAoB;QAC/B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;QAC5D,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YAClC,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;gBAC3B,IAAI,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC;oBACrC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;oBAC9C,MAAM,GAAG,sBAAe,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAQ,CAAC;oBAC3D,MAAM;gBACV,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,cAAsB,EAAE,KAAU,EAAE,WAAoB;QACxE,MAAM,iBAAiB,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QAEhH,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACvD,IAAI,UAA8B,CAAC;QACnC,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC3C,qFAAqF;YACrF,MAAM,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC/D,IAAI,UAAU,KAAK,SAAS,IAAI,mBAAmB,EAAE,CAAC;gBAClD,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAClE,CAAC;YACD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,mBAAmB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;YACjG,OAAO,YAAY,KAAK,UAAU,IAAI,YAAY,KAAK,iBAAiB,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,EAAE,CAAC;QACpC,MAAM,qBAAqB,GAAG,EAAE,CAAC;QACjC,MAAM,gBAAgB,GAAG,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,aAAa,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC;YAC1E,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC;YAE1E,gEAAgE;YAChE,IAAI,WAAW,IAAI,aAAa,EAAE,CAAC;gBAC/B,IAAI,MAAM,SAAS,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC;oBACpE,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;iBAAM,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC,CAAC,kCAAkC;gBACvE,wBAAwB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,WAAW,EAAE,CAAC,CAAC,cAAc;gBACpC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1C,CAAC;iBAAM,IAAI,aAAa,EAAE,CAAC,CAAC,yCAAyC;gBACjE,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACJ,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,GAAG,CAAC,wBAAwB,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAExG,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;gBACnC,IAAI,MAAM,SAAS,CAAC,aAAa,CAAC,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC;oBACpE,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEQ,cAAc,CAAC,KAAsB;QAC1C,OAAO,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,IAAI,KAAK,KAAK,sBAAe,CAAC,MAAM,IAAI,KAAK,KAAK,sBAAe,CAAC,SAAS,CAAC;IACvI,CAAC;IAES,0BAA0B,CAAC,WAAoB;QACrD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsC,CAAC;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACvD,KAAK,MAAM,UAAU,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;YACvG,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBAC/B,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,KAAK,UAAU,EAAE,CAAC;oBACtE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACzB,CAAC;YACL,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,kBAAkB,CAAC,WAAoB;QAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,YAAY,GAAG,IAAI,aAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QAC/C,IAAI,MAAM,GAAmD,EAAE,UAAU,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC;QACrG,MAAM,SAAS,GAAG,IAAI,GAAG,EAAsC,CAAC;QAChE,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YACnD,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;YAEpC,mGAAmG;YACnG,MAAM,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACpE,IAAI,UAAU,IAAI,CAAC,IAAI,MAAM,CAAC,UAAU,GAAG,UAAU,EAAE,CAAC;gBACpD,MAAM,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;YACjC,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACzD,CAAC;IAES,cAAc,CAAC,GAAQ,EAAE,OAAe,EAAE,MAAgB;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,+BAA+B,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5E,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAClH,OAAO,QAAQ,CAAC;IACpB,CAAC;CAEJ,CAAA;AA3NY,gEAA0B;AAGhB;IADlB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;sCACY,oCAAgB;oEAAC;AAGnC;IADlB,IAAA,kBAAM,EAAC,4DAA+B,CAAC;;mFAC4C;AAGjE;IADlB,IAAA,kBAAM,EAAC,+BAAwB,CAAC;sCACE,+BAAwB;kEAAC;AAGzC;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,wCAAwC,CAAC;;0DAC9B;AAKzB;IADT,IAAA,yBAAa,GAAE;;;;sDAGf;qCAnBQ,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA2NtC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Listener, ListenerList, MaybePromise, MessageService } from '@theia/core';
|
|
1
|
+
import { Listener, ListenerList, MaybePromise, MessageService, ILogger } from '@theia/core';
|
|
2
2
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
3
3
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
4
4
|
import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
|
|
@@ -81,6 +81,7 @@ export declare class PreferenceTransaction extends Transaction<[string, string[]
|
|
|
81
81
|
protected readonly jsoncEditor: MonacoJSONCEditor;
|
|
82
82
|
protected readonly messageService: MessageService;
|
|
83
83
|
protected readonly editorManager: EditorManager;
|
|
84
|
+
protected readonly logger: ILogger;
|
|
84
85
|
protected doInit(): Promise<void>;
|
|
85
86
|
protected setUp(): Promise<boolean>;
|
|
86
87
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqB,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAO,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -215,7 +215,7 @@ let PreferenceTransaction = class PreferenceTransaction extends Transaction {
|
|
|
215
215
|
catch (e) {
|
|
216
216
|
const message = `Failed to update the value of '${key}' in '${this.context.getConfigUri()}'.`;
|
|
217
217
|
this.messageService.error(`${message} Please check if it is corrupted.`);
|
|
218
|
-
|
|
218
|
+
this.logger.error(`${message}`, e);
|
|
219
219
|
return false;
|
|
220
220
|
}
|
|
221
221
|
}
|
|
@@ -261,6 +261,11 @@ tslib_1.__decorate([
|
|
|
261
261
|
(0, inversify_1.inject)(editor_manager_1.EditorManager),
|
|
262
262
|
tslib_1.__metadata("design:type", editor_manager_1.EditorManager)
|
|
263
263
|
], PreferenceTransaction.prototype, "editorManager", void 0);
|
|
264
|
+
tslib_1.__decorate([
|
|
265
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
266
|
+
(0, inversify_1.named)('preferences:PreferenceTransaction'),
|
|
267
|
+
tslib_1.__metadata("design:type", Object)
|
|
268
|
+
], PreferenceTransaction.prototype, "logger", void 0);
|
|
264
269
|
exports.PreferenceTransaction = PreferenceTransaction = tslib_1.__decorate([
|
|
265
270
|
(0, inversify_1.injectable)()
|
|
266
271
|
], PreferenceTransaction);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-transaction-manager.js","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.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,
|
|
1
|
+
{"version":3,"file":"preference-transaction-manager.js","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
2
|
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
3
|
-
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult } from '@theia/core';
|
|
3
|
+
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, ILogger } from '@theia/core';
|
|
4
4
|
export declare const UserStorageLocationProvider: unique symbol;
|
|
5
5
|
/**
|
|
6
6
|
* Binds together preference section prefs providers for user-level preferences.
|
|
@@ -9,6 +9,7 @@ export declare class UserConfigsPreferenceProvider extends PreferenceProviderImp
|
|
|
9
9
|
protected readonly providerFactory: UserPreferenceProviderFactory;
|
|
10
10
|
private userStorageLocationProvider;
|
|
11
11
|
protected readonly configurations: PreferenceConfigurations;
|
|
12
|
+
protected readonly logger: ILogger;
|
|
12
13
|
protected readonly providers: Map<string, UserPreferenceProvider>;
|
|
13
14
|
protected init(): void;
|
|
14
15
|
protected doInit(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-configs-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAmB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"user-configs-preference-provider.d.ts","sourceRoot":"","sources":["../../src/common/user-configs-preference-provider.ts"],"names":[],"mappings":"AAmBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,uBAAuB,EAAmB,OAAO,EAAE,MAAM,aAAa,CAAC;AAElI,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AAEjF;;GAEG;AACH,qBACa,6BAA8B,SAAQ,sBAAsB;IAGrE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,6BAA6B,CAAC;IAGlE,OAAO,CAAC,2BAA2B,CAAqB;IAGxD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,SAAS,sCAA6C;IAGzE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvC,SAAS,CAAC,eAAe,CAAC,mBAAmB,EAAE,GAAG,GAAG,IAAI;IAWhD,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,WAAW,GAAE,MAA4C,GAAG,GAAG,GAAG,SAAS;IAU9G,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,uBAAuB,CAAC,CAAC,CAAC;IAY7F,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IASpD,aAAa,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAwB/F,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,sBAAsB;CAMlF"}
|
|
@@ -38,7 +38,7 @@ let UserConfigsPreferenceProvider = class UserConfigsPreferenceProvider extends
|
|
|
38
38
|
this.createProviders(userStorageUri);
|
|
39
39
|
const readyPromises = [];
|
|
40
40
|
for (const provider of this.providers.values()) {
|
|
41
|
-
readyPromises.push(provider.ready.catch(e =>
|
|
41
|
+
readyPromises.push(provider.ready.catch(e => this.logger.error(e)));
|
|
42
42
|
}
|
|
43
43
|
Promise.all(readyPromises).then(() => this._ready.resolve());
|
|
44
44
|
}
|
|
@@ -122,6 +122,11 @@ tslib_1.__decorate([
|
|
|
122
122
|
(0, inversify_1.inject)(core_1.PreferenceConfigurations),
|
|
123
123
|
tslib_1.__metadata("design:type", core_1.PreferenceConfigurations)
|
|
124
124
|
], UserConfigsPreferenceProvider.prototype, "configurations", void 0);
|
|
125
|
+
tslib_1.__decorate([
|
|
126
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
127
|
+
(0, inversify_1.named)('preferences:UserConfigsPreferenceProvider'),
|
|
128
|
+
tslib_1.__metadata("design:type", Object)
|
|
129
|
+
], UserConfigsPreferenceProvider.prototype, "logger", void 0);
|
|
125
130
|
tslib_1.__decorate([
|
|
126
131
|
(0, inversify_1.postConstruct)(),
|
|
127
132
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-configs-preference-provider.js","sourceRoot":"","sources":["../../src/common/user-configs-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;AAEvD,
|
|
1
|
+
{"version":3,"file":"user-configs-preference-provider.js","sourceRoot":"","sources":["../../src/common/user-configs-preference-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.73.0-next.
|
|
3
|
+
"version": "1.73.0-next.24+ed85d4937",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.73.0-next.
|
|
7
|
-
"@theia/editor": "1.73.0-next.
|
|
8
|
-
"@theia/filesystem": "1.73.0-next.
|
|
9
|
-
"@theia/monaco": "1.73.0-next.
|
|
6
|
+
"@theia/core": "1.73.0-next.24+ed85d4937",
|
|
7
|
+
"@theia/editor": "1.73.0-next.24+ed85d4937",
|
|
8
|
+
"@theia/filesystem": "1.73.0-next.24+ed85d4937",
|
|
9
|
+
"@theia/monaco": "1.73.0-next.24+ed85d4937",
|
|
10
10
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
|
-
"@theia/userstorage": "1.73.0-next.
|
|
12
|
-
"@theia/workspace": "1.73.0-next.
|
|
11
|
+
"@theia/userstorage": "1.73.0-next.24+ed85d4937",
|
|
12
|
+
"@theia/workspace": "1.73.0-next.24+ed85d4937",
|
|
13
13
|
"async-mutex": "^0.3.2",
|
|
14
14
|
"fast-deep-equal": "^3.1.3",
|
|
15
15
|
"jsonc-parser": "^3.3.1",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "ed85d49379279b6472543df174249476e1619bac"
|
|
59
59
|
}
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
18
18
|
|
|
19
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
21
|
import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
|
|
22
22
|
import { FolderPreferenceProvider, FolderPreferenceProviderFactory } from './folder-preference-provider';
|
|
23
23
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
24
|
-
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope, PreferenceUtils } from '@theia/core';
|
|
24
|
+
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceScope, PreferenceUtils, ILogger } from '@theia/core';
|
|
25
25
|
|
|
26
26
|
@injectable()
|
|
27
27
|
export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
@@ -35,6 +35,9 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
35
35
|
@inject(PreferenceConfigurations)
|
|
36
36
|
protected readonly configurations: PreferenceConfigurations;
|
|
37
37
|
|
|
38
|
+
@inject(ILogger) @named('preferences:FoldersPreferencesProvider')
|
|
39
|
+
protected readonly logger: ILogger;
|
|
40
|
+
|
|
38
41
|
protected readonly providers = new Map<string, FolderPreferenceProvider>();
|
|
39
42
|
|
|
40
43
|
@postConstruct()
|
|
@@ -50,7 +53,7 @@ export class FoldersPreferencesProvider extends PreferenceProviderImpl {
|
|
|
50
53
|
|
|
51
54
|
const readyPromises: Promise<void>[] = [];
|
|
52
55
|
for (const provider of this.providers.values()) {
|
|
53
|
-
readyPromises.push(provider.ready.catch(e =>
|
|
56
|
+
readyPromises.push(provider.ready.catch(e => this.logger.error(e)));
|
|
54
57
|
}
|
|
55
58
|
Promise.all(readyPromises).then(() => this._ready.resolve());
|
|
56
59
|
}
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { CancellationError, Listener, ListenerList, MaybePromise, MessageService, nls } from '@theia/core';
|
|
17
|
+
import { CancellationError, Listener, ListenerList, MaybePromise, MessageService, nls, ILogger } from '@theia/core';
|
|
18
18
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
19
|
-
import { inject, injectable, interfaces, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { inject, injectable, interfaces, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
|
|
21
21
|
import URI from '@theia/core/lib/common/uri';
|
|
22
22
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
@@ -186,6 +186,8 @@ export class PreferenceTransaction extends Transaction<[string, string[], unknow
|
|
|
186
186
|
@inject(MonacoJSONCEditor) protected readonly jsoncEditor: MonacoJSONCEditor;
|
|
187
187
|
@inject(MessageService) protected readonly messageService: MessageService;
|
|
188
188
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
189
|
+
@inject(ILogger) @named('preferences:PreferenceTransaction')
|
|
190
|
+
protected readonly logger: ILogger;
|
|
189
191
|
|
|
190
192
|
protected override async doInit(): Promise<void> {
|
|
191
193
|
this.waitFor(this.prelude?.());
|
|
@@ -245,7 +247,7 @@ export class PreferenceTransaction extends Transaction<[string, string[], unknow
|
|
|
245
247
|
} catch (e) {
|
|
246
248
|
const message = `Failed to update the value of '${key}' in '${this.context.getConfigUri()}'.`;
|
|
247
249
|
this.messageService.error(`${message} Please check if it is corrupted.`);
|
|
248
|
-
|
|
250
|
+
this.logger.error(`${message}`, e);
|
|
249
251
|
return false;
|
|
250
252
|
}
|
|
251
253
|
}
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
18
18
|
|
|
19
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { inject, injectable, postConstruct, named } from '@theia/core/shared/inversify';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
21
|
import { UserPreferenceProvider, UserPreferenceProviderFactory } from '../common/user-preference-provider';
|
|
22
|
-
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceUtils } from '@theia/core';
|
|
22
|
+
import { PreferenceProviderImpl, PreferenceConfigurations, PreferenceResolveResult, PreferenceUtils, ILogger } from '@theia/core';
|
|
23
23
|
|
|
24
24
|
export const UserStorageLocationProvider = Symbol('UserStorageLocationProvider');
|
|
25
25
|
|
|
@@ -38,6 +38,9 @@ export class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
|
38
38
|
@inject(PreferenceConfigurations)
|
|
39
39
|
protected readonly configurations: PreferenceConfigurations;
|
|
40
40
|
|
|
41
|
+
@inject(ILogger) @named('preferences:UserConfigsPreferenceProvider')
|
|
42
|
+
protected readonly logger: ILogger;
|
|
43
|
+
|
|
41
44
|
protected readonly providers = new Map<string, UserPreferenceProvider>();
|
|
42
45
|
|
|
43
46
|
@postConstruct()
|
|
@@ -51,7 +54,7 @@ export class UserConfigsPreferenceProvider extends PreferenceProviderImpl {
|
|
|
51
54
|
|
|
52
55
|
const readyPromises: Promise<void>[] = [];
|
|
53
56
|
for (const provider of this.providers.values()) {
|
|
54
|
-
readyPromises.push(provider.ready.catch(e =>
|
|
57
|
+
readyPromises.push(provider.ready.catch(e => this.logger.error(e)));
|
|
55
58
|
}
|
|
56
59
|
Promise.all(readyPromises).then(() => this._ready.resolve());
|
|
57
60
|
}
|