@eclipse-glsp/client 0.9.0-rc-01 → 0.10.0-next.bb1c2fd.157
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/LICENSE +642 -277
- package/README.md +4 -2
- package/css/command-palette.css +9 -5
- package/css/decoration.css +3 -2
- package/css/glsp-sprotty.css +16 -7
- package/css/tool-palette.css +44 -27
- package/lib/base/action-dispatcher.d.ts +19 -3
- package/lib/base/action-dispatcher.d.ts.map +1 -1
- package/lib/base/action-dispatcher.js +47 -65
- package/lib/base/action-dispatcher.js.map +1 -1
- package/lib/base/actions/focus-change-action.d.ts +1 -1
- package/lib/base/actions/focus-change-action.d.ts.map +1 -1
- package/lib/base/actions/focus-change-action.js +4 -5
- package/lib/base/actions/focus-change-action.js.map +1 -1
- package/lib/base/{args.d.ts → argumentable.d.ts} +3 -5
- package/lib/base/argumentable.d.ts.map +1 -0
- package/lib/base/{args.js → argumentable.js} +1 -1
- package/lib/base/argumentable.js.map +1 -0
- package/lib/base/auto-complete/auto-complete-actions.d.ts +1 -1
- package/lib/base/auto-complete/auto-complete-actions.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.d.ts +3 -3
- package/lib/base/auto-complete/auto-complete-widget.d.ts.map +1 -1
- package/lib/base/auto-complete/auto-complete-widget.js +119 -153
- package/lib/base/auto-complete/auto-complete-widget.js.map +1 -1
- package/lib/base/auto-complete/validation-decorator.d.ts +3 -18
- package/lib/base/auto-complete/validation-decorator.d.ts.map +1 -1
- package/lib/base/auto-complete/validation-decorator.js +44 -65
- package/lib/base/auto-complete/validation-decorator.js.map +1 -1
- package/lib/base/command-stack.d.ts.map +1 -1
- package/lib/base/command-stack.js +19 -37
- package/lib/base/command-stack.js.map +1 -1
- package/lib/base/container-modules.d.ts +40 -0
- package/lib/base/container-modules.d.ts.map +1 -0
- package/lib/base/container-modules.js +100 -0
- package/lib/base/container-modules.js.map +1 -0
- package/lib/base/di.config.d.ts +12 -2
- package/lib/base/di.config.d.ts.map +1 -1
- package/lib/base/di.config.js +43 -27
- package/lib/base/di.config.js.map +1 -1
- package/lib/base/drag-aware-mouse-listener.d.ts +3 -2
- package/lib/base/drag-aware-mouse-listener.d.ts.map +1 -1
- package/lib/base/drag-aware-mouse-listener.js +23 -62
- package/lib/base/drag-aware-mouse-listener.js.map +1 -1
- package/lib/base/{editor-context.d.ts → editor-context-service.d.ts} +18 -22
- package/lib/base/editor-context-service.d.ts.map +1 -0
- package/lib/base/editor-context-service.js +109 -0
- package/lib/base/editor-context-service.js.map +1 -0
- package/lib/base/focus-tracker.d.ts +17 -1
- package/lib/base/focus-tracker.d.ts.map +1 -1
- package/lib/base/focus-tracker.js +19 -39
- package/lib/base/focus-tracker.js.map +1 -1
- package/lib/base/model/model-registry.js +10 -28
- package/lib/base/model/model-registry.js.map +1 -1
- package/lib/base/model/update-model-command.d.ts +19 -5
- package/lib/base/model/update-model-command.d.ts.map +1 -1
- package/lib/base/model/update-model-command.js +69 -94
- package/lib/base/model/update-model-command.js.map +1 -1
- package/lib/base/model-initialization-constraint.d.ts +16 -1
- package/lib/base/model-initialization-constraint.d.ts.map +1 -1
- package/lib/base/model-initialization-constraint.js +34 -54
- package/lib/base/model-initialization-constraint.js.map +1 -1
- package/lib/base/selection-clearing-mouse-listener.js +10 -28
- package/lib/base/selection-clearing-mouse-listener.js.map +1 -1
- package/lib/base/source-uri-aware.js +2 -5
- package/lib/base/source-uri-aware.js.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.d.ts.map +1 -1
- package/lib/base/tool-manager/glsp-tool-manager.js +58 -140
- package/lib/base/tool-manager/glsp-tool-manager.js.map +1 -1
- package/lib/base/types.d.ts +3 -1
- package/lib/base/types.d.ts.map +1 -1
- package/lib/base/types.js +4 -2
- package/lib/base/types.js.map +1 -1
- package/lib/base/view/view-registry.js +10 -28
- package/lib/base/view/view-registry.js.map +1 -1
- package/lib/features/change-bounds/model.d.ts +3 -1
- package/lib/features/change-bounds/model.d.ts.map +1 -1
- package/lib/features/change-bounds/model.js +20 -31
- package/lib/features/change-bounds/model.js.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.d.ts +17 -1
- package/lib/features/change-bounds/movement-restrictor.d.ts.map +1 -1
- package/lib/features/change-bounds/movement-restrictor.js +28 -42
- package/lib/features/change-bounds/movement-restrictor.js.map +1 -1
- package/lib/features/change-bounds/snap.d.ts +17 -1
- package/lib/features/change-bounds/snap.d.ts.map +1 -1
- package/lib/features/change-bounds/snap.js +13 -39
- package/lib/features/change-bounds/snap.js.map +1 -1
- package/lib/features/command-palette/command-palette-tool.js +30 -38
- package/lib/features/command-palette/command-palette-tool.js.map +1 -1
- package/lib/features/command-palette/di.config.js +6 -6
- package/lib/features/command-palette/di.config.js.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.d.ts +18 -2
- package/lib/features/command-palette/server-command-palette-provider.d.ts.map +1 -1
- package/lib/features/command-palette/server-command-palette-provider.js +28 -33
- package/lib/features/command-palette/server-command-palette-provider.js.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts +1 -1
- package/lib/features/context-menu/delete-element-context-menu.d.ts.map +1 -1
- package/lib/features/context-menu/delete-element-context-menu.js +20 -68
- package/lib/features/context-menu/delete-element-context-menu.js.map +1 -1
- package/lib/features/context-menu/di.config.d.ts +1 -1
- package/lib/features/context-menu/di.config.d.ts.map +1 -1
- package/lib/features/context-menu/di.config.js +8 -8
- package/lib/features/context-menu/di.config.js.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts +16 -0
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.d.ts.map +1 -1
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js +61 -71
- package/lib/features/context-menu/selection-service-aware-context-menu-mouse-listener.js.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.d.ts +18 -2
- package/lib/features/context-menu/server-context-menu-provider.d.ts.map +1 -1
- package/lib/features/context-menu/server-context-menu-provider.js +30 -31
- package/lib/features/context-menu/server-context-menu-provider.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts +22 -2
- package/lib/features/copy-paste/copy-paste-context-menu.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-context-menu.js +99 -72
- package/lib/features/copy-paste/copy-paste-context-menu.js.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.d.ts +19 -2
- package/lib/features/copy-paste/copy-paste-handler.d.ts.map +1 -1
- package/lib/features/copy-paste/copy-paste-handler.js +70 -70
- package/lib/features/copy-paste/copy-paste-handler.js.map +1 -1
- package/lib/features/copy-paste/di.config.d.ts +1 -1
- package/lib/features/copy-paste/di.config.d.ts.map +1 -1
- package/lib/features/copy-paste/di.config.js +11 -11
- package/lib/features/copy-paste/di.config.js.map +1 -1
- package/lib/features/decoration/decoration-placer.d.ts +17 -1
- package/lib/features/decoration/decoration-placer.d.ts.map +1 -1
- package/lib/features/decoration/decoration-placer.js +12 -46
- package/lib/features/decoration/decoration-placer.js.map +1 -1
- package/lib/features/decoration/di.config.js +4 -4
- package/lib/features/decoration/di.config.js.map +1 -1
- package/lib/features/edit-label/di.config.js +7 -7
- package/lib/features/edit-label/di.config.js.map +1 -1
- package/lib/features/edit-label/edit-label-tool.js +20 -43
- package/lib/features/edit-label/edit-label-tool.js.map +1 -1
- package/lib/features/edit-label/edit-label-validator.d.ts +16 -1
- package/lib/features/edit-label/edit-label-validator.d.ts.map +1 -1
- package/lib/features/edit-label/edit-label-validator.js +40 -62
- package/lib/features/edit-label/edit-label-validator.js.map +1 -1
- package/lib/features/hints/di.config.d.ts +0 -15
- package/lib/features/hints/di.config.d.ts.map +1 -1
- package/lib/features/hints/di.config.js +9 -9
- package/lib/features/hints/di.config.js.map +1 -1
- package/lib/features/hints/model.d.ts +3 -2
- package/lib/features/hints/model.d.ts.map +1 -1
- package/lib/features/hints/model.js.map +1 -1
- package/lib/features/hints/type-hints.d.ts +17 -45
- package/lib/features/hints/type-hints.d.ts.map +1 -1
- package/lib/features/hints/type-hints.js +81 -140
- package/lib/features/hints/type-hints.js.map +1 -1
- package/lib/features/hover/di.config.d.ts +1 -1
- package/lib/features/hover/di.config.d.ts.map +1 -1
- package/lib/features/hover/di.config.js +11 -9
- package/lib/features/hover/di.config.js.map +1 -1
- package/lib/features/hover/hover.d.ts +28 -2
- package/lib/features/hover/hover.d.ts.map +1 -1
- package/lib/features/hover/hover.js +56 -76
- package/lib/features/hover/hover.js.map +1 -1
- package/lib/features/layout/di.config.d.ts +1 -1
- package/lib/features/layout/di.config.d.ts.map +1 -1
- package/lib/features/layout/di.config.js +11 -7
- package/lib/features/layout/di.config.js.map +1 -1
- package/lib/features/layout/freeform-layout.d.ts +16 -0
- package/lib/features/layout/freeform-layout.d.ts.map +1 -0
- package/lib/features/layout/freeform-layout.js +107 -0
- package/lib/features/layout/freeform-layout.js.map +1 -0
- package/lib/features/layout/layout-commands.d.ts +19 -3
- package/lib/features/layout/layout-commands.d.ts.map +1 -1
- package/lib/features/layout/layout-commands.js +189 -265
- package/lib/features/layout/layout-commands.js.map +1 -1
- package/lib/features/layout/layout-commands.spec.d.ts +0 -15
- package/lib/features/layout/layout-commands.spec.d.ts.map +1 -1
- package/lib/features/layout/layout-commands.spec.js +95 -89
- package/lib/features/layout/layout-commands.spec.js.map +1 -1
- package/lib/features/layout/vbox-layout.d.ts +25 -0
- package/lib/features/layout/vbox-layout.d.ts.map +1 -0
- package/lib/features/layout/vbox-layout.js +188 -0
- package/lib/features/layout/vbox-layout.js.map +1 -0
- package/lib/features/model-source-watcher/di.config.d.ts +0 -15
- package/lib/features/model-source-watcher/di.config.d.ts.map +1 -1
- package/lib/features/model-source-watcher/di.config.js +7 -7
- package/lib/features/model-source-watcher/di.config.js.map +1 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts +17 -2
- package/lib/features/model-source-watcher/model-source-changed-action-handler.d.ts.map +1 -1
- package/lib/features/model-source-watcher/model-source-changed-action-handler.js +38 -46
- package/lib/features/model-source-watcher/model-source-changed-action-handler.js.map +1 -1
- package/lib/features/mouse-tool/di.config.js +5 -5
- package/lib/features/mouse-tool/di.config.js.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts +2 -1
- package/lib/features/mouse-tool/mouse-tool.d.ts.map +1 -1
- package/lib/features/mouse-tool/mouse-tool.js +70 -215
- package/lib/features/mouse-tool/mouse-tool.js.map +1 -1
- package/lib/features/navigation/di.config.d.ts +0 -15
- package/lib/features/navigation/di.config.d.ts.map +1 -1
- package/lib/features/navigation/di.config.js +11 -10
- package/lib/features/navigation/di.config.js.map +1 -1
- package/lib/features/navigation/navigation-action-handler.d.ts +19 -38
- package/lib/features/navigation/navigation-action-handler.d.ts.map +1 -1
- package/lib/features/navigation/navigation-action-handler.js +118 -254
- package/lib/features/navigation/navigation-action-handler.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.d.ts +18 -40
- package/lib/features/navigation/navigation-target-resolver.d.ts.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.js +46 -188
- package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.spec.d.ts +0 -15
- package/lib/features/navigation/navigation-target-resolver.spec.d.ts.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.spec.js +26 -26
- package/lib/features/navigation/navigation-target-resolver.spec.js.map +1 -1
- package/lib/features/rank/model.d.ts +1 -1
- package/lib/features/rank/model.js +2 -2
- package/lib/features/rank/model.js.map +1 -1
- package/lib/features/reconnect/model.d.ts +1 -1
- package/lib/features/reconnect/model.d.ts.map +1 -1
- package/lib/features/reconnect/model.js +9 -27
- package/lib/features/reconnect/model.js.map +1 -1
- package/lib/features/save/di.config.d.ts +1 -1
- package/lib/features/save/di.config.d.ts.map +1 -1
- package/lib/features/save/di.config.js +6 -6
- package/lib/features/save/di.config.js.map +1 -1
- package/lib/features/save/{save.d.ts → save-keylistener.d.ts} +4 -10
- package/lib/features/save/save-keylistener.d.ts.map +1 -0
- package/lib/features/{undo-redo/model.d.ts → save/save-keylistener.js} +16 -12
- package/lib/features/save/save-keylistener.js.map +1 -0
- package/lib/features/select/di.config.js +11 -11
- package/lib/features/select/di.config.js.map +1 -1
- package/lib/features/select/select-feedback-action.d.ts.map +1 -1
- package/lib/features/select/select-feedback-action.js +45 -71
- package/lib/features/select/select-feedback-action.js.map +1 -1
- package/lib/features/select/select-mouse-listener.js +7 -23
- package/lib/features/select/select-mouse-listener.js.map +1 -1
- package/lib/features/select/selection-service.d.ts +17 -1
- package/lib/features/select/selection-service.d.ts.map +1 -1
- package/lib/features/select/selection-service.js +134 -236
- package/lib/features/select/selection-service.js.map +1 -1
- package/lib/features/select/selection-service.spec.js +96 -139
- package/lib/features/select/selection-service.spec.js.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts +19 -2
- package/lib/features/tool-feedback/change-bounds-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js +102 -142
- package/lib/features/tool-feedback/change-bounds-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts +18 -2
- package/lib/features/tool-feedback/creation-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/creation-tool-feedback.js +95 -118
- package/lib/features/tool-feedback/creation-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/css-feedback.d.ts +20 -2
- package/lib/features/tool-feedback/css-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/css-feedback.js +37 -81
- package/lib/features/tool-feedback/css-feedback.js.map +1 -1
- package/lib/features/tool-feedback/di.config.d.ts +1 -1
- package/lib/features/tool-feedback/di.config.d.ts.map +1 -1
- package/lib/features/tool-feedback/di.config.js +27 -27
- package/lib/features/tool-feedback/di.config.js.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts +18 -2
- package/lib/features/tool-feedback/edge-edit-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js +147 -208
- package/lib/features/tool-feedback/edge-edit-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts +19 -3
- package/lib/features/tool-feedback/feedback-action-dispatcher.d.ts.map +1 -1
- package/lib/features/tool-feedback/feedback-action-dispatcher.js +35 -72
- package/lib/features/tool-feedback/feedback-action-dispatcher.js.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts +17 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.d.ts.map +1 -1
- package/lib/features/tool-feedback/marquee-tool-feedback.js +41 -84
- package/lib/features/tool-feedback/marquee-tool-feedback.js.map +1 -1
- package/lib/features/tool-feedback/model.d.ts +1 -1
- package/lib/features/tool-feedback/model.js +11 -27
- package/lib/features/tool-feedback/model.js.map +1 -1
- package/lib/features/tool-feedback/view.d.ts +21 -5
- package/lib/features/tool-feedback/view.d.ts.map +1 -1
- package/lib/features/tool-feedback/view.js +29 -51
- package/lib/features/tool-feedback/view.js.map +1 -1
- package/lib/features/tool-palette/di.config.d.ts +1 -1
- package/lib/features/tool-palette/di.config.d.ts.map +1 -1
- package/lib/features/tool-palette/di.config.js +6 -6
- package/lib/features/tool-palette/di.config.js.map +1 -1
- package/lib/features/tool-palette/palette-item.d.ts +2 -3
- package/lib/features/tool-palette/palette-item.d.ts.map +1 -1
- package/lib/features/tool-palette/palette-item.js +6 -6
- package/lib/features/tool-palette/palette-item.js.map +1 -1
- package/lib/features/tool-palette/tool-palette.d.ts +19 -3
- package/lib/features/tool-palette/tool-palette.d.ts.map +1 -1
- package/lib/features/tool-palette/tool-palette.js +199 -269
- package/lib/features/tool-palette/tool-palette.js.map +1 -1
- package/lib/features/tools/base-glsp-tool.d.ts +18 -2
- package/lib/features/tools/base-glsp-tool.d.ts.map +1 -1
- package/lib/features/tools/base-glsp-tool.js +37 -59
- package/lib/features/tools/base-glsp-tool.js.map +1 -1
- package/lib/features/tools/change-bounds-tool.d.ts +20 -3
- package/lib/features/tools/change-bounds-tool.d.ts.map +1 -1
- package/lib/features/tools/change-bounds-tool.js +192 -241
- package/lib/features/tools/change-bounds-tool.js.map +1 -1
- package/lib/features/tools/delete-tool.d.ts +17 -1
- package/lib/features/tools/delete-tool.d.ts.map +1 -1
- package/lib/features/tools/delete-tool.js +71 -104
- package/lib/features/tools/delete-tool.js.map +1 -1
- package/lib/features/tools/di.config.d.ts +0 -15
- package/lib/features/tools/di.config.d.ts.map +1 -1
- package/lib/features/tools/di.config.js +19 -19
- package/lib/features/tools/di.config.js.map +1 -1
- package/lib/features/tools/edge-creation-tool.d.ts +17 -2
- package/lib/features/tools/edge-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-creation-tool.js +62 -87
- package/lib/features/tools/edge-creation-tool.js.map +1 -1
- package/lib/features/tools/edge-edit-tool.d.ts +17 -1
- package/lib/features/tools/edge-edit-tool.d.ts.map +1 -1
- package/lib/features/tools/edge-edit-tool.js +112 -183
- package/lib/features/tools/edge-edit-tool.js.map +1 -1
- package/lib/features/tools/marquee-behavior.d.ts +42 -0
- package/lib/features/tools/marquee-behavior.d.ts.map +1 -0
- package/lib/features/tools/marquee-behavior.js +128 -0
- package/lib/features/tools/marquee-behavior.js.map +1 -0
- package/{src/features/undo-redo/model.ts → lib/features/tools/marquee-behavior.spec.d.ts} +3 -12
- package/lib/features/tools/marquee-behavior.spec.d.ts.map +1 -0
- package/lib/features/tools/marquee-behavior.spec.js +165 -0
- package/lib/features/tools/marquee-behavior.spec.js.map +1 -0
- package/lib/features/tools/marquee-mouse-tool.d.ts +24 -13
- package/lib/features/tools/marquee-mouse-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-mouse-tool.js +86 -195
- package/lib/features/tools/marquee-mouse-tool.js.map +1 -1
- package/lib/features/tools/marquee-tool.d.ts +17 -1
- package/lib/features/tools/marquee-tool.d.ts.map +1 -1
- package/lib/features/tools/marquee-tool.js +32 -73
- package/lib/features/tools/marquee-tool.js.map +1 -1
- package/lib/features/tools/model.js +4 -22
- package/lib/features/tools/model.js.map +1 -1
- package/lib/features/tools/node-creation-tool.d.ts +17 -2
- package/lib/features/tools/node-creation-tool.d.ts.map +1 -1
- package/lib/features/tools/node-creation-tool.js +60 -90
- package/lib/features/tools/node-creation-tool.js.map +1 -1
- package/lib/features/tools/view.d.ts +1 -1
- package/lib/features/tools/view.d.ts.map +1 -1
- package/lib/features/tools/view.js +12 -31
- package/lib/features/tools/view.js.map +1 -1
- package/lib/features/validation/di.config.js +12 -12
- package/lib/features/validation/di.config.js.map +1 -1
- package/lib/features/validation/issue-marker.d.ts +2 -2
- package/lib/features/validation/issue-marker.d.ts.map +1 -1
- package/lib/features/validation/issue-marker.js +17 -55
- package/lib/features/validation/issue-marker.js.map +1 -1
- package/lib/features/validation/marker-navigator.d.ts +17 -1
- package/lib/features/validation/marker-navigator.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.js +131 -164
- package/lib/features/validation/marker-navigator.js.map +1 -1
- package/lib/features/validation/marker-navigator.spec.d.ts +0 -15
- package/lib/features/validation/marker-navigator.spec.d.ts.map +1 -1
- package/lib/features/validation/marker-navigator.spec.js +83 -77
- package/lib/features/validation/marker-navigator.spec.js.map +1 -1
- package/lib/features/validation/validate.d.ts +18 -29
- package/lib/features/validation/validate.d.ts.map +1 -1
- package/lib/features/validation/validate.js +147 -300
- package/lib/features/validation/validate.js.map +1 -1
- package/lib/features/viewport/di.config.js +10 -10
- package/lib/features/viewport/di.config.js.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts +18 -2
- package/lib/features/viewport/glsp-scroll-mouse-listener.d.ts.map +1 -1
- package/lib/features/viewport/glsp-scroll-mouse-listener.js +16 -47
- package/lib/features/viewport/glsp-scroll-mouse-listener.js.map +1 -1
- package/lib/index.d.ts +9 -15
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +29 -34
- package/lib/index.js.map +1 -1
- package/lib/lib/model.js +11 -27
- package/lib/lib/model.js.map +1 -1
- package/lib/model-source/glsp-diagram-server.d.ts +3 -5
- package/lib/model-source/glsp-diagram-server.d.ts.map +1 -1
- package/lib/model-source/glsp-diagram-server.js +60 -121
- package/lib/model-source/glsp-diagram-server.js.map +1 -1
- package/lib/protocol-reexport.d.ts +45 -0
- package/lib/protocol-reexport.d.ts.map +1 -0
- package/lib/protocol-reexport.js +75 -0
- package/lib/protocol-reexport.js.map +1 -0
- package/lib/utils/argument-utils.d.ts +3 -3
- package/lib/utils/argument-utils.d.ts.map +1 -1
- package/lib/utils/argument-utils.js +32 -97
- package/lib/utils/argument-utils.js.map +1 -1
- package/lib/utils/html-utils.js +2 -2
- package/lib/utils/html-utils.js.map +1 -1
- package/lib/utils/layout-utils.d.ts +3 -2
- package/lib/utils/layout-utils.d.ts.map +1 -1
- package/lib/utils/layout-utils.js +5 -5
- package/lib/utils/layout-utils.js.map +1 -1
- package/lib/utils/marker.d.ts +0 -38
- package/lib/utils/marker.d.ts.map +1 -1
- package/lib/utils/marker.js +14 -61
- package/lib/utils/marker.js.map +1 -1
- package/lib/utils/smodel-util.d.ts +4 -4
- package/lib/utils/smodel-util.d.ts.map +1 -1
- package/lib/utils/smodel-util.js +16 -65
- package/lib/utils/smodel-util.js.map +1 -1
- package/lib/utils/viewpoint-util.d.ts +3 -2
- package/lib/utils/viewpoint-util.d.ts.map +1 -1
- package/lib/utils/viewpoint-util.js +15 -30
- package/lib/utils/viewpoint-util.js.map +1 -1
- package/lib/views/base-view-module.d.ts +0 -15
- package/lib/views/base-view-module.d.ts.map +1 -1
- package/lib/views/base-view-module.js +28 -28
- package/lib/views/base-view-module.js.map +1 -1
- package/lib/views/compartments.d.ts +6 -0
- package/lib/views/compartments.d.ts.map +1 -0
- package/lib/views/compartments.js +43 -0
- package/lib/views/compartments.js.map +1 -0
- package/lib/views/glsp-edge-view.d.ts +18 -3
- package/lib/views/glsp-edge-view.d.ts.map +1 -1
- package/lib/views/glsp-edge-view.js +32 -77
- package/lib/views/glsp-edge-view.js.map +1 -1
- package/lib/views/index.d.ts +1 -1
- package/lib/views/index.d.ts.map +1 -1
- package/lib/views/index.js +1 -1
- package/lib/views/index.js.map +1 -1
- package/lib/views/issue-marker-view.d.ts +2 -1
- package/lib/views/issue-marker-view.d.ts.map +1 -1
- package/lib/views/issue-marker-view.js +36 -50
- package/lib/views/issue-marker-view.js.map +1 -1
- package/lib/views/rounded-corner-view.d.ts +2 -3
- package/lib/views/rounded-corner-view.d.ts.map +1 -1
- package/lib/views/rounded-corner-view.js +40 -70
- package/lib/views/rounded-corner-view.js.map +1 -1
- package/lib/views/rounded-corner.d.ts +2 -1
- package/lib/views/rounded-corner.d.ts.map +1 -1
- package/lib/views/rounded-corner.js +44 -65
- package/lib/views/rounded-corner.js.map +1 -1
- package/package.json +12 -19
- package/src/base/action-dispatcher.ts +12 -12
- package/src/base/actions/focus-change-action.ts +2 -2
- package/src/base/{args.ts → argumentable.ts} +2 -3
- package/src/base/auto-complete/auto-complete-actions.ts +1 -1
- package/src/base/auto-complete/auto-complete-widget.ts +37 -25
- package/src/base/auto-complete/validation-decorator.ts +12 -11
- package/src/base/command-stack.ts +2 -5
- package/src/base/container-modules.ts +112 -0
- package/src/base/di.config.ts +33 -18
- package/src/base/drag-aware-mouse-listener.ts +3 -4
- package/src/base/{editor-context.ts → editor-context-service.ts} +4 -31
- package/src/base/focus-tracker.ts +2 -4
- package/src/base/model/update-model-command.ts +8 -16
- package/src/base/model-initialization-constraint.ts +3 -2
- package/src/base/tool-manager/glsp-tool-manager.ts +3 -5
- package/src/base/types.ts +4 -2
- package/src/features/change-bounds/model.ts +15 -5
- package/src/features/change-bounds/movement-restrictor.ts +17 -9
- package/src/features/change-bounds/snap.ts +3 -2
- package/src/features/command-palette/server-command-palette-provider.ts +11 -9
- package/src/features/context-menu/delete-element-context-menu.ts +3 -4
- package/src/features/context-menu/di.config.ts +11 -9
- package/src/features/context-menu/selection-service-aware-context-menu-mouse-listener.ts +40 -10
- package/src/features/context-menu/server-context-menu-provider.ts +10 -7
- package/src/features/copy-paste/copy-paste-context-menu.ts +59 -30
- package/src/features/copy-paste/copy-paste-handler.ts +18 -10
- package/src/features/copy-paste/di.config.ts +2 -3
- package/src/features/decoration/decoration-placer.ts +3 -13
- package/src/features/edit-label/edit-label-validator.ts +11 -12
- package/src/features/hints/di.config.ts +2 -3
- package/src/features/hints/model.ts +4 -3
- package/src/features/hints/type-hints.ts +23 -90
- package/src/features/hover/di.config.ts +4 -3
- package/src/features/hover/hover.ts +26 -7
- package/src/features/layout/di.config.ts +8 -4
- package/src/features/layout/freeform-layout.ts +133 -0
- package/src/features/layout/layout-commands.spec.ts +82 -64
- package/src/features/layout/layout-commands.ts +43 -34
- package/src/features/layout/vbox-layout.ts +256 -0
- package/src/features/model-source-watcher/di.config.ts +3 -4
- package/src/features/model-source-watcher/model-source-changed-action-handler.ts +11 -7
- package/src/features/mouse-tool/mouse-tool.ts +33 -23
- package/src/features/navigation/di.config.ts +4 -10
- package/src/features/navigation/navigation-action-handler.ts +33 -69
- package/src/features/navigation/navigation-target-resolver.spec.ts +3 -7
- package/src/features/navigation/navigation-target-resolver.ts +13 -91
- package/src/features/rank/model.ts +2 -2
- package/src/features/reconnect/model.ts +2 -3
- package/src/features/save/di.config.ts +2 -3
- package/src/features/save/{save.ts → save-keylistener.ts} +3 -11
- package/src/features/select/select-feedback-action.ts +4 -6
- package/src/features/select/selection-service.spec.ts +11 -6
- package/src/features/select/selection-service.ts +14 -10
- package/src/features/tool-feedback/change-bounds-tool-feedback.ts +26 -20
- package/src/features/tool-feedback/creation-tool-feedback.ts +49 -14
- package/src/features/tool-feedback/css-feedback.ts +9 -6
- package/src/features/tool-feedback/di.config.ts +2 -5
- package/src/features/tool-feedback/edge-edit-tool-feedback.ts +19 -18
- package/src/features/tool-feedback/feedback-action-dispatcher.ts +8 -9
- package/src/features/tool-feedback/marquee-tool-feedback.ts +4 -5
- package/src/features/tool-feedback/model.ts +1 -2
- package/src/features/tool-feedback/view.tsx +17 -11
- package/src/features/tool-palette/di.config.ts +2 -4
- package/src/features/tool-palette/palette-item.ts +4 -6
- package/src/features/tool-palette/tool-palette.ts +44 -40
- package/src/features/tools/base-glsp-tool.ts +4 -4
- package/src/features/tools/change-bounds-tool.ts +64 -34
- package/src/features/tools/delete-tool.ts +9 -6
- package/src/features/tools/di.config.ts +2 -3
- package/src/features/tools/edge-creation-tool.ts +5 -10
- package/src/features/tools/edge-edit-tool.ts +10 -20
- package/src/features/tools/marquee-behavior.spec.ts +175 -0
- package/src/features/tools/marquee-behavior.ts +158 -0
- package/src/features/tools/marquee-mouse-tool.ts +43 -134
- package/src/features/tools/marquee-tool.ts +2 -3
- package/src/features/tools/node-creation-tool.ts +4 -11
- package/src/features/tools/view.tsx +17 -12
- package/src/features/validation/issue-marker.ts +2 -3
- package/src/features/validation/marker-navigator.spec.ts +18 -14
- package/src/features/validation/marker-navigator.ts +24 -12
- package/src/features/validation/validate.ts +7 -40
- package/src/features/viewport/glsp-scroll-mouse-listener.ts +3 -12
- package/src/index.ts +30 -19
- package/src/model-source/glsp-diagram-server.ts +12 -28
- package/src/protocol-reexport.ts +64 -0
- package/src/utils/argument-utils.ts +14 -11
- package/src/utils/layout-utils.ts +13 -7
- package/src/utils/marker.ts +2 -26
- package/src/utils/smodel-util.ts +15 -11
- package/src/utils/viewpoint-util.ts +4 -4
- package/src/views/base-view-module.ts +1 -2
- package/src/{base/actions/edit-mode-action.ts → views/compartments.tsx} +18 -14
- package/src/views/glsp-edge-view.tsx +21 -14
- package/src/views/index.ts +1 -1
- package/src/views/issue-marker-view.tsx +28 -19
- package/src/views/rounded-corner-view.tsx +38 -25
- package/src/views/rounded-corner.ts +5 -6
- package/lib/base/actions/context-actions.d.ts +0 -36
- package/lib/base/actions/context-actions.d.ts.map +0 -1
- package/lib/base/actions/context-actions.js +0 -51
- package/lib/base/actions/context-actions.js.map +0 -1
- package/lib/base/actions/edit-mode-action.d.ts +0 -13
- package/lib/base/actions/edit-mode-action.d.ts.map +0 -1
- package/lib/base/actions/edit-mode-action.js +0 -56
- package/lib/base/actions/edit-mode-action.js.map +0 -1
- package/lib/base/actions/edit-validation-actions.d.ts +0 -78
- package/lib/base/actions/edit-validation-actions.d.ts.map +0 -1
- package/lib/base/actions/edit-validation-actions.js +0 -83
- package/lib/base/actions/edit-validation-actions.js.map +0 -1
- package/lib/base/actions/protocol-actions.d.ts +0 -41
- package/lib/base/actions/protocol-actions.d.ts.map +0 -1
- package/lib/base/actions/protocol-actions.js +0 -151
- package/lib/base/actions/protocol-actions.js.map +0 -1
- package/lib/base/args.d.ts.map +0 -1
- package/lib/base/args.js.map +0 -1
- package/lib/base/editor-context.d.ts.map +0 -1
- package/lib/base/editor-context.js +0 -174
- package/lib/base/editor-context.js.map +0 -1
- package/lib/base/operations/operation.d.ts +0 -135
- package/lib/base/operations/operation.d.ts.map +0 -1
- package/lib/base/operations/operation.js +0 -231
- package/lib/base/operations/operation.js.map +0 -1
- package/lib/features/copy-paste/copy-paste-actions.d.ts +0 -50
- package/lib/features/copy-paste/copy-paste-actions.d.ts.map +0 -1
- package/lib/features/copy-paste/copy-paste-actions.js +0 -68
- package/lib/features/copy-paste/copy-paste-actions.js.map +0 -1
- package/lib/features/hints/request-type-hints-action.d.ts +0 -32
- package/lib/features/hints/request-type-hints-action.d.ts.map +0 -1
- package/lib/features/hints/request-type-hints-action.js +0 -30
- package/lib/features/hints/request-type-hints-action.js.map +0 -1
- package/lib/features/model-source-watcher/model-source-changed-action.d.ts +0 -24
- package/lib/features/model-source-watcher/model-source-changed-action.d.ts.map +0 -1
- package/lib/features/model-source-watcher/model-source-changed-action.js +0 -17
- package/lib/features/model-source-watcher/model-source-changed-action.js.map +0 -1
- package/lib/features/save/save.d.ts.map +0 -1
- package/lib/features/save/save.js +0 -62
- package/lib/features/save/save.js.map +0 -1
- package/lib/features/undo-redo/model.d.ts.map +0 -1
- package/lib/features/undo-redo/model.js +0 -22
- package/lib/features/undo-redo/model.js.map +0 -1
- package/lib/model-source/glsp-server-status.d.ts +0 -30
- package/lib/model-source/glsp-server-status.d.ts.map +0 -1
- package/lib/model-source/glsp-server-status.js +0 -61
- package/lib/model-source/glsp-server-status.js.map +0 -1
- package/lib/utils/array-utils.d.ts +0 -28
- package/lib/utils/array-utils.d.ts.map +0 -1
- package/lib/utils/array-utils.js +0 -61
- package/lib/utils/array-utils.js.map +0 -1
- package/lib/views/default-types.d.ts +0 -37
- package/lib/views/default-types.d.ts.map +0 -1
- package/lib/views/default-types.js +0 -47
- package/lib/views/default-types.js.map +0 -1
- package/src/base/actions/context-actions.ts +0 -43
- package/src/base/actions/edit-validation-actions.ts +0 -103
- package/src/base/actions/protocol-actions.ts +0 -82
- package/src/base/operations/operation.ts +0 -178
- package/src/features/copy-paste/copy-paste-actions.ts +0 -60
- package/src/features/hints/request-type-hints-action.ts +0 -36
- package/src/features/model-source-watcher/model-source-changed-action.ts +0 -26
- package/src/model-source/glsp-server-status.ts +0 -38
- package/src/utils/array-utils.ts +0 -55
- package/src/views/default-types.ts +0 -48
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAkD;AAElD,4CAA8C;AAC9C,yDAO4B;AAC5B,yCAAqH;AAExG,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAiB,CAAC,CAAC;IACvD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,8BAAmB,CAAC,CAAC;IACzD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,+BAAoB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,0CAAuB,CAAC,CAAC,EAAE,CAAC,mDAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,0CAAuB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACU,QAAA,gCAAgC,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3F,IAAI,CAAC,kBAAU,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,yDAAsC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpG,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,6CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC9E,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/********************************************************************************
|
|
2
|
-
* Copyright (c) 2019-
|
|
2
|
+
* Copyright (c) 2019-2021 EclipseSource and others.
|
|
3
3
|
*
|
|
4
4
|
* This program and the accompanying materials are made available under the
|
|
5
5
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -13,8 +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 { Marker } from '@eclipse-glsp/protocol';
|
|
16
17
|
import { SIssue, SIssueMarker, SParentElement } from 'sprotty';
|
|
17
|
-
import { Marker } from '../../utils/marker';
|
|
18
18
|
export declare class GIssueMarker extends SIssueMarker {
|
|
19
19
|
constructor();
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5E,
|
|
1
|
+
{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5E,qBAAa,YAAa,SAAQ,YAAY;;CAK7C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAalF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAoBnD"}
|
|
@@ -1,32 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __extends = (this && this.__extends) || (function () {
|
|
3
|
-
var extendStatics = function (d, b) {
|
|
4
|
-
extendStatics = Object.setPrototypeOf ||
|
|
5
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
7
|
-
return extendStatics(d, b);
|
|
8
|
-
};
|
|
9
|
-
return function (d, b) {
|
|
10
|
-
extendStatics(d, b);
|
|
11
|
-
function __() { this.constructor = d; }
|
|
12
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
13
|
-
};
|
|
14
|
-
})();
|
|
15
|
-
var __values = (this && this.__values) || function(o) {
|
|
16
|
-
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
17
|
-
if (m) return m.call(o);
|
|
18
|
-
if (o && typeof o.length === "number") return {
|
|
19
|
-
next: function () {
|
|
20
|
-
if (o && i >= o.length) o = void 0;
|
|
21
|
-
return { value: o && o[i++], done: !o };
|
|
22
|
-
}
|
|
23
|
-
};
|
|
24
|
-
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
25
|
-
};
|
|
26
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
3
|
exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
|
|
28
4
|
/********************************************************************************
|
|
29
|
-
* Copyright (c) 2019-
|
|
5
|
+
* Copyright (c) 2019-2021 EclipseSource and others.
|
|
30
6
|
*
|
|
31
7
|
* This program and the accompanying materials are made available under the
|
|
32
8
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -40,17 +16,14 @@ exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker
|
|
|
40
16
|
*
|
|
41
17
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
42
18
|
********************************************************************************/
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
_this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
|
|
50
|
-
return _this;
|
|
19
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
20
|
+
const sprotty_1 = require("sprotty");
|
|
21
|
+
class GIssueMarker extends sprotty_1.SIssueMarker {
|
|
22
|
+
constructor() {
|
|
23
|
+
super();
|
|
24
|
+
this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
|
|
51
25
|
}
|
|
52
|
-
|
|
53
|
-
}(sprotty_1.SIssueMarker));
|
|
26
|
+
}
|
|
54
27
|
exports.GIssueMarker = GIssueMarker;
|
|
55
28
|
/**
|
|
56
29
|
* Retrieves the `SIssueMarker` contained by the provided model element as
|
|
@@ -60,7 +33,7 @@ exports.GIssueMarker = GIssueMarker;
|
|
|
60
33
|
* @returns the child `SIssueMarker` or a new `SIssueMarker` if no such child exists.
|
|
61
34
|
*/
|
|
62
35
|
function getOrCreateSIssueMarker(modelElement) {
|
|
63
|
-
|
|
36
|
+
let issueMarker;
|
|
64
37
|
issueMarker = getSIssueMarker(modelElement);
|
|
65
38
|
if (issueMarker === undefined) {
|
|
66
39
|
issueMarker = new GIssueMarker();
|
|
@@ -78,22 +51,11 @@ exports.getOrCreateSIssueMarker = getOrCreateSIssueMarker;
|
|
|
78
51
|
* @returns the child `SIssueMarker` or `undefined` if no such child exists.
|
|
79
52
|
*/
|
|
80
53
|
function getSIssueMarker(modelElement) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
var child = _c.value;
|
|
86
|
-
if (child instanceof sprotty_1.SIssueMarker) {
|
|
87
|
-
issueMarker = child;
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
92
|
-
finally {
|
|
93
|
-
try {
|
|
94
|
-
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
54
|
+
let issueMarker;
|
|
55
|
+
for (const child of modelElement.children) {
|
|
56
|
+
if (child instanceof sprotty_1.SIssueMarker) {
|
|
57
|
+
issueMarker = child;
|
|
95
58
|
}
|
|
96
|
-
finally { if (e_1) throw e_1.error; }
|
|
97
59
|
}
|
|
98
60
|
return issueMarker;
|
|
99
61
|
}
|
|
@@ -105,18 +67,18 @@ exports.getSIssueMarker = getSIssueMarker;
|
|
|
105
67
|
* @returns the created `SIssue`.
|
|
106
68
|
*/
|
|
107
69
|
function createSIssue(marker) {
|
|
108
|
-
|
|
70
|
+
const issue = new sprotty_1.SIssue();
|
|
109
71
|
issue.message = marker.description;
|
|
110
72
|
switch (marker.kind) {
|
|
111
|
-
case
|
|
73
|
+
case protocol_1.MarkerKind.ERROR: {
|
|
112
74
|
issue.severity = 'error';
|
|
113
75
|
break;
|
|
114
76
|
}
|
|
115
|
-
case
|
|
77
|
+
case protocol_1.MarkerKind.INFO: {
|
|
116
78
|
issue.severity = 'info';
|
|
117
79
|
break;
|
|
118
80
|
}
|
|
119
|
-
case
|
|
81
|
+
case protocol_1.MarkerKind.WARNING: {
|
|
120
82
|
issue.severity = 'warning';
|
|
121
83
|
break;
|
|
122
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,qCAA4E;AAE5E,MAAa,YAAa,SAAQ,sBAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,qBAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;CACJ;AALD,oCAKC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,WAAW,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC5B,WAAW,CAAC,MAAM,GAAG,IAAI,KAAK,EAAU,CAAC;QACzC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAbD,0DAaC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,sBAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc;IACvC,MAAM,KAAK,GAAW,IAAI,gBAAM,EAAE,CAAC;IACnC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,qBAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AApBD,oCAoBC"}
|
|
@@ -1,4 +1,20 @@
|
|
|
1
|
-
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2020-2021 EclipseSource and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
*
|
|
8
|
+
* This Source Code may also be made available under the following Secondary
|
|
9
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
* with the GNU Classpath Exception which is available at
|
|
12
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
*
|
|
14
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
import { Action, Point } from '@eclipse-glsp/protocol';
|
|
17
|
+
import { BoundsAware, CenterCommand, Command, CommandExecutionContext, CommandReturn, IContextMenuItemProvider, KeyListener, MenuItem, Selectable, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot } from 'sprotty';
|
|
2
18
|
import { SelectCommand, SelectionService } from '../select/selection-service';
|
|
3
19
|
export declare class NavigateToMarkerAction implements Action {
|
|
4
20
|
readonly direction: 'next' | 'previous';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-navigator.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"marker-navigator.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAgB,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAErE,OAAO,EACH,WAAW,EACX,aAAa,EACb,OAAO,EACP,uBAAuB,EACvB,aAAa,EAEb,wBAAwB,EAGxB,WAAW,EACX,QAAQ,EACR,UAAU,EAEV,YAAY,EACZ,cAAc,EACd,aAAa,EACb,UAAU,EAEb,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,sBAAuB,YAAW,MAAM;aAI7B,SAAS,EAAE,MAAM,GAAG,UAAU;aAC9B,kBAAkB,CAAC;aACnB,UAAU,EAAE,cAAc,EAAE;IACrC,IAAI;IANf,MAAM,CAAC,QAAQ,CAAC,IAAI,sBAAsB;gBAGtB,SAAS,GAAE,MAAM,GAAG,UAAmB,EACvC,kBAAkB,CAAC,sBAAU,EAC7B,UAAU,GAAE,cAAc,EAAmC,EACtE,IAAI,SAA8B;CAEhD;AAED,qBAAa,uBAAuB;IAChC,OAAO,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,GAAG,MAAM;CAG9D;AAED,uGAAuG;AACvG,qBACa,gCAAgC;IACzC,OAAO,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM;CAa5D;AAED;;;;GAIG;AACH,qBACa,eAAe;IACxB,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,EAAE,CAAgC;IAGhF,SAAS,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;IAEpD,IAAI,CACA,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,EACrC,SAAS,GAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAA8B,GACpE,YAAY,GAAG,SAAS;IAQ3B,QAAQ,CACJ,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,aAAa,GAAG,WAAW,EACrC,SAAS,GAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAA8B,GACpE,YAAY,GAAG,SAAS;IAQ3B,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,GAAG,YAAY,EAAE;IAKpG,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM;IAS7F,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM;CAQpG;AAED,qBACa,uBAAwB,SAAQ,OAAO;IAed,SAAS,CAAC,MAAM,EAAE,sBAAsB;IAd1E,MAAM,CAAC,IAAI,SAA+B;IAG1C,SAAS,CAAC,gBAAgB,EAAE,uBAAuB,CAAC;IAGpD,SAAS,CAAC,eAAe,EAAE,eAAe,CAAC;IAG3C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;gBAEK,MAAM,EAAE,sBAAsB;IAI1E,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAmBxD,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,CAAC,aAAa,GAAG,UAAU,CAAC,EAAE;IAU/E,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,YAAY,GAAG,SAAS;IAU1F,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO;IAI1D,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAOrD,IAAI,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAMxD;AAED,qBACa,sCAAuC,YAAW,wBAAwB;IAC9C,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAElF,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,iBAAiB,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CA4BvF;AAED,qBACa,0BAA2B,SAAQ,WAAW;IACvD,OAAO,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAQnE"}
|
|
@@ -1,17 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __extends = (this && this.__extends) || (function () {
|
|
3
|
-
var extendStatics = function (d, b) {
|
|
4
|
-
extendStatics = Object.setPrototypeOf ||
|
|
5
|
-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
|
|
6
|
-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
|
|
7
|
-
return extendStatics(d, b);
|
|
8
|
-
};
|
|
9
|
-
return function (d, b) {
|
|
10
|
-
extendStatics(d, b);
|
|
11
|
-
function __() { this.constructor = d; }
|
|
12
|
-
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
13
|
-
};
|
|
14
|
-
})();
|
|
15
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
16
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
17
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -27,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
27
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
15
|
exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvider = exports.NavigateToMarkerCommand = exports.MarkerNavigator = exports.LeftToRightTopToBottomComparator = exports.SModelElementComparator = exports.NavigateToMarkerAction = void 0;
|
|
29
16
|
/********************************************************************************
|
|
30
|
-
* Copyright (c) 2020 EclipseSource and others.
|
|
17
|
+
* Copyright (c) 2020-2021 EclipseSource and others.
|
|
31
18
|
*
|
|
32
19
|
* This program and the accompanying materials are made available under the
|
|
33
20
|
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
@@ -41,43 +28,35 @@ exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvi
|
|
|
41
28
|
*
|
|
42
29
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
43
30
|
********************************************************************************/
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (severities === void 0) { severities = MarkerNavigator.ALL_SEVERITIES; }
|
|
55
|
-
if (kind === void 0) { kind = NavigateToMarkerAction.KIND; }
|
|
31
|
+
const protocol_1 = require("@eclipse-glsp/protocol");
|
|
32
|
+
const inversify_1 = require("inversify");
|
|
33
|
+
const sprotty_1 = require("sprotty");
|
|
34
|
+
const keyboard_1 = require("sprotty/lib/utils/keyboard");
|
|
35
|
+
const types_1 = require("../../base/types");
|
|
36
|
+
const marker_1 = require("../../utils/marker");
|
|
37
|
+
const smodel_util_1 = require("../../utils/smodel-util");
|
|
38
|
+
const selection_service_1 = require("../select/selection-service");
|
|
39
|
+
class NavigateToMarkerAction {
|
|
40
|
+
constructor(direction = 'next', selectedElementIds, severities = MarkerNavigator.ALL_SEVERITIES, kind = NavigateToMarkerAction.KIND) {
|
|
56
41
|
this.direction = direction;
|
|
57
42
|
this.selectedElementIds = selectedElementIds;
|
|
58
43
|
this.severities = severities;
|
|
59
44
|
this.kind = kind;
|
|
60
45
|
}
|
|
61
|
-
|
|
62
|
-
return NavigateToMarkerAction;
|
|
63
|
-
}());
|
|
46
|
+
}
|
|
64
47
|
exports.NavigateToMarkerAction = NavigateToMarkerAction;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
SModelElementComparator.prototype.compare = function (_one, _other) {
|
|
48
|
+
NavigateToMarkerAction.KIND = 'navigateToMarker';
|
|
49
|
+
class SModelElementComparator {
|
|
50
|
+
compare(_one, _other) {
|
|
69
51
|
return 0;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
}());
|
|
52
|
+
}
|
|
53
|
+
}
|
|
73
54
|
exports.SModelElementComparator = SModelElementComparator;
|
|
74
55
|
/** Specifies the order of two selectable and bounds-aware elements left-to-right and top-to-bottom. */
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
var boundsOne = sprotty_1.findParentByFeature(one, smodel_util_1.isSelectableAndBoundsAware);
|
|
80
|
-
var boundsOther = sprotty_1.findParentByFeature(other, smodel_util_1.isSelectableAndBoundsAware);
|
|
56
|
+
let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
|
|
57
|
+
compare(one, other) {
|
|
58
|
+
const boundsOne = sprotty_1.findParentByFeature(one, smodel_util_1.isSelectableAndBoundsAware);
|
|
59
|
+
const boundsOther = sprotty_1.findParentByFeature(other, smodel_util_1.isSelectableAndBoundsAware);
|
|
81
60
|
if (boundsOne && boundsOther) {
|
|
82
61
|
if (boundsOne.bounds.y !== boundsOther.bounds.y) {
|
|
83
62
|
return boundsOne.bounds.y - boundsOther.bounds.y;
|
|
@@ -87,190 +66,179 @@ var LeftToRightTopToBottomComparator = /** @class */ (function () {
|
|
|
87
66
|
}
|
|
88
67
|
}
|
|
89
68
|
return 0;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
}());
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
LeftToRightTopToBottomComparator = __decorate([
|
|
72
|
+
inversify_1.injectable()
|
|
73
|
+
], LeftToRightTopToBottomComparator);
|
|
96
74
|
exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator;
|
|
97
75
|
/**
|
|
98
76
|
* Specifies the next/previous marker in a graph model.
|
|
99
77
|
*
|
|
100
78
|
* This navigator uses a `MarkerComparator` to determine the order of markers. It can also return next/previous
|
|
101
79
|
*/
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
MarkerNavigator.prototype.next = function (root, current, predicate) {
|
|
106
|
-
if (predicate === void 0) { predicate = marker_1.MarkerPredicates.ALL; }
|
|
107
|
-
var markers = this.getMarkers(root, predicate);
|
|
80
|
+
let MarkerNavigator = class MarkerNavigator {
|
|
81
|
+
next(root, current, predicate = marker_1.MarkerPredicates.ALL) {
|
|
82
|
+
const markers = this.getMarkers(root, predicate);
|
|
108
83
|
if (current === undefined) {
|
|
109
84
|
return markers.length > 0 ? markers[0] : undefined;
|
|
110
85
|
}
|
|
111
86
|
return markers[this.getNextIndex(current, markers) % markers.length];
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
var markers = this.getMarkers(root, predicate);
|
|
87
|
+
}
|
|
88
|
+
previous(root, current, predicate = marker_1.MarkerPredicates.ALL) {
|
|
89
|
+
const markers = this.getMarkers(root, predicate);
|
|
116
90
|
if (current === undefined) {
|
|
117
91
|
return markers.length > 0 ? markers[0] : undefined;
|
|
118
92
|
}
|
|
119
93
|
return markers[this.getPreviousIndex(current, markers) % markers.length];
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
|
|
94
|
+
}
|
|
95
|
+
getMarkers(root, predicate) {
|
|
96
|
+
const markers = marker_1.collectIssueMarkers(root);
|
|
123
97
|
return markers.filter(predicate).sort(this.markerComparator.compare);
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
for (
|
|
98
|
+
}
|
|
99
|
+
getNextIndex(current, markers) {
|
|
100
|
+
for (let index = 0; index < markers.length; index++) {
|
|
127
101
|
if (this.markerComparator.compare(markers[index], current) > 0) {
|
|
128
102
|
return index;
|
|
129
103
|
}
|
|
130
104
|
}
|
|
131
105
|
return 0;
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
for (
|
|
106
|
+
}
|
|
107
|
+
getPreviousIndex(current, markers) {
|
|
108
|
+
for (let index = markers.length - 1; index >= 0; index--) {
|
|
135
109
|
if (this.markerComparator.compare(markers[index], current) < 0) {
|
|
136
110
|
return index;
|
|
137
111
|
}
|
|
138
112
|
}
|
|
139
113
|
return markers.length - 1;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
}());
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
MarkerNavigator.ALL_SEVERITIES = ['error', 'warning', 'info'];
|
|
117
|
+
__decorate([
|
|
118
|
+
inversify_1.inject(SModelElementComparator),
|
|
119
|
+
__metadata("design:type", SModelElementComparator)
|
|
120
|
+
], MarkerNavigator.prototype, "markerComparator", void 0);
|
|
121
|
+
MarkerNavigator = __decorate([
|
|
122
|
+
inversify_1.injectable()
|
|
123
|
+
], MarkerNavigator);
|
|
151
124
|
exports.MarkerNavigator = MarkerNavigator;
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
_this.action = action;
|
|
157
|
-
return _this;
|
|
125
|
+
let NavigateToMarkerCommand = class NavigateToMarkerCommand extends sprotty_1.Command {
|
|
126
|
+
constructor(action) {
|
|
127
|
+
super();
|
|
128
|
+
this.action = action;
|
|
158
129
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
130
|
+
execute(context) {
|
|
131
|
+
const root = context.root;
|
|
132
|
+
const selected = this.getSelectedElements(root);
|
|
133
|
+
const target = this.getTarget(selected, root);
|
|
163
134
|
if (target === undefined) {
|
|
164
135
|
return root;
|
|
165
136
|
}
|
|
166
|
-
|
|
137
|
+
const selectableTarget = sprotty_1.findParentByFeature(target, sprotty_1.isSelectable);
|
|
167
138
|
if (selectableTarget) {
|
|
168
|
-
|
|
139
|
+
const deselect = selected.map(e => e.id).filter(id => id !== selectableTarget.id);
|
|
169
140
|
this.selectCommand = new selection_service_1.SelectCommand(new sprotty_1.SelectAction([selectableTarget.id], deselect), this.selectionService);
|
|
170
|
-
this.centerCommand = new sprotty_1.CenterCommand(new
|
|
141
|
+
this.centerCommand = new sprotty_1.CenterCommand(new protocol_1.CenterAction([selectableTarget.id]));
|
|
171
142
|
this.centerCommand.execute(context);
|
|
172
143
|
return this.selectCommand.execute(context);
|
|
173
144
|
}
|
|
174
145
|
return root;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
|
|
146
|
+
}
|
|
147
|
+
getSelectedElements(root) {
|
|
148
|
+
let selectedIds = [];
|
|
178
149
|
if (this.action.selectedElementIds !== undefined && this.action.selectedElementIds.length > 0) {
|
|
179
150
|
selectedIds = this.action.selectedElementIds;
|
|
180
151
|
}
|
|
181
152
|
else {
|
|
182
153
|
selectedIds = Array.from(this.selectionService.getSelectedElementIDs());
|
|
183
154
|
}
|
|
184
|
-
return selectedIds.map(
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
var currentTopmost = selectedBoundsAware.length > 0 ? selectedBoundsAware[0] : undefined;
|
|
155
|
+
return selectedIds.map(id => root.index.getById(id)).filter(sprotty_1.isSelectable);
|
|
156
|
+
}
|
|
157
|
+
getTarget(selected, root) {
|
|
158
|
+
const selectedBoundsAware = selected.filter(sprotty_1.isBoundsAware).sort(this.markerComparator.compare);
|
|
159
|
+
const currentTopmost = selectedBoundsAware.length > 0 ? selectedBoundsAware[0] : undefined;
|
|
190
160
|
if (this.action.direction === 'previous') {
|
|
191
|
-
return this.markerNavigator.previous(root, currentTopmost,
|
|
161
|
+
return this.markerNavigator.previous(root, currentTopmost, marker => this.matchesSeverities(marker));
|
|
192
162
|
}
|
|
193
163
|
else {
|
|
194
|
-
return this.markerNavigator.next(root, currentTopmost,
|
|
164
|
+
return this.markerNavigator.next(root, currentTopmost, marker => this.matchesSeverities(marker));
|
|
195
165
|
}
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
NavigateToMarkerCommand.prototype.undo = function (context) {
|
|
166
|
+
}
|
|
167
|
+
matchesSeverities(marker) {
|
|
168
|
+
return marker.issues.find(issue => this.action.severities.includes(issue.severity)) !== undefined;
|
|
169
|
+
}
|
|
170
|
+
undo(context) {
|
|
202
171
|
if (this.selectCommand) {
|
|
203
172
|
context.root = this.selectCommand.undo(context);
|
|
204
173
|
}
|
|
205
174
|
return this.centerCommand ? this.centerCommand.undo(context) : context.root;
|
|
206
|
-
}
|
|
207
|
-
|
|
175
|
+
}
|
|
176
|
+
redo(context) {
|
|
208
177
|
if (this.selectCommand) {
|
|
209
178
|
context.root = this.selectCommand.redo(context);
|
|
210
179
|
}
|
|
211
180
|
return this.centerCommand ? this.centerCommand.redo(context) : context.root;
|
|
212
|
-
};
|
|
213
|
-
NavigateToMarkerCommand.KIND = NavigateToMarkerAction.KIND;
|
|
214
|
-
__decorate([
|
|
215
|
-
inversify_1.inject(SModelElementComparator),
|
|
216
|
-
__metadata("design:type", SModelElementComparator)
|
|
217
|
-
], NavigateToMarkerCommand.prototype, "markerComparator", void 0);
|
|
218
|
-
__decorate([
|
|
219
|
-
inversify_1.inject(MarkerNavigator),
|
|
220
|
-
__metadata("design:type", MarkerNavigator)
|
|
221
|
-
], NavigateToMarkerCommand.prototype, "markerNavigator", void 0);
|
|
222
|
-
__decorate([
|
|
223
|
-
inversify_1.inject(types_1.GLSP_TYPES.SelectionService),
|
|
224
|
-
__metadata("design:type", selection_service_1.SelectionService)
|
|
225
|
-
], NavigateToMarkerCommand.prototype, "selectionService", void 0);
|
|
226
|
-
NavigateToMarkerCommand = __decorate([
|
|
227
|
-
inversify_1.injectable(),
|
|
228
|
-
__param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
|
|
229
|
-
__metadata("design:paramtypes", [NavigateToMarkerAction])
|
|
230
|
-
], NavigateToMarkerCommand);
|
|
231
|
-
return NavigateToMarkerCommand;
|
|
232
|
-
}(sprotty_1.Command));
|
|
233
|
-
exports.NavigateToMarkerCommand = NavigateToMarkerCommand;
|
|
234
|
-
var MarkerNavigatorContextMenuItemProvider = /** @class */ (function () {
|
|
235
|
-
function MarkerNavigatorContextMenuItemProvider() {
|
|
236
181
|
}
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
182
|
+
};
|
|
183
|
+
NavigateToMarkerCommand.KIND = NavigateToMarkerAction.KIND;
|
|
184
|
+
__decorate([
|
|
185
|
+
inversify_1.inject(SModelElementComparator),
|
|
186
|
+
__metadata("design:type", SModelElementComparator)
|
|
187
|
+
], NavigateToMarkerCommand.prototype, "markerComparator", void 0);
|
|
188
|
+
__decorate([
|
|
189
|
+
inversify_1.inject(MarkerNavigator),
|
|
190
|
+
__metadata("design:type", MarkerNavigator)
|
|
191
|
+
], NavigateToMarkerCommand.prototype, "markerNavigator", void 0);
|
|
192
|
+
__decorate([
|
|
193
|
+
inversify_1.inject(types_1.GLSP_TYPES.SelectionService),
|
|
194
|
+
__metadata("design:type", selection_service_1.SelectionService)
|
|
195
|
+
], NavigateToMarkerCommand.prototype, "selectionService", void 0);
|
|
196
|
+
NavigateToMarkerCommand = __decorate([
|
|
197
|
+
inversify_1.injectable(),
|
|
198
|
+
__param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
|
|
199
|
+
__metadata("design:paramtypes", [NavigateToMarkerAction])
|
|
200
|
+
], NavigateToMarkerCommand);
|
|
201
|
+
exports.NavigateToMarkerCommand = NavigateToMarkerCommand;
|
|
202
|
+
let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
|
|
203
|
+
getItems(root, lastMousePosition) {
|
|
204
|
+
const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());
|
|
205
|
+
const hasMarkers = marker_1.collectIssueMarkers(root).length > 0;
|
|
240
206
|
return Promise.resolve([
|
|
241
207
|
{
|
|
242
|
-
id: 'navigate',
|
|
208
|
+
id: 'navigate',
|
|
209
|
+
label: 'Go to',
|
|
210
|
+
group: 'navigate',
|
|
211
|
+
actions: [],
|
|
243
212
|
children: [
|
|
244
213
|
{
|
|
245
|
-
id: 'next-marker',
|
|
214
|
+
id: 'next-marker',
|
|
215
|
+
label: 'Next marker',
|
|
216
|
+
group: 'marker',
|
|
246
217
|
actions: [new NavigateToMarkerAction('next', selectedElementIds)],
|
|
247
|
-
isEnabled:
|
|
218
|
+
isEnabled: () => hasMarkers
|
|
248
219
|
},
|
|
249
220
|
{
|
|
250
|
-
id: 'previous-marker',
|
|
221
|
+
id: 'previous-marker',
|
|
222
|
+
label: 'Previous marker',
|
|
223
|
+
group: 'marker',
|
|
251
224
|
actions: [new NavigateToMarkerAction('previous', selectedElementIds)],
|
|
252
|
-
isEnabled:
|
|
225
|
+
isEnabled: () => hasMarkers
|
|
253
226
|
}
|
|
254
227
|
]
|
|
255
228
|
}
|
|
256
229
|
]);
|
|
257
|
-
};
|
|
258
|
-
__decorate([
|
|
259
|
-
inversify_1.inject(types_1.GLSP_TYPES.SelectionService),
|
|
260
|
-
__metadata("design:type", selection_service_1.SelectionService)
|
|
261
|
-
], MarkerNavigatorContextMenuItemProvider.prototype, "selectionService", void 0);
|
|
262
|
-
MarkerNavigatorContextMenuItemProvider = __decorate([
|
|
263
|
-
inversify_1.injectable()
|
|
264
|
-
], MarkerNavigatorContextMenuItemProvider);
|
|
265
|
-
return MarkerNavigatorContextMenuItemProvider;
|
|
266
|
-
}());
|
|
267
|
-
exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider;
|
|
268
|
-
var MarkerNavigatorKeyListener = /** @class */ (function (_super) {
|
|
269
|
-
__extends(MarkerNavigatorKeyListener, _super);
|
|
270
|
-
function MarkerNavigatorKeyListener() {
|
|
271
|
-
return _super !== null && _super.apply(this, arguments) || this;
|
|
272
230
|
}
|
|
273
|
-
|
|
231
|
+
};
|
|
232
|
+
__decorate([
|
|
233
|
+
inversify_1.inject(types_1.GLSP_TYPES.SelectionService),
|
|
234
|
+
__metadata("design:type", selection_service_1.SelectionService)
|
|
235
|
+
], MarkerNavigatorContextMenuItemProvider.prototype, "selectionService", void 0);
|
|
236
|
+
MarkerNavigatorContextMenuItemProvider = __decorate([
|
|
237
|
+
inversify_1.injectable()
|
|
238
|
+
], MarkerNavigatorContextMenuItemProvider);
|
|
239
|
+
exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider;
|
|
240
|
+
let MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends sprotty_1.KeyListener {
|
|
241
|
+
keyDown(_element, event) {
|
|
274
242
|
if (keyboard_1.matchesKeystroke(event, 'Period', 'ctrl')) {
|
|
275
243
|
return [new NavigateToMarkerAction('next')];
|
|
276
244
|
}
|
|
@@ -278,11 +246,10 @@ var MarkerNavigatorKeyListener = /** @class */ (function (_super) {
|
|
|
278
246
|
return [new NavigateToMarkerAction('previous')];
|
|
279
247
|
}
|
|
280
248
|
return [];
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
}(sprotty_1.KeyListener));
|
|
249
|
+
}
|
|
250
|
+
};
|
|
251
|
+
MarkerNavigatorKeyListener = __decorate([
|
|
252
|
+
inversify_1.injectable()
|
|
253
|
+
], MarkerNavigatorKeyListener);
|
|
287
254
|
exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener;
|
|
288
255
|
//# sourceMappingURL=marker-navigator.js.map
|