@eclipse-glsp/client 1.1.0-next.c40feb3.207 → 1.1.0-next.c5afbfa.273

package/src/features/tools/marquee-selection/marquee-tool-feedback.ts

@@ -0,0 +1,130 @@
+/********************************************************************************
+ * Copyright (c) 2021-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
+ * 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 { inject, injectable } from 'inversify';
+import {
+    Action,
+    AnchorComputerRegistry,
+    CommandExecutionContext,
+    CommandReturn,
+    MouseListener,
+    Point,
+    SChildElement,
+    SModelElement,
+    SModelRoot,
+    TYPES,
+    hasObjectProp
+} from '~glsp-sprotty';
+import { FeedbackCommand } from '../../../base/feedback/feedback-command';
+
+export interface DrawMarqueeAction extends Action {
+    kind: typeof DrawMarqueeAction.KIND;
+    startPoint: Point;
+    endPoint: Point;
+}
+
+export namespace DrawMarqueeAction {
+    export const KIND = 'drawMarquee';
+
+    export function is(object: any): object is DrawMarqueeAction {
+        return Action.hasKind(object, KIND) && hasObjectProp(object, 'startPoint') && hasObjectProp(object, 'endPoint');
+    }
+
+    export function create(options: { startPoint: Point; endPoint: Point }): DrawMarqueeAction {
+        return {
+            kind: KIND,
+            ...options
+        };
+    }
+}
+
+@injectable()
+export class DrawMarqueeCommand extends FeedbackCommand {
+    static readonly KIND = DrawMarqueeAction.KIND;
+
+    constructor(@inject(TYPES.Action) protected action: DrawMarqueeAction) {
+        super();
+    }
+
+    execute(context: CommandExecutionContext): CommandReturn {
+        drawMarquee(context, this.action.startPoint, this.action.endPoint);
+        return context.root;
+    }
+}
+
+export interface RemoveMarqueeAction extends Action {
+    kind: typeof RemoveMarqueeAction.KIND;
+}
+
+export namespace RemoveMarqueeAction {
+    export const KIND = 'removeMarquee';
+
+    export function is(object: any): object is RemoveMarqueeAction {
+        return Action.hasKind(object, KIND);
+    }
+
+    export function create(): RemoveMarqueeAction {
+        return { kind: KIND };
+    }
+}
+
+@injectable()
+export class RemoveMarqueeCommand extends FeedbackCommand {
+    static readonly KIND = RemoveMarqueeAction.KIND;
+
+    execute(context: CommandExecutionContext): CommandReturn {
+        removeMarquee(context.root);
+        return context.root;
+    }
+}
+
+export class MarqueeEndMovingMouseListener extends MouseListener {
+    constructor(protected anchorRegistry: AnchorComputerRegistry) {
+        super();
+    }
+
+    override mouseMove(target: SModelElement, event: MouseEvent): Action[] {
+        return [];
+    }
+}
+
+export function marqueeId(root: SModelRoot): string {
+    return root.id + '_' + MARQUEE;
+}
+
+export const MARQUEE = 'marquee';
+
+export function drawMarquee(context: CommandExecutionContext, startPoint: Point, endPoint: Point): void {
+    const root = context.root;
+
+    removeMarquee(root);
+
+    const marqueeSchema = {
+        type: MARQUEE,
+        id: marqueeId(root),
+        startPoint: startPoint,
+        endPoint: endPoint
+    };
+
+    const marquee = context.modelFactory.createElement(marqueeSchema);
+    root.add(marquee);
+}
+
+export function removeMarquee(root: SModelRoot): void {
+    const marquee = root.index.getById(marqueeId(root));
+    if (marquee instanceof SChildElement) {
+        root.remove(marquee);
+    }
+}

package/src/features/tools/marquee-selection/marquee-tool.ts

@@ -0,0 +1,45 @@
+/********************************************************************************
+ * Copyright (c) 2021-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
+ * 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 } from 'inversify';
+import { Action, KeyListener, SModelElement } from '~glsp-sprotty';
+import { EnableToolsAction } from '../../../base/tool-manager/tool';
+import { BaseEditTool } from '../base-tools';
+import { MarqueeMouseTool } from './marquee-mouse-tool';
+
+@injectable()
+export class MarqueeTool extends BaseEditTool {
+    static ID = 'glsp.marquee-tool';
+
+    protected marqueeKeyListener: MarqueeKeyListener = new MarqueeKeyListener();
+
+    get id(): string {
+        return MarqueeTool.ID;
+    }
+
+    enable(): void {
+        this.toDisposeOnDisable.push(this.keyTool.registerListener(this.marqueeKeyListener));
+    }
+}
+
+@injectable()
+export class MarqueeKeyListener extends KeyListener {
+    override keyDown(_element: SModelElement, event: KeyboardEvent): Action[] {
+        if (event.shiftKey) {
+            return [EnableToolsAction.create([MarqueeMouseTool.ID])];
+        }
+        return [];
+    }
+}

package/src/features/tools/marquee-selection/model.ts

@@ -0,0 +1,22 @@
+/********************************************************************************
+ * Copyright (c) 2021-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
+ * 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 { boundsFeature, Point, RectangularNode } from '~glsp-sprotty';
+
+export class MarqueeNode extends RectangularNode {
+    static override readonly DEFAULT_FEATURES = [boundsFeature];
+    startPoint: Point;
+    endPoint: Point;
+}

package/src/features/tools/marquee-selection/view.tsx

@@ -0,0 +1,43 @@
+/********************************************************************************
+ * Copyright (c) 2021-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
+ * 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 } from 'inversify';
+import { VNode } from 'snabbdom';
+import { RectangularNodeView, RenderingContext, svg } from '~glsp-sprotty';
+import { MarqueeNode } from './model';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const JSX = { createElement: svg };
+
+@injectable()
+export class MarqueeView extends RectangularNodeView {
+    override render(node: MarqueeNode, context: RenderingContext): VNode {
+        const graph = (
+            <g>
+                <rect
+                    class-sprotty-node={true}
+                    class-marquee={true}
+                    x={node.startPoint.x - node.endPoint.x <= 0 ? node.startPoint.x : node.endPoint.x}
+                    y={node.startPoint.y - node.endPoint.y <= 0 ? node.startPoint.y : node.endPoint.y}
+                    rx={0}
+                    ry={0}
+                    width={Math.abs(node.startPoint.x - node.endPoint.x)}
+                    height={Math.abs(node.startPoint.y - node.endPoint.y)}
+                ></rect>
+            </g>
+        );
+        return graph;
+    }
+}

package/src/features/tools/node-creation/node-creation-module.ts

@@ -0,0 +1,23 @@
+/********************************************************************************
+ * 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
+ * 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 { FeatureModule, TYPES, TriggerNodeCreationAction, bindAsService, configureActionHandler } from '~glsp-sprotty';
+import { NodeCreationTool } from './node-creation-tool';
+
+export const nodeCreationToolModule = new FeatureModule((bind, unbind, isBound, rebind) => {
+    const context = { bind, unbind, isBound, rebind };
+    bindAsService(context, TYPES.ITool, NodeCreationTool);
+    configureActionHandler(context, TriggerNodeCreationAction.KIND, NodeCreationTool);
+});

package/src/features/tools/node-creation/node-creation-tool.ts

@@ -0,0 +1,101 @@
+/********************************************************************************
+ * 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
+ * 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 { inject, injectable, optional } from 'inversify';
+import {
+    Action,
+    CreateNodeOperation,
+    ISnapper,
+    SModelElement,
+    SNode,
+    TYPES,
+    TriggerNodeCreationAction,
+    findParentByFeature,
+    isCtrlOrCmd
+} from '~glsp-sprotty';
+import { DragAwareMouseListener } from '../../../base/drag-aware-mouse-listener';
+import { CursorCSS, cursorFeedbackAction } from '../../../base/feedback/css-feedback';
+import { EnableDefaultToolsAction } from '../../../base/tool-manager/tool';
+import { getAbsolutePosition } from '../../../utils/viewpoint-util';
+import { Containable, isContainable } from '../../hints/model';
+import { BaseCreationTool } from '../base-tools';
+
+@injectable()
+export class NodeCreationTool extends BaseCreationTool<TriggerNodeCreationAction> {
+    static ID = 'tool_create_node';
+
+    protected isTriggerAction = TriggerNodeCreationAction.is;
+
+    @inject(TYPES.ISnapper) @optional() readonly snapper?: ISnapper;
+
+    get id(): string {
+        return NodeCreationTool.ID;
+    }
+
+    doEnable(): void {
+        this.toDisposeOnDisable.push(
+            this.mouseTool.registerListener(new NodeCreationToolMouseListener(this.triggerAction, this)),
+            this.registerFeedback([cursorFeedbackAction(CursorCSS.NODE_CREATION)], this, [cursorFeedbackAction()])
+        );
+    }
+}
+
+@injectable()
+export class NodeCreationToolMouseListener extends DragAwareMouseListener {
+    protected container?: SModelElement & Containable;
+
+    constructor(protected triggerAction: TriggerNodeCreationAction, protected tool: NodeCreationTool) {
+        super();
+    }
+
+    protected creationAllowed(elementTypeId: string): boolean | undefined {
+        return this.container && this.container.isContainableElement(elementTypeId);
+    }
+
+    get elementTypeId(): string {
+        return this.triggerAction.elementTypeId;
+    }
+
+    override nonDraggingMouseUp(target: SModelElement, event: MouseEvent): Action[] {
+        const result: Action[] = [];
+        if (this.creationAllowed(this.elementTypeId)) {
+            const containerId = this.container ? this.container.id : undefined;
+            let location = getAbsolutePosition(target, event);
+            if (this.tool.snapper) {
+                // Create a 0-bounds proxy element for snapping
+                const elementProxy = new SNode();
+                elementProxy.size = { width: 0, height: 0 };
+                location = this.tool.snapper.snap(location, elementProxy);
+            }
+            result.push(CreateNodeOperation.create(this.elementTypeId, { location, containerId, args: this.triggerAction.args }));
+            if (!isCtrlOrCmd(event)) {
+                result.push(EnableDefaultToolsAction.create());
+            }
+        }
+        return result;
+    }
+
+    override mouseOver(target: SModelElement, event: MouseEvent): Action[] {
+        const currentContainer = findParentByFeature(target, isContainable);
+        if (!this.container || currentContainer !== this.container) {
+            this.container = currentContainer;
+            const feedback = this.creationAllowed(this.elementTypeId)
+                ? cursorFeedbackAction(CursorCSS.NODE_CREATION)
+                : cursorFeedbackAction(CursorCSS.OPERATION_NOT_ALLOWED);
+            this.tool.registerFeedback([feedback]);
+        }
+        return [];
+    }
+}

package/src/features/tools/tool-focus-loss-module.ts

@@ -0,0 +1,39 @@
+/********************************************************************************
+ * Copyright (c) 2022-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
+ * 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 } from 'inversify';
+import { Action, FeatureModule, IActionHandler, ICommand, configureActionHandler } from '~glsp-sprotty';
+import { FocusStateChangedAction } from '../../base/focus/focus-state-change-action';
+import { EnableDefaultToolsAction } from '../../base/tool-manager/tool';
+
+/**
+ * Action handler that enables the default tools when the diagram lost focus.
+ * @see FocusStateChangedAction
+ */
+@injectable()
+export class EnableDefaultToolsOnFocusLossHandler implements IActionHandler {
+    handle(action: Action): void | Action | ICommand {
+        if (FocusStateChangedAction.is(action) && !action.hasFocus) {
+            return EnableDefaultToolsAction.create();
+        }
+    }
+}
+
+/**
+ * Enables the default tools in the tool manager if the diagram looses focus.
+ */
+export const toolFocusLossModule = new FeatureModule((bind, _unbind, isBound) => {
+    configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
+});

