@eclipse-glsp/client 0.9.0-next.c5944e10 → 0.9.0-next.fd1a8bb6

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
@@ -27,21 +27,24 @@ import {
     SRoutableElement,
     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
@@ -41,7 +41,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/glsp-edge-view.tsx

@@ -31,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 {
@@ -53,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 {
@@ -66,5 +76,4 @@ export class GEdgeView extends PolylineEdgeView {
         }
         return path;
     }
-
 }

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
@@ -23,15 +23,16 @@ 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>
+                    <circle class-sprotty-issue-background={true} r={this.radius} cx={this.radius} cy={this.radius} />
+                    <path d={this.getGlspIssueMarkerPath(maxSeverity)} />
+                </g>
             </g>
-        </g>;
+        );
         setClass(group, 'sprotty-' + maxSeverity, true);
         return group;
     }
@@ -51,5 +52,4 @@ export class GIssueMarkerView extends IssueMarkerView {
                 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';
         }
     }
-
 }

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

@@ -32,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 {
@@ -52,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 {
@@ -70,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

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