@eclipse-glsp/client 0.10.0-next.e5fcffe.169 → 1.1.0-next.fe0b297.182

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

@@ -13,7 +13,21 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SelectMouseListener } from 'sprotty';
+import { Action, SelectAction } from '@eclipse-glsp/protocol';
+import {
+    BringToFrontAction,
+    findParentByFeature,
+    isCtrlOrCmd,
+    isSelectable,
+    SButton,
+    SelectMouseListener,
+    SModelElement,
+    SModelRoot,
+    SRoutableElement,
+    SRoutingHandle,
+    SwitchEditModeAction
+} from 'sprotty';
+import { toArray } from 'sprotty/lib/utils/iterable';
 import { DEFAULT_RANK, Ranked } from '../rank/model';
 
 /**
@@ -22,4 +36,70 @@ 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[] {
+        const result: Action[] = [];
+        if (this.buttonHandlerRegistry !== undefined && target instanceof SButton && target.enabled) {
+            const buttonHandler = this.buttonHandlerRegistry.get(target.type);
+            if (buttonHandler !== undefined) {
+                return buttonHandler.buttonPressed(target);
+            }
+        }
+        const selectableTarget = findParentByFeature(target, isSelectable);
+        if (selectableTarget !== undefined || target instanceof SModelRoot) {
+            this.hasDragged = false;
+            let deselect: SModelElement[] = [];
+            // multi-selection?
+            if (!isCtrlOrCmd(event)) {
+                deselect = toArray(
+                    target.root.index
+                        .all()
+                        .filter(
+                            element =>
+                                isSelectable(element) &&
+                                element.selected &&
+                                !(selectableTarget instanceof SRoutingHandle && element === (selectableTarget.parent as SModelElement))
+                        )
+                );
+            }
+            if (selectableTarget !== undefined) {
+                if (!selectableTarget.selected) {
+                    this.wasSelected = false;
+                    result.push(
+                        SelectAction.create({
+                            selectedElementsIDs: [selectableTarget.id],
+                            deselectedElementsIDs: deselect.map(e => e.id)
+                        })
+                    );
+                    result.push(BringToFrontAction.create([selectableTarget.id]));
+                    const routableDeselect = deselect.filter(e => e instanceof SRoutableElement).map(e => e.id);
+                    if (selectableTarget instanceof SRoutableElement) {
+                        result.push(
+                            SwitchEditModeAction.create({
+                                elementsToActivate: [selectableTarget.id],
+                                elementsToDeactivate: routableDeselect
+                            })
+                        );
+                    } else if (routableDeselect.length > 0) {
+                        result.push(SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
+                    }
+                } else if (isCtrlOrCmd(event)) {
+                    this.wasSelected = false;
+                    result.push(SelectAction.create({ deselectedElementsIDs: [selectableTarget.id] }));
+                    if (selectableTarget instanceof SRoutableElement) {
+                        result.push(SwitchEditModeAction.create({ elementsToDeactivate: [selectableTarget.id] }));
+                    }
+                } else {
+                    this.wasSelected = true;
+                }
+            } else {
+                result.push(SelectAction.create({ deselectedElementsIDs: deselect.map(e => e.id) }));
+                const routableDeselect = deselect.filter(e => e instanceof SRoutableElement).map(e => e.id);
+                if (routableDeselect.length > 0) {
+                    result.push(SwitchEditModeAction.create({ elementsToDeactivate: routableDeselect }));
+                }
+            }
+        }
+        return result;
+    }
 }

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

@@ -347,7 +347,7 @@ describe('SelectionService', () => {
         expect(selectionService.hasSelectedElements()).to.equal(expectedSelection.length > 0);
         expect(selectionService.getSelectedElementIDs()).to.have.lengthOf(expectedSelection.length);
         if (expectedSelection.length > 0) {
-            expect(selectionService.getSelectedElementIDs()).to.have.all.keys(...expectedSelection);
+            expect(selectionService.getSelectedElementIDs()).to.have.ordered.members(expectedSelection);
         }
     }
 

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

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, distinctAdd, remove, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
+import { Action, distinctAdd, pluck, remove, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
 import {
     Command,
@@ -25,12 +25,11 @@ import {
     SelectAllCommand as SprottySelectAllCommand,
     SelectCommand as SprottySelectCommand,
     SModelElement,
-    SModelRoot,
-    SParentElement
+    SModelRoot
 } from 'sprotty';
 import { SModelRootListener } from '../../base/model/update-model-command';
 import { TYPES } from '../../base/types';
-import { getElements } from '../../utils/smodel-util';
+import { getElements, getMatchingElements } from '../../utils/smodel-util';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import { SelectFeedbackAction } from './select-feedback-action';
 
@@ -135,8 +134,8 @@ export class SelectionService implements SModelRootListener {
      * QUERY METHODS
      */
 
