@eclipse-glsp/client 0.10.0-next.c94277c.176 → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/css/decoration.css +5 -1
  2. package/css/glsp-sprotty.css +39 -0
  3. package/css/tool-palette.css +2 -2
  4. package/lib/base/container-modules.js +8 -8
  5. package/lib/base/container-modules.js.map +1 -1
  6. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +5 -7
  7. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
  8. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +7 -14
  9. package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
  10. package/lib/features/hover/hover.d.ts +1 -2
  11. package/lib/features/hover/hover.d.ts.map +1 -1
  12. package/lib/features/hover/hover.js +2 -15
  13. package/lib/features/hover/hover.js.map +1 -1
  14. package/lib/features/mouse-tool/mouse-tool.d.ts +0 -1
  15. package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
  16. package/lib/features/mouse-tool/mouse-tool.js +0 -3
  17. package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
  18. package/lib/features/select/select-mouse-listener.d.ts +3 -1
  19. package/lib/features/select/select-mouse-listener.d.ts.map +1 -1
  20. package/lib/features/select/select-mouse-listener.js +62 -0
  21. package/lib/features/select/select-mouse-listener.js.map +1 -1
  22. package/lib/features/source-model-watcher/di.config.d.ts +4 -0
  23. package/lib/features/{model-source-watcher → source-model-watcher}/di.config.d.ts.map +1 -1
  24. package/lib/features/{model-source-watcher → source-model-watcher}/di.config.js +4 -4
  25. package/lib/features/{model-source-watcher → source-model-watcher}/di.config.js.map +1 -1
  26. package/lib/features/{model-source-watcher/model-source-changed-action-handler.d.ts → source-model-watcher/source-model-changed-action-handler.d.ts} +9 -9
  27. package/lib/features/{model-source-watcher/model-source-changed-action-handler.d.ts.map → source-model-watcher/source-model-changed-action-handler.d.ts.map} +1 -1
  28. package/lib/features/{model-source-watcher/model-source-changed-action-handler.js → source-model-watcher/source-model-changed-action-handler.js} +19 -19
  29. package/lib/features/{model-source-watcher/model-source-changed-action-handler.js.map → source-model-watcher/source-model-changed-action-handler.js.map} +1 -1
  30. package/lib/features/validation/issue-marker.d.ts +11 -5
  31. package/lib/features/validation/issue-marker.d.ts.map +1 -1
  32. package/lib/features/validation/issue-marker.js +25 -5
  33. package/lib/features/validation/issue-marker.js.map +1 -1
  34. package/lib/features/validation/validate.d.ts.map +1 -1
  35. package/lib/features/validation/validate.js +6 -3
  36. package/lib/features/validation/validate.js.map +1 -1
  37. package/lib/index.d.ts +3 -3
  38. package/lib/index.d.ts.map +1 -1
  39. package/lib/index.js +11 -11
  40. package/lib/index.js.map +1 -1
  41. package/lib/views/glsp-projection-view.d.ts +30 -0
  42. package/lib/views/glsp-projection-view.d.ts.map +1 -0
  43. package/lib/views/glsp-projection-view.js +142 -0
  44. package/lib/views/glsp-projection-view.js.map +1 -0
  45. package/lib/views/index.d.ts +1 -0
  46. package/lib/views/index.d.ts.map +1 -1
  47. package/lib/views/index.js +1 -0
  48. package/lib/views/index.js.map +1 -1
  49. package/package.json +4 -4
  50. package/src/base/container-modules.ts +2 -2
  51. package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +19 -25
  52. package/src/features/hover/hover.ts +2 -24
  53. package/src/features/mouse-tool/mouse-tool.ts +0 -4
  54. package/src/features/select/select-mouse-listener.ts +81 -1
  55. package/src/features/{model-source-watcher → source-model-watcher}/di.config.ts +5 -5
  56. package/src/features/{model-source-watcher/model-source-changed-action-handler.ts → source-model-watcher/source-model-changed-action-handler.ts} +12 -12
  57. package/src/features/validation/issue-marker.ts +34 -12
  58. package/src/features/validation/validate.ts +6 -4
  59. package/src/index.ts +3 -3
  60. package/src/views/glsp-projection-view.tsx +166 -0
  61. package/src/views/index.ts +2 -0
  62. package/lib/features/model-source-watcher/di.config.d.ts +0 -4
@@ -23,16 +23,20 @@
23
23
 
24
24
  .sprotty-issue-background {
25
25
  fill: var(--glsp-issue-background);
26
+ background-color: var(--glsp-issue-background);
26
27
  }
27
28
 
28
29
  .sprotty-issue.sprotty-error {
29
30
  fill: var(--glsp-error-foreground);
31
+ background-color: var(--glsp-error-foreground);
30
32
  }
31
33
 
32
34
  .sprotty-issue.sprotty-warning {
33
35
  fill: var(--glsp-warning-foreground);
36
+ background-color: var(--glsp-warning-foreground);
34
37
  }
35
38
 
36
39
  .sprotty-issue.sprotty-info {
37
40
  fill: var(--glsp-info-foreground);
38
- }
41
+ background-color: var(--glsp-info-foreground);
42
+ }
@@ -215,3 +215,42 @@ text {
215
215
  font-size: 8pt;
216
216
  text-anchor: middle;
217
217
  }
218
+
219
+ .glsp-projection {
220
+ width: 40%;
221
+ opacity: 1;
222
+ }
223
+
224
+ .sprotty-projection-bar.vertical.bordered-projection-bar {
225
+ width: var(--theia-scrollbar-rail-width);
226
+ }
227
+
228
+ .sprotty-projection-bar.horizontal.bordered-projection-bar {
229
+ height: var(--theia-scrollbar-rail-width);
230
+ }
231
+
232
+ .projection-scroll-bar {
233
+ transition: opacity 0.8s linear;
234
+ }
235
+
236
+ .mouse-enter .projection-scroll-bar {
237
+ opacity: 0.3;
238
+ background: transparent;
239
+ background-color: #aaa;
240
+ z-index: 1;
241
+ }
242
+
243
+ .mouse-leave .projection-scroll-bar {
244
+ opacity: 0;
245
+ pointer-events: none;
246
+ background: transparent;
247
+ background-color: #aaa;
248
+ z-index: 1;
249
+ }
250
+
251
+ .bordered-projection-bar {
252
+ border-left: 1px solid rgba(212, 212, 212, 0.2);
253
+ border-top: 1px solid rgba(212, 212, 212, 0.2);
254
+ fill: transparent;
255
+ width: var(--theia-scrollbar-rail-width);
256
+ }
@@ -17,7 +17,7 @@
17
17
  /* Css for main container */
