@eclipse-glsp/client 1.1.0-RC08 → 1.1.0-RC10

package/lib/views/glsp-projection-view.js

@@ -1,6 +1,6 @@
 "use strict";
 /********************************************************************************
- * Copyright (c) 2017-2022 TypeFox and others.
+ * Copyright (c) 2017-2023 TypeFox 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
@@ -24,20 +24,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPProjectionView = void 0;
 const inversify_1 = require("inversify");
 const snabbdom_1 = require("snabbdom");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const JSX = { createElement: _glsp_sprotty_1.html };
 /**
  * Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
  */
-let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedViewportView {
+let GLSPProjectionView = class GLSPProjectionView extends _glsp_sprotty_1.ProjectedViewportView {
     render(model, context, args) {
         const svgElem = this.renderSvg(model, context, args);
         if (svgElem.data) {
             svgElem.data.class = { 'sprotty-graph': true };
         }
-        const rootNode = ((0, sprotty_1.html)("div", { "class-sprotty-graph": false, style: { width: '100%', height: '100%' } },
+        const rootNode = (JSX.createElement("div", { "class-sprotty-graph": false, style: { width: '100%', height: '100%' } },
             svgElem,
             this.renderProjections(model, context, args)));
-        (0, sprotty_1.setAttr)(rootNode, 'tabindex', 0);
+        (0, _glsp_sprotty_1.setAttr)(rootNode, 'tabindex', 0);
         return rootNode;
     }
     renderSvg(model, context, args) {
@@ -53,7 +55,7 @@ let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedVie
         params.factor =
             orientation === 'horizontal' ? model.canvasBounds.width / modelBounds.width : model.canvasBounds.height / modelBounds.height;
         params.zoomedFactor = params.factor / model.zoom;
-        return ((0, sprotty_1.html)("div", { "class-sprotty-projection-bar": true, "class-horizontal": orientation === 'horizontal', "class-vertical": orientation === 'vertical', "class-bordered-projection-bar": true },
+        return (JSX.createElement("div", { "class-sprotty-projection-bar": true, "class-horizontal": orientation === 'horizontal', "class-vertical": orientation === 'vertical', "class-bordered-projection-bar": true },
             this.renderViewport(model, params),
             projections.map(p => this.renderProjection(p, model, params))));
     }
@@ -96,7 +98,7 @@ let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedVie
                 height: `${viewportSize}px`,
                 border: 'none'
             };
-        return (0, sprotty_1.html)("div", { "class-sprotty-viewport": viewportSize !== 0, "class-projection-scroll-bar": true, style: style });
+        return JSX.createElement("div", { "class-sprotty-viewport": viewportSize !== 0, "class-projection-scroll-bar": true, style: style });
     }
     renderProjection(projection, model, params) {
         let canvasSize;
@@ -136,8 +138,8 @@ let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedVie
                 height: `${projSize}px`,
                 width: '60%'
             };
-        const result = ((0, sprotty_1.html)("div", { id: `${params.orientation}-projection:${projection.elementId}`, "class-sprotty-projection": true, "class-glsp-projection": true, style: style }));
-        projection.cssClasses.forEach(cl => (0, sprotty_1.setClass)(result, cl, true));
+        const result = (JSX.createElement("div", { id: `${params.orientation}-projection:${projection.elementId}`, "class-sprotty-projection": true, "class-glsp-projection": true, style: style }));
+        projection.cssClasses.forEach(cl => (0, _glsp_sprotty_1.setClass)(result, cl, true));
         return result;
     }
 };

package/lib/views/glsp-projection-view.js.map

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

package/lib/views/issue-marker-view.d.ts

@@ -1,5 +1,5 @@
 import { VNode } from 'snabbdom';
-import { IssueMarkerView, RenderingContext, SIssueMarker, SIssueSeverity } from 'sprotty';
+import { IssueMarkerView, RenderingContext, SIssueMarker, SIssueSeverity } from '../glsp-sprotty/index';
 export declare class GIssueMarkerView extends IssueMarkerView {
     render(marker: SIssueMarker, _context: RenderingContext): VNode;
     protected getGlspIssueMarkerBackground(severity: SIssueSeverity): VNode;

package/lib/views/issue-marker-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker-view.d.ts","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAY,YAAY,EAAE,cAAc,EAAO,MAAM,SAAS,CAAC;AAKzG,qBACa,gBAAiB,SAAQ,eAAe;IACxC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,KAAK;IAcxE,SAAS,CAAC,4BAA4B,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK;IAUvE,SAAS,KAAK,MAAM,IAAI,MAAM,CAE7B;IAED,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM;CAWrE"}
+{"version":3,"file":"issue-marker-view.d.ts","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAY,YAAY,EAAE,cAAc,EAAO,MAAM,eAAe,CAAC;AAK/G,qBACa,gBAAiB,SAAQ,eAAe;IACxC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,KAAK;IAcxE,SAAS,CAAC,4BAA4B,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK;IAUvE,SAAS,KAAK,MAAM,IAAI,MAAM,CAE7B;IAED,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM;CAWrE"}

package/lib/views/issue-marker-view.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GIssueMarkerView = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 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
@@ -24,17 +24,17 @@ exports.GIssueMarkerView = void 0;
  ********************************************************************************/
 /* eslint-disable max-len */
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: sprotty_1.svg };
-let GIssueMarkerView = class GIssueMarkerView extends sprotty_1.IssueMarkerView {
+const JSX = { createElement: _glsp_sprotty_1.svg };
+let GIssueMarkerView = class GIssueMarkerView extends _glsp_sprotty_1.IssueMarkerView {
     render(marker, _context) {
         const maxSeverity = super.getMaxSeverity(marker);
         const group = (JSX.createElement("g", { "class-sprotty-issue": true },
             JSX.createElement("g", null,
                 this.getGlspIssueMarkerBackground(maxSeverity),
                 JSX.createElement("path", { d: this.getGlspIssueMarkerPath(maxSeverity) }))));
-        (0, sprotty_1.setClass)(group, 'sprotty-' + maxSeverity, true);
+        (0, _glsp_sprotty_1.setClass)(group, 'sprotty-' + maxSeverity, true);
         return group;
     }
     getGlspIssueMarkerBackground(severity) {

package/lib/views/issue-marker-view.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker-view.js","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4BAA4B;AAC5B,yCAAuC;AAEvC,qCAAyG;AAEzG,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,yBAAe;IACxC,MAAM,CAAC,MAAoB,EAAE,QAA0B;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,CACV,gDAAwB,IAAI;YACxB;gBACK,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC;gBAC/C,4BAAM,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAI,CACrD,CACJ,CACP,CAAC;QACF,IAAA,kBAAQ,EAAC,KAAK,EAAE,UAAU,GAAG,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,4BAA4B,CAAC,QAAwB;QAC3D,QAAQ,QAAQ,EAAE;YACd,KAAK,SAAS;gBACV,OAAO,iEAAyC,IAAI,EAAE,MAAM,EAAC,0BAA0B,GAAG,CAAC;YAC/F,KAAK,OAAO,CAAC;YACb,KAAK,MAAM;gBACP,OAAO,gEAAwC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,GAAI,CAAC;SACjH;IACL,CAAC;IAED,IAAc,MAAM;QAChB,OAAO,CAAC,CAAC,CAAC,wCAAwC;IACtD,CAAC;IAES,sBAAsB,CAAC,QAAwB;QACrD,QAAQ,QAAQ,EAAE;YACd,uFAAuF;YACvF,KAAK,OAAO,EAAE,kBAAkB;gBAC5B,OAAO,u0CAAu0C,CAAC;YACn1C,KAAK,SAAS,EAAE,oBAAoB;gBAChC,OAAO,2RAA2R,CAAC;YACvS,KAAK,MAAM,EAAE,iBAAiB;gBAC1B,OAAO,ktBAAktB,CAAC;SACjuB;IACL,CAAC;CACJ,CAAA;AAxCY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAwC5B;AAxCY,4CAAgB"}
+{"version":3,"file":"issue-marker-view.js","sourceRoot":"","sources":["../../src/views/issue-marker-view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,4BAA4B;AAC5B,yCAAuC;AAEvC,iDAA+G;AAE/G,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,mBAAG,EAAE,CAAC;AAGnC,IAAa,gBAAgB,GAA7B,MAAa,gBAAiB,SAAQ,+BAAe;IACxC,MAAM,CAAC,MAAoB,EAAE,QAA0B;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,CACV,gDAAwB,IAAI;YACxB;gBACK,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC;gBAC/C,4BAAM,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAI,CACrD,CACJ,CACP,CAAC;QACF,IAAA,wBAAQ,EAAC,KAAK,EAAE,UAAU,GAAG,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,4BAA4B,CAAC,QAAwB;QAC3D,QAAQ,QAAQ,EAAE;YACd,KAAK,SAAS;gBACV,OAAO,iEAAyC,IAAI,EAAE,MAAM,EAAC,0BAA0B,GAAG,CAAC;YAC/F,KAAK,OAAO,CAAC;YACb,KAAK,MAAM;gBACP,OAAO,gEAAwC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,GAAI,CAAC;SACjH;IACL,CAAC;IAED,IAAc,MAAM;QAChB,OAAO,CAAC,CAAC,CAAC,wCAAwC;IACtD,CAAC;IAES,sBAAsB,CAAC,QAAwB;QACrD,QAAQ,QAAQ,EAAE;YACd,uFAAuF;YACvF,KAAK,OAAO,EAAE,kBAAkB;gBAC5B,OAAO,u0CAAu0C,CAAC;YACn1C,KAAK,SAAS,EAAE,oBAAoB;gBAChC,OAAO,2RAA2R,CAAC;YACvS,KAAK,MAAM,EAAE,iBAAiB;gBAC1B,OAAO,ktBAAktB,CAAC;SACjuB;IACL,CAAC;CACJ,CAAA;AAxCY,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAwC5B;AAxCY,4CAAgB"}

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

@@ -1,5 +1,5 @@
 import { Classes, VNode } from 'snabbdom';
-import { Hoverable, RectangularNodeView, RenderingContext, Selectable, SShapeElement } from 'sprotty';
+import { Hoverable, RectangularNodeView, RenderingContext, SShapeElement, Selectable } from '../glsp-sprotty/index';
 import { RoundedCornerWrapper } from './rounded-corner';
 export declare class RoundedCornerNodeView extends RectangularNodeView {
     render(node: Readonly<SShapeElement & Hoverable & Selectable>, context: RenderingContext): VNode | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"rounded-corner-view.d.ts","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,UAAU,EAAgB,aAAa,EAAO,MAAM,SAAS,CAAC;AAEzH,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,qBACa,qBAAsB,SAAQ,mBAAmB;IACjD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS;IAoBrH,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS;IAInI,SAAS,CAAC,iBAAiB,IAAI,MAAM,GAAG,SAAS;IAIjD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAanG,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO;IAIzH,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CA0BnH;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,GAAG,MAAM,CAE3F"}
+{"version":3,"file":"rounded-corner-view.d.ts","sourceRoot":"","sources":["../../src/views/rounded-corner-view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,gBAAgB,EAAgB,aAAa,EAAE,UAAU,EAAO,MAAM,eAAe,CAAC;AAE/H,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAKxD,qBACa,qBAAsB,SAAQ,mBAAmB;IACjD,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS;IAoBrH,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK,GAAG,SAAS;IAInI,SAAS,CAAC,iBAAiB,IAAI,MAAM,GAAG,SAAS;IAIjD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;IAanG,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO;IAIzH,SAAS,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CA0BnH;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC,GAAG,MAAM,CAE3F"}

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

@@ -23,12 +23,12 @@ exports.toClipPathId = exports.RoundedCornerNodeView = void 0;
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
 const argument_utils_1 = require("../utils/argument-utils");
 const rounded_corner_1 = require("./rounded-corner");
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const JSX = { createElement: sprotty_1.svg };
-let RoundedCornerNodeView = class RoundedCornerNodeView extends sprotty_1.RectangularNodeView {
+const JSX = { createElement: _glsp_sprotty_1.svg };
+let RoundedCornerNodeView = class RoundedCornerNodeView extends _glsp_sprotty_1.RectangularNodeView {
     render(node, context) {
         const cornerRadius = argument_utils_1.CornerRadius.from(node);
         if (!cornerRadius) {
@@ -49,7 +49,7 @@ let RoundedCornerNodeView = class RoundedCornerNodeView extends sprotty_1.Rectan
         return 2;
     }
     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))));
+        return (JSX.createElement("path", Object.assign({ d: this.renderPath(wrapper, context, 0), "class-sprotty-node": wrapper.element instanceof _glsp_sprotty_1.SNode, "class-sprotty-port": wrapper.element instanceof _glsp_sprotty_1.SPort, "class-mouseover": wrapper.element.hoverFeedback, "class-selected": wrapper.element.selected }, this.additionalClasses(wrapper.element, context))));
     }
     additionalClasses(_node, _context) {
         return {};

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":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAyH;AACzH,4DAAuD;AACvD,qDAAwD;AAExD,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAG5B,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,6BAAmB;IACjD,MAAM,CAAC,IAAsD,EAAE,OAAyB;QAC7F,MAAM,YAAY,GAAG,6BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,YAAY,EAAE;YACf,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAClD;QAED,MAAM,OAAO,GAAG,IAAI,qCAAoB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC7D,OAAO,CACH,uCAAe,IAAI;YACf;gBACI,gCAAU,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC;oBAC5B,4BAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,GAAS,CAC3E,CACR;YACN,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC;YACrC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAC7B,CACP,CAAC;IACN,CAAC;IAES,mBAAmB,CAAC,IAAsD,EAAE,OAAyB;QAC3G,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAES,iBAAiB;QACvB,OAAO,CAAC,CAAC;IACb,CAAC;IAES,cAAc,CAAC,OAAuC,EAAE,OAAyB;QACvF,OAAO,CACH,0CACI,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,wBACnB,OAAO,CAAC,OAAO,YAAY,eAAK,wBAChC,OAAO,CAAC,OAAO,YAAY,eAAK,qBACnC,OAAO,CAAC,OAAO,CAAC,aAAa,oBAC9B,OAAO,CAAC,OAAO,CAAC,QAAQ,IACpC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EACtD,CACL,CAAC;IACN,CAAC;IAES,iBAAiB,CAAC,KAAuD,EAAE,QAA0B;QAC3G,OAAO,EAAE,CAAC;IACd,CAAC;IAES,UAAU,CAAC,OAAuC,EAAE,QAA0B,EAAE,KAAa;QACnG,6CAA6C;QAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACrH,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC5H,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAE9H,MAAM,IAAI,GACN,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE;YACpD,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,OAAO,CAAC,aAAa,CAAC,OAAO,GAAG,KAAK,IAAI,CAAC,CAC3F,OAAO,CAAC,aAAa,CAAC,OAAO,GAAG,KAAK,CACxC,EAAE;YACH,IAAI,aAAa,EAAE;YACnB,IAAI,OAAO,CAAC,cAAc,CAAC,OAAO,GAAG,KAAK,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,GAAG,KAAK,IAClF,OAAO,CAAC,cAAc,CAAC,OAAO,GAAG,KACrC,EAAE;YACF,IAAI,eAAe,EAAE;YACrB,MAAM,OAAO,CAAC,iBAAiB,CAAC,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,GAAG,KAAK,CAAC,IAC3F,OAAO,CAAC,iBAAiB,CAAC,OAAO,GAAG,KACxC,EAAE;YACF,IAAI,CAAC,gBAAgB,EAAE;YACvB,IAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CACjG,OAAO,CAAC,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAC3C,EAAE;YACH,IAAI,CAAC;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAxEY,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAwEjC;AAxEY,sDAAqB;AA0ElC,SAAgB,YAAY,CAAC,IAAsD;IAC/E,OAAO,GAAG,IAAI,CAAC,EAAE,YAAY,CAAC;AAClC,CAAC;AAFD,oCAEC"}
+{"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,8 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Dimension } from '@eclipse-glsp/protocol';
-import { Hoverable, Selectable, SShapeElement } from 'sprotty';
+import { Dimension, Hoverable, Selectable, SShapeElement } from '../glsp-sprotty/index';
 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,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"}
+{"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,eAAe,CAAC;AAChF,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.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"rounded-corner.js","sourceRoot":"","sources":["../../src/views/rounded-corner.ts"],"names":[],"mappings":";;;AAuBA,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": "1.1.0-RC08",
+  "version": "1.1.0-RC10",
   "description": "A sprotty-based client for GLSP",
   "keywords": [
     "eclipse",
@@ -36,7 +36,7 @@
     "css"
   ],
   "scripts": {
-    "build": "tsc -b",
+    "build": "tsc -b && tsc-alias",
     "clean": "rimraf lib tsconfig.tsbuildinfo  coverage .nyc_output",
     "lint": "eslint --ext .ts,.tsx ./src",
     "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
@@ -47,15 +47,18 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/protocol": "1.1.0-RC08",
+    "@eclipse-glsp/protocol": "1.1.0-RC10",
     "autocompleter": "5.1.0",
-    "sprotty": "0.13.0-next.f4445dd.342"
+    "lodash": "4.17.21",
+    "sprotty": "0.14.0-next.02bbac0.26"
   },
   "devDependencies": {
-    "@vscode/codicons": "^0.0.25"
+    "@types/lodash": "4.14.191",
+    "@vscode/codicons": "^0.0.25",
+    "tsc-alias": "^1.8.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "26c24b12bc3b1224eebe24dee8366ee6e4a8f970"
+  "gitHead": "415d2da9bf55d4d06f0c7df51ee76871a476b75a"
 }

package/src/base/action-dispatcher.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject } from 'inversify';
-import { ActionDispatcher } from 'sprotty';
+import { Action, ActionDispatcher, RequestAction, ResponseAction } from '~glsp-sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
 
 export class GLSPActionDispatcher extends ActionDispatcher {

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, hasBooleanProp } from '@eclipse-glsp/protocol';
+import { Action, hasBooleanProp } from '~glsp-sprotty';
 
 /**
  * A `FocusStateChangedAction` is dispatched by the client whenever the

package/src/base/argumentable.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2023 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,7 @@
  *
  * 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';
+import { Args, SModelElement } from '~glsp-sprotty';
 
 export interface SArgumentable {
     args: Args;

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 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,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { hasStringProp, LabeledAction } from '@eclipse-glsp/protocol';
+import { hasStringProp, LabeledAction } from '~glsp-sprotty';
 
 export interface AutoCompleteValue extends LabeledAction {
     readonly text: string;

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

@@ -13,11 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
-import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
-import { toArray } from 'sprotty/lib/utils/iterable';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+import { Action, ILogger, LabeledAction, SModelRoot, ValidationStatus, codiconCSSClasses, matchesKeystroke, toArray } from '~glsp-sprotty';
 import { AutoCompleteValue } from './auto-complete-actions';
 import { IValidationDecorator } from './validation-decorator';
 
@@ -28,6 +25,7 @@ export interface AutoCompleteSettings {
     readonly showOnFocus?: boolean;
 }
 
+export type CloseReason = 'submission' | 'blur' | 'escape';
 export interface InputValidator {
     validate(input: string): Promise<ValidationStatus>;
 }
@@ -48,6 +46,11 @@ export interface TextSubmitHandler {
     executeFromTextOnlyInput(input: string): void;
 }
 
+export interface AutoCompleteWidgetOptions {
+    visibleSuggestionsChanged?: (suggestions: LabeledAction[]) => void;
+    selectedSuggestionChanged?: (suggestion?: LabeledAction) => void;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const configureAutocomplete: (settings: AutocompleteSettings<LabeledAction>) => AutocompleteResult = require('autocompleter');
 
@@ -78,8 +81,9 @@ export class AutoCompleteWidget {
         public suggestionProvider: SuggestionProvider,
         public suggestionSubmitHandler: SuggestionSubmitHandler,
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        protected notifyClose: () => void = () => {},
-        protected logger?: ILogger
+        protected notifyClose: (reason: CloseReason) => void = () => {},
+        protected logger?: ILogger,
+        protected options?: AutoCompleteWidgetOptions
     ) {}
 
     configureValidation(
@@ -109,13 +113,18 @@ export class AutoCompleteWidget {
         inputElement.autocomplete = 'false';
         inputElement.style.width = '100%';
         inputElement.addEventListener('keydown', event => this.handleKeyDown(event));
-        inputElement.addEventListener('blur', () => window.setTimeout(() => this.notifyClose(), 200));
+        inputElement.addEventListener('blur', () => {
+            if (this.containerElement.style.visibility !== 'hidden') {
+                window.setTimeout(() => this.notifyClose('blur'), 200);
+            }
+        });
+
         return inputElement;
     }
 
     protected handleKeyDown(event: KeyboardEvent): void {
         if (matchesKeystroke(event, 'Escape')) {
-            this.notifyClose();
+            this.notifyClose('escape');
             return;
         }
         if (matchesKeystroke(event, 'Enter') && !this.isInputElementChanged() && this.isSuggestionAvailable()) {
@@ -133,7 +142,7 @@ export class AutoCompleteWidget {
         }
         if (this.textSubmitHandler) {
             this.executeFromTextOnlyInput();
-            this.notifyClose();
+            this.notifyClose('submission');
         }
     }
 
@@ -175,6 +184,17 @@ export class AutoCompleteWidget {
         // move container into our UIExtension container as this is already positioned correctly
         if (this.containerElement) {
             this.containerElement.appendChild(container);
+
+            if (this.options && this.options.selectedSuggestionChanged) {
+                const selectedElement = container.querySelector('.selected');
+                // eslint-disable-next-line no-null/no-null
+                if (selectedElement !== null && selectedElement !== undefined) {
+                    const index = Array.from(container.children).indexOf(selectedElement);
+                    this.options.selectedSuggestionChanged(this.contextActions?.[index]);
+                } else {
+                    this.options.selectedSuggestionChanged(undefined);
+                }
+            }
         }
     }
 
@@ -189,6 +209,7 @@ export class AutoCompleteWidget {
             .then(actions => {
                 this.contextActions = this.filterActions(text, actions);
                 update(this.contextActions);
+                this.options?.visibleSuggestionsChanged?.(this.contextActions);
                 this.onLoaded('success');
             })
             .catch(reason => {
@@ -228,7 +249,7 @@ export class AutoCompleteWidget {
         if (item.icon) {
             this.renderIcon(itemElement, item.icon);
         }
-        itemElement.innerHTML += item.label.replace(regex, match => '<em>' + match + '</em>');
+        itemElement.innerHTML += item.label.replace(regex, match => '<em>' + match + '</em>').replace(/ /g, '&nbsp;');
         return itemElement;
     }
 
@@ -257,7 +278,7 @@ export class AutoCompleteWidget {
             window.setTimeout(() => this.inputElement.dispatchEvent(new Event('keyup')));
         } else {
             this.executeFromSuggestion(item);
-            this.notifyClose();
+            this.notifyClose('submission');
         }
     }
 

package/src/base/auto-complete/validation-decorator.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020-2021 EclipseSource and others.
+ * Copyright (c) 2020-2023 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,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { codiconCSSString } from 'sprotty/lib/utils/codicon';
-import { ValidationStatus } from '@eclipse-glsp/protocol';
+import { ValidationStatus, codiconCSSString } from '~glsp-sprotty';
 
 export interface IValidationDecorator {
     decorateValidationResult(status: ValidationStatus): void;

package/src/base/command-stack.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { injectable } from 'inversify';
-import { CommandStack, SModelRoot } from 'sprotty';
+import { CommandStack, SModelRoot } from '~glsp-sprotty';
 
 @injectable()
 export class GLSPCommandStack extends CommandStack {

package/src/base/container-modules.ts

@@ -14,22 +14,22 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerConfiguration, initializeContainer } from '@eclipse-glsp/protocol';
 import { Container, ContainerModule } from 'inversify';
 import {
+    ContainerConfiguration,
     buttonModule,
     defaultModule,
     edgeIntersectionModule,
     edgeLayoutModule,
     expandModule,
     fadeModule,
+    initializeContainer,
     labelEditUiModule,
     modelSourceModule,
     openModule,
     routingModule,
     zorderModule
-} from 'sprotty';
-import svgMetadataModule from '../features/svg-metadata/di.config';
+} from '~glsp-sprotty';
 import glspBoundsModule from '../features/bounds/di.config';
 import glspCommandPaletteModule from '../features/command-palette/di.config';
 import glspContextMenuModule from '../features/context-menu/di.config';
@@ -44,6 +44,7 @@ import glspMouseToolModule from '../features/mouse-tool/di.config';
 import navigationModule from '../features/navigation/di.config';
 import glspSelectModule from '../features/select/di.config';
 import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
+import svgMetadataModule from '../features/svg-metadata/di.config';
 import toolFeedbackModule from '../features/tool-feedback/di.config';
 import toolPaletteModule from '../features/tool-palette/di.config';
 import { enableDefaultToolsOnFocusLossModule, toolsModule } from '../features/tools/di.config';

package/src/base/di.config.ts

@@ -13,10 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { bindAsService, bindOrRebind, InitializeResult, SetEditModeAction } from '@eclipse-glsp/protocol';
 import '@vscode/codicons/dist/codicon.css';
 import { Container, ContainerModule } from 'inversify';
-import { ActionHandlerRegistry, configureActionHandler, configureCommand, ModelSource, SetModelCommand } from 'sprotty';
+import {
+    ActionHandlerRegistry,
+    bindAsService,
+    bindOrRebind,
+    configureActionHandler,
+    configureCommand,
+    InitializeResult,
+    ModelSource,
+    SetEditModeAction,
+    SetModelCommand,
+    TYPES
+} from '~glsp-sprotty';
 import '../../css/glsp-sprotty.css';
 import { GLSPActionDispatcher } from './action-dispatcher';
 import { FocusStateChangedAction } from './actions/focus-change-action';
@@ -28,7 +38,6 @@ import { GLSPModelRegistry } from './model/model-registry';
 import { FeedbackAwareUpdateModelCommand, SetModelActionHandler } from './model/update-model-command';
 import { SelectionClearingMouseListener } from './selection-clearing-mouse-listener';
 import { GLSPToolManager } from './tool-manager/glsp-tool-manager';
-import { TYPES } from './types';
 import { GLSPViewRegistry } from './view/view-registry';
 
 const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) => {

package/src/base/drag-aware-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2022 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
-import { MouseListener, SModelElement } from 'sprotty';
+import { Action, MouseListener, SModelElement } from '~glsp-sprotty';
 
 /**
  * A mouse listener that is aware of prior mouse dragging.

package/src/base/editor-context-service.ts

@@ -13,12 +13,24 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, Args, distinctAdd, EditMode, EditorContext, remove, SetEditModeAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
-import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot } from 'sprotty';
+import {
+    Action,
+    Args,
+    EditMode,
+    EditorContext,
+    IActionHandler,
+    ModelSource,
+    MousePositionTracker,
+    SModelElement,
+    SModelRoot,
+    SetEditModeAction,
+    TYPES,
+    distinctAdd,
+    remove
+} from '~glsp-sprotty';
 import { SelectionService } from '../features/select/selection-service';
 import { isSourceUriAware } from './source-uri-aware';
-import { TYPES } from './types';
 
 export interface EditModeListener {
     editModeChanged(newValue: string, oldValue: string): void;

package/src/base/focus-tracker.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,11 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { IActionHandler, ICommand, ViewerOptions } from 'sprotty';
+import { Action, IActionHandler, ICommand, TYPES, ViewerOptions } from '~glsp-sprotty';
 import { FocusStateChangedAction } from './actions/focus-change-action';
-import { TYPES } from './types';
 
 @injectable()
 export class FocusTracker implements IActionHandler {