@eclipse-glsp/client 1.1.0-next.c8b4f65.194 → 1.1.0-next.cb7168a.239

package/src/features/save/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/src/features/select/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -21,12 +22,12 @@ import { RankedSelectMouseListener } from './select-mouse-listener';
 import { SelectAllCommand, SelectCommand, SelectionService } from './selection-service';
 
 const glspSelectModule = new ContainerModule((bind, _unbind, isBound) => {
-    bind(SelectionService).toSelf().inSingletonScope();
-    bind(TYPES.SelectionService).toService(SelectionService);
-    configureCommand({ bind, isBound }, SelectCommand);
-    configureCommand({ bind, isBound }, SelectAllCommand);
-    configureCommand({ bind, isBound }, SelectFeedbackCommand);
-    bind(TYPES.MouseListener).to(RankedSelectMouseListener);
+    const context = { bind, isBound };
+    bindAsService(context, TYPES.SelectionService, SelectionService);
+    configureCommand(context, SelectCommand);
+    configureCommand(context, SelectAllCommand);
+    configureCommand(context, SelectFeedbackCommand);
+    bindAsService(context, TYPES.MouseListener, RankedSelectMouseListener);
     bind(TYPES.SModelRootListener).toService(SelectionService);
 });
 

package/src/features/select/select-mouse-listener.ts

