@eclipse-glsp/client 0.9.0-rc-01 → 0.9.0

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;
-}

package/src/utils/smodel-util.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,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { ElementAndRoutingPoints } from '@eclipse-glsp/protocol';
 import {
     BoundsAware,
     ElementAndBounds,
@@ -28,20 +29,22 @@ import {
     SRoutingHandle
 } from 'sprotty';
 
-import { ElementAndRoutingPoints } from '../base/operations/operation';
-
 export function getIndex(element: SModelElement): SModelIndex<SModelElement> {
     return element.root.index;
 }
 
-export function forEachElement<T>(element: SModelElement, predicate: (element: SModelElement) => element is SModelElement & T,
-    runnable: (element: SModelElement & T) => void): void {
-    getIndex(element).all()
-        .filter(predicate)
-        .forEach(runnable);
+export function forEachElement<T>(
+    element: SModelElement,
+    predicate: (modelElement: SModelElement) => modelElement is SModelElement & T,
+    runnable: (modelElement: SModelElement & T) => void
+): void {
+    getIndex(element).all().filter(predicate).forEach(runnable);
 }
 
-export function getMatchingElements<T>(element: SModelElement, predicate: (element: SModelElement) => element is SModelElement & T): (SModelElement & T)[] {
+export function getMatchingElements<T>(
+    element: SModelElement,
+    predicate: (modelElement: SModelElement) => modelElement is SModelElement & T
+): (SModelElement & T)[] {
     const matching: (SModelElement & T)[] = [];
     forEachElement(element, predicate, item => matching.push(item));
     return matching;
@@ -53,9 +56,10 @@ export function hasSelectedElements(element: SModelElement): boolean {
 
 export function getSelectedElementCount(element: SModelElement): number {
     let selected = 0;
-    getIndex(element).all()
+    getIndex(element)
+        .all()
         .filter(isSelected)
-        .forEach(e => selected = selected + 1);
+        .forEach(e => (selected = selected + 1));
     return selected;
 }
 

package/src/utils/viewpoint-util.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,15 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Bounds, Point } from '@eclipse-glsp/protocol';
 import {
-    Bounds,
     BoundsAware,
     Dimension,
     findParentByFeature,
     isAlignable,
     isViewport,
     ORIGIN_POINT,
-    Point,
     SModelElement,
     translateBounds,
     Viewport
@@ -41,7 +40,8 @@ import {
  *  A mouseEvent
  */
 export function getAbsolutePosition(target: SModelElement, mouseEvent: MouseEvent): Point {
-    let xPos = mouseEvent.pageX; let yPos = mouseEvent.pageY;
+    let xPos = mouseEvent.pageX;
+    let yPos = mouseEvent.pageY;
     const canvasBounds = target.root.canvasBounds;
     xPos -= canvasBounds.x;
     yPos -= canvasBounds.y;

package/src/views/base-view-module.ts

@@ -13,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { DefaultTypes } from '@eclipse-glsp/protocol';
 import { ContainerModule, interfaces } from 'inversify';
 import {
     CircularNode,
@@ -45,9 +46,7 @@ import {
     SvgViewportView,
     ViewportRootElement
 } from 'sprotty';
-
 import { GLSPGraph } from '../lib/model';
-import { DefaultTypes } from './default-types';
 import { GEdgeView } from './glsp-edge-view';
 import { GIssueMarkerView } from './issue-marker-view';
 import { RoundedCornerNodeView } from './rounded-corner-view';

package/src/{base/actions/edit-mode-action.ts → views/compartments.tsx}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * 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
@@ -14,20 +14,24 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import { Action } from 'sprotty';
+import { VNode } from 'snabbdom';
+import { BoundsAware, RenderingContext, SChildElement, SCompartment, ShapeView, svg } from 'sprotty/lib';
 
-@injectable()
-export class SetEditModeAction implements Action {
-    static readonly KIND = 'setEditMode';
-    constructor(public readonly editMode: string = EditMode.EDITABLE, public readonly kind: string = SetEditModeAction.KIND) { }
-}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const JSX = { createElement: svg };
 
-export function isSetEditModeAction(action: Action): action is SetEditModeAction {
-    return action !== undefined && (action.kind === SetEditModeAction.KIND)
-        && 'editMode' in action && typeof action['editMode'] === 'string';
-}
+@injectable()
+export class StructureCompartmentView extends ShapeView {
+    render(model: Readonly<SCompartment & SChildElement & BoundsAware>, context: RenderingContext): VNode | undefined {
+        if (!this.isVisible(model, context)) {
+            return undefined;
+        }
 
-export namespace EditMode {
-    export const READONLY = 'readonly';
-    export const EDITABLE = 'editable';
+        return (
+            <g>
+                <rect class-sprotty-comp={true} class-debug={true} x='0' y='0' width={model.size.width} height={model.size.height}></rect>
+                {context.renderChildren(model)}
+            </g>
+        );
+    }
 }

package/src/views/glsp-edge-view.tsx

@@ -13,16 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import * as snabbdom from 'snabbdom-jsx';
-import { Classes } from 'snabbdom/modules/class';
-import { VNode } from 'snabbdom/vnode';
-import { Point, PolylineEdgeView, RenderingContext, SEdge } from 'sprotty';
-
+import { Classes, VNode } from 'snabbdom';
+import { PolylineEdgeView, RenderingContext, SEdge, svg } from 'sprotty';
 import { EdgePadding } from '../utils/argument-utils';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: snabbdom.svg };
+const JSX = { createElement: svg };
 
 @injectable()
 export class GEdgeView extends PolylineEdgeView {
@@ -33,11 +31,13 @@ export class GEdgeView extends PolylineEdgeView {
             return this.renderDanglingEdge('Cannot compute route', edge, context);
         }
 
-        return <g class-sprotty-edge={true} class-mouseover={edge.hoverFeedback} {...this.addtionalClasses(edge, context)}>
-            {this.renderLine(edge, route, context)}
-            {this.renderAdditionals(edge, route, context)}
-            {context.renderChildren(edge, { route })}
-        </g>;
+        return (
+            <g class-sprotty-edge={true} class-mouseover={edge.hoverFeedback} {...this.addtionalClasses(edge, context)}>
+                {this.renderLine(edge, route, context)}
+                {this.renderAdditionals(edge, route, context)}
+                {context.renderChildren(edge, { route })}
+            </g>
+        );
     }
 
     protected addtionalClasses(_edge: Readonly<SEdge>, _context: RenderingContext): Classes {
@@ -55,8 +55,16 @@ export class GEdgeView extends PolylineEdgeView {
     }
 
     protected renderMouseHandle(segments: Point[], padding: number): VNode {
-        return <path class-mouse-handle d={this.createPathForSegments(segments)}
-            style-stroke-width={padding * 2} style-stroke="transparent" style-stroke-dasharray="none" style-stroke-dashoffset="0" />;
+        return (
+            <path
+                class-mouse-handle
+                d={this.createPathForSegments(segments)}
+                style-stroke-width={padding * 2}
+                style-stroke='transparent'
+                style-stroke-dasharray='none'
+                style-stroke-dashoffset='0'
+            />
+        );
     }
 
     protected createPathForSegments(segments: Point[]): string {
@@ -68,5 +76,4 @@ export class GEdgeView extends PolylineEdgeView {
         }
         return path;
     }
-
 }

package/src/views/index.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export * from './base-view-module';
-export * from './default-types';
+export * from './compartments';
 export * from './glsp-edge-view';
 export * from './issue-marker-view';
 export * from './rounded-corner';

package/src/views/issue-marker-view.tsx

@@ -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
@@ -15,42 +15,51 @@
  ********************************************************************************/
 /* eslint-disable max-len */
 import { injectable } from 'inversify';
-import * as snabbdom from 'snabbdom-jsx';
-import { VNode } from 'snabbdom/vnode';
-import { IssueMarkerView, RenderingContext, setClass, SIssueMarker, SIssueSeverity } from 'sprotty';
+import { VNode } from 'snabbdom';
+import { IssueMarkerView, RenderingContext, setClass, SIssueMarker, SIssueSeverity, svg } from 'sprotty';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: snabbdom.svg };
+const JSX = { createElement: svg };
 
 @injectable()
 export class GIssueMarkerView extends IssueMarkerView {
-
     render(marker: SIssueMarker, _context: RenderingContext): VNode {
         const maxSeverity = super.getMaxSeverity(marker);
-        const group = <g class-sprotty-issue={true} >
-            <g>
-                <circle class-sprotty-issue-background={true} r={this.radius} cx={this.radius} cy={this.radius} />
-                <path d={this.getGlspIssueMarkerPath(maxSeverity)} />
+        const group = (
+            <g class-sprotty-issue={true}>
+                <g>
+                    {this.getGlspIssueMarkerBackground(maxSeverity)}
+                    <path d={this.getGlspIssueMarkerPath(maxSeverity)} />
+                </g>
             </g>
-        </g>;
+        );
         setClass(group, 'sprotty-' + maxSeverity, true);
         return group;
     }
 
+    protected getGlspIssueMarkerBackground(severity: SIssueSeverity): VNode {
+        switch (severity) {
+            case 'warning':
+                return <polygon class-sprotty-issue-background={true} points='8 2, 15.9 14.9, 0.2 14.9' />;
+            case 'error':
+            case 'info':
+                return <circle class-sprotty-issue-background={true} r={this.radius} cx={this.radius} cy={this.radius} />;
+        }
+    }
+
     protected get radius(): number {
         return 8; // var(--theia-icon-size)=16px => 16/2=8
     }
 
     protected getGlspIssueMarkerPath(severity: SIssueSeverity): string {
         switch (severity) {
-            // paths used here are svg versions of FontAwesome icons, resized to var(--theia-icon-size) 16px
-            case 'error': // 'fa-times-circle'
-                return 'M 8,0 C 3.5806452,0 0,3.58065 0,8 c 0,4.41935 3.5806452,8 8,8 4.419355,0 8,-3.58065 8,-8 C 16,3.58065 12.419355,0 8,0 Z m 3.922581,10.1 c 0.151613,0.15161 0.151613,0.39677 0,0.54839 l -1.27742,1.27419 c -0.151613,0.15161 -0.396774,0.15161 -0.548387,0 L 8,9.80645 5.9,11.92258 c -0.1516129,0.15161 -0.3967742,0.15161 -0.5483871,0 L 4.0774194,10.64516 c -0.1516129,-0.15161 -0.1516129,-0.39677 0,-0.54839 L 6.1935484,8 4.0774194,5.9 c -0.1516129,-0.15161 -0.1516129,-0.39677 0,-0.54839 L 5.3548387,4.07419 c 0.1516129,-0.15161 0.3967742,-0.15161 0.5483871,0 L 8,6.19355 10.1,4.07742 c 0.151613,-0.15161 0.396774,-0.15161 0.548387,0 l 1.277419,1.27742 c 0.151613,0.15161 0.151613,0.39677 0,0.54839 L 9.8064516,8 Z';
-            case 'warning': // 'fa-exclamation-circle'
-                return 'm 16,8 c 0,4.41926 -3.582032,8 -8,8 C 3.5820323,16 0,12.41926 0,8 0,3.58332 3.5820323,0 8,0 c 4.417968,0 8,3.58332 8,8 z M 8,9.6129 c -0.8195161,0 -1.483871,0.66436 -1.483871,1.48387 0,0.81952 0.6643549,1.48388 1.483871,1.48388 0.8195161,0 1.483871,-0.66436 1.483871,-1.48388 C 9.483871,10.27726 8.8195161,9.6129 8,9.6129 Z M 6.5911935,4.27916 6.8304839,8.66626 c 0.011194,0.20529 0.1809355,0.366 0.3865161,0.366 h 1.566 c 0.2055806,0 0.3753226,-0.16071 0.3865161,-0.366 L 9.4088065,4.27916 C 9.4209035,4.05742 9.2443548,3.87097 9.0222903,3.87097 H 6.9776774 c -0.2220645,0 -0.3985806,0.18645 -0.3864839,0.40819 z';
-            case 'info': // 'fa-info-circle information'
-                return 'M 8.0000004,0 C 3.5820324,0 0,3.58332 0,8 0,12.41926 3.5820324,16 8.0000004,16 12.417968,16 16,12.41926 16,8 16,3.58332 12.417968,0 8.0000004,0 Z m 0,3.54839 c 0.748258,0 1.354839,0.60658 1.354839,1.35484 0,0.74825 -0.606581,1.35483 -1.354839,1.35483 -0.748258,0 -1.354839,-0.60658 -1.354839,-1.35483 0,-0.74826 0.606581,-1.35484 1.354839,-1.35484 z m 1.806452,8.19355 c 0,0.21377 -0.173323,0.38709 -0.387097,0.38709 h -2.83871 c -0.213774,0 -0.387097,-0.17332 -0.387097,-0.38709 v -0.7742 c 0,-0.21377 0.173323,-0.38709 0.387097,-0.38709 h 0.387097 V 8.51613 h -0.387097 c -0.213774,0 -0.387097,-0.17332 -0.387097,-0.3871 V 7.35484 c 0,-0.21378 0.173323,-0.3871 0.387097,-0.3871 h 2.064516 c 0.213774,0 0.387097,0.17332 0.387097,0.3871 v 3.22581 h 0.387097 c 0.213774,0 0.387097,0.17332 0.387097,0.38709 z';
+            // paths used here are svg versions of codicons, resized to var(--theia-icon-size) 16px
+            case 'error': // 'codicon-error'
+                return 'm 8.8527788,0.00699568 c 1.8523692,0.115773 3.5889642,1.04195762 4.8624692,2.31546152 1.505048,1.620823 2.31546,3.5889653 2.31546,5.9044268 0,1.852369 -0.694637,3.588965 -1.852367,5.094015 -1.157733,1.389277 -2.778554,2.431235 -4.6309235,2.778554 C 7.6950478,16.446772 5.8426784,16.215226 4.2218552,15.289042 2.6010319,14.362857 1.3275281,12.97358 0.63288942,11.236984 -0.06174907,9.5003878 -0.17752216,7.5322456 0.4013433,5.7956494 0.98020876,3.9432802 2.0221665,2.4382302 3.6429898,1.3962725 5.14804,0.35431486 7.0004094,-0.10877742 8.8527788,0.00699568 Z M 9.4316445,14.941722 c 1.5050505,-0.347319 2.8943275,-1.15773 3.9362845,-2.431234 0.926185,-1.273504 1.50505,-2.778554 1.389277,-4.3993771 0,-1.8523692 -0.69464,-3.7047384 -1.968142,-4.9782422 C 11.631331,1.9751379 10.242054,1.2804995 8.6212324,1.1647264 7.1161824,1.0489533 5.4953592,1.3962725 4.2218552,2.3224572 2.9483511,3.2486418 2.0221665,4.5221456 1.5590742,6.1429686 c -0.4630923,1.50505 -0.4630923,3.1258731 0.2315462,4.6309234 0.6946384,1.50505 1.7365963,2.66278 3.1258734,3.473192 1.3892769,0.810411 3.0101002,1.041958 4.5151507,0.694638 z M 8.042367,7.5322456 10.82092,4.6379187 11.631331,5.4483302 8.8527788,8.3426571 11.631331,11.236984 10.82092,12.047395 8.042367,9.1530686 5.2638128,12.047395 4.4534013,11.236984 7.2319555,8.3426571 4.4534013,5.4483302 5.2638128,4.6379187 Z';
+            case 'warning': // 'codicon-warning'
+                return 'M 7.5587159,0.61312771 H 8.565869 L 16.050847,14.644601 15.54727,15.491525 H 0.55442396 L 0.05084746,14.644601 Z M 8.0622924,2.0780776 1.5157974,14.347033 H 14.585897 Z M 8.7776,13.202541 V 12.058049 H 7.3469848 v 1.144492 z M 7.3469848,10.913557 V 6.3355883 H 8.7776 v 4.5779687 z';
+            case 'info': // 'codicon-info'
+                return 'M 8.7624795,0.01729008 A 7.8878137,7.8878137 0 0 1 13.625085,2.3592747 8.1894066,8.1894066 0 0 1 14.158672,13.251418 7.9458123,7.9458123 0 0 1 4.2061071,15.26977 8.1198082,8.1198082 0 0 1 0.58699265,11.209866 8.259005,8.259005 0 0 1 0.32019895,5.7463948 8.1198082,8.1198082 0 0 1 3.533323,1.3500986 7.8878137,7.8878137 0 0 1 8.7624795,0.01729008 Z M 9.3099868,14.921778 A 6.8322386,6.8322386 0 0 0 13.265493,12.520635 7.0410337,7.0410337 0 0 0 12.801504,3.1712556 6.7510406,6.7510406 0 0 0 4.1829077,2.3128758 7.029434,7.029434 0 0 0 4.762894,14.248994 6.7394408,6.7394408 0 0 0 9.3099868,14.921778 Z M 7.3786322,5.7811939 H 8.8285979 V 4.6212213 H 7.3786322 Z M 8.8285979,6.9411665 V 11.581057 H 7.3786322 V 6.9411665 Z';
         }
     }
-
 }

package/src/views/rounded-corner-view.tsx

@@ -14,16 +14,14 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import * as snabbdom from 'snabbdom-jsx';
-import { Classes } from 'snabbdom/modules/class';
-import { VNode } from 'snabbdom/vnode';
-import { Hoverable, RectangularNodeView, RenderingContext, Selectable, SNode, SPort, SShapeElement } from 'sprotty/lib';
+import { Classes, VNode } from 'snabbdom';
+import { Hoverable, RectangularNodeView, RenderingContext, Selectable, SNode, SPort, SShapeElement, svg } from 'sprotty';
 
 import { CornerRadius } from '../utils/argument-utils';
 import { RoundedCornerWrapper } from './rounded-corner';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: snabbdom.svg };
+const JSX = { createElement: svg };
 
 @injectable()
 export class RoundedCornerNodeView extends RectangularNodeView {
@@ -34,15 +32,17 @@ export class RoundedCornerNodeView extends RectangularNodeView {
         }
 
         const wrapper = new RoundedCornerWrapper(node, cornerRadius);
-        return <g class-node={true} >
-            <defs>
-                <clipPath id={toClipPathId(node)}>
-                    <path d={this.renderPath(wrapper, context, this.getClipPathInsets() || 0)}></path>
-                </clipPath>
-            </defs>
-            {this.renderPathNode(wrapper, context)}
-            {context.renderChildren(node)}
-        </g>;
+        return (
+            <g class-node={true}>
+                <defs>
+                    <clipPath id={toClipPathId(node)}>
+                        <path d={this.renderPath(wrapper, context, this.getClipPathInsets() || 0)}></path>
+                    </clipPath>
+                </defs>
+                {this.renderPathNode(wrapper, context)}
+                {context.renderChildren(node)}
+            </g>
+        );
     }
 
     protected renderWithoutRadius(node: Readonly<SShapeElement & Hoverable & Selectable>, context: RenderingContext): VNode | undefined {
@@ -54,12 +54,16 @@ export class RoundedCornerNodeView extends RectangularNodeView {
     }
 
     protected renderPathNode(wrapper: Readonly<RoundedCornerWrapper>, context: RenderingContext): VNode {
-        return <path d={this.renderPath(wrapper, context, 0)}
-            class-sprotty-node={wrapper.element instanceof SNode}
-            class-sprotty-port={wrapper.element instanceof SPort}
-            class-mouseover={wrapper.element.hoverFeedback}
-            class-selected={wrapper.element.selected}
-            {...this.additionalClasses(wrapper.element, context)} />;
+        return (
+            <path
+                d={this.renderPath(wrapper, context, 0)}
+                class-sprotty-node={wrapper.element instanceof SNode}
+                class-sprotty-port={wrapper.element instanceof SPort}
+                class-mouseover={wrapper.element.hoverFeedback}
+                class-selected={wrapper.element.selected}
+                {...this.additionalClasses(wrapper.element, context)}
+            />
+        );
     }
 
     protected additionalClasses(_node: Readonly<SShapeElement & Hoverable & Selectable>, _context: RenderingContext): Classes {
@@ -72,14 +76,23 @@ export class RoundedCornerNodeView extends RectangularNodeView {
         const rightLineLength = Math.max(0, wrapper.size.height - wrapper.cornerRadius.topRight - wrapper.cornerRadius.bottomRight);
         const bottomLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.bottomLeft - wrapper.cornerRadius.bottomRight);
 
-        const path = `M${0 + inset},${0 + wrapper.topLeftCorner.radiusY}` +
-            `q${0},${-(wrapper.topLeftCorner.radiusY - inset)} ${wrapper.topLeftCorner.radiusX - inset},${-(wrapper.topLeftCorner.radiusY - inset)}` +
+        const path =
+            `M${0 + inset},${0 + wrapper.topLeftCorner.radiusY}` +
+            `q${0},${-(wrapper.topLeftCorner.radiusY - inset)} ${wrapper.topLeftCorner.radiusX - inset},${-(
+                wrapper.topLeftCorner.radiusY - inset
+            )}` +
             `h${topLineLength}` +
-            `q${wrapper.topRightCorner.radiusX - inset},0 ${wrapper.topRightCorner.radiusX - inset},${wrapper.topRightCorner.radiusY - inset}` +
+            `q${wrapper.topRightCorner.radiusX - inset},0 ${wrapper.topRightCorner.radiusX - inset},${
+                wrapper.topRightCorner.radiusY - inset
+            }` +
             `v${rightLineLength}` +
-            `q0,${wrapper.bottomRightCorner.radiusY - inset} ${-(wrapper.bottomRightCorner.radiusX - inset)},${wrapper.bottomRightCorner.radiusY - inset}` +
+            `q0,${wrapper.bottomRightCorner.radiusY - inset} ${-(wrapper.bottomRightCorner.radiusX - inset)},${
+                wrapper.bottomRightCorner.radiusY - inset
+            }` +
             `h${-bottomLineLength}` +
-            `q${-(wrapper.bottomLeftCorner.radiusX - inset)},0 ${-(wrapper.bottomLeftCorner.radiusX - inset)},${-(wrapper.bottomLeftCorner.radiusY - inset)}` +
+            `q${-(wrapper.bottomLeftCorner.radiusX - inset)},0 ${-(wrapper.bottomLeftCorner.radiusX - inset)},${-(
+                wrapper.bottomLeftCorner.radiusY - inset
+            )}` +
             'z ';
         return path;
     }

package/src/views/rounded-corner.ts

@@ -13,8 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Dimension, Hoverable, Selectable, SShapeElement } from 'sprotty/lib';
-
+import { Dimension } from '@eclipse-glsp/protocol';
+import { Hoverable, Selectable, SShapeElement } from 'sprotty';
 import { CornerRadius } from '../utils/argument-utils';
 
 export interface RoundedCorner {
@@ -28,8 +28,7 @@ export class RoundedCornerWrapper {
     protected _bottomRightCorner: RoundedCorner;
     protected _bottomLeftCorner: RoundedCorner;
 
-    constructor(public readonly element: SShapeElement & Hoverable & Selectable, public readonly cornerRadius: CornerRadius) {
-    }
+    constructor(public readonly element: SShapeElement & Hoverable & Selectable, public readonly cornerRadius: CornerRadius) {}
 
     get size(): Dimension {
         return this.element.size;
@@ -77,8 +76,8 @@ export class RoundedCornerWrapper {
 }
 
 /*
-* Scales the radius if necessary. (Percentual downscaling if the radius is bigger then the maximal allowed length)
-*/
+ * Scales the radius if necessary. (Percentual downscaling if the radius is bigger then the maximal allowed length)
+ */
 export function scaledRadius(radius: number, maximalLength: number): number {
     if (radius <= maximalLength) {
         return radius;

package/lib/base/actions/context-actions.d.ts

@@ -1,36 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2019 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, LabeledAction, RequestAction, ResponseAction } from 'sprotty';
-import { Args } from '../args';
-import { EditorContext } from '../editor-context';
-export declare class RequestContextActions implements RequestAction<SetContextActions> {
-    readonly contextId: string;
-    readonly editorContext: EditorContext;
-    readonly requestId: string;
-    readonly kind: string;
-    static readonly KIND = "requestContextActions";
-    constructor(contextId: string, editorContext: EditorContext, requestId?: string, kind?: string);
-}
-export declare class SetContextActions implements ResponseAction {
-    readonly actions: LabeledAction[];
-    readonly responseId: string;
-    readonly args?: Args | undefined;
-    readonly kind: string;
-    static readonly KIND = "setContextActions";
-    constructor(actions: LabeledAction[], responseId?: string, args?: Args | undefined, kind?: string);
-}
-export declare function isSetContextActionsAction(action: Action): action is SetContextActions;
-//# sourceMappingURL=context-actions.d.ts.map