package/src/features/undo-redo/undo-redo-key-listener.ts

@@ -0,0 +1,32 @@
+/********************************************************************************
+ * Copyright (c) 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
+ * 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 { Action, KeyListener, RedoAction, SModelElement, UndoAction, isMac, matchesKeystroke } from '~glsp-sprotty';
+
+/**
+ * Key listener that listens to the typical keyboard shortcuts for undo/redo and dispatches the corresponding actions.
+ */
+export class GLSPUndoRedoKeyListener extends KeyListener {
+    override keyDown(element: SModelElement, event: KeyboardEvent): Action[] {
+        if (matchesKeystroke(event, 'KeyZ', 'ctrlCmd')) {
+            return [UndoAction.create()];
+        }
+        if (matchesKeystroke(event, 'KeyZ', 'ctrlCmd', 'shift') || (!isMac() && matchesKeystroke(event, 'KeyY', 'ctrlCmd'))) {
+            return [RedoAction.create()];
+        }
+        return [];
+    }
+}

package/src/features/undo-redo/undo-redo-module.ts

@@ -0,0 +1,28 @@
+/********************************************************************************
+ * Copyright (c) 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
+ * 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 { bindAsService, TYPES } from '~glsp-sprotty';
+import { GLSPUndoRedoKeyListener } from './undo-redo-key-listener';
+
+/**
+ * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
+ * When integrated into an application frame (e.g Theia/VS Code) this module is typically omitted and/or replaced
+ * with an application native module.
+ */
+export const undoRedoModule = new ContainerModule((bind, unbind, isBound, rebind) => {
+    bindAsService(bind, TYPES.KeyListener, GLSPUndoRedoKeyListener);
+});

