@eclipse-glsp/client 0.9.0-rc-01 → 0.10.0-next.bb1c2fd.157

package/lib/views/rounded-corner-view.js

@@ -1,28 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -46,67 +22,61 @@ exports.toClipPathId = exports.RoundedCornerNodeView = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var snabbdom = require("snabbdom-jsx");
-var lib_1 = require("sprotty/lib");
-var argument_utils_1 = require("../utils/argument-utils");
-var rounded_corner_1 = require("./rounded-corner");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const argument_utils_1 = require("../utils/argument-utils");
+const rounded_corner_1 = require("./rounded-corner");
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-var JSX = { createElement: snabbdom.svg };
-var RoundedCornerNodeView = /** @class */ (function (_super) {
-    __extends(RoundedCornerNodeView, _super);
-    function RoundedCornerNodeView() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    RoundedCornerNodeView.prototype.render = function (node, context) {
-        var cornerRadius = argument_utils_1.CornerRadius.from(node);
+const JSX = { createElement: sprotty_1.svg };
+let RoundedCornerNodeView = class RoundedCornerNodeView extends sprotty_1.RectangularNodeView {
+    render(node, context) {
+        const cornerRadius = argument_utils_1.CornerRadius.from(node);
         if (!cornerRadius) {
             return this.renderWithoutRadius(node, context);
         }
-        var wrapper = new rounded_corner_1.RoundedCornerWrapper(node, cornerRadius);
-        return JSX.createElement("g", { "class-node": true },
+        const wrapper = new rounded_corner_1.RoundedCornerWrapper(node, cornerRadius);
+        return (JSX.createElement("g", { "class-node": true },
             JSX.createElement("defs", null,
                 JSX.createElement("clipPath", { id: toClipPathId(node) },
                     JSX.createElement("path", { d: this.renderPath(wrapper, context, this.getClipPathInsets() || 0) }))),
             this.renderPathNode(wrapper, context),
-            context.renderChildren(node));
-    };
-    RoundedCornerNodeView.prototype.renderWithoutRadius = function (node, context) {
-        return _super.prototype.render.call(this, node, context);
-    };
-    RoundedCornerNodeView.prototype.getClipPathInsets = function () {
+            context.renderChildren(node)));
+    }
+    renderWithoutRadius(node, context) {
+        return super.render(node, context);
+    }
+    getClipPathInsets() {
         return 2;
-    };
-    RoundedCornerNodeView.prototype.renderPathNode = function (wrapper, context) {
-        return JSX.createElement("path", __assign({ d: this.renderPath(wrapper, context, 0), "class-sprotty-node": wrapper.element instanceof lib_1.SNode, "class-sprotty-port": wrapper.element instanceof lib_1.SPort, "class-mouseover": wrapper.element.hoverFeedback, "class-selected": wrapper.element.selected }, this.additionalClasses(wrapper.element, context)));
-    };
-    RoundedCornerNodeView.prototype.additionalClasses = function (_node, _context) {
+    }
+    renderPathNode(wrapper, context) {
+        return (JSX.createElement("path", Object.assign({ d: this.renderPath(wrapper, context, 0), "class-sprotty-node": wrapper.element instanceof sprotty_1.SNode, "class-sprotty-port": wrapper.element instanceof sprotty_1.SPort, "class-mouseover": wrapper.element.hoverFeedback, "class-selected": wrapper.element.selected }, this.additionalClasses(wrapper.element, context))));
+    }
+    additionalClasses(_node, _context) {
         return {};
-    };
-    RoundedCornerNodeView.prototype.renderPath = function (wrapper, _context, inset) {
+    }
+    renderPath(wrapper, _context, inset) {
         // Calcualte length of straight line segments
-        var topLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.topLeft - wrapper.cornerRadius.topRight);
-        var rightLineLength = Math.max(0, wrapper.size.height - wrapper.cornerRadius.topRight - wrapper.cornerRadius.bottomRight);
-        var bottomLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.bottomLeft - wrapper.cornerRadius.bottomRight);
-        var 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)) +
-            ("v" + rightLineLength) +
-            ("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)) +
+        const topLineLength = Math.max(0, wrapper.size.width - wrapper.cornerRadius.topLeft - wrapper.cornerRadius.topRight);
+        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)}` +
+            `h${topLineLength}` +
+            `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}` +
+            `h${-bottomLineLength}` +
+            `q${-(wrapper.bottomLeftCorner.radiusX - inset)},0 ${-(wrapper.bottomLeftCorner.radiusX - inset)},${-(wrapper.bottomLeftCorner.radiusY - inset)}` +
             'z ';
         return path;
-    };
-    RoundedCornerNodeView = __decorate([
-        inversify_1.injectable()
-    ], RoundedCornerNodeView);
-    return RoundedCornerNodeView;
-}(lib_1.RectangularNodeView));
+    }
+};
+RoundedCornerNodeView = __decorate([
+    inversify_1.injectable()
+], RoundedCornerNodeView);
 exports.RoundedCornerNodeView = RoundedCornerNodeView;
 function toClipPathId(node) {
-    return node.id + "_clip_path";
+    return `${node.id}_clip_path`;
 }
 exports.toClipPathId = toClipPathId;
 //# sourceMappingURL=rounded-corner-view.js.map

package/lib/views/rounded-corner-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"rounded-corner-view.js","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"rounded-corner-view.js","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"names":[],"mappings":"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"}

package/lib/views/rounded-corner.d.ts

@@ -13,7 +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 {
     radiusX: number;

package/lib/views/rounded-corner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rounded-corner.d.ts","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,oBAAoB;aAMD,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU;aAAkB,YAAY,EAAE,YAAY;IALvH,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;gBAEf,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU,EAAkB,YAAY,EAAE,YAAY;IAGvH,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED,IAAI,aAAa,IAAI,aAAa,CAQjC;IAED,IAAI,cAAc,IAAI,aAAa,CAQlC;IAED,IAAI,iBAAiB,IAAI,aAAa,CAQrC;IAED,IAAI,gBAAgB,IAAI,aAAa,CAQpC;CACJ;AAKD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAM1E"}
+{"version":3,"file":"rounded-corner.d.ts","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,oBAAoB;aAMD,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU;aAAkB,YAAY,EAAE,YAAY;IALvH,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC;IACxC,SAAS,CAAC,eAAe,EAAE,aAAa,CAAC;IACzC,SAAS,CAAC,kBAAkB,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;gBAEf,OAAO,EAAE,aAAa,GAAG,SAAS,GAAG,UAAU,EAAkB,YAAY,EAAE,YAAY;IAEvH,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED,IAAI,aAAa,IAAI,aAAa,CAQjC;IAED,IAAI,cAAc,IAAI,aAAa,CAQlC;IAED,IAAI,iBAAiB,IAAI,aAAa,CAQrC;IAED,IAAI,gBAAgB,IAAI,aAAa,CAQpC;CACJ;AAKD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CAM1E"}

package/lib/views/rounded-corner.js

@@ -1,76 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scaledRadius = exports.RoundedCornerWrapper = void 0;
-var RoundedCornerWrapper = /** @class */ (function () {
-    function RoundedCornerWrapper(element, cornerRadius) {
+class RoundedCornerWrapper {
+    constructor(element, cornerRadius) {
         this.element = element;
         this.cornerRadius = cornerRadius;
     }
-    Object.defineProperty(RoundedCornerWrapper.prototype, "size", {
-        get: function () {
-            return this.element.size;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "topLeftCorner", {
-        get: function () {
-            if (!this._topLeftCorner) {
-                this._topLeftCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.topLeft, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.topLeft, this.element.size.height / 2)
-                };
-            }
-            return this._topLeftCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "topRightCorner", {
-        get: function () {
-            if (!this._topRightCorner) {
-                this._topRightCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.topRight, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.topRight, this.element.size.height / 2)
-                };
-            }
-            return this._topRightCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "bottomRightCorner", {
-        get: function () {
-            if (!this._bottomRightCorner) {
-                this._bottomRightCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.bottomRight, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.bottomRight, this.element.size.height / 2)
-                };
-            }
-            return this._bottomRightCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(RoundedCornerWrapper.prototype, "bottomLeftCorner", {
-        get: function () {
-            if (!this._bottomLeftCorner) {
-                this._bottomLeftCorner = {
-                    radiusX: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.width / 2),
-                    radiusY: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.height / 2)
-                };
-            }
-            return this._bottomLeftCorner;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return RoundedCornerWrapper;
-}());
+    get size() {
+        return this.element.size;
+    }
+    get topLeftCorner() {
+        if (!this._topLeftCorner) {
+            this._topLeftCorner = {
+                radiusX: scaledRadius(this.cornerRadius.topLeft, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.topLeft, this.element.size.height / 2)
+            };
+        }
+        return this._topLeftCorner;
+    }
+    get topRightCorner() {
+        if (!this._topRightCorner) {
+            this._topRightCorner = {
+                radiusX: scaledRadius(this.cornerRadius.topRight, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.topRight, this.element.size.height / 2)
+            };
+        }
+        return this._topRightCorner;
+    }
+    get bottomRightCorner() {
+        if (!this._bottomRightCorner) {
+            this._bottomRightCorner = {
+                radiusX: scaledRadius(this.cornerRadius.bottomRight, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.bottomRight, this.element.size.height / 2)
+            };
+        }
+        return this._bottomRightCorner;
+    }
+    get bottomLeftCorner() {
+        if (!this._bottomLeftCorner) {
+            this._bottomLeftCorner = {
+                radiusX: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.width / 2),
+                radiusY: scaledRadius(this.cornerRadius.bottomLeft, this.element.size.height / 2)
+            };
+        }
+        return this._bottomLeftCorner;
+    }
+}
 exports.RoundedCornerWrapper = 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)
+ */
 function scaledRadius(radius, maximalLength) {
     if (radius <= maximalLength) {
         return radius;

package/lib/views/rounded-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"rounded-corner.js","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":";;;AAwBA;IAMI,8BAA4B,OAA+C,EAAkB,YAA0B;QAA3F,YAAO,GAAP,OAAO,CAAwC;QAAkB,iBAAY,GAAZ,YAAY,CAAc;IACvH,CAAC;IAED,sBAAI,sCAAI;aAAR;YACI,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC7B,CAAC;;;OAAA;IAED,sBAAI,+CAAa;aAAjB;YACI,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACtB,IAAI,CAAC,cAAc,GAAG;oBAClB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAC7E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACjF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,cAAc,CAAC;QAC/B,CAAC;;;OAAA;IAED,sBAAI,gDAAc;aAAlB;YACI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBACvB,IAAI,CAAC,eAAe,GAAG;oBACnB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAC9E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBAClF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,eAAe,CAAC;QAChC,CAAC;;;OAAA;IAED,sBAAI,mDAAiB;aAArB;YACI,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;gBAC1B,IAAI,CAAC,kBAAkB,GAAG;oBACtB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBACjF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACrF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;QACnC,CAAC;;;OAAA;IAED,sBAAI,kDAAgB;aAApB;YACI,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBACzB,IAAI,CAAC,iBAAiB,GAAG;oBACrB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;oBAChF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;iBACpF,CAAC;aACL;YACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;QAClC,CAAC;;;OAAA;IACL,2BAAC;AAAD,CAAC,AApDD,IAoDC;AApDY,oDAAoB;AAsDjC;;EAEE;AACF,SAAgB,YAAY,CAAC,MAAc,EAAE,aAAqB;IAC9D,IAAI,MAAM,IAAI,aAAa,EAAE;QACzB,OAAO,MAAM,CAAC;KACjB;SAAM;QACH,OAAO,MAAM,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,CAAC;KAC5C;AACL,CAAC;AAND,oCAMC"}
+{"version":3,"file":"rounded-corner.js","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":";;;AAwBA,MAAa,oBAAoB;IAM7B,YAA4B,OAA+C,EAAkB,YAA0B;QAA3F,YAAO,GAAP,OAAO,CAAwC;QAAkB,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAE3H,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,cAAc,GAAG;gBAClB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC7E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACjF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,IAAI,cAAc;QACd,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;YACvB,IAAI,CAAC,eAAe,GAAG;gBACnB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAC9E,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aAClF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,IAAI,iBAAiB;QACjB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC1B,IAAI,CAAC,kBAAkB,GAAG;gBACtB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBACjF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACrF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB;QAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YACzB,IAAI,CAAC,iBAAiB,GAAG;gBACrB,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;gBAChF,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;aACpF,CAAC;SACL;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAClC,CAAC;CACJ;AAnDD,oDAmDC;AAED;;GAEG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,aAAqB;IAC9D,IAAI,MAAM,IAAI,aAAa,EAAE;QACzB,OAAO,MAAM,CAAC;KACjB;SAAM;QACH,OAAO,MAAM,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC,CAAC;KAC5C;AACL,CAAC;AAND,oCAMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.9.0-rc-01",
+  "version": "0.10.0-next.bb1c2fd.157+bb1c2fd",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -23,19 +23,9 @@
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "contributors": [
     {
-      "name": "Philip Langer",
-      "email": "planger@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Tobias Ortmayr",
-      "email": "tortmayr@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
-    },
-    {
-      "name": "Martin Fleck",
-      "email": "mfleck@eclipsesource.com",
-      "url": "https://www.eclipsesource.com"
+      "name": "Eclipse GLSP Project",
+      "email": "glsp-dev@eclipse.org",
+      "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
   "files": [
@@ -44,16 +34,18 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.9.0-rc-01",
+    "@eclipse-glsp/protocol": "0.10.0-next.bb1c2fd.157+bb1c2fd",
     "autocompleter": "5.1.0",
-    "sprotty": "^0.10.0-next.a91d3d7"
+    "sprotty": "0.10.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.11.2",
     "@types/chai": "4.1.3",
     "@types/mocha": "^5.2.7",
     "@types/node": "10.14.18",
+    "@vscode/codicons": "^0.0.25",
     "chai": "^4.2.0",
+    "ignore-styles": "^5.0.1",
     "mocha": "^6.2.0",
     "mocha-jenkins-reporter": "0.4.5",
     "reflect-metadata": "^0.1.13",
@@ -67,12 +59,13 @@
     "build": "tsc",
     "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
     "watch": "tsc -w",
-    "test": "mocha --opts ../../configs/mocha.opts \"./src/**/*.spec.?(ts|tsx)\"",
-    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --colors --reporter mocha-jenkins-reporter"
+    "test": "mocha --opts ./mocha.opts \"./src/**/*.spec.?(ts|tsx)\"",
+    "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter"
   },
   "publishConfig": {
     "access": "public"
   },
   "main": "lib/index",
-  "types": "lib/index"
+  "types": "lib/index",
+  "gitHead": "bb1c2fd0120feb99965b33b6fdf57fcb7fe0d62d"
 }

package/src/base/action-dispatcher.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,35 +13,35 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isResponseAction, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject } from 'inversify';
-import { Action, ActionDispatcher, isResponseAction, RequestAction, ResponseAction } from 'sprotty';
-
+import { ActionDispatcher } from 'sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
 
 export class GLSPActionDispatcher extends ActionDispatcher {
-
     protected readonly timeouts: Map<string, NodeJS.Timeout> = new Map();
-
-    @inject(ModelInitializationConstraint) protected initiailizationConstraint: ModelInitializationConstraint;
-    protected onModelInitialized: Promise<void> = Promise.resolve();
+    protected initializedConstraint = false;
+    @inject(ModelInitializationConstraint) protected initializationConstraint: ModelInitializationConstraint;
 
     initialize(): Promise<void> {
         return super.initialize().then(() => this.startModelInitialization());
     }
 
     startModelInitialization(): void {
-        this.logger.log(this, 'Starting model initialization mode');
-        this.onModelInitialized = this.initiailizationConstraint.onInitialized();
-        this.onModelInitialized.then(() => this.logger.log(this, 'Model initialization completed'));
+        if (!this.initializedConstraint) {
+            this.logger.log(this, 'Starting model initialization mode');
+            this.initializationConstraint.onInitialized().then(() => this.logger.log(this, 'Model initialization completed'));
+            this.initializedConstraint = true;
+        }
     }
 
     onceModelInitialized(): Promise<void> {
-        return this.onModelInitialized;
+        return this.initializationConstraint.onInitialized();
     }
 
     dispatch(action: Action): Promise<void> {
         const result = super.dispatch(action);
-        this.initiailizationConstraint.notifyDispatched(action);
+        this.initializationConstraint.notifyDispatched(action);
         return result;
     }
 

package/src/base/actions/focus-change-action.ts

@@ -13,12 +13,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from 'sprotty';
+import { Action } from '@eclipse-glsp/protocol';
 
 export class FocusStateChangedAction implements Action {
     static KIND = 'focusStateChanged';
     readonly kind = FocusStateChangedAction.KIND;
-    constructor(public readonly hasFocus: boolean) { }
+    constructor(public readonly hasFocus: boolean) {}
 }
 
 export function isFocusStateChangedAction(action: Action): action is FocusStateChangedAction {

package/src/base/{args.ts → argumentable.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,10 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Args } from '@eclipse-glsp/protocol';
 import { SModelElement } from 'sprotty';
 
-export interface Args { [key: string]: string | number | boolean }
-
 export interface SArgumentable {
     args: Args;
 }

package/src/base/auto-complete/auto-complete-actions.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LabeledAction } from 'sprotty/lib';
+import { LabeledAction } from '@eclipse-glsp/protocol';
 
 export interface SetAutoCompleteValueAction extends LabeledAction {
     readonly text: string;

package/src/base/auto-complete/auto-complete-widget.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,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isAction, isLabeledAction, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
-import { Action, ILogger, isAction, isLabeledAction, LabeledAction, SModelRoot } from 'sprotty/lib';
+import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-
-import { ValidationStatus } from '../actions/edit-validation-actions';
 import { isSetAutoCompleteValueAction } from './auto-complete-actions';
 import { IValidationDecorator } from './validation-decorator';
 
@@ -53,7 +52,7 @@ export interface TextSubmitHandler {
 const configureAutocomplete: (settings: AutocompleteSettings<LabeledAction>) => AutocompleteResult = require('autocompleter');
 
 export class AutoCompleteWidget {
-    loadingIndicatorClasses = ['loading', 'fa', 'fa-spinner', 'fa-pulse', 'fa-3x', 'fa-fw'];
+    loadingIndicatorClasses = codiconCSSClasses('loading', false, true, ['loading']);
 
     protected containerElement: HTMLElement;
     protected inputElement: HTMLInputElement;
@@ -72,12 +71,14 @@ export class AutoCompleteWidget {
         public suggestionProvider: SuggestionProvider,
         public suggestionSubmitHandler: SuggestionSubmitHandler,
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        protected notifyClose: () => void = () => { },
+        protected notifyClose: () => void = () => {},
         protected logger?: ILogger
-    ) { }
+    ) {}
 
-    configureValidation(inputValidator: InputValidator,
-        validationDecorator: IValidationDecorator = IValidationDecorator.NO_DECORATION): void {
+    configureValidation(
+        inputValidator: InputValidator,
+        validationDecorator: IValidationDecorator = IValidationDecorator.NO_DECORATION
+    ): void {
         this.inputValidator = inputValidator;
         this.validationDecorator = validationDecorator;
     }
@@ -154,25 +155,33 @@ export class AutoCompleteWidget {
             showOnFocus: this.autoSuggestionSettings.showOnFocus,
             debounceWaitMs: this.autoSuggestionSettings.debounceWaitMs,
             minLength: -1,
-            fetch: (text: string, update: (items: LabeledAction[]) => void) =>
-                this.updateSuggestions(update, text, root),
+            fetch: (text: string, update: (items: LabeledAction[]) => void) => this.updateSuggestions(update, text, root),
             onSelect: (item: LabeledAction) => this.onSelect(item),
-            render: (item: LabeledAction, currentValue: string): HTMLDivElement | undefined =>
-                this.renderSuggestions(item, currentValue),
+            render: (item: LabeledAction, currentValue: string): HTMLDivElement | undefined => this.renderSuggestions(item, currentValue),
             customize: (input: HTMLInputElement, inputRect: ClientRect | DOMRect, container: HTMLDivElement, maxHeight: number) => {
                 this.customizeInputElement(input, inputRect, container, maxHeight);
             }
         };
     }
 
-    protected customizeInputElement(input: HTMLInputElement, inputRect: ClientRect | DOMRect, container: HTMLDivElement, maxHeight: number): void {
+    protected customizeInputElement(
+        input: HTMLInputElement,
+        inputRect: ClientRect | DOMRect,
+        container: HTMLDivElement,
+        maxHeight: number
+    ): void {
         // move container into our UIExtension container as this is already positioned correctly
         if (this.containerElement) {
             this.containerElement.appendChild(container);
         }
     }
 
-    protected updateSuggestions(update: (items: LabeledAction[]) => void, text: string, root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+    protected updateSuggestions(
+        update: (items: LabeledAction[]) => void,
+        text: string,
+        root: Readonly<SModelRoot>,
+        ...contextElementIds: string[]
+    ): void {
         this.onLoading();
         this.doUpdateSuggestions(text, root)
             .then(actions => {
@@ -230,11 +239,13 @@ export class AutoCompleteWidget {
     }
 
     protected filterActions(filterText: string, actions: LabeledAction[]): LabeledAction[] {
-        return toArray(actions.filter(action => {
-            const label = action.label.toLowerCase();
-            const searchWords = filterText.split(' ');
-            return searchWords.every(word => label.indexOf(word.toLowerCase()) !== -1);
-        }));
+        return toArray(
+            actions.filter(action => {
+                const label = action.label.toLowerCase();
+                const searchWords = filterText.split(' ');
+                return searchWords.every(word => label.indexOf(word.toLowerCase()) !== -1);
+            })
+        );
     }
 
     protected onSelect(item: LabeledAction): void {
@@ -257,10 +268,10 @@ export class AutoCompleteWidget {
     }
 
     private isNoOrExactlyOneMatchingContextAction(): boolean | undefined {
-        return !this.isSuggestionAvailable()
-            || (this.contextActions
-                && this.contextActions.length === 1
-                && this.inputElement.value.endsWith(this.contextActions[0].label));
+        return (
+            !this.isSuggestionAvailable() ||
+            (this.contextActions && this.contextActions.length === 1 && this.inputElement.value.endsWith(this.contextActions[0].label))
+        );
     }
 
     protected isSuggestionAvailable(): boolean | undefined {
@@ -269,7 +280,8 @@ export class AutoCompleteWidget {
 
     validateInput(): void {
         if (this.inputValidator) {
-            this.inputValidator.validate(this.inputElement.value)
+            this.inputValidator
+                .validate(this.inputElement.value)
                 .then(result => this.validationDecorator.decorateValidationResult(result))
                 .catch(error => this.handleErrorDuringValidation(error));
         }