18
18
  .tool-palette {
19
19
  position: absolute;
20
- right: 30px;
20
+ right: 40px;
21
21
  top: 25px;
22
22
  text-align: center;
23
23
  width: 225px;
@@ -140,7 +140,7 @@
140
140
 
141
141
  .minimize-palette-button {
142
142
  position: absolute;
143
- right: 10px;
143
+ right: 20px;
144
144
  top: 35px;
145
145
  z-index: 1000;
146
146
  }
@@ -26,10 +26,10 @@ const di_config_5 = require("../features/edit-label/di.config");
26
26
  const di_config_6 = require("../features/hints/di.config");
27
27
  const di_config_7 = require("../features/hover/di.config");
28
28
  const di_config_8 = require("../features/layout/di.config");
29
- const di_config_9 = require("../features/model-source-watcher/di.config");
30
- const di_config_10 = require("../features/mouse-tool/di.config");
31
- const di_config_11 = require("../features/navigation/di.config");
32
- const di_config_12 = require("../features/select/di.config");
29
+ const di_config_9 = require("../features/mouse-tool/di.config");
30
+ const di_config_10 = require("../features/navigation/di.config");
31
+ const di_config_11 = require("../features/select/di.config");
32
+ const di_config_12 = require("../features/source-model-watcher/di.config");
33
33
  const di_config_13 = require("../features/tool-feedback/di.config");
34
34
  const di_config_14 = require("../features/tool-palette/di.config");
35
35
  const di_config_15 = require("../features/tools/di.config");
@@ -51,8 +51,8 @@ exports.DEFAULT_MODULES = [
51
51
  di_config_4.default,
52
52
  di_config_5.default,
53
53
  di_config_7.default,
54
- di_config_10.default,
55
- di_config_12.default,
54
+ di_config_9.default,
55
+ di_config_11.default,
56
56
  di_config_3.glspServerCopyPasteModule,
57
57
  di_config_17.default,
58
58
  sprotty_1.labelEditUiModule,
@@ -60,8 +60,8 @@ exports.DEFAULT_MODULES = [
60
60
  di_config_16.markerNavigatorModule,
61
61
  di_config_6.default,
62
62
  sprotty_1.modelSourceModule,
63
- di_config_9.default,
64
- di_config_11.navigationModule,
63
+ di_config_12.default,
64
+ di_config_10.navigationModule,
65
65
  sprotty_1.openModule,
66
66
  di_config_14.default,
67
67
  sprotty_1.routingModule,
@@ -1 +1 @@
1
- {"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAAuD;AACvD,qCAciB;AACjB,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,2DAA2D;AAC3D,2DAA0D;AAC1D,4DAAwD;AACxD,0EAAkF;AAClF,iEAAmE;AACnE,iEAAoE;AACpE,6DAA4D;AAC5D,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,uBAAa;IACb,oBAAiB;IACjB,sBAAY;IACZ,sBAAY;IACZ,gCAAsB;IACtB,0BAAgB;IAChB,sBAAY;IACZ,sBAAY;IACZ,oBAAU;IACV,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,mBAAe;IACf,oBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,2BAAiB;IACjB,mBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,2BAAiB;IACjB,mBAAwB;IACxB,6BAAgB;IAChB,oBAAU;IACV,oBAAiB;IACjB,uBAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,sBAAY;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,qBAAqB,CAAC,GAAG,OAA0B;IAC/D,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC,GAAG,uBAAe,EAAE,GAAG,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC;AACrB,CAAC;AAJD,sDAIC"}
1
+ {"version":3,"file":"container-modules.js","sourceRoot":"","sources":["../../src/base/container-modules.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,yCAAuD;AACvD,qCAciB;AACjB,qEAA6E;AAC7E,kEAAuE;AACvE,gEAA6E;AAC7E,gEAAoE;AACpE,gEAAmE;AACnE,2DAA2D;AAC3D,2DAA0D;AAC1D,4DAAwD;AACxD,gEAAmE;AACnE,iEAAoE;AACpE,6DAA4D;AAC5D,2EAAkF;AAClF,oEAAqE;AACrE,mEAAmE;AACnE,4DAA+F;AAC/F,iEAA2F;AAC3F,+DAAgE;AAChE,4CAA4C;AAE/B,QAAA,eAAe,GAAG;IAC3B,uBAAa;IACb,oBAAiB;IACjB,sBAAY;IACZ,sBAAY;IACZ,gCAAsB;IACtB,0BAAgB;IAChB,sBAAY;IACZ,sBAAY;IACZ,oBAAU;IACV,mBAAwB;IACxB,mBAAqB;IACrB,mBAAoB;IACpB,mBAAmB;IACnB,mBAAe;IACf,mBAAmB;IACnB,oBAAgB;IAChB,qCAAyB;IACzB,oBAAkB;IAClB,2BAAiB;IACjB,mBAAY;IACZ,kCAAqB;IACrB,mBAAgB;IAChB,2BAAiB;IACjB,oBAAwB;IACxB,6BAAgB;IAChB,oBAAU;IACV,oBAAiB;IACjB,uBAAa;IACb,oBAAkB;IAClB,wBAAW;IACX,gDAAmC;IACnC,6BAAgB;IAChB,sBAAY;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,qBAAqB,CAAC,GAAG,OAA0B;IAC/D,MAAM,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC,GAAG,uBAAe,EAAE,GAAG,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC;AACrB,CAAC;AAJD,sDAIC"}
@@ -17,25 +17,23 @@ import { Action } from '@eclipse-glsp/protocol';
17
17
  import { ContextMenuProviderRegistry, IContextMenuServiceProvider, MouseListener, SModelElement } from 'sprotty';
18
18
  import { SelectionService } from '../select/selection-service';
19
19
  export declare class SelectionServiceAwareContextMenuMouseListener extends MouseListener {
20
- protected readonly contextMenuService: IContextMenuServiceProvider;
21
- protected readonly menuProvider: ContextMenuProviderRegistry;
20
+ protected readonly contextMenuService?: IContextMenuServiceProvider;
21
+ protected readonly menuProvider?: ContextMenuProviderRegistry;
22
22
  protected selectionService: SelectionService;
23
23
  /**
24
- * Opens the context menu on right-click.
24
+ * Opens the context menu.
25
25
  */
26
- mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[];
26
+ contextMenu(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[];
27
27
  /**
28
28
  * Opens the context menu.
29
29
  *
30
- * - query the element on the click-target
31
- * - select the element
32
30
  * - query the context menu service and the context menu elements
33
31
  * - show the context menu
34
32
  * - send a focus state change to indicate that the diagram becomes inactive, once the context menu is shown
35
33
  *
36
34
  * When the context menu is closed, we focus the diagram element again.
37
35
  */
38
- protected openContextMenu(event: MouseEvent, target: SModelElement): Promise<Action>[];
36
+ protected openContextMenu(target: SModelElement, event: MouseEvent): Promise<Action>[];
39
37
  protected focusEventTarget(event: MouseEvent): void;
40
38
  }
41
39
  //# sourceMappingURL=selection-service-aware-context-menu-mouse-listener.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"selection-service-aware-context-menu-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EACH,2BAA2B,EAE3B,2BAA2B,EAE3B,aAAa,EACb,aAAa,EAChB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,qBACa,6CAA8C,SAAQ,aAAa;IACrB,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,2BAA2B,CAAC;IAClE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IACrF,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7E;;OAEG;IACM,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;IAO1F;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE;IAetF,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOtD"}
1
+ {"version":3,"file":"selection-service-aware-context-menu-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGjH,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,qBACa,6CAA8C,SAAQ,aAAa;IAG5E,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,2BAA2B,CAAC;IAIpE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,2BAA2B,CAAC;IAG9D,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C;;OAEG;IACM,WAAW,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;IAI5F;;;;;;;;OAQG;IACH,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE;IActF,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOtD"}
@@ -17,32 +17,25 @@ const types_1 = require("../../base/types");
17
17
  const selection_service_1 = require("../select/selection-service");
18
18
  let SelectionServiceAwareContextMenuMouseListener = class SelectionServiceAwareContextMenuMouseListener extends sprotty_1.MouseListener {
19
19
  /**
20
- * Opens the context menu on right-click.
20
+ * Opens the context menu.
21
21
  */
22
- mouseDown(target, event) {
23
- if (event.button === 2 && this.contextMenuService && this.menuProvider) {
24
- return this.openContextMenu(event, target);
25
- }
26
- return [];
22
+ contextMenu(target, event) {
23
+ return this.openContextMenu(target, event);
27
24
  }
28
25
  /**
29
26
  * Opens the context menu.
30
27
  *
31
- * - query the element on the click-target
32
- * - select the element
33
28
  * - query the context menu service and the context menu elements
34
29
  * - show the context menu
35
30
  * - send a focus state change to indicate that the diagram becomes inactive, once the context menu is shown
36
31
  *
37
32
  * When the context menu is closed, we focus the diagram element again.
38
33
  */
39
- openContextMenu(event, target) {
40
- const mousePosition = { x: event.x, y: event.y };
41
- const selectableTarget = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable);
42
- if (selectableTarget) {
43
- selectableTarget.selected = true;
44
- this.selectionService.updateSelection(target.root, [selectableTarget.id], []);
34
+ openContextMenu(target, event) {
35
+ if (!this.contextMenuService || !this.menuProvider) {
36
+ return [];
45
37
  }
38
+ const mousePosition = { x: event.x, y: event.y };
46
39
  const result = Promise.all([this.contextMenuService(), this.menuProvider.getItems(target.root, mousePosition)])
47
40
  .then(([menuService, menuItems]) => menuService.show(menuItems, mousePosition, () => this.focusEventTarget(event)))
48
41
  .then(() => focus_change_action_1.FocusStateChangedAction.create(false));
@@ -1 +1 @@
1
- {"version":3,"file":"selection-service-aware-context-menu-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AACzD,qCAOiB;AACjB,gFAAiF;AACjF,4CAAyC;AACzC,mEAA+D;AAG/D,IAAa,6CAA6C,GAA1D,MAAa,6CAA8C,SAAQ,uBAAa;IAK5E;;OAEG;IACM,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,YAAY,EAAE;YACpE,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC9C;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;;;;;;;OAUG;IACO,eAAe,CAAC,KAAiB,EAAE,MAAqB;QAC9D,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QACjD,MAAM,gBAAgB,GAAG,IAAA,6BAAmB,EAAC,MAAM,EAAE,sBAAY,CAAC,CAAC;QACnE,IAAI,gBAAgB,EAAE;YAClB,gBAAgB,CAAC,QAAQ,GAAG,IAAI,CAAC;YACjC,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;SACjF;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;aAC1G,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;aAClH,IAAI,CAAC,GAAW,EAAE,CAAC,6CAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAES,gBAAgB,CAAC,KAAiB;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,MAAM,gBAAgB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,gBAAgB,EAAE;YAClB,gBAAgB,CAAC,KAAK,EAAE,CAAC;SAC5B;IACL,CAAC;CACJ,CAAA;AA/C0D;IAAtD,IAAA,kBAAM,EAAC,aAAK,CAAC,2BAA2B,CAAC;IAAE,IAAA,oBAAQ,GAAE;;yFAAoE;AAClE;IAAvD,IAAA,kBAAM,EAAC,aAAK,CAAC,4BAA4B,CAAC;IAAE,IAAA,oBAAQ,GAAE;8BAAkC,qCAA2B;mFAAC;AACrF;IAA/B,IAAA,kBAAM,EAAC,aAAK,CAAC,gBAAgB,CAAC;8BAA6B,oCAAgB;uFAAC;AAHpE,6CAA6C;IADzD,IAAA,sBAAU,GAAE;GACA,6CAA6C,CAgDzD;AAhDY,sGAA6C"}
1
+ {"version":3,"file":"selection-service-aware-context-menu-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,yCAAyD;AACzD,qCAAiH;AACjH,gFAAiF;AACjF,4CAAyC;AACzC,mEAA+D;AAG/D,IAAa,6CAA6C,GAA1D,MAAa,6CAA8C,SAAQ,uBAAa;IAY5E;;OAEG;IACM,WAAW,CAAC,MAAqB,EAAE,KAAiB;QACzD,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;;;;OAQG;IACO,eAAe,CAAC,MAAqB,EAAE,KAAiB;QAC9D,IAAI,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAChD,OAAO,EAAE,CAAC;SACb;QAED,MAAM,aAAa,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC;QAEjD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;aAC1G,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;aAClH,IAAI,CAAC,GAAW,EAAE,CAAC,6CAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAE/D,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;IAES,gBAAgB,CAAC,KAAiB;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACpF,MAAM,gBAAgB,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,gBAAgB,EAAE;YAClB,gBAAgB,CAAC,KAAK,EAAE,CAAC;SAC5B;IACL,CAAC;CACJ,CAAA;AA9CG;IAFC,IAAA,kBAAM,EAAC,aAAK,CAAC,2BAA2B,CAAC;IACzC,IAAA,oBAAQ,GAAE;;yFACyD;AAIpE;IAFC,IAAA,kBAAM,EAAC,aAAK,CAAC,4BAA4B,CAAC;IAC1C,IAAA,oBAAQ,GAAE;8BACuB,qCAA2B;mFAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,aAAK,CAAC,gBAAgB,CAAC;8BACH,oCAAgB;uFAAC;AAVpC,6CAA6C;IADzD,IAAA,sBAAU,GAAE;GACA,6CAA6C,CAiDzD;AAjDY,sGAA6C"}
@@ -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
  import { Action, Bounds, SModelElementSchema, SModelRootSchema } from '@eclipse-glsp/protocol';
17
- import { HoverMouseListener, IActionHandler, ICommand, SIssueMarker, SIssueSeverity, SModelElement } from 'sprotty';
17
+ import { HoverMouseListener, IActionHandler, ICommand, SModelElement } from 'sprotty';
18
18
  import { GIssueMarker } from '../validation/issue-marker';
19
19
  export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
20
20
  protected enableHover: boolean;
@@ -35,5 +35,4 @@ export declare class GlspHoverMouseListener extends HoverMouseListener implement
35
35
  protected createIssueMessage(marker: GIssueMarker): string;
36
36
  protected modifyBounds(bounds: Bounds): Bounds;
37
37
  }
38
- export declare function getSeverity(marker: SIssueMarker): SIssueSeverity;
39
38
  //# sourceMappingURL=hover.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,cAAc,EACd,aAAa,EAChB,MAAM,SAAS,CAAC;AAIjB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
1
+ {"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,MAAM,EAIN,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAmC,kBAAkB,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIvH,OAAO,EAAe,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACvE,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF,SAAS,CAAC,WAAW,UAAQ;IAC7B;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAevC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;cAOvE,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBjG,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD"}
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.getSeverity = exports.GlspHoverMouseListener = void 0;
9
+ exports.GlspHoverMouseListener = void 0;
10
10
  /********************************************************************************
11
11
  * Copyright (c) 2020-2022 EclipseSource and others.
12
12
  *
@@ -97,7 +97,7 @@ let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.Hove
97
97
  return {
98
98
  type: 'pre-rendered',
99
99
  id: 'popup-title',
100
- code: `<div class="${getSeverity(marker)}"><div class="sprotty-popup-title">${message}</div></div>`
100
+ code: `<div class="${(0, issue_marker_1.getSeverity)(marker)}"><div class="sprotty-popup-title">${message}</div></div>`
101
101
  };
102
102
  }
103
103
  createIssueMessage(marker) {
@@ -111,17 +111,4 @@ GlspHoverMouseListener = __decorate([
111
111
  (0, inversify_1.injectable)()
112
112
  ], GlspHoverMouseListener);
113
113
  exports.GlspHoverMouseListener = GlspHoverMouseListener;
114
- function getSeverity(marker) {
115
- let currentSeverity = 'info';
116
- for (const severity of marker.issues.map(s => s.severity)) {
117
- if (severity === 'error') {
118
- return severity;
119
- }
120
- if (severity === 'warning' && currentSeverity === 'info') {
121
- currentSeverity = severity;
122
- }
123
- }
124
- return currentSeverity;
125
- }
126
- exports.getSeverity = getSeverity;
127
114
  //# sourceMappingURL=hover.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hover.js","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAQgC;AAChC,yCAAuC;AACvC,qCAAuH;AACvH,gFAAiF;AACjF,uEAAmG;AACnG,oEAA+D;AAC/D,6DAAuE;AAEvE,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,4BAAkB;IAA9D;;QACc,gBAAW,GAAG,IAAI,CAAC;IA6EjC,CAAC;IA5EG;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAc;QACjB,IAAI,6CAAuB,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACxD,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,0BAA0B,EAAE;gBACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,0BAA0B,CAAC;gBACzD,IAAI,CAAC,0BAA0B,GAAG,SAAS,CAAC;gBAC5C,OAAO,6BAAmB,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;aACjG;SACJ;aAAM,IAAI,gCAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YACrC,IAAI,CAAC,WAAW,GAAG,CAAE,MAA4B,CAAC,OAAO,CAAC,QAAQ,CAAC,qCAAgB,CAAC,EAAE,CAAC,CAAC;SAC3F;aAAM,IAAI,uCAAwB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;YAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;SAC3B;IACL,CAAC;IAEQ,SAAS,CAAC,MAAqB,EAAE,KAAiB;QACvD,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,OAAO,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SACzC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAEkB,mBAAmB,CAAC,MAAqB,EAAE,KAAiB;QAC3E,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACxF,IAAI,MAAM,YAAY,2BAAY,EAAE;oBAChC,OAAO,CAAC,8BAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAsB,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;iBACnG;qBAAM;oBACH,OAAO,CAAC,kCAAuB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;iBAC1F;gBAED,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,oBAAoB,GAAG,MAAM,CAAC;YAC7C,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACP,CAAC;IAES,gBAAgB,CAAC,MAAoB,EAAE,MAAc;QAC3D,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACzD,OAAO;gBACH,IAAI,EAAE,MAAM;gBACZ,EAAE,EAAE,eAAe;gBACnB,QAAQ,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;gBAC/C,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;aAC1C,CAAC;SACL;QACD,OAAO,EAAE,IAAI,EAAE,oBAAU,CAAC,IAAI,EAAE,EAAE,EAAE,oBAAU,CAAC,EAAE,EAAE,CAAC;IACxD,CAAC;IAES,sBAAsB,CAAC,MAAoB;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO;YACH,IAAI,EAAE,cAAc;YACpB,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,eAAe,IAAA,0BAAW,EAAC,MAAM,CAAC,sCAAsC,OAAO,cAAc;SAC1E,CAAC;IAClC,CAAC;IAES,kBAAkB,CAAC,MAAoB;QAC7C,OAAO,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;IAC9H,CAAC;IAES,YAAY,CAAC,MAAc;QACjC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AA9EY,sBAAsB;IADlC,IAAA,sBAAU,GAAE;GACA,sBAAsB,CA8ElC;AA9EY,wDAAsB"}
@@ -14,7 +14,6 @@ export declare class RankingMouseTool extends MouseTool implements IMouseTool {
14
14
  constructor(mouseListeners?: MouseListener[]);
15
15
  register(mouseListener: MouseListener): void;
16
16
  deregister(mouseListener: MouseListener): void;
17
- contextMenu(model: SModelRoot, event: MouseEvent): void;
18
17
  protected handleEvent<K extends MouseListenerMethods>(methodName: K, model: SModelRoot, event: MouseEvent): void;
19
18
  notifyListenersByRank<K extends MouseListenerMethods>(element: SModelElement, methodName: K, model: SModelRoot, event: MouseEvent): Promise<void>;
20
19
  dispatchActions<K extends MouseListenerMethods>(mouseListeners: MouseListener[], methodName: K, element: SModelElement, event: MouseEvent): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/mouse-tool/mouse-tool.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAI9E,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7C,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CAClD;AAED;;;GAGG;AACH,aAAK,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AAElE,qBACa,gBAAiB,SAAQ,SAAU,YAAW,UAAU;cAGY,cAAc,EAAE,aAAa,EAAE;IAF5G,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;gBAEgB,cAAc,GAAE,aAAa,EAAO;IAKxG,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAK5C,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAKvD,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;cAIpC,WAAW,CAAC,CAAC,SAAS,oBAAoB,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IASnH,qBAAqB,CAAC,CAAC,SAAS,oBAAoB,EACtD,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,CAAC,EACb,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;IAMV,eAAe,CAAC,CAAC,SAAS,oBAAoB,EAChD,cAAc,EAAE,aAAa,EAAE,EAC/B,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;CAenB"}
1
+ {"version":3,"file":"mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/mouse-tool/mouse-tool.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAI9E,MAAM,WAAW,UAAU;IACvB,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;IAC7C,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CAClD;AAED;;;GAGG;AACH,aAAK,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AAElE,qBACa,gBAAiB,SAAQ,SAAU,YAAW,UAAU;cAGY,cAAc,EAAE,aAAa,EAAE;IAF5G,SAAS,CAAC,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;gBAEgB,cAAc,GAAE,aAAa,EAAO;IAKxG,QAAQ,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;IAK5C,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI;cAKpC,WAAW,CAAC,CAAC,SAAS,oBAAoB,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI;IASnH,qBAAqB,CAAC,CAAC,SAAS,oBAAoB,EACtD,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,CAAC,EACb,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;IAMV,eAAe,CAAC,CAAC,SAAS,oBAAoB,EAChD,cAAc,EAAE,aAAa,EAAE,EAC/B,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,aAAa,EACtB,KAAK,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC;CAenB"}
@@ -47,9 +47,6 @@ let RankingMouseTool = class RankingMouseTool extends sprotty_1.MouseTool {
47
47
  super.deregister(mouseListener);
48
48
  this.rankedMouseListeners = groupBy(this.mouseListeners, listener => (0, model_1.getRank)(listener));
49
49
  }
50
- contextMenu(model, event) {
51
- event.preventDefault();
52
- }
53
50
  handleEvent(methodName, model, event) {
54
51
  this.focusOnMouseEvent(methodName, model);
55
52
  const element = this.getTargetElement(model, event);
@@ -1 +1 @@
1
- {"version":3,"file":"mouse-tool.js","sourceRoot":"","sources":["../../../src/features/mouse-tool/mouse-tool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAgD;AAChD,yCAA8D;AAC9D,qCAA8E;AAC9E,4CAAyC;AACzC,yCAAwC;AAcxC,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,mBAAS;IAG3C,YAA6E,iBAAkC,EAAE;QAC7G,KAAK,CAAC,cAAc,CAAC,CAAC;QADmD,mBAAc,GAAd,cAAc,CAAsB;QAE7G,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC,CAAC;IACvF,CAAC;IAEQ,QAAQ,CAAC,aAA4B;QAC1C,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC9B,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC,CAAC;IAC5F,CAAC;IAEQ,UAAU,CAAC,aAA4B;QAC5C,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAChC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAA,eAAO,EAAC,QAAQ,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,WAAW,CAAC,KAAiB,EAAE,KAAiB;QAC5C,KAAK,CAAC,cAAc,EAAE,CAAC;IAC3B,CAAC;IAEkB,WAAW,CAAiC,UAAa,EAAE,KAAiB,EAAE,KAAiB;QAC9G,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,OAAO,EAAE;YACV,OAAO;SACV;QACD,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,qBAAqB,CACvB,OAAsB,EACtB,UAAa,EACb,KAAiB,EACjB,KAAiB;QAEjB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,oBAAoB,EAAE;YAC1C,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SACnE;IACL,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,cAA+B,EAC/B,UAAa,EACb,OAAsB,EACtB,KAAiB;QAEjB,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,KAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACjI,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,KAAK,MAAM,eAAe,IAAI,OAAO,EAAE;gBACnC,IAAI,iBAAM,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;oBAC5B,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;iBACzD;qBAAM;oBACH,eAAe,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE;wBACpC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBAC3C,CAAC,CAAC,CAAC;iBACN;aACJ;SACJ;IACL,CAAC;CACJ,CAAA;AA9DY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;IAII,WAAA,IAAA,uBAAW,EAAC,aAAK,CAAC,aAAa,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;;GAHhD,gBAAgB,CA8D5B;AA9DY,4CAAgB;AAgE7B,SAAS,OAAO,CAAO,KAAe,EAAE,WAAwB;IAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,MAAmB,EAAE,IAAO,EAAE,EAAE;QAC9D,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAClB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;SAC3B;aAAM;YACH,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,OAAO,EAAE;gBACT,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtB;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC,EAAE,IAAI,GAAG,EAAU,CAAC,CAAC;IACtB,OAAO,IAAI,GAAG,CAAS,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAC9D,CAAC"}
1
+ {"version":3,"file":"mouse-tool.js","sourceRoot":"","sources":["../../../src/features/mouse-tool/mouse-tool.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,8 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { SelectMouseListener } from 'sprotty';
16
+ import { Action } from '@eclipse-glsp/protocol';
17
+ import { SelectMouseListener, SModelElement } from 'sprotty';
17
18
  import { Ranked } from '../rank/model';
18
19
  /**
19
20
  * Ranked select mouse listener that is executed before default mouse listeners when using the RankedMouseTool.
@@ -21,5 +22,6 @@ import { Ranked } from '../rank/model';
21
22
  */
22
23
  export declare class RankedSelectMouseListener extends SelectMouseListener implements Ranked {
23
24
  rank: number;
25
+ mouseDown(target: SModelElement, event: MouseEvent): Action[];
24
26
  }
25
27
  //# sourceMappingURL=select-mouse-listener.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"select-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/select/select-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAgB,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,mBAAoB,YAAW,MAAM;IAChF,IAAI,EAAE,MAAM,CAAoB;CACnC"}
1
+ {"version":3,"file":"select-mouse-listener.d.ts","sourceRoot":"","sources":["../../../src/features/select/select-mouse-listener.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAMH,mBAAmB,EACnB,aAAa,EAKhB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAgB,MAAM,EAAE,MAAM,eAAe,CAAC;AAErD;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,mBAAoB,YAAW,MAAM;IAChF,IAAI,EAAE,MAAM,CAAoB;IAEvB,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;CAiEzE"}
@@ -16,7 +16,9 @@ exports.RankedSelectMouseListener = void 0;
16
16
  *
17
17
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
18
18
  ********************************************************************************/
19
+ const protocol_1 = require("@eclipse-glsp/protocol");
19
20
  const sprotty_1 = require("sprotty");
21
+ const iterable_1 = require("sprotty/lib/utils/iterable");
20
22
  const model_1 = require("../rank/model");
21
23
  /**
22
24
  * Ranked select mouse listener that is executed before default mouse listeners when using the RankedMouseTool.
@@ -27,6 +29,66 @@ class RankedSelectMouseListener extends sprotty_1.SelectMouseListener {
27
29
  super(...arguments);
28
30
  this.rank = model_1.DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
29
31
  }
32
+ mouseDown(target, event) {
33
+ const result = [];
34
+ if (this.buttonHandlerRegistry !== undefined && target instanceof sprotty_1.SButton && target.enabled) {
35
+ const buttonHandler = this.buttonHandlerRegistry.get(target.type);
36
+ if (buttonHandler !== undefined) {
37
+ return buttonHandler.buttonPressed(target);
38
+ }
39
+ }
40
+ const selectableTarget = (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable);
41
+ if (selectableTarget !== undefined || target instanceof sprotty_1.SModelRoot) {
42
+ this.hasDragged = false;
43
+ let deselect = [];
44
+ // multi-selection?
45
+ if (!(0, sprotty_1.isCtrlOrCmd)(event)) {
46
+ deselect = (0, iterable_1.toArray)(target.root.index
47
+ .all()
48
+ .filter(element => (0, sprotty_1.isSelectable)(element) &&
49
+ element.selected &&
50
+ !(selectableTarget instanceof sprotty_1.SRoutingHandle && element === selectableTarget.parent)));
51
+ }
52
+ if (selectableTarget !== undefined) {
53
+ if (!selectableTarget.selected) {
54
+ this.wasSelected = false;
55
+ result.push(protocol_1.SelectAction.create({
56
+ selectedElementsIDs: [selectableTarget.id],
57
+ deselectedElementsIDs: deselect.map(e => e.id)
58
+ }));
59
+ result.push(sprotty_1.BringToFrontAction.create([selectableTarget.id]));
60
+ const routableDeselect = deselect.filter(e => e instanceof sprotty_1.SRoutableElement).map(e => e.id);
61
+ if (selectableTarget instanceof sprotty_1.SRoutableElement) {
62
+ result.push(sprotty_1.SwitchEditModeAction.create({
63
+ elementsToActivate: [selectableTarget.id],
64
+ elementsToDeactivate: routableDeselect
65
+ }));
66
+ }
67
+ else if (routableDeselect.length > 0) {
68
+ result.push(sprotty_1.SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
69
+ }
70
+ }
71
+ else if ((0, sprotty_1.isCtrlOrCmd)(event)) {
72
+ this.wasSelected = false;
73
+ result.push(protocol_1.SelectAction.create({ deselectedElementsIDs: [selectableTarget.id] }));
74
+ if (selectableTarget instanceof sprotty_1.SRoutableElement) {
75
+ result.push(sprotty_1.SwitchEditModeAction.create({ elementsToDeactivate: [selectableTarget.id] }));
76
+ }
77
+ }
78
+ else {
79
+ this.wasSelected = true;
80
+ }
81
+ }
82
+ else {
83
+ result.push(protocol_1.SelectAction.create({ deselectedElementsIDs: deselect.map(e => e.id) }));
84
+ const routableDeselect = deselect.filter(e => e instanceof sprotty_1.SRoutableElement).map(e => e.id);
85
+ if (routableDeselect.length > 0) {
86
+ result.push(sprotty_1.SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
87
+ }
88
+ }
89
+ }
90
+ return result;
91
+ }
30
92
  }
31
93
  exports.RankedSelectMouseListener = RankedSelectMouseListener;
32
94
  //# sourceMappingURL=select-mouse-listener.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"select-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/select/select-mouse-listener.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qCAA8C;AAC9C,yCAAqD;AAErD;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,6BAAmB;IAAlE;;QACI,SAAI,GAAW,oBAAY,GAAG,CAAC,CAAC,CAAC,+DAA+D;IACpG,CAAC;CAAA;AAFD,8DAEC"}
1
+ {"version":3,"file":"select-mouse-listener.js","sourceRoot":"","sources":["../../../src/features/select/select-mouse-listener.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import { ContainerModule } from 'inversify';
2
+ declare const sourceModelWatcherModule: ContainerModule;
3
+ export default sourceModelWatcherModule;
4
+ //# sourceMappingURL=di.config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/model-source-watcher/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,QAAA,MAAM,wBAAwB,iBAE5B,CAAC;AAEH,eAAe,wBAAwB,CAAC"}
1
+ {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/source-model-watcher/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI5C,QAAA,MAAM,wBAAwB,iBAE5B,CAAC;AAEH,eAAe,wBAAwB,CAAC"}
@@ -18,9 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  const protocol_1 = require("@eclipse-glsp/protocol");
19
19
  const inversify_1 = require("inversify");
20
20
  const sprotty_1 = require("sprotty");
21
- const model_source_changed_action_handler_1 = require("./model-source-changed-action-handler");
22
- const modelSourceWatcherModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
23
- (0, sprotty_1.configureActionHandler)({ bind, isBound }, protocol_1.ModelSourceChangedAction.KIND, model_source_changed_action_handler_1.ModelSourceChangedActionHandler);
21
+ const source_model_changed_action_handler_1 = require("./source-model-changed-action-handler");
22
+ const sourceModelWatcherModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
23
+ (0, sprotty_1.configureActionHandler)({ bind, isBound }, protocol_1.SourceModelChangedAction.KIND, source_model_changed_action_handler_1.SourceModelChangedActionHandler);
24
24
  });
25
- exports.default = modelSourceWatcherModule;
25
+ exports.default = sourceModelWatcherModule;
26
26
  //# sourceMappingURL=di.config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/model-source-watcher/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkE;AAClE,yCAA4C;AAC5C,qCAAiD;AACjD,+FAAwF;AAExF,MAAM,wBAAwB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC5E,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,mCAAwB,CAAC,IAAI,EAAE,qEAA+B,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAC;AAEH,kBAAe,wBAAwB,CAAC"}
1
+ {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/source-model-watcher/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAkE;AAClE,yCAA4C;AAC5C,qCAAiD;AACjD,+FAAwF;AAExF,MAAM,wBAAwB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC5E,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,mCAAwB,CAAC,IAAI,EAAE,qEAA+B,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAC;AAEH,kBAAe,wBAAwB,CAAC"}
@@ -13,26 +13,26 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { Action, ModelSourceChangedAction } from '@eclipse-glsp/protocol';
16
+ import { Action, SourceModelChangedAction } from '@eclipse-glsp/protocol';
17
17
  import { IActionDispatcher, IActionHandler, ViewerOptions } from 'sprotty';
18
18
  /**
19
- * An external handler of the model source change event.
19
+ * An external handler of the source model change event.
20
20
  *
21
21
  * This allows external applications to react specifically to this event, e.g. by bringing up the diagram,
22
22
  * check their dirty state, show a dialog, etc.
23
23
  */
24
- export declare abstract class ExternalModelSourceChangedHandler {
24
+ export declare abstract class ExternalSourceModelChangedHandler {
25
25
  /**
26
- * Notifies about a change of the model source.
26
+ * Notifies about a change of the source model.
27
27
  * @returns actions to be dispatched after the notification.
28
28
  */
29
- abstract notifyModelSourceChange(modelSourceName: string, options: ViewerOptions): Promise<Action[]>;
29
+ abstract notifySourceModelChange(sourceModelName: string, options: ViewerOptions): Promise<Action[]>;
30
30
  }
31
- export declare class ModelSourceChangedActionHandler implements IActionHandler {
31
+ export declare class SourceModelChangedActionHandler implements IActionHandler {
32
32
  protected dispatcher: IActionDispatcher;
33
33
  protected options: ViewerOptions;
34
- protected externalModelSourceChangedHandler?: ExternalModelSourceChangedHandler;
34
+ protected externalModelSourceChangedHandler?: ExternalSourceModelChangedHandler;
35
35
  handle(action: Action): void;
36
- protected showSimpleNotification(action: ModelSourceChangedAction): void;
36
+ protected showSimpleNotification(action: SourceModelChangedAction): void;
37
37
  }
38
- //# sourceMappingURL=model-source-changed-action-handler.d.ts.map
38
+ //# sourceMappingURL=source-model-changed-action-handler.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"model-source-changed-action-handler.d.ts","sourceRoot":"","sources":["../../../src/features/model-source-watcher/model-source-changed-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,wBAAwB,EAA2C,MAAM,wBAAwB,CAAC;AAEnH,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAG3E;;;;;GAKG;AACH,8BACsB,iCAAiC;IACnD;;;OAGG;IACH,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CACvG;AAED,qBACa,+BAAgC,YAAW,cAAc;IAElE,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAIjC,SAAS,CAAC,iCAAiC,CAAC,EAAE,iCAAiC,CAAC;IAEhF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY5B,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,wBAAwB,GAAG,IAAI;CAS3E"}
1
+ {"version":3,"file":"source-model-changed-action-handler.d.ts","sourceRoot":"","sources":["../../../src/features/source-model-watcher/source-model-changed-action-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAA2C,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAEnH,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAG3E;;;;;GAKG;AACH,8BACsB,iCAAiC;IACnD;;;OAGG;IACH,QAAQ,CAAC,uBAAuB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CACvG;AAED,qBACa,+BAAgC,YAAW,cAAc;IAElE,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAIjC,SAAS,CAAC,iCAAiC,CAAC,EAAE,iCAAiC,CAAC;IAEhF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY5B,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,wBAAwB,GAAG,IAAI;CAS3E"}
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.ModelSourceChangedActionHandler = exports.ExternalModelSourceChangedHandler = void 0;
12
+ exports.SourceModelChangedActionHandler = exports.ExternalSourceModelChangedHandler = void 0;
13
13
  /********************************************************************************
14
14
  * Copyright (c) 2020-2022 EclipseSource and others.
15
15
  *
@@ -29,23 +29,23 @@ const protocol_1 = require("@eclipse-glsp/protocol");
29
29
  const inversify_1 = require("inversify");
30
30
  const types_1 = require("../../base/types");
31
31
  /**
32
- * An external handler of the model source change event.
32
+ * An external handler of the source model change event.
33
33
  *
34
34
  * This allows external applications to react specifically to this event, e.g. by bringing up the diagram,
35
35
  * check their dirty state, show a dialog, etc.
36
36
  */
37
- let ExternalModelSourceChangedHandler = class ExternalModelSourceChangedHandler {
37
+ let ExternalSourceModelChangedHandler = class ExternalSourceModelChangedHandler {
38
38
  };
39
- ExternalModelSourceChangedHandler = __decorate([
39
+ ExternalSourceModelChangedHandler = __decorate([
40
40
  (0, inversify_1.injectable)()
41
- ], ExternalModelSourceChangedHandler);
42
- exports.ExternalModelSourceChangedHandler = ExternalModelSourceChangedHandler;
43
- let ModelSourceChangedActionHandler = class ModelSourceChangedActionHandler {
41
+ ], ExternalSourceModelChangedHandler);
42
+ exports.ExternalSourceModelChangedHandler = ExternalSourceModelChangedHandler;
43
+ let SourceModelChangedActionHandler = class SourceModelChangedActionHandler {
44
44
  handle(action) {
45
- if (protocol_1.ModelSourceChangedAction.is(action)) {
45
+ if (protocol_1.SourceModelChangedAction.is(action)) {
46
46
  if (this.externalModelSourceChangedHandler) {
47
47
  this.externalModelSourceChangedHandler
48
- .notifyModelSourceChange(action.modelSourceName, this.options)
48
+ .notifySourceModelChange(action.sourceModelName, this.options)
49
49
  .then(actions => this.dispatcher.dispatchAll(actions));
50
50
  return;
51
51
  }
@@ -53,7 +53,7 @@ let ModelSourceChangedActionHandler = class ModelSourceChangedActionHandler {
53
53
  }
54
54
  }
55
55
  showSimpleNotification(action) {
56
- const message = `The model source ${action.modelSourceName} has changed. You might want to consider reloading.`;
56
+ const message = `The source model ${action.sourceModelName} has changed. You might want to consider reloading.`;
57
57
  const timeout = 0;
58
58
  const severity = 'WARNING';
59
59
  this.dispatcher.dispatchAll([
@@ -65,18 +65,18 @@ let ModelSourceChangedActionHandler = class ModelSourceChangedActionHandler {
65
65
  __decorate([
66
66
  (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
67
67
  __metadata("design:type", Object)
68
- ], ModelSourceChangedActionHandler.prototype, "dispatcher", void 0);
68
+ ], SourceModelChangedActionHandler.prototype, "dispatcher", void 0);
69
69
  __decorate([
70
70
  (0, inversify_1.inject)(types_1.TYPES.ViewerOptions),
71
71
  __metadata("design:type", Object)
72
- ], ModelSourceChangedActionHandler.prototype, "options", void 0);
72
+ ], SourceModelChangedActionHandler.prototype, "options", void 0);
73
73
  __decorate([
74
- (0, inversify_1.inject)(ExternalModelSourceChangedHandler),
74
+ (0, inversify_1.inject)(ExternalSourceModelChangedHandler),
75
75
  (0, inversify_1.optional)(),
76
- __metadata("design:type", ExternalModelSourceChangedHandler)
77
- ], ModelSourceChangedActionHandler.prototype, "externalModelSourceChangedHandler", void 0);
78
- ModelSourceChangedActionHandler = __decorate([
76
+ __metadata("design:type", ExternalSourceModelChangedHandler)
77
+ ], SourceModelChangedActionHandler.prototype, "externalModelSourceChangedHandler", void 0);
78
+ SourceModelChangedActionHandler = __decorate([
79
79
  (0, inversify_1.injectable)()
80
- ], ModelSourceChangedActionHandler);
81
- exports.ModelSourceChangedActionHandler = ModelSourceChangedActionHandler;
82
- //# sourceMappingURL=model-source-changed-action-handler.js.map
80
+ ], SourceModelChangedActionHandler);
81
+ exports.SourceModelChangedActionHandler = SourceModelChangedActionHandler;
82
+ //# sourceMappingURL=source-model-changed-action-handler.js.map