@theia/preferences 1.24.0-next.71 → 1.24.0-next.74
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/abstract-resource-preference-provider.d.ts.map +1 -1
- package/lib/browser/abstract-resource-preference-provider.js +1 -2
- package/lib/browser/abstract-resource-preference-provider.js.map +1 -1
- package/lib/browser/preference-frontend-module.d.ts.map +1 -1
- package/lib/browser/preference-frontend-module.js +1 -5
- package/lib/browser/preference-frontend-module.js.map +1 -1
- package/lib/browser/preference-transaction-manager.d.ts +6 -1
- package/lib/browser/preference-transaction-manager.d.ts.map +1 -1
- package/lib/browser/preference-transaction-manager.js +23 -1
- package/lib/browser/preference-transaction-manager.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/abstract-resource-preference-provider.ts +1 -2
- package/src/browser/preference-frontend-module.ts +2 -6
- package/src/browser/preference-transaction-manager.ts +18 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.d.ts","sourceRoot":"","sources":["../../src/browser/abstract-resource-preference-provider.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,eAAe,EAAgC,MAAM,yBAAyB,CAAC;AACtI,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,+DAA+D,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,8BACsB,kCAAmC,SAAQ,kBAAkB;IAE/E,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAChD,SAAS,CAAC,WAAW,UAAS;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAkB;IAC5C,SAAS,CAAC,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,0BAA0B,mBAA0B;IAEvE,IAAI,UAAU,CAAC,MAAM,EAAE,OAAO,EAK7B;IAED,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAEqC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;IACxE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IACzE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;cAG9E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBrC,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG;IAChC,QAAQ,CAAC,QAAQ,IAAI,eAAe;IAEpC,IAAI,KAAK,IAAI,OAAO,CAEnB;IAEQ,YAAY,IAAI,GAAG;IACnB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS;IAQvE,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAYlD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAItD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAQpE,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-resource-preference-provider.d.ts","sourceRoot":"","sources":["../../src/browser/abstract-resource-preference-provider.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,eAAe,EAAgC,MAAM,yBAAyB,CAAC;AACtI,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,+DAA+D,CAAC;AACzG,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAC1H,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAE7C,8BACsB,kCAAmC,SAAQ,kBAAkB;IAE/E,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAChD,SAAS,CAAC,WAAW,UAAS;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAkB;IAC5C,SAAS,CAAC,WAAW,EAAE,qBAAqB,GAAG,SAAS,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,0BAA0B,mBAA0B;IAEvE,IAAI,UAAU,CAAC,MAAM,EAAE,OAAO,EAK7B;IAED,IAAI,mBAAmB,IAAI,KAAK,CAAC,OAAO,CAAC,CAExC;IAEqC,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;IACxE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IACzE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;cAG9E,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBrC,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,GAAG;IAChC,QAAQ,CAAC,QAAQ,IAAI,eAAe;IAEpC,IAAI,KAAK,IAAI,OAAO,CAEnB;IAEQ,YAAY,IAAI,GAAG;IACnB,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS;IAQvE,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAYlD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAItD,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAQpE,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB9F;;;;OAIG;IACH,SAAS,CAAC,aAAa,IAAI,iBAAiB;IAI5C,SAAS,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS;cAQ/C,uBAAuB,IAAI,OAAO,CAAC,IAAI,CAAC;IAaxD,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAW3D,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IASrC,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,GAAG,IAAI;IA8BzE,SAAS,CAAC,KAAK,IAAI,IAAI;CAgB1B"}
|
|
@@ -105,8 +105,7 @@ let AbstractResourcePreferenceProvider = class AbstractResourcePreferenceProvide
|
|
|
105
105
|
var _a;
|
|
106
106
|
if (!((_a = this.transaction) === null || _a === void 0 ? void 0 : _a.open)) {
|
|
107
107
|
const current = this.transaction;
|
|
108
|
-
this.transaction = this.transactionFactory(this.toFileManager());
|
|
109
|
-
this.transaction.waitFor(current === null || current === void 0 ? void 0 : current.result);
|
|
108
|
+
this.transaction = this.transactionFactory(this.toFileManager(), current === null || current === void 0 ? void 0 : current.result);
|
|
110
109
|
this.transaction.onWillConclude(({ status, waitUntil }) => {
|
|
111
110
|
if (status) {
|
|
112
111
|
waitUntil((async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-resource-preference-provider.js","sourceRoot":"","sources":["../../src/browser/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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,uDAAuD;AACvD,oCAAoC;AAEpC,4CAA4C;AAC5C,4DAAiF;AACjF,kEAA+D;AAC/D,qDAAsI;AACtI,oDAA6C;AAC7C,6GAAyG;AACzG,sEAA+D;AAC/D,6EAAyE;AACzE,qFAA0H;AAC1H,sCAA6C;AAG7C,IAAsB,kCAAkC,GAAxD,MAAsB,kCAAmC,SAAQ,4BAAkB;IAAnF;;QAEc,gBAAW,GAAwB,EAAE,CAAC;QACtC,gBAAW,GAAG,KAAK,CAAC;QACX,YAAO,GAAG,IAAI,uBAAQ,EAAE,CAAC;QAEzB,+BAA0B,GAAG,IAAI,cAAO,EAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-resource-preference-provider.js","sourceRoot":"","sources":["../../src/browser/abstract-resource-preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAc3E,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"preference-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAc3E,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,CAoBtF;;AAED,wBAEG"}
|
|
@@ -44,11 +44,7 @@ function bindPreferences(bind, unbind) {
|
|
|
44
44
|
bind(json_schema_store_1.JsonSchemaContribution).toService(preferences_json_schema_contribution_1.PreferencesJsonSchemaContribution);
|
|
45
45
|
bind(monaco_jsonc_editor_1.MonacoJSONCEditor).toSelf().inSingletonScope();
|
|
46
46
|
bind(preference_transaction_manager_1.PreferenceTransaction).toSelf();
|
|
47
|
-
bind(preference_transaction_manager_1.PreferenceTransactionFactory).toFactory(
|
|
48
|
-
const child = container.createChild();
|
|
49
|
-
child.bind(preference_transaction_manager_1.PreferenceContext).toConstantValue(context);
|
|
50
|
-
return child.get(preference_transaction_manager_1.PreferenceTransaction);
|
|
51
|
-
});
|
|
47
|
+
bind(preference_transaction_manager_1.PreferenceTransactionFactory).toFactory(preference_transaction_manager_1.preferenceTransactionFactoryCreator);
|
|
52
48
|
}
|
|
53
49
|
exports.bindPreferences = bindPreferences;
|
|
54
50
|
exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.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,6CAA2C;AAC3C,6CAA2C;AAC3C,4DAA2E;AAC3E,qDAA4E;AAC5E,mFAA0F;AAC1F,gFAA2E;AAC3E,+DAAgE;AAChE,mFAA4E;AAC5E,yEAAqE;AACrE,8FAAwF;AACxF,iFAAmF;AACnF,iGAA2F;AAC3F,+DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"preference-frontend-module.js","sourceRoot":"","sources":["../../src/browser/preference-frontend-module.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,6CAA2C;AAC3C,6CAA2C;AAC3C,4DAA2E;AAC3E,qDAA4E;AAC5E,mFAA0F;AAC1F,gFAA2E;AAC3E,+DAAgE;AAChE,mFAA4E;AAC5E,yEAAqE;AACrE,8FAAwF;AACxF,iFAAmF;AACnF,iGAA2F;AAC3F,+DAA0D;AAC1D,qFAA4I;AAC5I,uEAAkE;AAElE,SAAgB,eAAe,CAAC,IAAqB,EAAE,MAAyB;IAC5E,IAAA,6CAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,IAAA,mDAAsB,EAAC,IAAI,CAAC,CAAC;IAE7B,IAAI,CAAC,mDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAA,8BAAoB,EAAC,IAAI,EAAE,kDAAuB,CAAC,CAAC;IAEpD,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,qBAAW,CAAC,CAAC,SAAS,CAAC,+CAAqB,CAAC,CAAC;IAEnD,IAAI,CAAC,gEAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,2CAAyB,CAAC,CAAC,SAAS,CAAC,kDAAuB,CAAC,CAAC;IAEnE,IAAI,CAAC,wEAAiC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,wEAAiC,CAAC,CAAC;IAE1E,IAAI,CAAC,uCAAiB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpD,IAAI,CAAC,sDAAqB,CAAC,CAAC,MAAM,EAAE,CAAC;IACrC,IAAI,CAAC,6DAA4B,CAAC,CAAC,SAAS,CAAC,oEAAmC,CAAC,CAAC;AACtF,CAAC;AApBD,0CAoBC;AAED,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Emitter, Event, MaybePromise, MessageService, WaitUntilEvent } from '@theia/core';
|
|
2
2
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
3
|
+
import { interfaces } from '@theia/core/shared/inversify';
|
|
3
4
|
import { PreferenceScope } from '@theia/core/lib/common/preferences/preference-scope';
|
|
4
5
|
import URI from '@theia/core/lib/common/uri';
|
|
5
6
|
import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
|
|
@@ -72,13 +73,16 @@ export interface PreferenceContext {
|
|
|
72
73
|
getScope(): PreferenceScope;
|
|
73
74
|
}
|
|
74
75
|
export declare const PreferenceContext: unique symbol;
|
|
76
|
+
export declare const PreferenceTransactionPrelude: unique symbol;
|
|
75
77
|
export declare class PreferenceTransaction extends Transaction<[string, string[], unknown], boolean> {
|
|
76
78
|
reference: IReference<MonacoEditorModel> | undefined;
|
|
77
79
|
protected readonly context: PreferenceContext;
|
|
80
|
+
protected readonly prelude?: Promise<unknown>;
|
|
78
81
|
protected readonly textModelService: MonacoTextModelService;
|
|
79
82
|
protected readonly jsoncEditor: MonacoJSONCEditor;
|
|
80
83
|
protected readonly messageService: MessageService;
|
|
81
84
|
protected readonly editorManager: EditorManager;
|
|
85
|
+
protected init(): Promise<void>;
|
|
82
86
|
protected setUp(): Promise<boolean>;
|
|
83
87
|
/**
|
|
84
88
|
* @returns whether the setting operation in progress, and any others started in the meantime, should continue.
|
|
@@ -88,7 +92,8 @@ export declare class PreferenceTransaction extends Transaction<[string, string[]
|
|
|
88
92
|
protected tearDown(): Promise<boolean>;
|
|
89
93
|
}
|
|
90
94
|
export interface PreferenceTransactionFactory {
|
|
91
|
-
(context: PreferenceContext): PreferenceTransaction;
|
|
95
|
+
(context: PreferenceContext, waitFor?: Promise<unknown>): PreferenceTransaction;
|
|
92
96
|
}
|
|
93
97
|
export declare const PreferenceTransactionFactory: unique symbol;
|
|
98
|
+
export declare const preferenceTransactionFactoryCreator: interfaces.FactoryCreator<PreferenceTransaction>;
|
|
94
99
|
//# sourceMappingURL=preference-transaction-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAqB,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,cAAc,EAAO,cAAc,EAAE,MAAM,aAAa,CAAC;AACnH,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-transaction-manager.d.ts","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
24
24
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
25
|
};
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.PreferenceTransactionFactory = exports.PreferenceTransaction = exports.PreferenceContext = exports.Transaction = void 0;
|
|
27
|
+
exports.preferenceTransactionFactoryCreator = exports.PreferenceTransactionFactory = exports.PreferenceTransaction = exports.PreferenceTransactionPrelude = exports.PreferenceContext = exports.Transaction = void 0;
|
|
28
28
|
const core_1 = require("@theia/core");
|
|
29
29
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
30
30
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
@@ -171,7 +171,12 @@ Transaction = __decorate([
|
|
|
171
171
|
], Transaction);
|
|
172
172
|
exports.Transaction = Transaction;
|
|
173
173
|
exports.PreferenceContext = Symbol('PreferenceContext');
|
|
174
|
+
exports.PreferenceTransactionPrelude = Symbol('PreferenceTransactionPrelude');
|
|
174
175
|
let PreferenceTransaction = class PreferenceTransaction extends Transaction {
|
|
176
|
+
init() {
|
|
177
|
+
this.waitFor(this.prelude);
|
|
178
|
+
return super.init();
|
|
179
|
+
}
|
|
175
180
|
async setUp() {
|
|
176
181
|
const reference = await this.textModelService.createModelReference(this.context.getConfigUri());
|
|
177
182
|
if (this._open) {
|
|
@@ -246,6 +251,10 @@ __decorate([
|
|
|
246
251
|
(0, inversify_1.inject)(exports.PreferenceContext),
|
|
247
252
|
__metadata("design:type", Object)
|
|
248
253
|
], PreferenceTransaction.prototype, "context", void 0);
|
|
254
|
+
__decorate([
|
|
255
|
+
(0, inversify_1.inject)(exports.PreferenceTransactionPrelude),
|
|
256
|
+
__metadata("design:type", Promise)
|
|
257
|
+
], PreferenceTransaction.prototype, "prelude", void 0);
|
|
249
258
|
__decorate([
|
|
250
259
|
(0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
|
|
251
260
|
__metadata("design:type", monaco_text_model_service_1.MonacoTextModelService)
|
|
@@ -262,9 +271,22 @@ __decorate([
|
|
|
262
271
|
(0, inversify_1.inject)(editor_manager_1.EditorManager),
|
|
263
272
|
__metadata("design:type", editor_manager_1.EditorManager)
|
|
264
273
|
], PreferenceTransaction.prototype, "editorManager", void 0);
|
|
274
|
+
__decorate([
|
|
275
|
+
(0, inversify_1.postConstruct)(),
|
|
276
|
+
__metadata("design:type", Function),
|
|
277
|
+
__metadata("design:paramtypes", []),
|
|
278
|
+
__metadata("design:returntype", Promise)
|
|
279
|
+
], PreferenceTransaction.prototype, "init", null);
|
|
265
280
|
PreferenceTransaction = __decorate([
|
|
266
281
|
(0, inversify_1.injectable)()
|
|
267
282
|
], PreferenceTransaction);
|
|
268
283
|
exports.PreferenceTransaction = PreferenceTransaction;
|
|
269
284
|
exports.PreferenceTransactionFactory = Symbol('PreferenceTransactionFactory');
|
|
285
|
+
const preferenceTransactionFactoryCreator = ({ container }) => (context, waitFor) => {
|
|
286
|
+
const child = container.createChild();
|
|
287
|
+
child.bind(exports.PreferenceContext).toConstantValue(context);
|
|
288
|
+
child.bind(exports.PreferenceTransactionPrelude).toConstantValue(waitFor);
|
|
289
|
+
return child.get(PreferenceTransaction);
|
|
290
|
+
};
|
|
291
|
+
exports.preferenceTransactionFactoryCreator = preferenceTransactionFactoryCreator;
|
|
270
292
|
//# sourceMappingURL=preference-transaction-manager.js.map
|
|
@@ -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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,sCAAmH;AACnH,sEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"preference-transaction-manager.js","sourceRoot":"","sources":["../../src/browser/preference-transaction-manager.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.24.0-next.
|
|
3
|
+
"version": "1.24.0-next.74+51443155c8c",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.24.0-next.
|
|
7
|
-
"@theia/editor": "1.24.0-next.
|
|
8
|
-
"@theia/filesystem": "1.24.0-next.
|
|
9
|
-
"@theia/monaco": "1.24.0-next.
|
|
6
|
+
"@theia/core": "1.24.0-next.74+51443155c8c",
|
|
7
|
+
"@theia/editor": "1.24.0-next.74+51443155c8c",
|
|
8
|
+
"@theia/filesystem": "1.24.0-next.74+51443155c8c",
|
|
9
|
+
"@theia/monaco": "1.24.0-next.74+51443155c8c",
|
|
10
10
|
"@theia/monaco-editor-core": "1.65.2",
|
|
11
|
-
"@theia/userstorage": "1.24.0-next.
|
|
12
|
-
"@theia/workspace": "1.24.0-next.
|
|
11
|
+
"@theia/userstorage": "1.24.0-next.74+51443155c8c",
|
|
12
|
+
"@theia/workspace": "1.24.0-next.74+51443155c8c",
|
|
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": "51443155c8c860c7d517e2f692336e149a8b4988"
|
|
56
56
|
}
|
|
@@ -115,8 +115,7 @@ export abstract class AbstractResourcePreferenceProvider extends PreferenceProvi
|
|
|
115
115
|
protected async doSetPreference(key: string, path: string[], value: unknown): Promise<boolean> {
|
|
116
116
|
if (!this.transaction?.open) {
|
|
117
117
|
const current = this.transaction;
|
|
118
|
-
this.transaction = this.transactionFactory(this.toFileManager());
|
|
119
|
-
this.transaction.waitFor(current?.result);
|
|
118
|
+
this.transaction = this.transactionFactory(this.toFileManager(), current?.result);
|
|
120
119
|
this.transaction.onWillConclude(({ status, waitUntil }) => {
|
|
121
120
|
if (status) {
|
|
122
121
|
waitUntil((async () => {
|
|
@@ -27,7 +27,7 @@ import { PreferenceScopeCommandManager } from './util/preference-scope-command-m
|
|
|
27
27
|
import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
|
|
28
28
|
import { PreferencesJsonSchemaContribution } from './preferences-json-schema-contribution';
|
|
29
29
|
import { MonacoJSONCEditor } from './monaco-jsonc-editor';
|
|
30
|
-
import {
|
|
30
|
+
import { PreferenceTransaction, PreferenceTransactionFactory, preferenceTransactionFactoryCreator } from './preference-transaction-manager';
|
|
31
31
|
import { PreferenceOpenHandler } from './preference-open-handler';
|
|
32
32
|
|
|
33
33
|
export function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind): void {
|
|
@@ -49,11 +49,7 @@ export function bindPreferences(bind: interfaces.Bind, unbind: interfaces.Unbind
|
|
|
49
49
|
|
|
50
50
|
bind(MonacoJSONCEditor).toSelf().inSingletonScope();
|
|
51
51
|
bind(PreferenceTransaction).toSelf();
|
|
52
|
-
bind(PreferenceTransactionFactory).toFactory(
|
|
53
|
-
const child = container.createChild();
|
|
54
|
-
child.bind(PreferenceContext).toConstantValue(context);
|
|
55
|
-
return child.get(PreferenceTransaction);
|
|
56
|
-
});
|
|
52
|
+
bind(PreferenceTransactionFactory).toFactory(preferenceTransactionFactoryCreator);
|
|
57
53
|
}
|
|
58
54
|
|
|
59
55
|
export default new ContainerModule((bind, unbind, isBound, rebind) => {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { CancellationError, Emitter, Event, MaybePromise, MessageService, nls, WaitUntilEvent } from '@theia/core';
|
|
18
18
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
19
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
import { inject, injectable, interfaces, postConstruct } 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';
|
|
@@ -176,16 +176,24 @@ export interface PreferenceContext {
|
|
|
176
176
|
getScope(): PreferenceScope;
|
|
177
177
|
}
|
|
178
178
|
export const PreferenceContext = Symbol('PreferenceContext');
|
|
179
|
+
export const PreferenceTransactionPrelude = Symbol('PreferenceTransactionPrelude');
|
|
179
180
|
|
|
180
181
|
@injectable()
|
|
181
182
|
export class PreferenceTransaction extends Transaction<[string, string[], unknown], boolean> {
|
|
182
183
|
reference: IReference<MonacoEditorModel> | undefined;
|
|
183
184
|
@inject(PreferenceContext) protected readonly context: PreferenceContext;
|
|
185
|
+
@inject(PreferenceTransactionPrelude) protected readonly prelude?: Promise<unknown>;
|
|
184
186
|
@inject(MonacoTextModelService) protected readonly textModelService: MonacoTextModelService;
|
|
185
187
|
@inject(MonacoJSONCEditor) protected readonly jsoncEditor: MonacoJSONCEditor;
|
|
186
188
|
@inject(MessageService) protected readonly messageService: MessageService;
|
|
187
189
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
188
190
|
|
|
191
|
+
@postConstruct()
|
|
192
|
+
protected override init(): Promise<void> {
|
|
193
|
+
this.waitFor(this.prelude);
|
|
194
|
+
return super.init();
|
|
195
|
+
}
|
|
196
|
+
|
|
189
197
|
protected async setUp(): Promise<boolean> {
|
|
190
198
|
const reference = await this.textModelService.createModelReference(this.context.getConfigUri()!);
|
|
191
199
|
if (this._open) {
|
|
@@ -259,6 +267,14 @@ export class PreferenceTransaction extends Transaction<[string, string[], unknow
|
|
|
259
267
|
}
|
|
260
268
|
|
|
261
269
|
export interface PreferenceTransactionFactory {
|
|
262
|
-
(context: PreferenceContext): PreferenceTransaction;
|
|
270
|
+
(context: PreferenceContext, waitFor?: Promise<unknown>): PreferenceTransaction;
|
|
263
271
|
}
|
|
264
272
|
export const PreferenceTransactionFactory = Symbol('PreferenceTransactionFactory');
|
|
273
|
+
|
|
274
|
+
export const preferenceTransactionFactoryCreator: interfaces.FactoryCreator<PreferenceTransaction> = ({ container }) =>
|
|
275
|
+
(context: PreferenceContext, waitFor?: Promise<unknown>) => {
|
|
276
|
+
const child = container.createChild();
|
|
277
|
+
child.bind(PreferenceContext).toConstantValue(context);
|
|
278
|
+
child.bind(PreferenceTransactionPrelude).toConstantValue(waitFor);
|
|
279
|
+
return child.get(PreferenceTransaction);
|
|
280
|
+
};
|