@eclipse-glsp/client 0.9.0-next.4fc0d719 → 0.9.0-next.75608185

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
@@ -13,46 +13,46 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import defaultGLSPModule from "./base/di.config";
-import glspCommandPaletteModule from "./features/command-palette/di.config";
-import glspContextMenuModule from "./features/context-menu/di.config";
-import { copyPasteContextMenuModule, glspServerCopyPasteModule } from "./features/copy-paste/di.config";
-import glspDecorationModule from "./features/decoration/di.config";
-import glspEditLabelModule from "./features/edit-label/di.config";
-import modelHintsModule from "./features/hints/di.config";
-import glspHoverModule from "./features/hover/di.config";
-import layoutCommandsModule from "./features/layout/di.config";
-import modelSourceWatcherModule from "./features/model-source-watcher/di.config";
-import glspMouseToolModule from "./features/mouse-tool/di.config";
-import { navigationModule } from "./features/navigation/di.config";
-import saveModule from "./features/save/di.config";
-import glspSelectModule from "./features/select/di.config";
-import toolFeedbackModule from "./features/tool-feedback/di.config";
-import paletteModule from "./features/tool-palette/di.config";
-import toolsModule from "./features/tools/di.config";
-import { markerNavigatorModule, validationModule } from "./features/validation/di.config";
+import defaultGLSPModule from './base/di.config';
+import glspCommandPaletteModule from './features/command-palette/di.config';
+import glspContextMenuModule from './features/context-menu/di.config';
+import { copyPasteContextMenuModule, glspServerCopyPasteModule } from './features/copy-paste/di.config';
+import glspDecorationModule from './features/decoration/di.config';
+import glspEditLabelModule from './features/edit-label/di.config';
+import modelHintsModule from './features/hints/di.config';
+import glspHoverModule from './features/hover/di.config';
+import layoutCommandsModule from './features/layout/di.config';
+import modelSourceWatcherModule from './features/model-source-watcher/di.config';
+import glspMouseToolModule from './features/mouse-tool/di.config';
+import { navigationModule } from './features/navigation/di.config';
+import saveModule from './features/save/di.config';
+import glspSelectModule from './features/select/di.config';
+import toolFeedbackModule from './features/tool-feedback/di.config';
+import paletteModule from './features/tool-palette/di.config';
+import toolsModule from './features/tools/di.config';
+import { markerNavigatorModule, validationModule } from './features/validation/di.config';
+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';
+export * from './base/view/view-registry';
 export * from './features/change-bounds/model';
 export * from './features/change-bounds/movement-restrictor';
 export * from './features/change-bounds/snap';
@@ -60,15 +60,12 @@ export * from './features/command-palette/server-command-palette-provider';
 export * from './features/context-menu/delete-element-context-menu';
 export * from './features/copy-paste/copy-paste-handler';
 export * from './features/decoration/decoration-placer';
-export * from './features/decoration/view';
 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';
@@ -76,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';
@@ -85,24 +82,44 @@ export * from './features/tool-feedback/feedback-action-dispatcher';
 export * from './features/tool-feedback/model';
 export * from './features/tool-palette/palette-item';
 export * from './features/tool-palette/tool-palette';
+export * from './features/tools/base-glsp-tool';
 export * from './features/tools/change-bounds-tool';
 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/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 './utils/array-utils';
+export * from './protocol-reexport';
+export * from './utils/argument-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
+    validationModule,
+    saveModule,
+    paletteModule,
+    toolFeedbackModule,
+    defaultGLSPModule,
+    modelHintsModule,
+    glspCommandPaletteModule,
+    glspContextMenuModule,
+    glspServerCopyPasteModule,
+    copyPasteContextMenuModule,
+    glspSelectModule,
+    glspMouseToolModule,
+    layoutCommandsModule,
+    glspEditLabelModule,
+    glspHoverModule,
+    toolsModule,
+    navigationModule,
+    markerNavigatorModule,
+    glspDecorationModule,
+    modelSourceWatcherModule,
+    glspViewportModule
 };

package/src/lib/model.ts

@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { exportFeature, SGraph, SModelElement, SModelElementSchema, viewportFeature } from "sprotty/lib";
+import { exportFeature, SGraph, SModelElement, SModelElementSchema, viewportFeature } from 'sprotty/lib';
 