-    getSelectedElementIDs(): Set<string> {
-        return this.selectedElementIDs;
+    getSelectedElementIDs(): string[] {
+        return [...this.selectedElementIDs];
     }
 
     hasSelectedElements(): boolean {
@@ -152,6 +151,11 @@ export class SelectionService implements SModelRootListener {
     }
 }
 
+/**
+ * Handles a {@link SelectAction} and propagates the new selection to the {@link SelectionService}.
+ * Other tools might be selection-sensitive which means {@link SelectAction}s must be processed as fast as possible.
+ * Handling the action with a command ensures that the action is processed before the next render tick.
+ */
 @injectable()
 export class SelectCommand extends Command {
     static readonly KIND = SprottySelectCommand.KIND;
@@ -168,36 +172,30 @@ export class SelectCommand extends Command {
 
     execute(context: CommandExecutionContext): SModelRoot {
         const model = context.root;
-        this.action.selectedElementsIDs.forEach(id => {
-            const element = model.index.getById(id);
-            if (element instanceof SChildElement && isSelectable(element)) {
-                this.selected.push(element);
-            }
-        });
-        this.action.deselectedElementsIDs.forEach(id => {
-            const element = model.index.getById(id);
-            if (element instanceof SChildElement && isSelectable(element)) {
-                this.deselected.push(element);
-            }
-        });
-        return this.redo(context);
+        const selectionGuard = (element: any): element is SModelElement => element instanceof SChildElement && isSelectable(element);
+        const selectedElements = getElements(model.index, this.action.selectedElementsIDs, selectionGuard);
+        const deselectedElements = getElements(model.index, this.action.deselectedElementsIDs, selectionGuard);
+
+        this.selectionService.updateSelection(model, pluck(selectedElements, 'id'), pluck(deselectedElements, 'id'));
+        return model;
     }
 
+    // Basically no-op since client-side undo is not supported in GLSP.
     undo(context: CommandExecutionContext): SModelRoot {
-        const select = this.deselected.map(element => element.id);
-        const deselect = this.selected.map(element => element.id);
-        this.selectionService.updateSelection(context.root, select, deselect);
         return context.root;
     }
 
+    // Basically no-op since client-side redo is not supported in GLSP.
     redo(context: CommandExecutionContext): SModelRoot {
-        const select = this.selected.map(element => element.id);
-        const deselect = this.deselected.map(element => element.id);
-        this.selectionService.updateSelection(context.root, select, deselect);
         return context.root;
     }
 }
 
+/**
+ * Handles a {@link SelectAllAction} and propagates the new selection to the {@link SelectionService}.
+ * Other tools might be selection-sensitive which means {@link SelectionAllAction}s must be processed as fast as possible.
+ * Handling the action with a command ensures that the action is processed before the next render tick.
+ */
 @injectable()
 export class SelectAllCommand extends Command {
     static readonly KIND = SprottySelectAllCommand.KIND;
@@ -211,38 +209,27 @@ export class SelectAllCommand extends Command {
     }
 
     execute(context: CommandExecutionContext): SModelRoot {
-        return this.redo(context);
+        const model = context.root;
+        const selectionGuard = (element: any): element is SModelElement => element instanceof SChildElement && isSelectable(element);
+
+        const selectables = getMatchingElements(model.index, selectionGuard);
+        const selectableIds = pluck(selectables, 'id');
+        if (this.action.select) {
+            this.selectionService.updateSelection(model, selectableIds, []);
+        } else {
+            this.selectionService.updateSelection(model, [], selectableIds);
+        }
+
+        return model;
     }
 
+    // Basically no-op since client-side undo is not supported in GLSP.
     undo(context: CommandExecutionContext): SModelRoot {
-        const index = context.root.index;
-        for (const previousState of this.previousSelection) {
-            const element = index.getById(previousState[0]);
-            if (element !== undefined && isSelectable(element)) {
-                element.selected = previousState[1];
-            }
-        }
         return context.root;
     }
 
+    // Basically no-op since client-side redo is not supported in GLSP.
     redo(context: CommandExecutionContext): SModelRoot {
-        const selectables: string[] = [];
-        this.selectAll(context.root, this.action.select, selectables);
-        if (this.action.select) {
-            this.selectionService.updateSelection(context.root, selectables, []);
-        } else {
-            this.selectionService.updateSelection(context.root, [], selectables);
-        }
         return context.root;
     }
-
-    protected selectAll(element: SParentElement, newState: boolean, selected: string[]): void {
-        if (isSelectable(element)) {
-            this.previousSelection.set(element.id, element.selected);
-            selected.push(element.id);
-        }
-        for (const child of element.children) {
-            this.selectAll(child, newState, selected);
-        }
-    }
 }

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

@@ -13,13 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ModelSourceChangedAction } from '@eclipse-glsp/protocol';
+import { SourceModelChangedAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureActionHandler } from 'sprotty';
-import { ModelSourceChangedActionHandler } from './model-source-changed-action-handler';
+import { SourceModelChangedActionHandler } from './source-model-changed-action-handler';
 
-const modelSourceWatcherModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureActionHandler({ bind, isBound }, ModelSourceChangedAction.KIND, ModelSourceChangedActionHandler);
+const sourceModelWatcherModule = new ContainerModule((bind, _unbind, isBound) => {
+    configureActionHandler({ bind, isBound }, SourceModelChangedAction.KIND, SourceModelChangedActionHandler);
 });
 
-export default modelSourceWatcherModule;
+export default sourceModelWatcherModule;

package/src/features/{model-source-watcher/model-source-changed-action-handler.ts → source-model-watcher/source-model-changed-action-handler.ts}

@@ -13,43 +13,43 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ModelSourceChangedAction, ServerMessageAction, ServerStatusAction } from '@eclipse-glsp/protocol';
+import { Action, ServerMessageAction, ServerStatusAction, SourceModelChangedAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
 import { IActionDispatcher, IActionHandler, ViewerOptions } from 'sprotty';
 import { TYPES } from '../../base/types';
 
 /**
- * An external handler of the model source change event.
+ * An external handler of the source model change event.
  *
  * This allows external applications to react specifically to this event, e.g. by bringing up the diagram,
  * check their dirty state, show a dialog, etc.
  */
 @injectable()
-export abstract class ExternalModelSourceChangedHandler {
+export abstract class ExternalSourceModelChangedHandler {
     /**
-     * Notifies about a change of the model source.
+     * Notifies about a change of the source model.
      * @returns actions to be dispatched after the notification.
      */
-    abstract notifyModelSourceChange(modelSourceName: string, options: ViewerOptions): Promise<Action[]>;
+    abstract notifySourceModelChange(sourceModelName: string, options: ViewerOptions): Promise<Action[]>;
 }
 
 @injectable()
-export class ModelSourceChangedActionHandler implements IActionHandler {
+export class SourceModelChangedActionHandler implements IActionHandler {
     @inject(TYPES.IActionDispatcher)
     protected dispatcher: IActionDispatcher;
 
     @inject(TYPES.ViewerOptions)
     protected options: ViewerOptions;
 
-    @inject(ExternalModelSourceChangedHandler)
+    @inject(ExternalSourceModelChangedHandler)
     @optional()
-    protected externalModelSourceChangedHandler?: ExternalModelSourceChangedHandler;
+    protected externalModelSourceChangedHandler?: ExternalSourceModelChangedHandler;
 
     handle(action: Action): void {
-        if (ModelSourceChangedAction.is(action)) {
+        if (SourceModelChangedAction.is(action)) {
             if (this.externalModelSourceChangedHandler) {
                 this.externalModelSourceChangedHandler
-                    .notifyModelSourceChange(action.modelSourceName, this.options)
+                    .notifySourceModelChange(action.sourceModelName, this.options)
                     .then(actions => this.dispatcher.dispatchAll(actions));
                 return;
             }
@@ -57,8 +57,8 @@ export class ModelSourceChangedActionHandler implements IActionHandler {
         }
     }
 
-    protected showSimpleNotification(action: ModelSourceChangedAction): void {
-        const message = `The model source ${action.modelSourceName} has changed. You might want to consider reloading.`;
+    protected showSimpleNotification(action: SourceModelChangedAction): void {
+        const message = `The source model ${action.sourceModelName} has changed. You might want to consider reloading.`;
         const timeout = 0;
         const severity = 'WARNING';
         this.dispatcher.dispatchAll([

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

@@ -224,7 +224,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
     protected validateMove(startPostion: Point, toPosition: Point, element: SModelElement, isFinished: boolean): Point {
         let newPosition = toPosition;
         if (this.tool.movementRestrictor) {
-            const valid = this.tool.movementRestrictor.validate(toPosition, element);
+            const valid = this.tool.movementRestrictor.validate(element, toPosition);
             let action;
             if (!valid) {
                 action = createMovementRestrictionFeedback(element, this.tool.movementRestrictor);

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

@@ -265,20 +265,20 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         }
         const positionUpdate = this.pointPositionUpdater.updatePosition(target, { x: event.pageX, y: event.pageY }, !event.altKey);
         if (positionUpdate) {
-            const moveActions = this.handleMoveOnClient(target, positionUpdate);
+            const moveActions = this.handleMoveOnClient(target, positionUpdate, !event.altKey);
             result.push(...moveActions);
         }
         return result;
     }
 
-    protected handleMoveOnClient(target: SModelElement, positionUpdate: Point): Action[] {
+    protected handleMoveOnClient(target: SModelElement, positionUpdate: Point, isSnap: boolean): Action[] {
         const handleMoves: ElementMove[] = [];
         target.root.index
             .all()
             .filter(element => isSelected(element))
             .forEach(element => {
                 if (isRoutingHandle(element)) {
-                    const elementMove = this.toElementMove(element, positionUpdate);
+                    const elementMove = this.toElementMove(element, positionUpdate, isSnap);
                     if (elementMove) {
                         handleMoves.push(elementMove);
                     }
@@ -290,21 +290,29 @@ export class FeedbackEdgeRouteMovingMouseListener extends MouseListener {
         return [];
     }
 
-    protected toElementMove(element: SRoutingHandle, positionDelta: Point): ElementMove | undefined {
+    protected toElementMove(element: SRoutingHandle, positionDelta: Point, isSnap: boolean): ElementMove | undefined {
         const point = this.getHandlePosition(element);
         if (point !== undefined) {
+            const snappedPoint = this.getSnappedHandlePosition(element, point, isSnap);
             return {
                 elementId: element.id,
                 fromPosition: point,
                 toPosition: {
-                    x: point.x + positionDelta.x,
-                    y: point.y + positionDelta.y
+                    x: snappedPoint.x + positionDelta.x,
+                    y: snappedPoint.y + positionDelta.y
                 }
             };
         }
         return undefined;
     }
 
+    protected getSnappedHandlePosition(element: SRoutingHandle, point: Point, isSnap: boolean): Point {
+        if (this.snapper && isSnap) {
+            return this.snapper.snap(point, element);
+        }
+        return point;
+    }
+
     protected getHandlePosition(handle: SRoutingHandle): Point | undefined {
         if (this.edgeRouterRegistry) {
             const parent = handle.parent;

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

@@ -16,19 +16,25 @@
 import { TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
 import { ContainerModule, interfaces } from 'inversify';
 import { configureActionHandler, configureModelElement } from 'sprotty';
+import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
 import { TYPES } from '../../base/types';
 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 { MarqueeMouseTool } from './marquee-mouse-tool';
 import { MarqueeTool } from './marquee-tool';
 import { MarqueeNode } from './model';
 import { NodeCreationTool } from './node-creation-tool';
 import { MarqueeView } from './view';
 
-const toolsModule = new ContainerModule((bind, _unbind, isBound) => {
+/**
+ * Registers the default tools of GLSP (node and edge creation, changing bounds, edge editing, deletion)
+ * and adds the marquee selection tool.
+ */
+export const toolsModule = new ContainerModule((bind, _unbind, isBound) => {
     // Register default tools
     bind(TYPES.IDefaultTool).to(ChangeBoundsTool);
     bind(TYPES.IDefaultTool).to(EdgeEditTool);
@@ -52,4 +58,9 @@ export function configureMarqueeTool(context: { bind: interfaces.Bind; isBound:
     context.bind(TYPES.ITool).to(MarqueeMouseTool);
 }
 
-export default toolsModule;
+/**
+ * Enables the default tools in the tool manager if the diagram looses focus.
+ */
+export const enableDefaultToolsOnFocusLossModule = new ContainerModule((bind, _unbind, isBound) => {
+    configureActionHandler({ bind, isBound }, FocusStateChangedAction.KIND, EnableDefaultToolsOnFocusLossHandler);
+});

package/src/features/tools/enable-default-tools-on-focus-loss.ts

@@ -0,0 +1,33 @@
+/********************************************************************************
+ * Copyright (c) 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
+ * 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 } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { EnableDefaultToolsAction, IActionHandler, ICommand } from 'sprotty';
+import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
+
+/**
+ * Action handler that enables the default tools when the diagram lost focus.
+ * @see FocusTracker
+ * @see FocusStateChangedAction
+ */
+@injectable()
+export class EnableDefaultToolsOnFocusLossHandler implements IActionHandler {
+    handle(action: Action): void | Action | ICommand {
+        if (FocusStateChangedAction.is(action) && !action.hasFocus) {
+            return EnableDefaultToolsAction.create();
+        }
+    }
+}

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

@@ -13,30 +13,33 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { SetMarkersAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureCommand } from 'sprotty';
+import { configureActionHandler, configureCommand } from 'sprotty';
 import { TYPES } from '../../base/types';
 import {
     LeftToRightTopToBottomComparator,
     MarkerNavigator,
     MarkerNavigatorContextMenuItemProvider,
     MarkerNavigatorKeyListener,
-    NavigateToMarkerCommand,
+    NavigateToMarkerAction,
+    NavigateToMarkerActionHandler,
     SModelElementComparator
 } from './marker-navigator';
-import { ApplyMarkersCommand, DeleteMarkersCommand, SetMarkersCommand, ValidationFeedbackEmitter } from './validate';
+import { ApplyMarkersCommand, DeleteMarkersCommand, SetMarkersActionHandler, ValidationFeedbackEmitter } from './validate';
 
 export const validationModule = new ContainerModule((bind, _unbind, isBound) => {
-    configureCommand({ bind, isBound }, SetMarkersCommand);
-    configureCommand({ bind, isBound }, ApplyMarkersCommand);
-    configureCommand({ bind, isBound }, DeleteMarkersCommand);
+    const context = { bind, isBound };
+    configureActionHandler(context, SetMarkersAction.KIND, SetMarkersActionHandler);
+    configureCommand(context, ApplyMarkersCommand);
+    configureCommand(context, DeleteMarkersCommand);
     bind(ValidationFeedbackEmitter).toSelf().inSingletonScope();
 });
 
 export const markerNavigatorModule = new ContainerModule((bind, _unbind, isBound) => {
     bind(SModelElementComparator).to(LeftToRightTopToBottomComparator).inSingletonScope();
     bind(MarkerNavigator).toSelf().inSingletonScope();
-    configureCommand({ bind, isBound }, NavigateToMarkerCommand);
+    configureActionHandler({ bind, isBound }, NavigateToMarkerAction.KIND, NavigateToMarkerActionHandler);
 });
 
 /**

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

@@ -13,14 +13,23 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Marker, MarkerKind } from '@eclipse-glsp/protocol';
-import { SDecoration, SIssue, SIssueMarker, SParentElement } from 'sprotty';
+import { Bounds, Marker, MarkerKind } from '@eclipse-glsp/protocol';
+import { isBoundsAware, Projectable, SDecoration, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
 
-export class GIssueMarker extends SIssueMarker {
+export class GIssueMarker extends SIssueMarker implements Projectable {
     constructor() {
         super();
         this.features = new Set<symbol>(SDecoration.DEFAULT_FEATURES);
     }
+    projectionCssClasses: string[];
+    projectedBounds?: Bounds;
+    override issues: SIssue[] = [];
+    override type = 'marker';
+
+    computeProjectionCssClasses(): void {
+        const severityCss = getSeverity(this);
+        this.projectionCssClasses = ['sprotty-issue', 'sprotty-' + severityCss];
+    }
 }
 
 /**
@@ -31,14 +40,15 @@ export class GIssueMarker extends SIssueMarker {
  * @returns the child `SIssueMarker` or a new `SIssueMarker` if no such child exists.
  */
 export function getOrCreateSIssueMarker(modelElement: SParentElement): SIssueMarker {
-    let issueMarker: SIssueMarker | undefined;
+    let issueMarker: GIssueMarker | undefined;
 
     issueMarker = getSIssueMarker(modelElement);
 
     if (issueMarker === undefined) {
         issueMarker = new GIssueMarker();
-        issueMarker.type = 'marker';
-        issueMarker.issues = new Array<SIssue>();
+        if (isBoundsAware(modelElement)) {
+            issueMarker.projectedBounds = modelElement.parentToLocal(modelElement.bounds);
+        }
         modelElement.add(issueMarker);
     }
 
@@ -51,11 +61,11 @@ export function getOrCreateSIssueMarker(modelElement: SParentElement): SIssueMar
  * @param modelElement for which the `SIssueMarker` should be retrieved.
  * @returns the child `SIssueMarker` or `undefined` if no such child exists.
  */
-export function getSIssueMarker(modelElement: SParentElement): SIssueMarker | undefined {
-    let issueMarker: SIssueMarker | undefined;
+export function getSIssueMarker(modelElement: SParentElement): GIssueMarker | undefined {
+    let issueMarker: GIssueMarker | undefined;
 
     for (const child of modelElement.children) {
-        if (child instanceof SIssueMarker) {
+        if (child instanceof GIssueMarker) {
             issueMarker = child;
         }
     }
@@ -69,8 +79,8 @@ export function getSIssueMarker(modelElement: SParentElement): SIssueMarker | un
  * @param marker `Marker` for that an `SIssue` should be created.
  * @returns the created `SIssue`.
  */
-export function createSIssue(marker: Marker): SIssue {
-    const issue: SIssue = new SIssue();
+export function createSIssue(marker: Marker, parent?: SParentElement): SIssue {
+    const issue = new SIssue();
     issue.message = marker.description;
 
     switch (marker.kind) {
@@ -87,6 +97,18 @@ export function createSIssue(marker: Marker): SIssue {
             break;
         }
     }
-
     return issue;
 }
+
+export function getSeverity(marker: SIssueMarker): SIssueSeverity {
+    let currentSeverity: SIssueSeverity = 'info';
+    for (const severity of marker.issues.map(s => s.severity)) {
+        if (severity === 'error') {
+            return severity;
+        }
+        if (severity === 'warning' && currentSeverity === 'info') {
+            currentSeverity = severity;
+        }
+    }
+    return currentSeverity;
+}