package/src/features/validation/issue-marker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2021 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,8 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Bounds, Marker, MarkerKind } from '@eclipse-glsp/protocol';
-import { isBoundsAware, Projectable, SDecoration, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
+import {
+    Bounds,
+    Marker,
+    MarkerKind,
+    Projectable,
+    SDecoration,
+    SIssue,
+    SIssueMarker,
+    SIssueSeverity,
+    SParentElement,
+    isBoundsAware
+} from '~glsp-sprotty';
 
 export class GIssueMarker extends SIssueMarker implements Projectable {
     constructor() {

package/src/features/validation/marker-navigator.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
@@ -13,27 +13,26 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-/* eslint-disable import/no-deprecated,no-unused-expressions */
-import { SNodeSchema } from '@eclipse-glsp/protocol';
 import { expect } from 'chai';
 import { Container } from 'inversify';
 import 'mocha';
 import 'reflect-metadata';
 import {
     BoundsAware,
-    decorationModule,
     SChildElement,
+    SGraphFactory,
     SIssue,
     SIssueMarker,
     SModelElement,
     SModelRoot,
+    SNodeSchema,
     SParentElement,
     TYPES
-} from 'sprotty';
-import defaultModule from 'sprotty/lib/base/di.config';
-import { SGraphFactory } from 'sprotty/lib/graph/sgraph-factory';
-import { markerNavigatorModule } from './di.config';
+} from '~glsp-sprotty';
+import { defaultModule } from '../../base/default.module';
+import { decorationModule } from '../decoration/decoration-module';
 import { MarkerNavigator } from './marker-navigator';
+import { markerNavigatorModule } from './validation-modules';
 
 describe('MarkerNavigator', () => {
     const container = new Container();

package/src/features/validation/marker-navigator.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
@@ -13,29 +13,34 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, CenterAction, hasArrayProp, hasStringProp, Point, SelectAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    ActionDispatcher,
+    Action,
     BoundsAware,
-    findParentByFeature,
+    CenterAction,
     IActionHandler,
     IContextMenuItemProvider,
-    isBoundsAware,
-    isSelectable,
     KeyListener,
     MenuItem,
-    Selectable,
+    Point,
     SIssueMarker,
     SIssueSeverity,
     SModelElement,
-    SModelRoot
-} from 'sprotty';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-import { TYPES } from '../../base/types';
-import { collectIssueMarkers, MarkerPredicates } from '../../utils/marker';
+    SModelRoot,
+    SelectAction,
+    Selectable,
+    TYPES,
+    findParentByFeature,
+    hasArrayProp,
+    hasStringProp,
+    isBoundsAware,
+    isSelectable,
+    matchesKeystroke
+} from '~glsp-sprotty';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { SelectionService } from '../../base/selection-service';
+import { MarkerPredicates, collectIssueMarkers } from '../../utils/marker';
 import { getElements, isSelectableAndBoundsAware } from '../../utils/smodel-util';
-import { SelectionService } from '../select/selection-service';
 
 export interface NavigateToMarkerAction extends Action {
     kind: typeof NavigateToMarkerAction.KIND;
@@ -159,11 +164,11 @@ export class NavigateToMarkerActionHandler implements IActionHandler {
     @inject(MarkerNavigator)
     protected markerNavigator: MarkerNavigator;
 
-    @inject(TYPES.SelectionService)
+    @inject(SelectionService)
     protected selectionService: SelectionService;
 
     @inject(TYPES.IActionDispatcher)
-    protected actionDispatcher: ActionDispatcher;
+    protected actionDispatcher: GLSPActionDispatcher;
 
     handle(action: NavigateToMarkerAction): void {
         const selected = this.getSelectedElements(action);
@@ -201,7 +206,7 @@ export class NavigateToMarkerActionHandler implements IActionHandler {
 
 @injectable()
 export class MarkerNavigatorContextMenuItemProvider implements IContextMenuItemProvider {
-    @inject(TYPES.SelectionService) protected selectionService: SelectionService;
+    @inject(SelectionService) protected selectionService: SelectionService;
 
     getItems(root: Readonly<SModelRoot>, lastMousePosition?: Point): Promise<MenuItem[]> {
         const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());