-import { Containable, containerFeature } from "../features/hints/model";
-import { Saveable, saveFeature } from "../features/save/model";
+import { Containable, containerFeature } from '../features/hints/model';
+import { Saveable, saveFeature } from '../features/save/model';
 
 export class GLSPGraph extends SGraph implements Saveable, Containable {
     static readonly DEFAULT_FEATURES = [viewportFeature, exportFeature, saveFeature, containerFeature];
-    dirty: boolean = false;
+    dirty = false;
     isContainableElement(input: string | SModelElement | SModelElementSchema): boolean {
         return true;
     }

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";
-import { SourceUriAware } from "../base/source-uri-aware";
-import { RequestTypeHintsAction } from "../features/hints/request-type-hints-action";
-import { isServerMessageAction, ServerMessageAction } from "./glsp-server-status";
+    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';
 
 const receivedFromServerProperty = '__receivedFromServer';
 
@@ -63,13 +56,15 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
 
     initialize(registry: ActionHandlerRegistry): void {
         registerDefaultGLSPServerActions(registry, this);
-        if (!this.clientId)
+        if (!this.clientId) {
             this.clientId = this.viewerOptions.baseDiv;
+        }
     }
 
     handle(action: Action): void | ICommand | Action {
-        if (action instanceof RequestModelAction && action.options !== undefined)
-            this._sourceUri = <string>action.options.sourceUri;
+        if (isRequestModelAction(action) && action.options) {
+            this._sourceUri = action.options.sourceUri as string;
+        }
         return super.handle(action);
     }
 
@@ -101,21 +96,12 @@ export class GLSPDiagramServer extends DiagramServer implements SourceUriAware {
     }
 }
 
