@eclipse-glsp/client 2.3.0-next.388 → 2.3.0-next.389
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/base/command-stack.d.ts +21 -1
- package/lib/base/command-stack.d.ts.map +1 -1
- package/lib/base/command-stack.js +26 -3
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/feedback/feedback-action-dispatcher-default.d.ts +5 -3
- package/lib/base/feedback/feedback-action-dispatcher-default.d.ts.map +1 -1
- package/lib/base/feedback/feedback-action-dispatcher-default.js +18 -5
- package/lib/base/feedback/feedback-action-dispatcher-default.js.map +1 -1
- package/lib/base/model/diagram-loader.d.ts +9 -6
- package/lib/base/model/diagram-loader.d.ts.map +1 -1
- package/lib/base/model/diagram-loader.js +6 -6
- package/lib/base/model/diagram-loader.js.map +1 -1
- package/lib/features/accessibility/toast/toast-tool.d.ts.map +1 -1
- package/lib/features/accessibility/toast/toast-tool.js +1 -1
- package/lib/features/accessibility/toast/toast-tool.js.map +1 -1
- package/lib/features/status/status-overlay.d.ts +1 -3
- package/lib/features/status/status-overlay.d.ts.map +1 -1
- package/lib/features/status/status-overlay.js +1 -6
- package/lib/features/status/status-overlay.js.map +1 -1
- package/lib/features/tool-palette/tool-palette.d.ts +6 -0
- package/lib/features/tool-palette/tool-palette.d.ts.map +1 -1
- package/lib/features/tool-palette/tool-palette.js +9 -5
- package/lib/features/tool-palette/tool-palette.js.map +1 -1
- package/package.json +3 -3
- package/src/base/command-stack.ts +28 -4
- package/src/base/feedback/feedback-action-dispatcher-default.ts +17 -6
- package/src/base/model/diagram-loader.ts +23 -16
- package/src/features/accessibility/toast/toast-tool.ts +2 -2
- package/src/features/status/status-overlay.ts +10 -7
- package/src/features/tool-palette/tool-palette.ts +10 -6
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { CommandStack, Disposable, DisposableCollection, Event, GModelRoot, ICommand, LazyInjector } from '@eclipse-glsp/sprotty';
|
|
16
|
+
import { CommandExecutionContext, CommandStack, Disposable, DisposableCollection, Event, GModelRoot, ICommand, LazyInjector } from '@eclipse-glsp/sprotty';
|
|
17
17
|
import { EditorContextService } from './editor-context-service';
|
|
18
18
|
export declare class GLSPCommandStack extends CommandStack implements Disposable {
|
|
19
19
|
protected lazyInjector: LazyInjector;
|
|
@@ -24,8 +24,28 @@ export declare class GLSPCommandStack extends CommandStack implements Disposable
|
|
|
24
24
|
* @deprecated Use the `EditorContext.onModelRootChanged` event instead
|
|
25
25
|
*/
|
|
26
26
|
get onModelRootChanged(): Event<Readonly<GModelRoot>>;
|
|
27
|
+
/**
|
|
28
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
29
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
30
|
+
*/
|
|
27
31
|
undo(): Promise<GModelRoot>;
|
|
32
|
+
/**
|
|
33
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
34
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
35
|
+
*/
|
|
28
36
|
redo(): Promise<GModelRoot>;
|
|
37
|
+
/**
|
|
38
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
39
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
40
|
+
* related methods are overridden to no-ops.
|
|
41
|
+
*/
|
|
42
|
+
protected pushToUndoStack(command: ICommand): void;
|
|
43
|
+
/**
|
|
44
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
45
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
46
|
+
* related methods are overridden to no-ops.
|
|
47
|
+
*/
|
|
48
|
+
protected mergeOrPush(command: ICommand, context: CommandExecutionContext): void;
|
|
29
49
|
execute(command: ICommand): Promise<GModelRoot>;
|
|
30
50
|
protected notifyListeners(root: Readonly<GModelRoot>): void;
|
|
31
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EAGf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBACa,gBAAiB,SAAQ,YAAa,YAAW,UAAU;IAEpE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,SAAS,uBAA8B;IAGjD,OAAO,IAAI,IAAI;IAMf,IAAI,aAAa,IAAI,oBAAoB,CAExC;IAED;;OAEG;IACH,IAAI,kBAAkB,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAEpD;
|
|
1
|
+
{"version":3,"file":"command-stack.d.ts","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,uBAAuB,EACvB,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EAGf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBACa,gBAAiB,SAAQ,YAAa,YAAW,UAAU;IAEpE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IACrC,SAAS,CAAC,SAAS,uBAA8B;IAGjD,OAAO,IAAI,IAAI;IAMf,IAAI,aAAa,IAAI,oBAAoB,CAExC;IAED;;OAEG;IACH,IAAI,kBAAkB,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAEpD;IAED;;;OAGG;IACM,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAQpC;;;OAGG;IACM,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAQpC;;;;OAIG;cACgB,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAI3D;;;;OAIG;cACgB,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI;IAG1E,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC;IAQ9D,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;CAG9D"}
|
|
@@ -47,21 +47,44 @@ let GLSPCommandStack = class GLSPCommandStack extends sprotty_1.CommandStack {
|
|
|
47
47
|
get onModelRootChanged() {
|
|
48
48
|
return this.editorContext.onModelRootChanged;
|
|
49
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
52
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
53
|
+
*/
|
|
50
54
|
undo() {
|
|
51
55
|
this.logger.warn(this, 'GLSPCommandStack.undo() was called. This should never happen as the GLSP server is responsible for handling undo requests');
|
|
52
56
|
return this.currentModel;
|
|
53
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
60
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
61
|
+
*/
|
|
54
62
|
redo() {
|
|
55
63
|
this.logger.warn(this, 'GLSPCommandStack.redo() was called. This should never happen as the GLSP server is responsible for handling redo requests');
|
|
56
64
|
return this.currentModel;
|
|
57
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
68
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
69
|
+
* related methods are overridden to no-ops.
|
|
70
|
+
*/
|
|
71
|
+
pushToUndoStack(command) {
|
|
72
|
+
// no-op
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
76
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
77
|
+
* related methods are overridden to no-ops.
|
|
78
|
+
*/
|
|
79
|
+
mergeOrPush(command, context) {
|
|
80
|
+
// no-op
|
|
81
|
+
}
|
|
58
82
|
async execute(command) {
|
|
83
|
+
const result = await super.execute(command);
|
|
59
84
|
if (command instanceof sprotty_1.SetModelCommand || command instanceof sprotty_1.UpdateModelCommand) {
|
|
60
|
-
const result = await super.execute(command);
|
|
61
85
|
this.notifyListeners(result);
|
|
62
|
-
return result;
|
|
63
86
|
}
|
|
64
|
-
return
|
|
87
|
+
return result;
|
|
65
88
|
}
|
|
66
89
|
notifyListeners(root) {
|
|
67
90
|
this.editorContext.notifyModelRootChanged(root, this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"command-stack.js","sourceRoot":"","sources":["../../src/base/command-stack.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAW+B;AAC/B,yCAA2D;AAC3D,qEAAgE;AAGzD,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,sBAAY;IAA3C;;QAGO,cAAS,GAAG,IAAI,8BAAoB,EAAE,CAAC;IAwErD,CAAC;IArEG,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,kDAAkD;IAClD,+FAA+F;IAC/F,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC;IACjD,CAAC;IAED;;;OAGG;IACM,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACM,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,IAAI,EACJ,2HAA2H,CAC9H,CAAC;QACF,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACgB,eAAe,CAAC,OAAiB;QAChD,QAAQ;IACZ,CAAC;IAED;;;;OAIG;IACgB,WAAW,CAAC,OAAiB,EAAE,OAAgC;QAC9E,QAAQ;IACZ,CAAC;IACQ,KAAK,CAAC,OAAO,CAAC,OAAiB;QACpC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,OAAO,YAAY,yBAAe,IAAI,OAAO,YAAY,4BAAkB,EAAE,CAAC;YAC9E,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,eAAe,CAAC,IAA0B;QAChD,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;CACJ,CAAA;AA3EY,4CAAgB;AAEf;IADT,IAAA,kBAAM,EAAC,sBAAY,CAAC;;sDACgB;AAIrC;IADC,IAAA,sBAAU,GAAE;;;;+CAGZ;2BARQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CA2E5B"}
|
|
@@ -14,13 +14,14 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { Action, ActionHandlerRegistry, Command, CommandExecutionContext, Disposable, IActionDispatcher, ICommand, ILogger } from '@eclipse-glsp/sprotty';
|
|
17
|
-
import { FeedbackEmitter } from './feedback-emitter';
|
|
18
17
|
import { IFeedbackActionDispatcher, IFeedbackEmitter, MaybeActions } from './feedback-action-dispatcher';
|
|
19
|
-
|
|
18
|
+
import { FeedbackEmitter } from './feedback-emitter';
|
|
19
|
+
export declare class FeedbackActionDispatcher implements IFeedbackActionDispatcher, Disposable {
|
|
20
20
|
protected registeredFeedback: Map<IFeedbackEmitter, Action[]>;
|
|
21
|
-
protected actionDispatcher:
|
|
21
|
+
protected actionDispatcher: IActionDispatcher;
|
|
22
22
|
protected logger: ILogger;
|
|
23
23
|
protected actionHandlerRegistry: ActionHandlerRegistry;
|
|
24
|
+
protected isDisposed: boolean;
|
|
24
25
|
registerFeedback(feedbackEmitter: IFeedbackEmitter, feedbackActions: Action[], cleanupActions?: MaybeActions): Disposable;
|
|
25
26
|
deregisterFeedback(feedbackEmitter: IFeedbackEmitter, cleanupActions?: MaybeActions): void;
|
|
26
27
|
getRegisteredFeedback(): Action[];
|
|
@@ -30,5 +31,6 @@ export declare class FeedbackActionDispatcher implements IFeedbackActionDispatch
|
|
|
30
31
|
protected actionToCommands(action: Action): ICommand[];
|
|
31
32
|
createEmitter(): FeedbackEmitter;
|
|
32
33
|
protected dispatchFeedback(actions: Action[], feedbackEmitter: IFeedbackEmitter): Promise<void>;
|
|
34
|
+
dispose(): void;
|
|
33
35
|
}
|
|
34
36
|
//# sourceMappingURL=feedback-action-dispatcher-default.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feedback-action-dispatcher-default.d.ts","sourceRoot":"","sources":["../../../src/base/feedback/feedback-action-dispatcher-default.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,qBAAqB,EACrB,OAAO,EAEP,uBAAuB,EACvB,UAAU,EAEV,iBAAiB,EACjB,QAAQ,EACR,OAAO,EAGV,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"feedback-action-dispatcher-default.d.ts","sourceRoot":"","sources":["../../../src/base/feedback/feedback-action-dispatcher-default.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,qBAAqB,EACrB,OAAO,EAEP,uBAAuB,EACvB,UAAU,EAEV,iBAAiB,EACjB,QAAQ,EACR,OAAO,EAGV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEzG,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBACa,wBAAyB,YAAW,yBAAyB,EAAE,UAAU;IAClF,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAa;IAEzC,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAElB,SAAS,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAEtF,SAAS,CAAC,UAAU,UAAS;IAE7B,gBAAgB,CAAC,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,cAAc,CAAC,EAAE,YAAY,GAAG,UAAU;IAezH,kBAAkB,CAAC,eAAe,EAAE,gBAAgB,EAAE,cAAc,CAAC,EAAE,YAAY,GAAG,IAAI;IAQ1F,qBAAqB,IAAI,MAAM,EAAE;IAMjC,6BAA6B,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAUjE,mBAAmB,IAAI,OAAO,EAAE;IAM1B,qBAAqB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5E,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAStD,aAAa,IAAI,eAAe;cAIhB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAarG,OAAO,IAAI,IAAI;CAIlB"}
|
|
@@ -27,12 +27,13 @@ exports.FeedbackActionDispatcher = void 0;
|
|
|
27
27
|
********************************************************************************/
|
|
28
28
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
29
29
|
const inversify_1 = require("inversify");
|
|
30
|
+
const feedback_action_dispatcher_1 = require("./feedback-action-dispatcher");
|
|
30
31
|
const feedback_command_1 = require("./feedback-command");
|
|
31
32
|
const feedback_emitter_1 = require("./feedback-emitter");
|
|
32
|
-
const feedback_action_dispatcher_1 = require("./feedback-action-dispatcher");
|
|
33
33
|
let FeedbackActionDispatcher = class FeedbackActionDispatcher {
|
|
34
34
|
constructor() {
|
|
35
35
|
this.registeredFeedback = new Map();
|
|
36
|
+
this.isDisposed = false;
|
|
36
37
|
}
|
|
37
38
|
registerFeedback(feedbackEmitter, feedbackActions, cleanupActions) {
|
|
38
39
|
if (feedbackEmitter instanceof sprotty_1.GModelElement) {
|
|
@@ -92,19 +93,25 @@ let FeedbackActionDispatcher = class FeedbackActionDispatcher {
|
|
|
92
93
|
}
|
|
93
94
|
async dispatchFeedback(actions, feedbackEmitter) {
|
|
94
95
|
try {
|
|
95
|
-
|
|
96
|
-
|
|
96
|
+
if (this.isDisposed) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
await this.actionDispatcher.dispatchAll(actions);
|
|
97
100
|
this.logger.info(this, `Dispatched feedback actions for ${feedbackEmitter}`);
|
|
98
101
|
}
|
|
99
102
|
catch (reason) {
|
|
100
103
|
this.logger.error(this, 'Failed to dispatch feedback actions', reason);
|
|
101
104
|
}
|
|
102
105
|
}
|
|
106
|
+
dispose() {
|
|
107
|
+
this.registeredFeedback.clear();
|
|
108
|
+
this.isDisposed = true;
|
|
109
|
+
}
|
|
103
110
|
};
|
|
104
111
|
exports.FeedbackActionDispatcher = FeedbackActionDispatcher;
|
|
105
112
|
__decorate([
|
|
106
|
-
(0, inversify_1.inject)(sprotty_1.TYPES.
|
|
107
|
-
__metadata("design:type",
|
|
113
|
+
(0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
|
|
114
|
+
__metadata("design:type", Object)
|
|
108
115
|
], FeedbackActionDispatcher.prototype, "actionDispatcher", void 0);
|
|
109
116
|
__decorate([
|
|
110
117
|
(0, inversify_1.inject)(sprotty_1.TYPES.ILogger),
|
|
@@ -114,6 +121,12 @@ __decorate([
|
|
|
114
121
|
(0, inversify_1.inject)(sprotty_1.ActionHandlerRegistry),
|
|
115
122
|
__metadata("design:type", sprotty_1.ActionHandlerRegistry)
|
|
116
123
|
], FeedbackActionDispatcher.prototype, "actionHandlerRegistry", void 0);
|
|
124
|
+
__decorate([
|
|
125
|
+
(0, inversify_1.preDestroy)(),
|
|
126
|
+
__metadata("design:type", Function),
|
|
127
|
+
__metadata("design:paramtypes", []),
|
|
128
|
+
__metadata("design:returntype", void 0)
|
|
129
|
+
], FeedbackActionDispatcher.prototype, "dispose", null);
|
|
117
130
|
exports.FeedbackActionDispatcher = FeedbackActionDispatcher = __decorate([
|
|
118
131
|
(0, inversify_1.injectable)()
|
|
119
132
|
], FeedbackActionDispatcher);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feedback-action-dispatcher-default.js","sourceRoot":"","sources":["../../../src/base/feedback/feedback-action-dispatcher-default.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAa+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"feedback-action-dispatcher-default.js","sourceRoot":"","sources":["../../../src/base/feedback/feedback-action-dispatcher-default.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,7 @@ export interface IDiagramOptions {
|
|
|
32
32
|
diagramType: string;
|
|
33
33
|
/**
|
|
34
34
|
* The provider function to retrieve the GLSP client used by this diagram to communicate with the server.
|
|
35
|
-
* Multiple invocations of the
|
|
35
|
+
* Multiple invocations of the provider function should always return the same {@link GLSPClient} instance.
|
|
36
36
|
*/
|
|
37
37
|
glspClientProvider: () => Promise<GLSPClient>;
|
|
38
38
|
/**
|
|
@@ -56,21 +56,24 @@ export interface IDiagramStartup extends Partial<Ranked> {
|
|
|
56
56
|
*/
|
|
57
57
|
preLoadDiagram?(): MaybePromise<void>;
|
|
58
58
|
/**
|
|
59
|
-
* Hook for services that want to execute code before the underlying
|
|
59
|
+
* Hook for services that want to execute code before the underlying {@link GLSPClient} is configured and the server is initialized.
|
|
60
60
|
*/
|
|
61
61
|
preInitialize?(): MaybePromise<void>;
|
|
62
62
|
/**
|
|
63
|
-
* Hook for services that want to execute code before the initial model loading request (i.e.
|
|
63
|
+
* Hook for services that want to execute code before the initial model loading request (i.e. {@link RequestModelAction}) but
|
|
64
64
|
* after the underlying GLSP client has been configured and the server is initialized.
|
|
65
65
|
*/
|
|
66
66
|
preRequestModel?(): MaybePromise<void>;
|
|
67
67
|
/**
|
|
68
|
-
* Hook for services that want to execute code after the initial model loading request (i.e.
|
|
69
|
-
* Note that this hook is invoked directly after the
|
|
68
|
+
* Hook for services that want to execute code after the initial model loading request (i.e. {@link RequestModelAction}).
|
|
69
|
+
* Note that this hook is invoked directly after the {@link RequestModelAction} has been dispatched. It does not necessarily wait
|
|
70
70
|
* until the client-server update roundtrip is completed. If you need to wait until the diagram is fully initialized use the
|
|
71
71
|
* {@link postModelInitialization} hook.
|
|
72
72
|
*/
|
|
73
73
|
postRequestModel?(): MaybePromise<void>;
|
|
74
|
+
/** Hook for services that want to execute code after the diagram model is fully initialized
|
|
75
|
+
* (i.e. {@link ModelInitializationConstraint} is completed).
|
|
76
|
+
*/
|
|
74
77
|
postModelInitialization?(): MaybePromise<void>;
|
|
75
78
|
}
|
|
76
79
|
export declare namespace IDiagramStartup {
|
|
@@ -84,7 +87,7 @@ export interface DiagramLoadingOptions {
|
|
|
84
87
|
*/
|
|
85
88
|
requestModelOptions?: Args;
|
|
86
89
|
/**
|
|
87
|
-
* Optional partial {@link InitializeParameters} that should be used for
|
|
90
|
+
* Optional partial {@link InitializeParameters} that should be used for {@link GLSPClient.initializeServer} request if the underlying
|
|
88
91
|
* {@link GLSPClient} has not been initialized yet.
|
|
89
92
|
*/
|
|
90
93
|
initializeParameters?: Partial<InitializeParameters>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAGH,IAAI,
|
|
1
|
+
{"version":3,"file":"diagram-loader.d.ts","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAGH,IAAI,EACJ,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,YAAY,EACZ,YAAY,EAMf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,kBAAkB,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAE9C;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;GAIG;AACH,MAAM,WAAW,eAAgB,SAAQ,OAAO,CAAC,MAAM,CAAC;IACpD;;;OAGG;IACH,cAAc,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAEtC;;OAEG;IACH,aAAa,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAErC;;;OAGG;IACH,eAAe,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IAEvC;;;;;OAKG;IAEH,gBAAgB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;IACxC;;OAEG;IACH,uBAAuB,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,yBAAiB,eAAe,CAAC;IAC7B,SAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,eAAe,CAU7D;CACJ;AAED,MAAM,WAAW,qBAAqB;IAClC;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,IAAI,CAAC;IAE3B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAErD;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,6BAA6B;IAC1C,mBAAmB,EAAE,IAAI,CAAC;IAC1B,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,mBAAmB,EAAE,OAAO,CAAC;CAChC;AAED;;;;;GAKG;AACH,qBACa,aAAa;IAEtB,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;IAGnC,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAG9C,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC;IAGvC,SAAS,CAAC,6BAA6B,EAAE,6BAA6B,CAAC;IAGvE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC,IAAI,eAAe,IAAI,eAAe,EAAE,CAEvC;IAEK,IAAI,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,IAAI,CAAC;cA2B9C,iBAAiB,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;cAU3E,YAAY,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnE,UAAU,CAAC,OAAO,EAAE,6BAA6B,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBpF"}
|
|
@@ -54,7 +54,7 @@ let DiagramLoader = class DiagramLoader {
|
|
|
54
54
|
return this.lazyInjector.getAll(sprotty_1.TYPES.IDiagramStartup);
|
|
55
55
|
}
|
|
56
56
|
async load(options = {}) {
|
|
57
|
-
var _a, _b;
|
|
57
|
+
var _a, _b, _c, _d;
|
|
58
58
|
this.diagramStartups.sort(ranked_1.Ranked.sort);
|
|
59
59
|
await this.invokeStartupHook('preLoadDiagram');
|
|
60
60
|
const resolvedOptions = {
|
|
@@ -70,14 +70,15 @@ let DiagramLoader = class DiagramLoader {
|
|
|
70
70
|
},
|
|
71
71
|
enableNotifications: (_b = options.enableNotifications) !== null && _b !== void 0 ? _b : true
|
|
72
72
|
};
|
|
73
|
-
//
|
|
74
|
-
await this.actionDispatcher.
|
|
73
|
+
// Ensure that the action dispatcher is initialized before starting the diagram loading process
|
|
74
|
+
await ((_d = (_c = this.actionDispatcher).initialize) === null || _d === void 0 ? void 0 : _d.call(_c));
|
|
75
75
|
await this.invokeStartupHook('preInitialize');
|
|
76
76
|
await this.initialize(resolvedOptions);
|
|
77
77
|
await this.invokeStartupHook('preRequestModel');
|
|
78
78
|
await this.requestModel(resolvedOptions);
|
|
79
79
|
await this.invokeStartupHook('postRequestModel');
|
|
80
|
-
this.modelInitializationConstraint.onInitialized(
|
|
80
|
+
await this.modelInitializationConstraint.onInitialized();
|
|
81
|
+
await this.invokeStartupHook('postModelInitialization');
|
|
81
82
|
}
|
|
82
83
|
async invokeStartupHook(hook) {
|
|
83
84
|
var _a;
|
|
@@ -91,8 +92,7 @@ let DiagramLoader = class DiagramLoader {
|
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
94
|
async requestModel(options) {
|
|
94
|
-
|
|
95
|
-
return this.actionDispatcher.dispatch(response);
|
|
95
|
+
await this.actionDispatcher.dispatch(sprotty_1.RequestModelAction.create({ options: options.requestModelOptions, requestId: sprotty_1.RequestAction.generateRequestId() }));
|
|
96
96
|
}
|
|
97
97
|
async initialize(options) {
|
|
98
98
|
if (options.enableNotifications) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"diagram-loader.js","sourceRoot":"","sources":["../../../src/base/model/diagram-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toast-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/toast/toast-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"toast-tool.d.ts","sourceRoot":"","sources":["../../../../src/features/accessibility/toast/toast-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAyC,MAAM,uBAAuB,CAAC;AAEnI,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAClF,OAAO,EAA2C,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAExF;;GAEG;AACH,qBACa,KAAM,SAAQ,uBAAwB,YAAW,cAAc,EAAE,eAAe;IACzF,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW;IAC7B,SAAS,CAAC,QAAQ,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAM;IAExB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAExF,SAAS,CAAC,aAAa,EAAE,oBAAoB,CAAC;IAE9C,EAAE,IAAI,MAAM;IAGZ,cAAc,IAAI,MAAM;IAIxB,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,WAAW,GAAG,IAAI;IAIlE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAqBhD,SAAS,CAAC,MAAM,IAAI,IAAI;IAYxB,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAKlC,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc;IAgBlE,aAAa,IAAI,IAAI;IAIrB,MAAM,CAAC,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,GAAG,YAAY,EAAE;CAG/D"}
|
|
@@ -94,7 +94,7 @@ let Toast = Toast_1 = class Toast extends ui_extension_1.GLSPAbstractUIExtension
|
|
|
94
94
|
return cell;
|
|
95
95
|
}
|
|
96
96
|
preInitialize() {
|
|
97
|
-
this.
|
|
97
|
+
this.actionDispatcher.dispatch(sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: Toast_1.ID, visible: true }));
|
|
98
98
|
}
|
|
99
99
|
values(obj) {
|
|
100
100
|
return Object.getOwnPropertySymbols(obj).map(s => obj[s]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toast-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/toast/toast-tool.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"toast-tool.js","sourceRoot":"","sources":["../../../../src/features/accessibility/toast/toast-tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import { IActionDispatcher, IActionHandler, StatusAction } from '@eclipse-glsp/sprotty';
|
|
17
|
-
import { EditorContextService } from '../../base/editor-context-service';
|
|
18
17
|
import { IDiagramStartup } from '../../base/model/diagram-loader';
|
|
19
18
|
import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
|
|
20
19
|
/**
|
|
@@ -23,7 +22,6 @@ import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
|
|
|
23
22
|
export declare class StatusOverlay extends GLSPAbstractUIExtension implements IActionHandler, IDiagramStartup {
|
|
24
23
|
static readonly ID = "glsp.server.status.overlay";
|
|
25
24
|
protected actionDispatcher: IActionDispatcher;
|
|
26
|
-
protected editorContext: EditorContextService;
|
|
27
25
|
protected statusIconDiv?: HTMLDivElement;
|
|
28
26
|
protected statusMessageDiv?: HTMLDivElement;
|
|
29
27
|
protected pendingTimeout?: number;
|
|
@@ -35,6 +33,6 @@ export declare class StatusOverlay extends GLSPAbstractUIExtension implements IA
|
|
|
35
33
|
protected clearTimeout(): void;
|
|
36
34
|
protected removeClasses(element: Element, keep: number): void;
|
|
37
35
|
handle(action: StatusAction): void;
|
|
38
|
-
preInitialize(): void
|
|
36
|
+
preInitialize(): Promise<void>;
|
|
39
37
|
}
|
|
40
38
|
//# sourceMappingURL=status-overlay.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-overlay.d.ts","sourceRoot":"","sources":["../../../src/features/status/status-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,
|
|
1
|
+
{"version":3,"file":"status-overlay.d.ts","sourceRoot":"","sources":["../../../src/features/status/status-overlay.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,iBAAiB,EACjB,cAAc,EAEd,YAAY,EAGf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAE/E;;GAEG;AACH,qBACa,aAAc,SAAQ,uBAAwB,YAAW,cAAc,EAAE,eAAe;IACjG,MAAM,CAAC,QAAQ,CAAC,EAAE,gCAAgC;IAGlD,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAE9C,SAAS,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC;IACzC,SAAS,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IAC5C,SAAS,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAEzB,EAAE,IAAI,MAAM;IAIZ,cAAc,IAAI,MAAM;cAGd,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;IAS1E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IA2B/C,SAAS,CAAC,WAAW,IAAI,IAAI;IAI7B,SAAS,CAAC,YAAY,IAAI,IAAI;IAO9B,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAU7D,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAelC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAGjC"}
|
|
@@ -28,7 +28,6 @@ exports.StatusOverlay = void 0;
|
|
|
28
28
|
********************************************************************************/
|
|
29
29
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
30
30
|
const inversify_1 = require("inversify");
|
|
31
|
-
const editor_context_service_1 = require("../../base/editor-context-service");
|
|
32
31
|
const ui_extension_1 = require("../../base/ui-extension/ui-extension");
|
|
33
32
|
/**
|
|
34
33
|
* A reusable status overlay for rendering (icon + message) and handling of {@link StatusAction}'s.
|
|
@@ -106,7 +105,7 @@ let StatusOverlay = StatusOverlay_1 = class StatusOverlay extends ui_extension_1
|
|
|
106
105
|
}
|
|
107
106
|
}
|
|
108
107
|
preInitialize() {
|
|
109
|
-
this.
|
|
108
|
+
return this.actionDispatcher.dispatch(sprotty_1.SetUIExtensionVisibilityAction.create({ extensionId: this.id(), visible: true }));
|
|
110
109
|
}
|
|
111
110
|
};
|
|
112
111
|
exports.StatusOverlay = StatusOverlay;
|
|
@@ -115,10 +114,6 @@ __decorate([
|
|
|
115
114
|
(0, inversify_1.inject)(sprotty_1.TYPES.IActionDispatcher),
|
|
116
115
|
__metadata("design:type", Object)
|
|
117
116
|
], StatusOverlay.prototype, "actionDispatcher", void 0);
|
|
118
|
-
__decorate([
|
|
119
|
-
(0, inversify_1.inject)(editor_context_service_1.EditorContextService),
|
|
120
|
-
__metadata("design:type", editor_context_service_1.EditorContextService)
|
|
121
|
-
], StatusOverlay.prototype, "editorContext", void 0);
|
|
122
117
|
exports.StatusOverlay = StatusOverlay = StatusOverlay_1 = __decorate([
|
|
123
118
|
(0, inversify_1.injectable)()
|
|
124
119
|
], StatusOverlay);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-overlay.js","sourceRoot":"","sources":["../../../src/features/status/status-overlay.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"status-overlay.js","sourceRoot":"","sources":["../../../src/features/status/status-overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,12 @@ export declare class ToolPalette extends GLSPAbstractUIExtension implements IAct
|
|
|
74
74
|
protected clearOnEscape(event: KeyboardEvent): void;
|
|
75
75
|
protected clearToolOnEscape(event: KeyboardEvent): void;
|
|
76
76
|
protected requestFilterUpdate(filter: string): void;
|
|
77
|
+
/**
|
|
78
|
+
* @deprecated This hook is no longer used by the ToolPalette.
|
|
79
|
+
* It is kept for compatibility reasons and will be removed in the future.
|
|
80
|
+
* Move initialization logic to the `postRequestModel` method.
|
|
81
|
+
* This ensures that tool palette initialization does not block the diagram loading process.
|
|
82
|
+
*/
|
|
77
83
|
preRequestModel(): Promise<void>;
|
|
78
84
|
postRequestModel(): Promise<void>;
|
|
79
85
|
protected setPaletteItems(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-palette.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tool-palette.d.ts","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":"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"}
|
|
@@ -407,15 +407,19 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends ui_extension_1.GLSPA
|
|
|
407
407
|
this.paletteItems = filteredPaletteItems;
|
|
408
408
|
this.createBody();
|
|
409
409
|
}
|
|
410
|
-
|
|
410
|
+
/**
|
|
411
|
+
* @deprecated This hook is no longer used by the ToolPalette.
|
|
412
|
+
* It is kept for compatibility reasons and will be removed in the future.
|
|
413
|
+
* Move initialization logic to the `postRequestModel` method.
|
|
414
|
+
* This ensures that tool palette initialization does not block the diagram loading process.
|
|
415
|
+
*/
|
|
416
|
+
async preRequestModel() { }
|
|
417
|
+
async postRequestModel() {
|
|
411
418
|
await this.setPaletteItems();
|
|
412
419
|
if (!this.editorContext.isReadonly) {
|
|
413
420
|
this.show(this.editorContext.modelRoot);
|
|
414
421
|
}
|
|
415
422
|
}
|
|
416
|
-
async postRequestModel() {
|
|
417
|
-
this.reloadPaletteBody();
|
|
418
|
-
}
|
|
419
423
|
async setPaletteItems() {
|
|
420
424
|
const requestAction = sprotty_1.RequestContextActions.create({
|
|
421
425
|
contextId: ToolPalette_1.ID,
|
|
@@ -436,7 +440,7 @@ let ToolPalette = ToolPalette_1 = class ToolPalette extends ui_extension_1.GLSPA
|
|
|
436
440
|
return ((_a = item.children) === null || _a === void 0 ? void 0 : _a.some(child => this.hasDynamicAction(child))) || false;
|
|
437
441
|
}
|
|
438
442
|
async reloadPaletteBody() {
|
|
439
|
-
if (this.dynamic) {
|
|
443
|
+
if (!this.editorContext.isReadonly && this.dynamic) {
|
|
440
444
|
await this.setPaletteItems();
|
|
441
445
|
this.paletteItemsCopy = [];
|
|
442
446
|
this.requestFilterUpdate(this.searchField.value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-palette.js","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tool-palette.js","sourceRoot":"","sources":["../../../src/features/tool-palette/tool-palette.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAkB+B;AAC/B,yCAAwE;AACxE,8EAA4F;AAC5F,kEAA8D;AAE9D,uDAA2F;AAC3F,uEAA+E;AAG/E,+DAAgE;AAChE,sFAAiF;AACjF,iEAAmE;AAEnE,MAAM,iBAAiB,GAAG,SAAS,CAAC;AACpC,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAC7C,MAAM,cAAc,GAAG,OAAO,CAAC;AAM/B,IAAiB,uBAAuB,CAUvC;AAVD,WAAiB,uBAAuB;IACvB,4BAAI,GAAG,mBAAmB,CAAC;IAExC,SAAgB,EAAE,CAAC,MAAW;QAC1B,OAAO,gBAAM,CAAC,OAAO,CAAC,MAAM,EAAE,wBAAA,IAAI,CAAC,CAAC;IACxC,CAAC;IAFe,0BAAE,KAEjB,CAAA;IAED,SAAgB,MAAM;QAClB,OAAO,EAAE,IAAI,EAAE,wBAAA,IAAI,EAAE,CAAC;IAC1B,CAAC;IAFe,8BAAM,SAErB,CAAA;AACL,CAAC,EAVgB,uBAAuB,uCAAvB,uBAAuB,QAUvC;AAEM,IAAM,WAAW,mBAAjB,MAAM,WAAY,SAAQ,sCAAuB;IAAjD;;QAqBO,qBAAgB,GAAkB,EAAE,CAAC;QACrC,YAAO,GAAG,KAAK,CAAC;IA4a9B,CAAC;IAraG,EAAE;QACE,OAAO,aAAW,CAAC,EAAE,CAAC;IAC1B,CAAC;IACD,cAAc;QACV,OAAO,aAAW,CAAC,EAAE,CAAC;IAC1B,CAAC;IAGD,aAAa;QACT,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3G,CAAC;IAEQ,UAAU;QACf,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,UAAU,EAAE,CAAC;IAC9B,CAAC;IAES,kBAAkB,CAAC,gBAA6B;QACtD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAChD,gBAAgB,CAAC,YAAY,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAChE,CAAC;IAEkB,YAAY,CAAC,iBAA8B,EAAE,IAA0B;QACtF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,GAAG,cAAc,CAAC;IAC3D,CAAC;IAES,wBAAwB;QAC9B,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpD,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAC3D,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;YAC5E,MAAM,YAAY,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;YACtD,IAAI,CAAC,kCAAkC,CAAC,aAAa,CAAC,CAAC;YACvD,YAAY,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE;gBAC5B,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;oBAC5B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,GAAG,cAAc,CAAC;gBAC3D,CAAC;gBACD,IAAI,CAAC,kCAAkC,CAAC,aAAa,CAAC,CAAC;gBACvD,kBAAkB,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gBAClD,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;YAC3D,CAAC,CAAC;YACF,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC1C,CAAC;IACL,CAAC;IAES,kCAAkC,CAAC,MAAsB;QAC/D,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC5B,MAAM,CAAC,KAAK,GAAG,kBAAkB,CAAC;QACtC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,GAAG,kBAAkB,CAAC;QACtC,CAAC;IACL,CAAC;IAES,kBAAkB;QACxB,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC;IACpF,CAAC;IAES,UAAU;QAChB,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACtC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAC3C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;gBACpC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1G,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YACnD,YAAY,CAAC,SAAS,GAAG,mBAAmB,CAAC;YAC7C,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC1C,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;QACD,mDAAmD;QACnD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAES,YAAY;QAClB,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAChC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAClD,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnD,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACxD,iBAAiB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAES,iBAAiB;QACvB,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClD,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACzD,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAEjD,MAAM,gBAAgB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAC5D,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAE1C,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACzD,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAE3C,MAAM,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACzD,WAAW,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QAE9C,MAAM,mBAAmB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;QAC7D,WAAW,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;QAE7C,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACvD,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACzD,WAAW,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAC/C,CAAC;QAED,2BAA2B;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC7C,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAEpC,OAAO,WAAW,CAAC;IACvB,CAAC;IAES,uBAAuB;QAC7B,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACrC,MAAM,CAAC,EAAE,GAAG,mBAAmB,CAAC;QAChC,MAAM,CAAC,KAAK,GAAG,uBAAuB,CAAC;QACvC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QAChC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,2BAA2B;QACjC,MAAM,gBAAgB,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;QACpD,gBAAgB,CAAC,KAAK,GAAG,sBAAsB,CAAC;QAChD,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,6BAAe,CAAC,EAAE,CAAC,CAAC;QAC9F,gBAAgB,CAAC,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC;QACpD,gBAAgB,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC9B,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAES,uBAAuB;QAC7B,MAAM,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;QACpD,iBAAiB,CAAC,KAAK,GAAG,qBAAqB,CAAC;QAChD,iBAAiB,CAAC,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,EAAE,qCAAgB,CAAC,EAAE,CAAC,CAAC;QACjG,iBAAiB,CAAC,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC;QACtD,iBAAiB,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC/B,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAES,oBAAoB;QAC1B,MAAM,oBAAoB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,oBAAoB,CAAC,KAAK,GAAG,gBAAgB,CAAC;QAC9C,oBAAoB,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE;YACpC,MAAM,QAAQ,GAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,8BAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,uBAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvG,oBAAoB,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC,CAAC;QACF,oBAAoB,CAAC,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC;QAC5D,oBAAoB,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClC,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAES,yBAAyB;QAC/B,MAAM,mBAAmB,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;QACxD,mBAAmB,CAAC,KAAK,GAAG,gBAAgB,CAAC;QAC7C,mBAAmB,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE;YACnC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,sCAAoB,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9D,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC,CAAC;QACF,mBAAmB,CAAC,SAAS,GAAG,mBAAmB,CAAC,KAAK,CAAC;QAC1D,mBAAmB,CAAC,QAAQ,GAAG,CAAC,CAAC;QACjC,OAAO,mBAAmB,CAAC;IAC/B,CAAC;IAES,sBAAsB;;QAC5B,MAAM,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACtD,gBAAgB,CAAC,KAAK,GAAG,aAAa,CAAC;QACvC,gBAAgB,CAAC,OAAO,GAAG,GAAG,EAAE;;YAC5B,IAAI,MAAA,IAAI,CAAC,WAAW,0CAAE,aAAa,EAAE,CAAC;gBAClC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBACrD,MAAA,IAAI,CAAC,WAAW,0CAAE,cAAc,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACJ,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBAClD,MAAA,IAAI,CAAC,WAAW,0CAAE,cAAc,CAAC,IAAI,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC,CAAC;QACF,IAAI,MAAA,IAAI,CAAC,WAAW,0CAAE,aAAa,EAAE,CAAC;YAClC,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QACD,gBAAgB,CAAC,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC;QACpD,gBAAgB,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC9B,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAES,uBAAuB;;QAC7B,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QAC9C,iBAAiB,CAAC,KAAK,GAAG,YAAY,CAAC;QACvC,iBAAiB,CAAC,OAAO,GAAG,GAAG,EAAE;;YAC7B,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAE,cAAc,EAAE,CAAC;gBACpC,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;gBACtD,MAAA,IAAI,CAAC,YAAY,0CAAE,eAAe,CAAC,KAAK,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACJ,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACnD,MAAA,IAAI,CAAC,YAAY,0CAAE,eAAe,CAAC,IAAI,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC,CAAC;QACF,IAAI,MAAA,IAAI,CAAC,YAAY,0CAAE,cAAc,EAAE,CAAC;YACpC,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACvD,CAAC;QACD,iBAAiB,CAAC,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC;QACtD,iBAAiB,CAAC,QAAQ,GAAG,CAAC,CAAC;QAC/B,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAES,kBAAkB;QACxB,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;QAC9C,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,EAAE;YACvB,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,GAAG,eAAe,CAAC,CAAC;YACxF,IAAI,WAAW,EAAE,CAAC;gBACd,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;oBACvC,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC;oBAC/B,WAAW,CAAC,KAAK,EAAE,CAAC;gBACxB,CAAC;qBAAM,CAAC;oBACJ,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;gBACvC,CAAC;YACL,CAAC;QACL,CAAC,CAAC;QACF,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,wBAAwB,CAAC;QAC5C,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;QACxC,UAAU,CAAC,QAAQ,GAAG,CAAC,CAAC;QACxB,OAAO,UAAU,CAAC;IACtB,CAAC;IAES,uBAAuB;QAC7B,MAAM,WAAW,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACpD,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC1C,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,GAAG,eAAe,CAAC;QAC5D,WAAW,CAAC,IAAI,GAAG,MAAM,CAAC;QAC1B,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QACnC,WAAW,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC7E,WAAW,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACrD,OAAO,WAAW,CAAC;IACvB,CAAC;IAES,iBAAiB;QACvB,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,gBAAgB,CAAC,IAAiB,EAAE,KAAa;QACvD,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QACxB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5D,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,uBAAuB,CAAC,MAAmB,EAAE,IAAiB;QACpE,OAAO,CAAC,GAAe,EAAE,EAAE;YACvB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;gBACjC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAChC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnB,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAES,uBAAuB,CAAC,MAAmB,EAAE,MAAe;QAClE,OAAO,CAAC,GAAe,EAAE,EAAE;YACvB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,wBAAiB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,+BAAwB,CAAC,MAAM,EAAE,CAAC;gBAC/F,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACvC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAChC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnB,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAED,kBAAkB,CAAC,MAAoB;QACnC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACxC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC;QACnC,CAAC;aAAM,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACjC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACzD,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACpD,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAc;;QACjB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,2BAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,wBAAc,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7B,CAAC;aAAM,IAAI,+BAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC7B,sEAAsE;gBACtE,MAAA,IAAI,CAAC,YAAY,CAAC,cAAc,0CAAE,KAAK,EAAE,CAAC;YAC9C,CAAC;QACL,CAAC;IACL,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,SAAiB;QAChD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAC1B,wCAA8B,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,aAAW,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAClH,CAAC;IACN,CAAC;IAES,aAAa,CAAC,KAAoB;QACxC,IAAI,IAAA,0BAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;IACL,CAAC;IAES,iBAAiB,CAAC,KAAoB;QAC5C,IAAI,IAAA,0BAAgB,EAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,+BAAwB,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAES,mBAAmB,CAAC,MAAc;QACxC,oCAAoC;QACpC,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,qBAAqB;YACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,0CAA0C;QAC1C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACtE,qBAAqB;QACrB,MAAM,oBAAoB,GAAkB,EAAE,CAAC;QAC/C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACrB,2CAA2C;gBAC3C,MAAM,gBAAgB,GAAG,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;gBACtH,mDAAmD;gBACnD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,0BAA0B;oBAC1B,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACxD,6BAA6B;oBAC7B,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,QAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;oBACnE,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACzC,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,oBAAoB,CAAC;QACzC,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,eAAe,KAAmB,CAAC;IAEzC,KAAK,CAAC,gBAAgB;QAClB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;IACL,CAAC;IAES,KAAK,CAAC,eAAe;QAC3B,MAAM,aAAa,GAAG,+BAAqB,CAAC,MAAM,CAAC;YAC/C,SAAS,EAAE,aAAW,CAAC,EAAE;YACzB,aAAa,EAAE;gBACX,kBAAkB,EAAE,EAAE;aACzB;SACJ,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAoB,aAAa,CAAC,CAAC;QACvF,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAqB,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,CAAC;IAES,gBAAgB,CAAC,IAAiB;;QACxC,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,mCAAyB,CAAC,EAAE,CAAC,MAAM,CAAC,KAAI,MAAA,MAAM,CAAC,YAAY,0CAAE,OAAO,CAAA,CAAA,EAAA,CAAC,CAAC;QACpH,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,KAAI,KAAK,CAAC;IAC/E,CAAC;IAES,KAAK,CAAC,iBAAiB;QAC7B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;YAC3B,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;IACL,CAAC;;AAjcQ,kCAAW;AACJ,cAAE,GAAG,cAAc,AAAjB,CAAkB;AAG1B;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;;qDACc;AAGpC;IADT,IAAA,kBAAM,EAAC,6CAAoB,CAAC;8BACJ,6CAAoB;kDAAC;AAGpC;IADT,IAAA,kBAAM,EAAC,4BAAY,CAAC;8BACG,4BAAY;iDAAC;AAI3B;IAFT,IAAA,kBAAM,EAAC,eAAK,CAAC,YAAY,CAAC;IAC1B,IAAA,oBAAQ,GAAE;;gDAC0B;AAI3B;IAFT,IAAA,kBAAM,EAAC,eAAK,CAAC,aAAa,CAAC;IAC3B,IAAA,oBAAQ,GAAE;;iDAC4B;AAmBvC;IADC,IAAA,yBAAa,GAAE;;;;gDAGf;sBAvCQ,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkcvB;AAED,SAAgB,OAAO,CAAC,CAAc,EAAE,CAAc;IAClD,MAAM,eAAe,GAAG,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IACjE,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,OAAO,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC;AAND,0BAMC;AAED,SAAgB,UAAU,CAAC,SAAiB;IACxC,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC;AAChB,CAAC;AAJD,gCAIC;AAED,SAAgB,eAAe,CAAC,IAAiB;IAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5C,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IACnB,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACrC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,EAAE;QACtB,MAAM,GAAG,GAAG,WAAW,CAAC;QACxB,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC3B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACxE,MAAO,CAAC,YAAY,EAAG,CAAC,eAAe,EAAE,CAAC;IAC9C,CAAC,CAAC;IAEF,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,KAAK,CAAC;AACjB,CAAC;AAnBD,0CAmBC;AAED,SAAgB,cAAc,CAAC,OAAgB,EAAE,GAAW;IACxD,+DAA+D;IAC/D,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACjG,CAAC;AAHD,wCAGC;AAED,SAAgB,kBAAkB,CAAC,OAAgB,EAAE,SAAiB;IAClE,+DAA+D;IAC/D,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAA,2BAAiB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AALD,gDAKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "2.3.0-next.
|
|
3
|
+
"version": "2.3.0-next.389+d14d1ee",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.3.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.3.0-next.389+d14d1ee",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "d14d1ee025af44a2e46eda8a9b9419cb2d58da93"
|
|
67
67
|
}
|
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
import {
|
|
17
|
+
CommandExecutionContext,
|
|
17
18
|
CommandStack,
|
|
18
19
|
Disposable,
|
|
19
20
|
DisposableCollection,
|
|
@@ -51,6 +52,10 @@ export class GLSPCommandStack extends CommandStack implements Disposable {
|
|
|
51
52
|
return this.editorContext.onModelRootChanged;
|
|
52
53
|
}
|
|
53
54
|
|
|
55
|
+
/**
|
|
56
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
57
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
58
|
+
*/
|
|
54
59
|
override undo(): Promise<GModelRoot> {
|
|
55
60
|
this.logger.warn(
|
|
56
61
|
this,
|
|
@@ -59,6 +64,10 @@ export class GLSPCommandStack extends CommandStack implements Disposable {
|
|
|
59
64
|
return this.currentModel;
|
|
60
65
|
}
|
|
61
66
|
|
|
67
|
+
/**
|
|
68
|
+
* Client-side undo/redo is not supported in GLSP. The server is responsible for handling undo/redo requests.
|
|
69
|
+
* If this method get called it's probably a mistake and a warning is logged
|
|
70
|
+
*/
|
|
62
71
|
override redo(): Promise<GModelRoot> {
|
|
63
72
|
this.logger.warn(
|
|
64
73
|
this,
|
|
@@ -67,14 +76,29 @@ export class GLSPCommandStack extends CommandStack implements Disposable {
|
|
|
67
76
|
return this.currentModel;
|
|
68
77
|
}
|
|
69
78
|
|
|
79
|
+
/**
|
|
80
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
81
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
82
|
+
* related methods are overridden to no-ops.
|
|
83
|
+
*/
|
|
84
|
+
protected override pushToUndoStack(command: ICommand): void {
|
|
85
|
+
// no-op
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Client-side undo/redo is not supported in GLSP.
|
|
90
|
+
* To avoid unnecessary infraction with the command stack (pushing/merging/popping commands)
|
|
91
|
+
* related methods are overridden to no-ops.
|
|
92
|
+
*/
|
|
93
|
+
protected override mergeOrPush(command: ICommand, context: CommandExecutionContext): void {
|
|
94
|
+
// no-op
|
|
95
|
+
}
|
|
70
96
|
override async execute(command: ICommand): Promise<GModelRoot> {
|
|
97
|
+
const result = await super.execute(command);
|
|
71
98
|
if (command instanceof SetModelCommand || command instanceof UpdateModelCommand) {
|
|
72
|
-
const result = await super.execute(command);
|
|
73
99
|
this.notifyListeners(result);
|
|
74
|
-
return result;
|
|
75
100
|
}
|
|
76
|
-
|
|
77
|
-
return super.execute(command);
|
|
101
|
+
return result;
|
|
78
102
|
}
|
|
79
103
|
|
|
80
104
|
protected notifyListeners(root: Readonly<GModelRoot>): void {
|
|
@@ -27,20 +27,23 @@ import {
|
|
|
27
27
|
TYPES,
|
|
28
28
|
toTypeGuard
|
|
29
29
|
} from '@eclipse-glsp/sprotty';
|
|
30
|
-
import { inject, injectable } from 'inversify';
|
|
30
|
+
import { inject, injectable, preDestroy } from 'inversify';
|
|
31
|
+
import { IFeedbackActionDispatcher, IFeedbackEmitter, MaybeActions } from './feedback-action-dispatcher';
|
|
31
32
|
import { getFeedbackRank } from './feedback-command';
|
|
32
33
|
import { FeedbackEmitter } from './feedback-emitter';
|
|
33
|
-
import { IFeedbackActionDispatcher, IFeedbackEmitter, MaybeActions } from './feedback-action-dispatcher';
|
|
34
34
|
|
|
35
35
|
@injectable()
|
|
36
|
-
export class FeedbackActionDispatcher implements IFeedbackActionDispatcher {
|
|
36
|
+
export class FeedbackActionDispatcher implements IFeedbackActionDispatcher, Disposable {
|
|
37
37
|
protected registeredFeedback: Map<IFeedbackEmitter, Action[]> = new Map();
|
|
38
38
|
|
|
39
|
-
@inject(TYPES.
|
|
39
|
+
@inject(TYPES.IActionDispatcher) protected actionDispatcher: IActionDispatcher;
|
|
40
|
+
|
|
40
41
|
@inject(TYPES.ILogger) protected logger: ILogger;
|
|
41
42
|
|
|
42
43
|
@inject(ActionHandlerRegistry) protected actionHandlerRegistry: ActionHandlerRegistry;
|
|
43
44
|
|
|
45
|
+
protected isDisposed = false;
|
|
46
|
+
|
|
44
47
|
registerFeedback(feedbackEmitter: IFeedbackEmitter, feedbackActions: Action[], cleanupActions?: MaybeActions): Disposable {
|
|
45
48
|
if (feedbackEmitter instanceof GModelElement) {
|
|
46
49
|
this.logger.log(
|
|
@@ -109,11 +112,19 @@ export class FeedbackActionDispatcher implements IFeedbackActionDispatcher {
|
|
|
109
112
|
|
|
110
113
|
protected async dispatchFeedback(actions: Action[], feedbackEmitter: IFeedbackEmitter): Promise<void> {
|
|
111
114
|
try {
|
|
112
|
-
|
|
113
|
-
|
|
115
|
+
if (this.isDisposed) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
await this.actionDispatcher.dispatchAll(actions);
|
|
114
119
|
this.logger.info(this, `Dispatched feedback actions for ${feedbackEmitter}`);
|
|
115
120
|
} catch (reason) {
|
|
116
121
|
this.logger.error(this, 'Failed to dispatch feedback actions', reason);
|
|
117
122
|
}
|
|
118
123
|
}
|
|
124
|
+
|
|
125
|
+
@preDestroy()
|
|
126
|
+
dispose(): void {
|
|
127
|
+
this.registeredFeedback.clear();
|
|
128
|
+
this.isDisposed = true;
|
|
129
|
+
}
|
|
119
130
|
}
|
|
@@ -18,14 +18,13 @@ import {
|
|
|
18
18
|
AnyObject,
|
|
19
19
|
ApplicationIdProvider,
|
|
20
20
|
Args,
|
|
21
|
-
EMPTY_ROOT,
|
|
22
21
|
GLSPClient,
|
|
23
22
|
IActionDispatcher,
|
|
24
23
|
InitializeParameters,
|
|
25
24
|
LazyInjector,
|
|
26
25
|
MaybePromise,
|
|
26
|
+
RequestAction,
|
|
27
27
|
RequestModelAction,
|
|
28
|
-
SetModelAction,
|
|
29
28
|
StatusAction,
|
|
30
29
|
TYPES,
|
|
31
30
|
hasNumberProp
|
|
@@ -44,19 +43,23 @@ export interface IDiagramOptions {
|
|
|
44
43
|
* corresponding client session.
|
|
45
44
|
*/
|
|
46
45
|
clientId: string;
|
|
46
|
+
|
|
47
47
|
/**
|
|
48
48
|
* The diagram type i.e. diagram language this diagram is associated with.
|
|
49
49
|
*/
|
|
50
50
|
diagramType: string;
|
|
51
|
+
|
|
51
52
|
/**
|
|
52
53
|
* The provider function to retrieve the GLSP client used by this diagram to communicate with the server.
|
|
53
|
-
* Multiple invocations of the
|
|
54
|
+
* Multiple invocations of the provider function should always return the same {@link GLSPClient} instance.
|
|
54
55
|
*/
|
|
55
56
|
glspClientProvider: () => Promise<GLSPClient>;
|
|
57
|
+
|
|
56
58
|
/**
|
|
57
59
|
* The file source URI associated with this diagram.
|
|
58
60
|
*/
|
|
59
61
|
sourceUri?: string;
|
|
62
|
+
|
|
60
63
|
/**
|
|
61
64
|
* The initial edit mode of diagram. Defaults to `editable`.
|
|
62
65
|
*/
|
|
@@ -74,24 +77,28 @@ export interface IDiagramStartup extends Partial<Ranked> {
|
|
|
74
77
|
* first hook that is invoked directly after {@link DiagramLoader.load} is called.
|
|
75
78
|
*/
|
|
76
79
|
preLoadDiagram?(): MaybePromise<void>;
|
|
80
|
+
|
|
77
81
|
/**
|
|
78
|
-
* Hook for services that want to execute code before the underlying
|
|
82
|
+
* Hook for services that want to execute code before the underlying {@link GLSPClient} is configured and the server is initialized.
|
|
79
83
|
*/
|
|
80
84
|
preInitialize?(): MaybePromise<void>;
|
|
85
|
+
|
|
81
86
|
/**
|
|
82
|
-
* Hook for services that want to execute code before the initial model loading request (i.e.
|
|
87
|
+
* Hook for services that want to execute code before the initial model loading request (i.e. {@link RequestModelAction}) but
|
|
83
88
|
* after the underlying GLSP client has been configured and the server is initialized.
|
|
84
89
|
*/
|
|
85
90
|
preRequestModel?(): MaybePromise<void>;
|
|
91
|
+
|
|
86
92
|
/**
|
|
87
|
-
* Hook for services that want to execute code after the initial model loading request (i.e.
|
|
88
|
-
* Note that this hook is invoked directly after the
|
|
93
|
+
* Hook for services that want to execute code after the initial model loading request (i.e. {@link RequestModelAction}).
|
|
94
|
+
* Note that this hook is invoked directly after the {@link RequestModelAction} has been dispatched. It does not necessarily wait
|
|
89
95
|
* until the client-server update roundtrip is completed. If you need to wait until the diagram is fully initialized use the
|
|
90
96
|
* {@link postModelInitialization} hook.
|
|
91
97
|
*/
|
|
98
|
+
|
|
92
99
|
postRequestModel?(): MaybePromise<void>;
|
|
93
|
-
|
|
94
|
-
* (i.e.
|
|
100
|
+
/** Hook for services that want to execute code after the diagram model is fully initialized
|
|
101
|
+
* (i.e. {@link ModelInitializationConstraint} is completed).
|
|
95
102
|
*/
|
|
96
103
|
postModelInitialization?(): MaybePromise<void>;
|
|
97
104
|
}
|
|
@@ -119,7 +126,7 @@ export interface DiagramLoadingOptions {
|
|
|
119
126
|
requestModelOptions?: Args;
|
|
120
127
|
|
|
121
128
|
/**
|
|
122
|
-
* Optional partial {@link InitializeParameters} that should be used for
|
|
129
|
+
* Optional partial {@link InitializeParameters} that should be used for {@link GLSPClient.initializeServer} request if the underlying
|
|
123
130
|
* {@link GLSPClient} has not been initialized yet.
|
|
124
131
|
*/
|
|
125
132
|
initializeParameters?: Partial<InitializeParameters>;
|
|
@@ -180,14 +187,15 @@ export class DiagramLoader {
|
|
|
180
187
|
},
|
|
181
188
|
enableNotifications: options.enableNotifications ?? true
|
|
182
189
|
};
|
|
183
|
-
//
|
|
184
|
-
await this.actionDispatcher.
|
|
190
|
+
// Ensure that the action dispatcher is initialized before starting the diagram loading process
|
|
191
|
+
await this.actionDispatcher.initialize?.();
|
|
185
192
|
await this.invokeStartupHook('preInitialize');
|
|
186
193
|
await this.initialize(resolvedOptions);
|
|
187
194
|
await this.invokeStartupHook('preRequestModel');
|
|
188
195
|
await this.requestModel(resolvedOptions);
|
|
189
196
|
await this.invokeStartupHook('postRequestModel');
|
|
190
|
-
this.modelInitializationConstraint.onInitialized(
|
|
197
|
+
await this.modelInitializationConstraint.onInitialized();
|
|
198
|
+
await this.invokeStartupHook('postModelInitialization');
|
|
191
199
|
}
|
|
192
200
|
|
|
193
201
|
protected async invokeStartupHook(hook: keyof Omit<IDiagramStartup, 'rank'>): Promise<void> {
|
|
@@ -201,10 +209,9 @@ export class DiagramLoader {
|
|
|
201
209
|
}
|
|
202
210
|
|
|
203
211
|
protected async requestModel(options: ResolvedDiagramLoadingOptions): Promise<void> {
|
|
204
|
-
|
|
205
|
-
RequestModelAction.create({ options: options.requestModelOptions })
|
|
212
|
+
await this.actionDispatcher.dispatch(
|
|
213
|
+
RequestModelAction.create({ options: options.requestModelOptions, requestId: RequestAction.generateRequestId() })
|
|
206
214
|
);
|
|
207
|
-
return this.actionDispatcher.dispatch(response);
|
|
208
215
|
}
|
|
209
216
|
|
|
210
217
|
protected async initialize(options: ResolvedDiagramLoadingOptions): Promise<void> {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
import { Action, IActionDispatcher, IActionHandler, ICommand, TYPES } from '@eclipse-glsp/sprotty';
|
|
17
|
+
import { Action, IActionDispatcher, IActionHandler, ICommand, SetUIExtensionVisibilityAction, TYPES } from '@eclipse-glsp/sprotty';
|
|
18
18
|
import { inject, injectable } from 'inversify';
|
|
19
19
|
import { EditorContextService } from '../../../base/editor-context-service';
|
|
20
20
|
import { IDiagramStartup } from '../../../base/model/diagram-loader';
|
|
@@ -99,7 +99,7 @@ export class Toast extends GLSPAbstractUIExtension implements IActionHandler, ID
|
|
|
99
99
|
}
|
|
100
100
|
|
|
101
101
|
preInitialize(): void {
|
|
102
|
-
this.
|
|
102
|
+
this.actionDispatcher.dispatch(SetUIExtensionVisibilityAction.create({ extensionId: Toast.ID, visible: true }));
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
values(obj: { [key: symbol]: ToastOptions }): ToastOptions[] {
|
|
@@ -13,9 +13,15 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import {
|
|
16
|
+
import {
|
|
17
|
+
IActionDispatcher,
|
|
18
|
+
IActionHandler,
|
|
19
|
+
SetUIExtensionVisibilityAction,
|
|
20
|
+
StatusAction,
|
|
21
|
+
TYPES,
|
|
22
|
+
codiconCSSClasses
|
|
23
|
+
} from '@eclipse-glsp/sprotty';
|
|
17
24
|
import { inject, injectable } from 'inversify';
|
|
18
|
-
import { EditorContextService } from '../../base/editor-context-service';
|
|
19
25
|
import { IDiagramStartup } from '../../base/model/diagram-loader';
|
|
20
26
|
import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
|
|
21
27
|
|
|
@@ -29,9 +35,6 @@ export class StatusOverlay extends GLSPAbstractUIExtension implements IActionHan
|
|
|
29
35
|
@inject(TYPES.IActionDispatcher)
|
|
30
36
|
protected actionDispatcher: IActionDispatcher;
|
|
31
37
|
|
|
32
|
-
@inject(EditorContextService)
|
|
33
|
-
protected editorContext: EditorContextService;
|
|
34
|
-
|
|
35
38
|
protected statusIconDiv?: HTMLDivElement;
|
|
36
39
|
protected statusMessageDiv?: HTMLDivElement;
|
|
37
40
|
protected pendingTimeout?: number;
|
|
@@ -115,7 +118,7 @@ export class StatusOverlay extends GLSPAbstractUIExtension implements IActionHan
|
|
|
115
118
|
}
|
|
116
119
|
}
|
|
117
120
|
|
|
118
|
-
preInitialize(): void {
|
|
119
|
-
this.
|
|
121
|
+
preInitialize(): Promise<void> {
|
|
122
|
+
return this.actionDispatcher.dispatch(SetUIExtensionVisibilityAction.create({ extensionId: this.id(), visible: true }));
|
|
120
123
|
}
|
|
121
124
|
}
|
|
@@ -474,17 +474,21 @@ export class ToolPalette extends GLSPAbstractUIExtension implements IActionHandl
|
|
|
474
474
|
this.createBody();
|
|
475
475
|
}
|
|
476
476
|
|
|
477
|
-
|
|
477
|
+
/**
|
|
478
|
+
* @deprecated This hook is no longer used by the ToolPalette.
|
|
479
|
+
* It is kept for compatibility reasons and will be removed in the future.
|
|
480
|
+
* Move initialization logic to the `postRequestModel` method.
|
|
481
|
+
* This ensures that tool palette initialization does not block the diagram loading process.
|
|
482
|
+
*/
|
|
483
|
+
async preRequestModel(): Promise<void> {}
|
|
484
|
+
|
|
485
|
+
async postRequestModel(): Promise<void> {
|
|
478
486
|
await this.setPaletteItems();
|
|
479
487
|
if (!this.editorContext.isReadonly) {
|
|
480
488
|
this.show(this.editorContext.modelRoot);
|
|
481
489
|
}
|
|
482
490
|
}
|
|
483
491
|
|
|
484
|
-
async postRequestModel(): Promise<void> {
|
|
485
|
-
this.reloadPaletteBody();
|
|
486
|
-
}
|
|
487
|
-
|
|
488
492
|
protected async setPaletteItems(): Promise<void> {
|
|
489
493
|
const requestAction = RequestContextActions.create({
|
|
490
494
|
contextId: ToolPalette.ID,
|
|
@@ -506,7 +510,7 @@ export class ToolPalette extends GLSPAbstractUIExtension implements IActionHandl
|
|
|
506
510
|
}
|
|
507
511
|
|
|
508
512
|
protected async reloadPaletteBody(): Promise<void> {
|
|
509
|
-
if (this.dynamic) {
|
|
513
|
+
if (!this.editorContext.isReadonly && this.dynamic) {
|
|
510
514
|
await this.setPaletteItems();
|
|
511
515
|
this.paletteItemsCopy = [];
|
|
512
516
|
this.requestFilterUpdate(this.searchField.value);
|