@@ -15,7 +15,6 @@
  ********************************************************************************/
 import { Action, SelectAction } from '@eclipse-glsp/protocol';
 import {
-    BringToFrontAction,
     findParentByFeature,
     isCtrlOrCmd,
     isSelectable,
@@ -27,6 +26,7 @@ import {
     SRoutingHandle,
     SwitchEditModeAction
 } from 'sprotty';
+import { BringToFrontAction } from 'sprotty-protocol/lib/actions';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { DEFAULT_RANK, Ranked } from '../rank/model';
 
@@ -37,7 +37,7 @@ import { DEFAULT_RANK, Ranked } from '../rank/model';
 export class RankedSelectMouseListener extends SelectMouseListener implements Ranked {
     rank: number = DEFAULT_RANK - 1; /* we want to be executed before all default mouse listeners */
 
-    override mouseDown(target: SModelElement, event: MouseEvent): Action[] {
+    override mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
         const result: Action[] = [];
         if (this.buttonHandlerRegistry !== undefined && target instanceof SButton && target.enabled) {
             const buttonHandler = this.buttonHandlerRegistry.get(target.type);

package/src/features/select/selection-service.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable import/no-deprecated,no-unused-expressions */
-import { Action, SModelElementSchema } from '@eclipse-glsp/protocol';
+import { Action, initializeContainer, SModelElementSchema } from '@eclipse-glsp/protocol';
 import { AssertionError, expect } from 'chai';
 import { Container, injectable } from 'inversify';
 import { defaultModule, SGraphFactory, SModelRoot } from 'sprotty';
@@ -72,8 +72,7 @@ class MockSelectionListener implements SelectionListener {
 }
 
 function createContainer(): Container {
-    const container = new Container();
-    container.load(defaultModule);
+    const container = initializeContainer(new Container(), defaultModule);
     // eslint-disable-next-line deprecation/deprecation
     container.rebind(TYPES.IModelFactory).to(SGraphFactory).inSingletonScope();
     container.bind(TYPES.IFeedbackActionDispatcher).to(MockFeedbackActionDispatcher).inSingletonScope();
@@ -200,7 +199,7 @@ describe('SelectionService', () => {
             selectionService.modelRootChanged(newRoot);
             assertSelectionAndFeedback(['node1'], ['node2']);
         });
-        it('Changing root with new selection correctly selects matchting elements and deselects not matching elements.', () => {
+        it('Changing root with new selection correctly selects matching elements and deselects not matching elements.', () => {
             assertSelectionAndFeedback([], []);
             selectionService.updateSelection(root, ['node1', 'node2'], []);
             assertSelectionAndFeedback(['node1', 'node2'], []);

package/src/features/source-model-watcher/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2019-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

package/src/features/svg-metadata/di.config.ts

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { ContainerModule } from 'inversify';
+import { TYPES } from '../../base/types';
+import { MetadataPlacer } from './metadata-placer';
+
+const svgMetadataModule = new ContainerModule(bind => {
+    bind(MetadataPlacer).toSelf().inSingletonScope();
+    bind(TYPES.IVNodePostprocessor).toService(MetadataPlacer);
+});
+
+export default svgMetadataModule;

package/src/features/svg-metadata/metadata-placer.ts

@@ -0,0 +1,51 @@
+/********************************************************************************
+ * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { injectable, inject } from 'inversify';
+import { VNode } from 'snabbdom';
+import { IVNodePostprocessor, SChildElement, SEdge, setAttr, SModelElement, SModelRoot } from 'sprotty';
+import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
+import { TYPES } from '../../base/types';
+
+@injectable()
+export class MetadataPlacer implements IVNodePostprocessor {
+    @inject(TYPES.DOMHelper) protected domHelper: DOMHelper;
+
+    decorate(vnode: VNode, element: SModelElement): VNode {
+        if (element instanceof SModelRoot) {
+            setAttr(vnode, 'data-svg-metadata-api', true);
+        }
+
+        setAttr(vnode, 'data-svg-metadata-type', element.type);
+
+        if (element instanceof SChildElement) {
+            setAttr(vnode, 'data-svg-metadata-parent-id', this.domHelper.createUniqueDOMElementId(element.parent));
+        }
+        if (element instanceof SEdge) {
+            if (element.source !== undefined) {
+                setAttr(vnode, 'data-svg-metadata-edge-source-id', this.domHelper.createUniqueDOMElementId(element.source));
+            }
+            if (element.target !== undefined) {
+                setAttr(vnode, 'data-svg-metadata-edge-target-id', this.domHelper.createUniqueDOMElementId(element.target));
+            }
+        }
+        return vnode;
+    }
+
+    postUpdate(): void {
+        // empty
+    }
+}

package/src/features/tool-feedback/change-bounds-tool-feedback.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,12 +25,12 @@ import {
     isSelectable,
     isViewport,
     MouseListener,
-    MoveAction,
     SChildElement,
     SModelElement,
     SModelRoot,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { forEachElement } from '../../utils/smodel-util';
 import { addResizeHandles, isResizable, removeResizeHandles, SResizeHandle } from '../change-bounds/model';
 import { createMovementRestrictionFeedback, removeMovementRestrictionFeedback } from '../change-bounds/movement-restrictor';
@@ -221,7 +221,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
         }
     }
 
-    protected validateMove(startPostion: Point, toPosition: Point, element: SModelElement, isFinished: boolean): Point {
+    protected validateMove(startPosition: Point, toPosition: Point, element: SModelElement, isFinished: boolean): Point {
         let newPosition = toPosition;
         if (this.tool.movementRestrictor) {
             const valid = this.tool.movementRestrictor.validate(element, toPosition);
@@ -230,7 +230,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
                 action = createMovementRestrictionFeedback(element, this.tool.movementRestrictor);
 
                 if (isFinished) {
-                    newPosition = startPostion;
+                    newPosition = startPosition;
                 }
             } else {
                 action = removeMovementRestrictionFeedback(element, this.tool.movementRestrictor);

package/src/features/tool-feedback/creation-tool-feedback.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Bounds, Point } from '@eclipse-glsp/protocol';
+import { Action, Bounds, Point, SEdgeSchema } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
     AnchorComputerRegistry,
@@ -24,17 +24,16 @@ import {
     isBoundsAware,
     isConnectable,
     MouseListener,
-    MoveAction,
     PolylineEdgeRouter,
     SChildElement,
     SConnectableElement,
     SDanglingAnchor,
-    SEdge as SEdgeSchema,
     SModelElement,
     SModelRoot,
     SRoutableElement,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { BoundsAwareModelElement, isRoutable } from '../../utils/smodel-util';
 import { getAbsolutePosition, toAbsoluteBounds, toAbsolutePosition } from '../../utils/viewpoint-util';
 import { FeedbackCommand } from './model';
@@ -42,7 +41,7 @@ export interface DrawFeedbackEdgeAction extends Action {
     kind: typeof DrawFeedbackEdgeAction.KIND;
     elementTypeId: string;
     sourceId: string;
-    edgeSchema?: SEdgeSchema;
+    edgeSchema?: Partial<SEdgeSchema>;
 }
 
 export namespace DrawFeedbackEdgeAction {
@@ -52,7 +51,11 @@ export namespace DrawFeedbackEdgeAction {
         return Action.hasKind(object, KIND);
     }
 
-    export function create(options: { elementTypeId: string; sourceId: string; edgeSchema?: SEdgeSchema }): DrawFeedbackEdgeAction {
+    export function create(options: {
+        elementTypeId: string;
+        sourceId: string;
+        edgeSchema?: Partial<SEdgeSchema>;
+    }): DrawFeedbackEdgeAction {
         return {
             kind: KIND,
             ...options
@@ -69,8 +72,7 @@ export class DrawFeedbackEdgeCommand extends FeedbackCommand {
     }
 
     execute(context: CommandExecutionContext): CommandReturn {
-        const feedbackEdgeSchema = this.action.edgeSchema ? this.action.edgeSchema : defaultFeedbackEdgeSchema;
-        drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, feedbackEdgeSchema);
+        drawFeedbackEdge(context, this.action.sourceId, this.action.elementTypeId, this.action.edgeSchema);
         return context.root;
     }
 }
@@ -195,16 +197,16 @@ export function feedbackEdgeEndId(root: SModelRoot): string {
     return root.id + '_feedback_anchor';
 }
 
-export const defaultFeedbackEdgeSchema: SEdgeSchema = {
+export const defaultFeedbackEdgeSchema: Partial<SEdgeSchema> = {
     cssClasses: ['feedback-edge'],
     opacity: 0.3
-} as SEdgeSchema;
+};
 
 export function drawFeedbackEdge(
     context: CommandExecutionContext,
     sourceId: string,
     elementTypeId: string,
-    feedbackEdgeSchema: SEdgeSchema
+    edgeTemplate?: Partial<SEdgeSchema>
 ): void {
     const root = context.root;
     const sourceChild = root.index.getById(sourceId);
@@ -221,12 +223,16 @@ export function drawFeedbackEdge(
     edgeEnd.id = feedbackEdgeEndId(root);
     edgeEnd.position = toAbsolutePosition(source);
 
-    feedbackEdgeSchema.id = feedbackEdgeId(root);
-    feedbackEdgeSchema.type = elementTypeId;
-    feedbackEdgeSchema.sourceId = source.id;
-    feedbackEdgeSchema.targetId = edgeEnd.id;
+    const edgeSchema: SEdgeSchema = {
+        id: feedbackEdgeId(root),
+        type: elementTypeId,
+        sourceId: source.id,
+        targetId: edgeEnd.id,
+        ...defaultFeedbackEdgeSchema,
+        ...edgeTemplate
+    };
 
-    const feedbackEdge = context.modelFactory.createElement(feedbackEdgeSchema);
+    const feedbackEdge = context.modelFactory.createElement(edgeSchema);
     if (isRoutable(feedbackEdge)) {
         edgeEnd.feedbackEdge = feedbackEdge;
         root.add(edgeEnd);

package/src/features/tool-feedback/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureCommand, configureView, LocationPostprocessor, MoveCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
@@ -31,35 +32,36 @@ import { DrawMarqueeCommand, RemoveMarqueeCommand } from './marquee-tool-feedbac
 import { FeedbackEdgeEndView, SResizeHandleView } from './view';
 
 const toolFeedbackModule = new ContainerModule((bind, _unbind, isBound) => {
+    const context = { bind, isBound };
     bind(TYPES.IFeedbackActionDispatcher).to(FeedbackActionDispatcher).inSingletonScope();
 
-    configureCommand({ bind, isBound }, ModifyCssFeedbackCommand);
+    configureCommand(context, ModifyCssFeedbackCommand);
 
     // create node and edge tool feedback
-    configureCommand({ bind, isBound }, DrawFeedbackEdgeCommand);
-    configureCommand({ bind, isBound }, RemoveFeedbackEdgeCommand);
+    configureCommand(context, DrawFeedbackEdgeCommand);
+    configureCommand(context, RemoveFeedbackEdgeCommand);
 
-    configureCommand({ bind, isBound }, DrawMarqueeCommand);
-    configureCommand({ bind, isBound }, RemoveMarqueeCommand);
+    configureCommand(context, DrawMarqueeCommand);
+    configureCommand(context, RemoveMarqueeCommand);
 
-    configureView({ bind, isBound }, FeedbackEdgeEnd.TYPE, FeedbackEdgeEndView);
-    // move tool feedback: we use sprotties MoveCommand as client-side visual feedback
-    configureCommand({ bind, isBound }, MoveCommand);
+    configureView(context, FeedbackEdgeEnd.TYPE, FeedbackEdgeEndView);
+    // move tool feedback: we use sprotty's MoveCommand as client-side visual feedback
+    configureCommand(context, MoveCommand);
 
     // resize tool feedback
-    configureCommand({ bind, isBound }, ShowChangeBoundsToolResizeFeedbackCommand);
-    configureCommand({ bind, isBound }, HideChangeBoundsToolResizeFeedbackCommand);
-    configureView({ bind, isBound }, SResizeHandle.TYPE, SResizeHandleView);
+    configureCommand(context, ShowChangeBoundsToolResizeFeedbackCommand);
+    configureCommand(context, HideChangeBoundsToolResizeFeedbackCommand);
+    configureView(context, SResizeHandle.TYPE, SResizeHandleView);
 
     // reconnect edge tool feedback
-    configureCommand({ bind, isBound }, ShowEdgeReconnectHandlesFeedbackCommand);
-    configureCommand({ bind, isBound }, HideEdgeReconnectHandlesFeedbackCommand);
-    configureCommand({ bind, isBound }, DrawFeedbackEdgeSourceCommand);
+    configureCommand(context, ShowEdgeReconnectHandlesFeedbackCommand);
+    configureCommand(context, HideEdgeReconnectHandlesFeedbackCommand);
+    configureCommand(context, DrawFeedbackEdgeSourceCommand);
 
-    configureCommand({ bind, isBound }, SwitchRoutingModeCommand);
+    configureCommand(context, SwitchRoutingModeCommand);
 
-    bind(TYPES.IVNodePostprocessor).to(LocationPostprocessor);
-    bind(TYPES.HiddenVNodePostprocessor).to(LocationPostprocessor);
+    bindAsService(context, TYPES.IVNodePostprocessor, LocationPostprocessor);
+    bind(TYPES.HiddenVNodePostprocessor).toService(LocationPostprocessor);
 });
 
 export default toolFeedbackModule;

package/src/features/tool-feedback/edge-edit-tool-feedback.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,16 +29,15 @@ import {
     ISnapper,
     isSelected,
     MouseListener,
-    MoveAction,
     PolylineEdgeRouter,
     SConnectableElement,
     SModelElement,
-    SModelRoot,
     SRoutingHandle,
     SwitchEditModeAction,
     SwitchEditModeCommand,
     TYPES
 } from 'sprotty';
+import { MoveAction } from 'sprotty-protocol/lib/actions';
 import { forEachElement, isRoutable, isRoutingHandle } from '../../utils/smodel-util';
 import { getAbsolutePosition, toAbsoluteBounds } from '../../utils/viewpoint-util';
 import { PointPositionUpdater } from '../change-bounds/snap';
@@ -326,14 +325,7 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         return undefined;
     }
 
-    override mouseEnter(target: SModelElement, event: MouseEvent): Action[] {
-        if (target instanceof SModelRoot && event.buttons === 0) {
-            this.mouseUp(target, event);
-        }
-        return [];
-    }
-
-    override mouseUp(_target: SModelElement, event: MouseEvent): Action[] {
+    override mouseUp(_target: SModelElement, _event: MouseEvent): Action[] {
         this.pointPositionUpdater.resetPosition();
         return [];
     }

package/src/features/tool-palette/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,15 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { bindAsService } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureActionHandler, EnableDefaultToolsAction } from 'sprotty';
 import '../../../css/tool-palette.css';
 import { TYPES } from '../../base/types';
 import { EnableToolPaletteAction, ToolPalette } from './tool-palette';
 
-const toolPaletteModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
-    bind(ToolPalette).toSelf().inSingletonScope();
-    bind(TYPES.IUIExtension).toService(ToolPalette);
+const toolPaletteModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
+    bindAsService(bind, TYPES.IUIExtension, ToolPalette);
     configureActionHandler({ bind, isBound }, EnableToolPaletteAction.KIND, ToolPalette);
     configureActionHandler({ bind, isBound }, EnableDefaultToolsAction.KIND, ToolPalette);
 });

package/src/features/tool-palette/tool-palette.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, PaletteItem, RequestContextActions, RequestMarkersAction, SetContextActions } from '@eclipse-glsp/protocol';
+import { Action, MarkersReason, PaletteItem, RequestContextActions, RequestMarkersAction, SetContextActions } from '@eclipse-glsp/protocol';
 import { inject, injectable, postConstruct } from 'inversify';
 import {
     AbstractUIExtension,
@@ -22,8 +22,8 @@ import {
     IActionHandler,
     ICommand,
     IToolManager,
-    SetUIExtensionVisibilityAction,
     SModelRoot,
+    SetUIExtensionVisibilityAction,
     TYPES
 } from 'sprotty';
 import { codiconCSSClasses } from 'sprotty/lib/utils/codicon';
@@ -222,7 +222,7 @@ export class ToolPalette extends AbstractUIExtension implements IActionHandler,
         validateActionButton.title = 'Validate model';
         validateActionButton.onclick = _event => {
             const modelIds: string[] = [this.modelRootId];
-            this.actionDispatcher.dispatch(RequestMarkersAction.create(modelIds));
+            this.actionDispatcher.dispatch(RequestMarkersAction.create(modelIds, { reason: MarkersReason.BATCH }));
         };
         return validateActionButton;
     }

package/src/features/tools/change-bounds-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
- import {
+import {
     Action,
     Bounds,
     ChangeBoundsOperation,
@@ -243,16 +243,16 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
             //  If client routing is enabled -> delegate routingpoints of connected edges to server
             forEachElement(target.index, isNonRoutableSelectedMovableBoundsAware, element => {
                 if (element instanceof SConnectableElement) {
-                    element.incomingEdges.map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
+                    element.incomingEdges
+                        .map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
                         .forEach(ear => newRoutingPoints.push(ear));
-                    element.outgoingEdges.map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
+                    element.outgoingEdges
+                        .map(connectable => calcElementAndRoutingPoints(connectable, routerRegistry))
                         .forEach(ear => newRoutingPoints.push(ear));
                 }
             });
         }
-        return newRoutingPoints.length > 0
-         ? [ChangeRoutingPointsOperation.create(newRoutingPoints)]
-         : [];
+        return newRoutingPoints.length > 0 ? [ChangeRoutingPointsOperation.create(newRoutingPoints)] : [];
     }
 
     protected handleResize(activeResizeHandle: SResizeHandle): Action[] {

package/src/features/tools/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,18 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
-import { ContainerModule, interfaces } from 'inversify';
-import { configureActionHandler, configureModelElement } from 'sprotty';
+import { bindAsService, BindingContext, bindOrRebind, TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
+import { ContainerModule } from 'inversify';
+import { configureActionHandler, configureModelElement, ManhattanEdgeRouter } from 'sprotty';
 import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
 import { TYPES } from '../../base/types';
-import { GLSPSvgExporter } from '../export/glsp-svg-exporter';
 import { MARQUEE } from '../tool-feedback/marquee-tool-feedback';
 import { ChangeBoundsTool } from './change-bounds-tool';
 import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
 import { EdgeCreationTool } from './edge-creation-tool';
 import { EdgeEditTool } from './edge-edit-tool';
 import { EnableDefaultToolsOnFocusLossHandler } from './enable-default-tools-on-focus-loss';
+import { GLSPManhattanEdgeRouter } from './glsp-manhattan-edge-router';
 import { MarqueeMouseTool } from './marquee-mouse-tool';
 import { MarqueeTool } from './marquee-tool';
 import { MarqueeNode } from './model';
@@ -36,30 +36,29 @@ import { MarqueeView } from './view';
  * and adds the marquee selection tool.
  */
 export const toolsModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
+    const context = { bind, isBound, rebind };
     // Register default tools
-    bind(TYPES.IDefaultTool).to(ChangeBoundsTool);
-    bind(TYPES.IDefaultTool).to(EdgeEditTool);
-    bind(TYPES.IDefaultTool).to(DelKeyDeleteTool);
+    bindAsService(context, TYPES.IDefaultTool, ChangeBoundsTool);
+    bindAsService(context, TYPES.IDefaultTool, EdgeEditTool);
+    bindAsService(context, TYPES.IDefaultTool, DelKeyDeleteTool);
 
     // Register  tools
-    bind(TYPES.ITool).to(MouseDeleteTool);
-    bind(NodeCreationTool).toSelf().inSingletonScope();
-    bind(EdgeCreationTool).toSelf().inSingletonScope();
-    bind(TYPES.ITool).toService(EdgeCreationTool);
-    bind(TYPES.ITool).toService(NodeCreationTool);
+    bindAsService(context, TYPES.ITool, MouseDeleteTool);
+    bindAsService(context, TYPES.ITool, NodeCreationTool);
+    bindAsService(context, TYPES.ITool, EdgeCreationTool);
 
-    configureMarqueeTool({ bind, isBound });
-    configureActionHandler({ bind, isBound }, TriggerNodeCreationAction.KIND, NodeCreationTool);
-    configureActionHandler({ bind, isBound }, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
+    configureMarqueeTool(context);
+    configureActionHandler(context, TriggerNodeCreationAction.KIND, NodeCreationTool);
+    configureActionHandler(context, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
 
-    bind(GLSPSvgExporter).toSelf().inSingletonScope();
-    rebind(TYPES.SvgExporter).toService(GLSPSvgExporter);
+    bind(GLSPManhattanEdgeRouter).toSelf().inSingletonScope();
+    bindOrRebind(context, ManhattanEdgeRouter).toService(GLSPManhattanEdgeRouter);
 });
 
-export function configureMarqueeTool(context: { bind: interfaces.Bind; isBound: interfaces.IsBound }): void {
+export function configureMarqueeTool(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
     configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
-    context.bind(TYPES.IDefaultTool).to(MarqueeTool);
-    context.bind(TYPES.ITool).to(MarqueeMouseTool);
+    bindAsService(context, TYPES.IDefaultTool, MarqueeTool);
+    bindAsService(context, TYPES.ITool, MarqueeMouseTool);
 }
 
 /**