-export function isReceivedFromServer(action: Action) {
+export function isReceivedFromServer(action: Action): boolean {
     return (action as any)[receivedFromServerProperty] === true;
 }
 
-export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServer) {
-    // 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);
-
+export function registerDefaultGLSPServerActions(registry: ActionHandlerRegistry, diagramServer: DiagramServer): void {
+    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

@@ -0,0 +1,130 @@
+/********************************************************************************
+ * Copyright (c) 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
+ * 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 { SModelElement } from 'sprotty';
+import { hasArguments } from '../base/argumentable';
+
+export namespace GArgument {
+    export function asNumber(argValue: string | number | boolean): number | undefined {
+        return typeof argValue === 'number' ? argValue : undefined;
+    }
+
+    export function asNumbers(argValues: (string | number | boolean)[]): (number | undefined)[] {
+        return argValues.map(asNumber);
+    }
+
+    export function asString(argValue: string | number | boolean): string | undefined {
+        return typeof argValue === 'string' ? argValue : undefined;
+    }
+
+    export function asStrings(argValues: (string | number | boolean)[]): (string | undefined)[] {
+        return argValues.map(asString);
+    }
+
+    export function asBoolean(argValue: string | number | boolean): boolean | undefined {
+        return typeof argValue === 'boolean' ? argValue : undefined;
+    }
+
+    export function asBooleans(argValues: (string | number | boolean)[]): (boolean | undefined)[] {
+        return argValues.map(asBoolean);
+    }
+
+    export function getArgument(element: SModelElement | undefined, key: string): string | number | boolean | undefined {
+        return hasArguments(element) ? element.args[key] : undefined;
+    }
+
+    export function getNumber(element: SModelElement | undefined, key: string): number | undefined {
+        return hasArguments(element) ? asNumber(element.args[key]) : undefined;
+    }
+
+    export function getString(element: SModelElement | undefined, key: string): string | undefined {
+        return hasArguments(element) ? asString(element.args[key]) : undefined;
+    }
+
+    export function getBoolean(element: SModelElement | undefined, key: string): boolean | undefined {
+        return hasArguments(element) ? asBoolean(element.args[key]) : undefined;
+    }
+
+    export function getArguments(element: SModelElement | undefined, ...keys: string[]): (number | boolean | string)[] | undefined {
+        if (!hasArguments(element)) {
+            return undefined;
+        }
+        const values = [];
+        for (const key of keys) {
+            const value = element.args[key];
+            if (value) {
+                values.push(value);
+            }
+        }
+        return values;
+    }
+
+    export function getNumbers(element: SModelElement | undefined, ...keys: string[]): (number | undefined)[] | undefined {
+        const values = getArguments(element, ...keys);
+        return values ? asNumbers(values) : undefined;
+    }
+
+    export function getStrings(element: SModelElement | undefined, ...keys: string[]): (string | undefined)[] | undefined {
+        const values = getArguments(element, ...keys);
+        return values ? asStrings(values) : undefined;
+    }
+
+    export function getBooleans(element: SModelElement | undefined, ...keys: string[]): (boolean | undefined)[] | undefined {
+        const values = getArguments(element, ...keys);
+        return values ? asBooleans(values) : undefined;
+    }
+
+    export function hasNValues<T>(values: (T | undefined)[], length: number): values is T[] {
+        return values.length === length && values.filter(e => e === undefined).length === 0;
+    }
+}
+
+export namespace EdgePadding {
+    const KEY = 'edgePadding';
+
+    export function from(element: SModelElement | undefined): number | undefined {
+        return GArgument.getNumber(element, KEY);
+    }
+}
+
+export class CornerRadius {
+    static NO_RADIUS = new CornerRadius(0);
+
+    static KEY_RADIUS_TOP_LEFT = 'radiusTopLeft';
+    static KEY_RADIUS_TOP_RIGHT = 'radiusTopRight';
+    static KEY_RADIUS_BOTTOM_RIGHT = 'radiusBottomRight';
+    static KEY_RADIUS_BOTTOM_LEFT = 'radiusBottomLeft';
+
+    constructor(
+        public readonly topLeft: number = 0,
+        public readonly topRight: number = topLeft,
+        public readonly bottomRight: number = topLeft,
+        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
+        );
+        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]);
+    }
+}

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,9 +13,9 @@
  *
  * 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 { IMovementRestrictor } from "../features/change-bounds/movement-restrictor";
+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 {
     const layoutOptions = getLayoutOptions(element);
@@ -41,25 +41,33 @@ export function getLayoutOptions(element: SModelElement): ModelLayoutOptions | u
     return undefined;
 }
 
-export function isValidSize(element: SModelElement & BoundsAware, size: Dimension) {
+export function isValidSize(element: SModelElement & BoundsAware, size: Dimension): boolean {
     return size.width >= minWidth(element) && size.height >= minHeight(element);
 }
 
-export function isValidMove(element: SModelElement & BoundsAware, newPosition: Point, movementRestrictor?: IMovementRestrictor) {
+export function isValidMove(element: SModelElement & BoundsAware, newPosition: Point, movementRestrictor?: IMovementRestrictor): boolean {
     if (movementRestrictor) {
         return movementRestrictor.validate(newPosition, element);
     }
     return true;
 }
 
-export function toValidElementMove(element: SModelElement & BoundsAware, move: WriteableElementMove, movementRestrictor?: IMovementRestrictor) {
+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) {
+export function toValidElementAndBounds(
+    element: SModelElement & BoundsAware,
+    bounds: WriteableElementAndBounds,
+    movementRestrictor?: IMovementRestrictor
+): WriteableElementAndBounds | undefined {
     if (!isValidMove(element, bounds.newPosition, movementRestrictor)) {
         return;
     }
@@ -85,11 +93,11 @@ export interface WriteableElementMove extends ElementMove {
 }
 
 export interface WriteableDimension extends Dimension {
-    width: number
-    height: number
+    width: number;
+    height: number;
 }
 
 export interface WriteableElementAndBounds extends ElementAndBounds {
     newPosition: WriteablePoint;
-    newSize: WriteableDimension
+    newSize: WriteableDimension;
 }

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,21 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SIssueMarker, SParentElement } from "sprotty";
-
-export namespace MarkerKind {
-    export const INFO = "info";
-    export const WARNING = "warning";
-    export const ERROR = "error";
-}
+import { MarkerKind } from '@eclipse-glsp/protocol';
+import { SIssueMarker, SParentElement } from 'sprotty';
 
 export namespace MarkerPredicates {
-    export const ALL = () => true;
-    export const ERRORS = (marker: SIssueMarker) => hasIssueWithSeverity(marker, MarkerKind.ERROR);
-    export const WARNINGS = (marker: SIssueMarker) => hasIssueWithSeverity(marker, MarkerKind.WARNING);
-    export const INFOS = (marker: SIssueMarker) => hasIssueWithSeverity(marker, MarkerKind.INFO);
+    export const ALL = (): boolean => true;
+    export const ERRORS = (marker: SIssueMarker): boolean => hasIssueWithSeverity(marker, MarkerKind.ERROR);
+    export const WARNINGS = (marker: SIssueMarker): boolean => hasIssueWithSeverity(marker, MarkerKind.WARNING);
+    export const INFOS = (marker: SIssueMarker): boolean => hasIssueWithSeverity(marker, MarkerKind.INFO);
 
-    export function hasIssueWithSeverity(marker: SIssueMarker, severity: 'info' | 'warning' | 'error') {
+    export function hasIssueWithSeverity(marker: SIssueMarker, severity: 'info' | 'warning' | 'error'): boolean {
         return marker.issues.find(issue => issue.severity === severity) !== undefined;
     }
 }
@@ -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;
-}