@eclipse-glsp/client 0.9.0-next.d2f88f00 → 0.9.0-next.d3c64530

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -13,11 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, CenterAction, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    Action,
     BoundsAware,
-    CenterAction,
     CenterCommand,
     Command,
     CommandExecutionContext,
@@ -28,7 +27,6 @@ import {
     isSelectable,
     KeyListener,
     MenuItem,
-    Point,
     Selectable,
     SelectAction,
     SIssueMarker,
@@ -38,7 +36,6 @@ import {
     TYPES
 } from 'sprotty';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-
 import { GLSP_TYPES } from '../../base/types';
 import { collectIssueMarkers, MarkerPredicates } from '../../utils/marker';
 import { isSelectableAndBoundsAware } from '../../utils/smodel-util';
@@ -51,7 +48,8 @@ export class NavigateToMarkerAction implements Action {
         public readonly direction: 'next' | 'previous' = 'next',
         public readonly selectedElementIds?: string[],
         public readonly severities: SIssueSeverity[] = MarkerNavigator.ALL_SEVERITIES,
-        public kind = NavigateToMarkerAction.KIND) { }
+        public kind = NavigateToMarkerAction.KIND
+    ) {}
 }
 
 export class SModelElementComparator {
@@ -90,7 +88,11 @@ export class MarkerNavigator {
     @inject(SModelElementComparator)
     protected markerComparator: SModelElementComparator;
 
-    next(root: SModelRoot, current?: SModelElement & BoundsAware, predicate: (marker: SIssueMarker) => boolean = MarkerPredicates.ALL): SIssueMarker | undefined {
+    next(
+        root: SModelRoot,
+        current?: SModelElement & BoundsAware,
+        predicate: (marker: SIssueMarker) => boolean = MarkerPredicates.ALL
+    ): SIssueMarker | undefined {
         const markers = this.getMarkers(root, predicate);
         if (current === undefined) {
             return markers.length > 0 ? markers[0] : undefined;
@@ -98,7 +100,11 @@ export class MarkerNavigator {
         return markers[this.getNextIndex(current, markers) % markers.length];
     }
 
-    previous(root: SModelRoot, current?: SModelElement & BoundsAware, predicate: (marker: SIssueMarker) => boolean = MarkerPredicates.ALL): SIssueMarker | undefined {
+    previous(
+        root: SModelRoot,
+        current?: SModelElement & BoundsAware,
+        predicate: (marker: SIssueMarker) => boolean = MarkerPredicates.ALL
+    ): SIssueMarker | undefined {
         const markers = this.getMarkers(root, predicate);
         if (current === undefined) {
             return markers.length > 0 ? markers[0] : undefined;
@@ -206,7 +212,6 @@ export class NavigateToMarkerCommand extends Command {
         }
         return this.centerCommand ? this.centerCommand.redo(context) : context.root;
     }
-
 }
 
 @injectable()
@@ -218,15 +223,22 @@ export class MarkerNavigatorContextMenuItemProvider implements IContextMenuItemP
         const hasMarkers = collectIssueMarkers(root).length > 0;
         return Promise.resolve([
             {
-                id: 'navigate', label: 'Go to', group: 'navigate', actions: [],
+                id: 'navigate',
+                label: 'Go to',
+                group: 'navigate',
+                actions: [],
                 children: [
                     {
-                        id: 'next-marker', label: 'Next marker', group: 'marker',
+                        id: 'next-marker',
+                        label: 'Next marker',
+                        group: 'marker',
                         actions: [new NavigateToMarkerAction('next', selectedElementIds)],
                         isEnabled: () => hasMarkers
                     },
                     {
-                        id: 'previous-marker', label: 'Previous marker', group: 'marker',
+                        id: 'previous-marker',
+                        label: 'Previous marker',
+                        group: 'marker',
                         actions: [new NavigateToMarkerAction('previous', selectedElementIds)],
                         isEnabled: () => hasMarkers
                     }

package/src/features/validation/validate.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 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
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, DeleteMarkersAction, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
 import {
-    Action,
     Command,
     CommandExecutionContext,
     CommandReturn,
@@ -27,10 +27,8 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-
-import { EditorContextService } from '../../base/editor-context';
+import { EditorContextService } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
-import { Marker } from '../../utils/marker';
 import { removeCssClasses } from '../../utils/smodel-util';
 import { getSeverity } from '../hover/hover';
 import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
@@ -43,7 +41,6 @@ import { createSIssue, getOrCreateSIssueMarker, getSIssueMarker } from './issue-
  */
 @injectable()
 export class ValidationFeedbackEmitter implements IFeedbackEmitter {
-
     @inject(GLSP_TYPES.IFeedbackActionDispatcher) protected feedbackActionDispatcher: IFeedbackActionDispatcher;
 
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
@@ -51,7 +48,7 @@ export class ValidationFeedbackEmitter implements IFeedbackEmitter {
     private registeredAction: MarkersAction;
 
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    private constructor() { }
+    private constructor() {}
 
     /**
      * Register the action that should be emitted for visualizing validation feedback.
@@ -73,17 +70,6 @@ export class ValidationFeedbackEmitter implements IFeedbackEmitter {
     }
 }
 
-/**
- * Action to set markers for a model
- */
-export class SetMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = SetMarkersCommand.KIND) { }
-}
-
-export function isSetMarkersAction(action: Action): action is SetMarkersAction {
-    return SetMarkersCommand.KIND === action.kind && ('markers' in action);
-}
-
 /**
  * Manages current markers for the outside of the GLSP.
  *
@@ -92,7 +78,6 @@ export function isSetMarkersAction(action: Action): action is SetMarkersAction {
  */
 @injectable()
 export abstract class ExternalMarkerManager {
-
     languageLabel: string;
 
     protected actionDispatcher?: IActionDispatcher;
@@ -115,12 +100,11 @@ export abstract class ExternalMarkerManager {
  */
 @injectable()
 export class SetMarkersCommand extends Command {
-
     @inject(ValidationFeedbackEmitter) protected validationFeedbackEmitter: ValidationFeedbackEmitter;
     @inject(ExternalMarkerManager) @optional() protected externalMarkerManager?: ExternalMarkerManager;
     @inject(EditorContextService) protected editorContextService: EditorContextService;
 
-    static readonly KIND = 'setMarkers';
+    static readonly KIND = SetMarkersAction.KIND;
 
     constructor(@inject(TYPES.Action) public action: SetMarkersAction) {
         super();
@@ -146,14 +130,6 @@ export class SetMarkersCommand extends Command {
     }
 }
 
-/**
-* Action to retrieve markers for a model
-*/
-export class RequestMarkersAction implements Action {
-    static readonly KIND = 'requestMarkers';
-    constructor(public readonly elementsIDs: string[] = [], public readonly kind = RequestMarkersAction.KIND) { }
-}
-
 /**
  * Interface for actions processing markers
  */
@@ -166,7 +142,7 @@ export interface MarkersAction extends Action {
  */
 @injectable()
 export class ApplyMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = ApplyMarkersCommand.KIND) { }
+    constructor(public readonly markers: Marker[], public readonly kind = ApplyMarkersCommand.KIND) {}
 }
 
 /**
@@ -219,20 +195,12 @@ function removeCSSClassFromIssueParent(modelElement: SParentElement, issueMarker
     removeCssClasses(modelElement, [getSeverity(issueMarker)]);
 }
 
-/**
- * Action for clearing makers of a model
- */
-@injectable()
-export class DeleteMarkersAction implements MarkersAction {
-    constructor(public readonly markers: Marker[], public readonly kind = DeleteMarkersCommand.KIND) { }
-}
-
 /**
  * Command for handling `DeleteMarkersAction`
  */
 @injectable()
 export class DeleteMarkersCommand extends Command {
-    static KIND = 'deleteMarkers';
+    static KIND = DeleteMarkersAction.KIND;
 
     constructor(@inject(TYPES.Action) protected action: DeleteMarkersAction) {
         super();
@@ -271,4 +239,3 @@ export class DeleteMarkersCommand extends Command {
         return this.execute(context);
     }
 }
-

package/src/features/viewport/glsp-scroll-mouse-listener.ts

@@ -13,22 +13,13 @@
  *
  * 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 {
-    Action,
-    EnableDefaultToolsAction,
-    EnableToolsAction,
-    IActionHandler,
-    ICommand,
-    ScrollMouseListener,
-    SModelElement
-} from 'sprotty';
-
+import { EnableDefaultToolsAction, EnableToolsAction, IActionHandler, ICommand, ScrollMouseListener, SModelElement } from 'sprotty';
 import { MarqueeMouseTool } from '../tools/marquee-mouse-tool';
 
 @injectable()
 export class GLSPScrollMouseListener extends ScrollMouseListener implements IActionHandler {
-
     preventScrolling = false;
 
     handle(action: Action): void | Action | ICommand {
@@ -41,7 +32,7 @@ export class GLSPScrollMouseListener extends ScrollMouseListener implements IAct
         }
     }
 
-    mouseDown(target: SModelElement, event: MouseEvent): Action[] {
+    mouseDown(target: SModelElement, event: MouseEvent): (Action | Promise<Action>)[] {
         if (this.preventScrolling) {
             return [];
         }

package/src/index.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
@@ -35,23 +35,20 @@ import glspViewportModule from './features/viewport/di.config';
 
 export * from 'sprotty';
 export * from './base/action-dispatcher';
-export * from './base/actions/context-actions';
-export * from './base/actions/edit-mode-action';
-export * from './base/actions/edit-validation-actions';
 export * from './base/actions/focus-change-action';
-export * from './base/actions/protocol-actions';
-export * from './base/args';
+export * from './base/argumentable';
 export * from './base/auto-complete/auto-complete-actions';
 export * from './base/auto-complete/auto-complete-widget';
 export * from './base/auto-complete/validation-decorator';
 export * from './base/command-stack';
+export * from './base/container-modules';
+export { configureServerActions } from './base/di.config';
 export * from './base/drag-aware-mouse-listener';
-export * from './base/editor-context';
+export * from './base/editor-context-service';
 export * from './base/focus-tracker';
 export * from './base/model-initialization-constraint';
 export * from './base/model/model-registry';
 export * from './base/model/update-model-command';
-export * from './base/operations/operation';
 export * from './base/selection-clearing-mouse-listener';
 export * from './base/source-uri-aware';
 export * from './base/types';
@@ -66,11 +63,9 @@ export * from './features/decoration/decoration-placer';
 export * from './features/edit-label/edit-label-tool';
 export * from './features/edit-label/edit-label-validator';
 export * from './features/hints/model';
-export * from './features/hints/request-type-hints-action';
 export * from './features/hints/type-hints';
 export * from './features/hover/hover';
 export * from './features/layout/layout-commands';
-export * from './features/model-source-watcher/model-source-changed-action';
 export * from './features/model-source-watcher/model-source-changed-action-handler';
 export * from './features/mouse-tool/mouse-tool';
 export * from './features/navigation/navigation-action-handler';
@@ -78,7 +73,7 @@ export * from './features/navigation/navigation-target-resolver';
 export * from './features/rank/model';
 export * from './features/reconnect/model';
 export * from './features/save/model';
-export * from './features/save/save';
+export * from './features/save/save-keylistener';
 export * from './features/tool-feedback/change-bounds-tool-feedback';
 export * from './features/tool-feedback/creation-tool-feedback';
 export * from './features/tool-feedback/css-feedback';
@@ -93,23 +88,39 @@ export * from './features/tools/delete-tool';
 export * from './features/tools/edge-creation-tool';
 export * from './features/tools/edge-edit-tool';
 export * from './features/tools/node-creation-tool';
-export * from './features/undo-redo/model';
+export * from './features/tools/marquee-behavior';
 export * from './features/validation/issue-marker';
-export * from './features/validation/validate';
 export * from './features/validation/marker-navigator';
+export * from './features/validation/validate';
 export * from './features/viewport/glsp-scroll-mouse-listener';
 export * from './lib/model';
-export * from './model-source/glsp-server-status';
 export * from './model-source/glsp-diagram-server';
+export * from './protocol-reexport';
 export * from './utils/argument-utils';
-export * from './utils/array-utils';
 export * from './utils/marker';
 export * from './utils/smodel-util';
 export * from './utils/viewpoint-util';
 export * from './views';
-
 export {
-    validationModule, saveModule, paletteModule, toolFeedbackModule, defaultGLSPModule, modelHintsModule, glspCommandPaletteModule,
-    glspContextMenuModule, glspServerCopyPasteModule, copyPasteContextMenuModule, glspSelectModule, glspMouseToolModule, layoutCommandsModule, glspEditLabelModule,
-    glspHoverModule, toolsModule, navigationModule, markerNavigatorModule, glspDecorationModule, modelSourceWatcherModule, glspViewportModule
+    validationModule,
+    saveModule,
+    paletteModule,
+    toolFeedbackModule,
+    defaultGLSPModule,
+    modelHintsModule,
+    glspCommandPaletteModule,
+    glspContextMenuModule,
+    glspServerCopyPasteModule,
+    copyPasteContextMenuModule,
+    glspSelectModule,
+    glspMouseToolModule,
+    layoutCommandsModule,
+    glspEditLabelModule,
+    glspHoverModule,
+    toolsModule,
+    navigationModule,
+    markerNavigatorModule,
+    glspDecorationModule,
+    modelSourceWatcherModule,
+    glspViewportModule
 };

package/src/model-source/glsp-diagram-server.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2020 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
@@ -13,26 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GLSPClient } from '@eclipse-glsp/protocol';
-import { injectable } from 'inversify';
 import {
     Action,
-    ActionHandlerRegistry,
-    ActionMessage,
     ComputedBoundsAction,
-    DiagramServer,
-    ICommand,
-    RequestModelAction,
-    ServerStatusAction,
-    SwitchEditModeCommand
-} from 'sprotty';
-
-import { RequestContextActions } from '../base/actions/context-actions';
-import { isSetEditModeAction, SetEditModeAction } from '../base/actions/edit-mode-action';
-import { InitializeClientSessionAction } from '../base/actions/protocol-actions';
+    GLSPClient,
+    isRequestModelAction,
+    isServerMessageAction,
+    isSetEditModeAction,
+    ServerMessageAction,
+    SetEditModeAction
+} from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { ActionHandlerRegistry, ActionMessage, DiagramServer, ICommand, ServerStatusAction, SwitchEditModeCommand } from 'sprotty';
 import { SourceUriAware } from '../base/source-uri-aware';
-import { RequestTypeHintsAction } from '../features/hints/request-type-hints-action';
-import { isServerMessageAction, ServerMessageAction } from './glsp-server-status';
 
 const receivedFromServerProperty = '__receivedFromServer';
 
@@ -69,7 +62,7 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
     }
 
     handle(action: Action): void | ICommand | Action {
-        if (action instanceof RequestModelAction && action.options !== undefined) {
+        if (isRequestModelAction(action) && action.options) {
             this._sourceUri = action.options.sourceUri as string;
         }
         return super.handle(action);
@@ -108,16 +101,7 @@ export function isReceivedFromServer(action: Action): boolean {
 }
 
 export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServer): void {
-    // Register the InitializeClientSessionAction as a server action. Then, the server will
-    // notify us about all actions it handles (Via ConfigureServerHandlersAction/Handler)
-    registry.register(InitializeClientSessionAction.KIND, diagramServer);
-
-    // Register some additional early actions, that will happen before the server can tell us
-    // which actions it handles
-    registry.register(RequestTypeHintsAction.KIND, diagramServer);
-    registry.register(RequestModelAction.KIND, diagramServer);
-    registry.register(RequestContextActions.KIND, diagramServer);
-
+    registry.register(ServerMessageAction.KIND, diagramServer);
     registry.register(ServerStatusAction.KIND, diagramServer);
 
     // Register an empty handler for SwitchEditMode, to avoid runtime exceptions.

package/src/protocol-reexport.ts

@@ -0,0 +1,64 @@
+/********************************************************************************
+ * Copyright (c) 2021 STMicroelectronics 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
+ ********************************************************************************/
+
+/**
+ * Workaround for now to solve ambiguous exports in glsp-client. This module provides all glsp-only components.
+ * i.e. typings that are not defined in sprotty
+ */
+
+export {
+    CompoundOperation,
+    isActionKind,
+    isCompoundOperation,
+    isRejectAction,
+    Operation
+} from '@eclipse-glsp/protocol/lib/action-protocol/base-protocol';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/client-notification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/clipboard';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/contexts';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/edge-modification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-creation';
+export { isRequestPopupModelAction, isSetPopupModelAction } from '@eclipse-glsp/protocol/lib/action-protocol/element-hover';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-navigation';
+export { isSelectAction, isSelectAllAction } from '@eclipse-glsp/protocol/lib/action-protocol/element-selection';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-text-editing';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-type-hints';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/element-validation';
+export { LayoutOperation } from '@eclipse-glsp/protocol/lib/action-protocol/mode-layout';
+export {
+    isModelSourceChangedAction,
+    isRequestModelAction,
+    isSetModelAction,
+    ModelSourceChangedAction
+} from '@eclipse-glsp/protocol/lib/action-protocol/model-data';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/model-edit-mode';
+export {
+    DirtyStateChangeReason,
+    isExportSvgAction,
+    isSaveModelAction,
+    isSetDirtyStateAction,
+    SaveModelAction,
+    SetDirtyStateAction
+} from '@eclipse-glsp/protocol/lib/action-protocol/model-saving';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/node-modification';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/tool-palette';
+export { Args, EditorContext, ElementAndRoutingPoints } from '@eclipse-glsp/protocol/lib/action-protocol/types';
+export * from '@eclipse-glsp/protocol/lib/action-protocol/undo-redo';
+export * from '@eclipse-glsp/protocol/lib/glsp-client';
+export * from '@eclipse-glsp/protocol/lib/jsonrpc/base-jsonrpc-glsp-client';
+export * from '@eclipse-glsp/protocol/lib/jsonrpc/glsp-jsonrpc-client';
+export * from '@eclipse-glsp/protocol/lib/utils/array-util';
+export * from '@eclipse-glsp/protocol/lib/utils/launch-util';

package/src/utils/argument-utils.ts

@@ -14,11 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { SModelElement } from 'sprotty';
-
-import { hasArguments } from '../base/args';
+import { hasArguments } from '../base/argumentable';
 
 export namespace GArgument {
-    export function asNumber(argValue: (string | number | boolean)): number | undefined {
+    export function asNumber(argValue: string | number | boolean): number | undefined {
         return typeof argValue === 'number' ? argValue : undefined;
     }
 
@@ -26,7 +25,7 @@ export namespace GArgument {
         return argValues.map(asNumber);
     }
 
-    export function asString(argValue: (string | number | boolean)): string | undefined {
+    export function asString(argValue: string | number | boolean): string | undefined {
         return typeof argValue === 'string' ? argValue : undefined;
     }
 
@@ -34,7 +33,7 @@ export namespace GArgument {
         return argValues.map(asString);
     }
 
-    export function asBoolean(argValue: (string | number | boolean)): boolean | undefined {
+    export function asBoolean(argValue: string | number | boolean): boolean | undefined {
         return typeof argValue === 'boolean' ? argValue : undefined;
     }
 
@@ -112,16 +111,20 @@ export class CornerRadius {
         public readonly topLeft: number = 0,
         public readonly topRight: number = topLeft,
         public readonly bottomRight: number = topLeft,
-        public readonly bottomLeft: number = topRight) {
-    }
+        public readonly bottomLeft: number = topRight
+    ) {}
 
     static from(element: SModelElement | undefined): CornerRadius | undefined {
-        const radius = GArgument.getNumbers(element, this.KEY_RADIUS_TOP_LEFT, this.KEY_RADIUS_TOP_RIGHT, this.KEY_RADIUS_BOTTOM_RIGHT, this.KEY_RADIUS_BOTTOM_LEFT);
+        const radius = GArgument.getNumbers(
+            element,
+            this.KEY_RADIUS_TOP_LEFT,
+            this.KEY_RADIUS_TOP_RIGHT,
+            this.KEY_RADIUS_BOTTOM_RIGHT,
+            this.KEY_RADIUS_BOTTOM_LEFT
+        );
         if (radius === undefined || radius[0] === undefined) {
             return undefined;
         }
-        return GArgument.hasNValues(radius, 4)
-            ? new CornerRadius(radius[0], radius[1], radius[2], radius[3])
-            : new CornerRadius(radius[0]);
+        return GArgument.hasNValues(radius, 4) ? new CornerRadius(radius[0], radius[1], radius[2], radius[3]) : new CornerRadius(radius[0]);
     }
 }

package/src/utils/layout-utils.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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
@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { BoundsAware, Dimension, ElementAndBounds, ElementMove, ModelLayoutOptions, Point, SModelElement } from 'sprotty';
-
+import { Point } from '@eclipse-glsp/protocol';
+import { BoundsAware, Dimension, ElementAndBounds, ElementMove, ModelLayoutOptions, SModelElement } from 'sprotty';
 import { IMovementRestrictor } from '../features/change-bounds/movement-restrictor';
 
 export function minWidth(element: SModelElement & BoundsAware): number {
@@ -52,16 +52,22 @@ export function isValidMove(element: SModelElement & BoundsAware, newPosition: P
     return true;
 }
 
-export function toValidElementMove(element: SModelElement & BoundsAware, move: WriteableElementMove, movementRestrictor?: IMovementRestrictor): WriteableElementMove | undefined {
+export function toValidElementMove(
+    element: SModelElement & BoundsAware,
+    move: WriteableElementMove,
+    movementRestrictor?: IMovementRestrictor
+): WriteableElementMove | undefined {
     if (!isValidMove(element, move.toPosition, movementRestrictor)) {
         return;
     }
     return move;
 }
 
-export function toValidElementAndBounds(element: SModelElement & BoundsAware, bounds: WriteableElementAndBounds,
-    movementRestrictor?: IMovementRestrictor): WriteableElementAndBounds | undefined {
-
+export function toValidElementAndBounds(
+    element: SModelElement & BoundsAware,
+    bounds: WriteableElementAndBounds,
+    movementRestrictor?: IMovementRestrictor
+): WriteableElementAndBounds | undefined {
     if (!isValidMove(element, bounds.newPosition, movementRestrictor)) {
         return;
     }

package/src/utils/marker.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
@@ -13,14 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { MarkerKind } from '@eclipse-glsp/protocol';
 import { SIssueMarker, SParentElement } from 'sprotty';
 
-export namespace MarkerKind {
-    export const INFO = 'info';
-    export const WARNING = 'warning';
-    export const ERROR = 'error';
-}
-
 export namespace MarkerPredicates {
     export const ALL = (): boolean => true;
     export const ERRORS = (marker: SIssueMarker): boolean => hasIssueWithSeverity(marker, MarkerKind.ERROR);
@@ -42,22 +37,3 @@ export function collectIssueMarkers(root: SParentElement): SIssueMarker[] {
     }
     return markers;
 }
-
-export interface Marker {
-    /**
-     * Short label describing this marker message, e.g., short validation message
-     */
-    readonly label: string;
-    /**
-     * Full description of this marker, e.g., full validation message
-     */
-    readonly description: string;
-    /**
-     * Id of the model element this marker refers to
-     */
-    readonly elementId: string;
-    /**
-     * Marker kind, e.g., info, warning, error or custom kind
-     */
-    readonly kind: string;
-}