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

package/lib/features/hints/type-hints.js

@@ -1,17 +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 __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);
@@ -25,9 +12,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHintsAction = exports.EdgeTypeHint = exports.ShapeTypeHint = exports.TypeHint = void 0;
+exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHintsAction = void 0;
 /********************************************************************************
- * 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,130 +28,86 @@ exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHint
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var types_1 = require("../../base/types");
-var smodel_util_1 = require("../../utils/smodel-util");
-var model_1 = require("../change-bounds/model");
-var model_2 = require("../reconnect/model");
-var model_3 = require("../tool-feedback/model");
-var model_4 = require("./model");
-var request_type_hints_action_1 = require("./request-type-hints-action");
-var TypeHint = /** @class */ (function () {
-    function TypeHint() {
-    }
-    return TypeHint;
-}());
-exports.TypeHint = TypeHint;
-var ShapeTypeHint = /** @class */ (function (_super) {
-    __extends(ShapeTypeHint, _super);
-    function ShapeTypeHint() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return ShapeTypeHint;
-}(TypeHint));
-exports.ShapeTypeHint = ShapeTypeHint;
-var EdgeTypeHint = /** @class */ (function (_super) {
-    __extends(EdgeTypeHint, _super);
-    function EdgeTypeHint() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    EdgeTypeHint.prototype.isAllowedSource = function (input) {
-        var type = smodel_util_1.getElementTypeId(input);
-        return this.sourceElementTypeIds.includes(type);
-    };
-    EdgeTypeHint.prototype.isAllowedTarget = function (input) {
-        var type = smodel_util_1.getElementTypeId(input);
-        return this.targetElementTypeIds.includes(type);
-    };
-    return EdgeTypeHint;
-}(TypeHint));
-exports.EdgeTypeHint = EdgeTypeHint;
-var ApplyTypeHintsAction = /** @class */ (function () {
-    function ApplyTypeHintsAction() {
+const protocol_1 = require("@eclipse-glsp/protocol");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const types_1 = require("../../base/types");
+const smodel_util_1 = require("../../utils/smodel-util");
+const model_1 = require("../change-bounds/model");
+const model_2 = require("../reconnect/model");
+const model_3 = require("../tool-feedback/model");
+const model_4 = require("./model");
+let ApplyTypeHintsAction = class ApplyTypeHintsAction {
+    constructor() {
         this.kind = ApplyTypeHintsCommand.KIND;
     }
-    ApplyTypeHintsAction = __decorate([
-        inversify_1.injectable()
-    ], ApplyTypeHintsAction);
-    return ApplyTypeHintsAction;
-}());
+};
+ApplyTypeHintsAction = __decorate([
+    inversify_1.injectable()
+], ApplyTypeHintsAction);
 exports.ApplyTypeHintsAction = ApplyTypeHintsAction;
-var ApplyTypeHintsCommand = /** @class */ (function (_super) {
-    __extends(ApplyTypeHintsCommand, _super);
-    function ApplyTypeHintsCommand(action) {
-        var _this = _super.call(this) || this;
-        _this.action = action;
-        _this.priority = 10;
-        return _this;
+let ApplyTypeHintsCommand = class ApplyTypeHintsCommand extends model_3.FeedbackCommand {
+    constructor(action) {
+        super();
+        this.action = action;
+        this.priority = 10;
     }
-    ApplyTypeHintsCommand.prototype.execute = function (context) {
-        var _this = this;
-        context.root.index.all()
-            .forEach(function (element) {
+    execute(context) {
+        context.root.index.all().forEach(element => {
             if (element instanceof sprotty_1.SShapeElement || element instanceof sprotty_1.SModelRoot) {
-                _this.applyShapeTypeHint(element);
+                this.applyShapeTypeHint(element);
             }
             else if (element instanceof sprotty_1.SEdge) {
-                return _this.applyEdgeTypeHint(element);
+                return this.applyEdgeTypeHint(element);
             }
         });
         return context.root;
-    };
-    ApplyTypeHintsCommand.prototype.applyEdgeTypeHint = function (element) {
-        var hint = this.typeHintProvider.getEdgeTypeHint(element);
+    }
+    applyEdgeTypeHint(element) {
+        const hint = this.typeHintProvider.getEdgeTypeHint(element);
         if (hint && isModifiableFetureSet(element.features)) {
             addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
             addOrRemove(element.features, sprotty_1.editFeature, hint.routable);
             addOrRemove(element.features, model_2.reconnectFeature, hint.repositionable);
         }
-    };
-    ApplyTypeHintsCommand.prototype.applyShapeTypeHint = function (element) {
-        var hint = this.typeHintProvider.getShapeTypeHint(element);
+    }
+    applyShapeTypeHint(element) {
+        const hint = this.typeHintProvider.getShapeTypeHint(element);
         if (hint && isModifiableFetureSet(element.features)) {
             addOrRemove(element.features, sprotty_1.deletableFeature, hint.deletable);
             addOrRemove(element.features, sprotty_1.moveFeature, hint.repositionable);
             addOrRemove(element.features, model_1.resizeFeature, hint.resizable);
             addOrRemove(element.features, model_4.reparentFeature, hint.reparentable);
             addOrRemove(element.features, model_4.containerFeature, true);
-            var containable = createContainable(hint);
+            const containable = createContainable(hint);
             Object.assign(element, containable);
             addOrRemove(element.features, sprotty_1.connectableFeature, true);
-            var validSourceEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'source');
-            var validTargetEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'target');
-            var connectable = createConnectable(validSourceEdges, validTargetEdges);
+            const validSourceEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'source');
+            const validTargetEdges = this.typeHintProvider.getValidEdgeElementTypes(element, 'target');
+            const connectable = createConnectable(validSourceEdges, validTargetEdges);
             Object.assign(element, connectable);
         }
-    };
-    ApplyTypeHintsCommand.KIND = 'applyTypeHints';
-    __decorate([
-        inversify_1.inject(types_1.GLSP_TYPES.ITypeHintProvider),
-        __metadata("design:type", Object)
-    ], ApplyTypeHintsCommand.prototype, "typeHintProvider", void 0);
-    ApplyTypeHintsCommand = __decorate([
-        inversify_1.injectable(),
-        __param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
-        __metadata("design:paramtypes", [ApplyTypeHintsAction])
-    ], ApplyTypeHintsCommand);
-    return ApplyTypeHintsCommand;
-}(model_3.FeedbackCommand));
+    }
+};
+ApplyTypeHintsCommand.KIND = 'applyTypeHints';
+__decorate([
+    inversify_1.inject(types_1.GLSP_TYPES.ITypeHintProvider),
+    __metadata("design:type", Object)
+], ApplyTypeHintsCommand.prototype, "typeHintProvider", void 0);
+ApplyTypeHintsCommand = __decorate([
+    inversify_1.injectable(),
+    __param(0, inversify_1.inject(sprotty_1.TYPES.Action)),
+    __metadata("design:paramtypes", [ApplyTypeHintsAction])
+], ApplyTypeHintsCommand);
 exports.ApplyTypeHintsCommand = ApplyTypeHintsCommand;
 function createConnectable(validSourceEdges, validTargetEdges) {
     return {
-        canConnect: function (routable, role) {
-            return role === 'source' ?
-                validSourceEdges.includes(routable.type) :
-                validTargetEdges.includes(routable.type);
-        }
+        canConnect: (routable, role) => role === 'source' ? validSourceEdges.includes(routable.type) : validTargetEdges.includes(routable.type)
     };
 }
 function createContainable(hint) {
     return {
-        isContainableElement: function (element) {
-            return hint.containableElementTypeIds ?
-                hint.containableElementTypeIds.includes(smodel_util_1.getElementTypeId(element)) :
-                false;
-        }
+        isContainableElement: element => hint.containableElementTypeIds ? hint.containableElementTypeIds.includes(smodel_util_1.getElementTypeId(element)) : false
     };
 }
 function addOrRemove(features, feature, add) {
@@ -178,54 +121,52 @@ function addOrRemove(features, feature, add) {
 function isModifiableFetureSet(featureSet) {
     return featureSet !== undefined && featureSet instanceof Set;
 }
-var TypeHintProvider = /** @class */ (function () {
-    function TypeHintProvider() {
-        this.shapeHints = new Map;
-        this.edgeHints = new Map;
+let TypeHintProvider = class TypeHintProvider {
+    constructor() {
+        this.shapeHints = new Map();
+        this.edgeHints = new Map();
     }
-    TypeHintProvider.prototype.handle = function (action) {
-        var _this = this;
-        if (request_type_hints_action_1.isSetTypeHintsAction(action)) {
-            action.shapeHints.forEach(function (hint) { return _this.shapeHints.set(hint.elementTypeId, hint); });
-            action.edgeHints.forEach(function (hint) { return _this.edgeHints.set(hint.elementTypeId, hint); });
+    handle(action) {
+        if (protocol_1.isSetTypeHintsAction(action)) {
+            action.shapeHints.forEach(hint => this.shapeHints.set(hint.elementTypeId, hint));
+            action.edgeHints.forEach(hint => this.edgeHints.set(hint.elementTypeId, hint));
             this.feedbackActionDispatcher.registerFeedback(this, [new ApplyTypeHintsAction()]);
         }
-    };
-    TypeHintProvider.prototype.getValidEdgeElementTypes = function (input, role) {
-        var elementTypeId = smodel_util_1.getElementTypeId(input);
+    }
+    getValidEdgeElementTypes(input, role) {
+        const elementTypeId = smodel_util_1.getElementTypeId(input);
         if (role === 'source') {
             return Array.from(Array.from(this.edgeHints.values())
-                .filter(function (hint) { return hint.sourceElementTypeIds.some(function (sourceElementTypeId) { return smodel_util_1.hasCompatibleType(elementTypeId, sourceElementTypeId); }); })
-                .map(function (hint) { return hint.elementTypeId; }));
+                .filter(hint => hint.sourceElementTypeIds.some(sourceElementTypeId => smodel_util_1.hasCompatibleType(elementTypeId, sourceElementTypeId)))
+                .map(hint => hint.elementTypeId));
         }
         else {
             return Array.from(Array.from(this.edgeHints.values())
-                .filter(function (hint) { return hint.targetElementTypeIds.some(function (targetElementTypeId) { return smodel_util_1.hasCompatibleType(elementTypeId, targetElementTypeId); }); })
-                .map(function (hint) { return hint.elementTypeId; }));
+                .filter(hint => hint.targetElementTypeIds.some(targetElementTypeId => smodel_util_1.hasCompatibleType(elementTypeId, targetElementTypeId)))
+                .map(hint => hint.elementTypeId));
         }
-    };
-    TypeHintProvider.prototype.getShapeTypeHint = function (input) {
+    }
+    getShapeTypeHint(input) {
         return getTypeHint(input, this.shapeHints);
-    };
-    TypeHintProvider.prototype.getEdgeTypeHint = function (input) {
+    }
+    getEdgeTypeHint(input) {
         return getTypeHint(input, this.edgeHints);
-    };
-    __decorate([
-        inversify_1.inject(types_1.GLSP_TYPES.IFeedbackActionDispatcher),
-        __metadata("design:type", Object)
-    ], TypeHintProvider.prototype, "feedbackActionDispatcher", void 0);
-    TypeHintProvider = __decorate([
-        inversify_1.injectable()
-    ], TypeHintProvider);
-    return TypeHintProvider;
-}());
+    }
+};
+__decorate([
+    inversify_1.inject(types_1.GLSP_TYPES.IFeedbackActionDispatcher),
+    __metadata("design:type", Object)
+], TypeHintProvider.prototype, "feedbackActionDispatcher", void 0);
+TypeHintProvider = __decorate([
+    inversify_1.injectable()
+], TypeHintProvider);
 exports.TypeHintProvider = TypeHintProvider;
 function getTypeHint(input, hints) {
-    var type = smodel_util_1.getElementTypeId(input);
-    var hint = hints.get(type);
+    const type = smodel_util_1.getElementTypeId(input);
+    let hint = hints.get(type);
     // Check subtypes
     if (hint === undefined) {
-        var subtypes = type.split(':');
+        const subtypes = type.split(':');
         while (hint === undefined && subtypes.length > 0) {
             subtypes.pop();
             hint = hints.get(subtypes.join(':'));

package/lib/features/hints/type-hints.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-hints.js","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-hints.js","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"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"}

package/lib/features/hover/di.config.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2022 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

package/lib/features/hover/di.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAqB5C,QAAA,MAAM,eAAe,iBAsBnB,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAoB5C,QAAA,MAAM,eAAe,iBAwBnB,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/lib/features/hover/di.config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2022 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,14 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var popup_position_updater_1 = require("sprotty/lib/features/hover/popup-position-updater");
-var focus_change_action_1 = require("../../base/actions/focus-change-action");
-var hover_1 = require("./hover");
-var glspHoverModule = new inversify_1.ContainerModule(function (bind, _unbind, isBound) {
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const popup_position_updater_1 = require("sprotty/lib/features/hover/popup-position-updater");
+const focus_change_action_1 = require("../../base/actions/focus-change-action");
+const hover_1 = require("./hover");
+const glspHoverModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     bind(sprotty_1.TYPES.PopupVNodePostprocessor).to(popup_position_updater_1.PopupPositionUpdater).inSingletonScope();
-    bind(sprotty_1.TYPES.MouseListener).to(hover_1.GlspHoverMouseListener);
+    bind(hover_1.GlspHoverMouseListener).toSelf().inSingletonScope();
+    bind(sprotty_1.TYPES.MouseListener).toService(hover_1.GlspHoverMouseListener);
     bind(sprotty_1.TYPES.PopupMouseListener).to(sprotty_1.PopupHoverMouseListener);
     bind(sprotty_1.TYPES.KeyListener).to(sprotty_1.HoverKeyListener);
     bind(sprotty_1.TYPES.HoverState).toConstantValue({
@@ -32,7 +33,7 @@ var glspHoverModule = new inversify_1.ContainerModule(function (bind, _unbind, i
         previousPopupElement: undefined
     });
     bind(sprotty_1.ClosePopupActionHandler).toSelf().inSingletonScope();
-    var context = { bind: bind, isBound: isBound };
+    const context = { bind, isBound };
     sprotty_1.configureCommand(context, sprotty_1.HoverFeedbackCommand);
     sprotty_1.configureCommand(context, sprotty_1.SetPopupModelCommand);
     sprotty_1.configureActionHandler(context, sprotty_1.SetPopupModelCommand.KIND, sprotty_1.ClosePopupActionHandler);
@@ -41,6 +42,7 @@ var glspHoverModule = new inversify_1.ContainerModule(function (bind, _unbind, i
     sprotty_1.configureActionHandler(context, sprotty_1.SetViewportCommand.KIND, sprotty_1.ClosePopupActionHandler);
     sprotty_1.configureActionHandler(context, sprotty_1.MoveCommand.KIND, sprotty_1.ClosePopupActionHandler);
     sprotty_1.configureActionHandler(context, focus_change_action_1.FocusStateChangedAction.KIND, sprotty_1.ClosePopupActionHandler);
+    sprotty_1.configureActionHandler(context, focus_change_action_1.FocusStateChangedAction.KIND, hover_1.GlspHoverMouseListener);
 });
 exports.default = glspHoverModule;
 //# sourceMappingURL=di.config.js.map

package/lib/features/hover/di.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,uCAA4C;AAC5C,mCAciB;AACjB,4FAAyF;AAEzF,8EAAiF;AACjF,iCAAiD;AAEjD,IAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAI,EAAE,OAAO,EAAE,OAAO;IAC/D,IAAI,CAAC,eAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChF,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,8BAAsB,CAAC,CAAC;IACrD,IAAI,CAAC,eAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,iCAAuB,CAAC,CAAC;IAC3D,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,0BAAgB,CAAC,CAAC;IAC7C,IAAI,CAAa,eAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC;QAC/C,cAAc,EAAE,SAAS;QACzB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,oBAAoB,EAAE,SAAS;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,iCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,IAAM,OAAO,GAAG,EAAE,IAAI,MAAA,EAAE,OAAO,SAAA,EAAE,CAAC;IAClC,0BAAgB,CAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,0BAAgB,CAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,gCAAsB,CAAC,OAAO,EAAE,8BAAoB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACpF,gCAAsB,CAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,gCAAsB,CAAC,OAAO,EAAE,uBAAa,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC7E,gCAAsB,CAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,gCAAsB,CAAC,OAAO,EAAE,qBAAW,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC3E,gCAAsB,CAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;AAC3F,CAAC,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hover/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAciB;AACjB,8FAAyF;AACzF,gFAAiF;AACjF,mCAAiD;AAEjD,MAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACnE,IAAI,CAAC,eAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChF,IAAI,CAAC,8BAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,eAAK,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,8BAAsB,CAAC,CAAC;IAC5D,IAAI,CAAC,eAAK,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC,iCAAuB,CAAC,CAAC;IAC3D,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,0BAAgB,CAAC,CAAC;IAC7C,IAAI,CAAa,eAAK,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC;QAC/C,cAAc,EAAE,SAAS;QACzB,aAAa,EAAE,SAAS;QACxB,SAAS,EAAE,KAAK;QAChB,oBAAoB,EAAE,SAAS;KAClC,CAAC,CAAC;IACH,IAAI,CAAC,iCAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE1D,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,0BAAgB,CAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,0BAAgB,CAAC,OAAO,EAAE,8BAAoB,CAAC,CAAC;IAChD,gCAAsB,CAAC,OAAO,EAAE,8BAAoB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACpF,gCAAsB,CAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,gCAAsB,CAAC,OAAO,EAAE,uBAAa,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC7E,gCAAsB,CAAC,OAAO,EAAE,4BAAkB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAClF,gCAAsB,CAAC,OAAO,EAAE,qBAAW,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IAC3E,gCAAsB,CAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,iCAAuB,CAAC,CAAC;IACvF,gCAAsB,CAAC,OAAO,EAAE,6CAAuB,CAAC,IAAI,EAAE,8BAAsB,CAAC,CAAC;AAC1F,CAAC,CAAC,CAAC;AAEH,kBAAe,eAAe,CAAC"}

package/lib/features/hover/hover.d.ts

@@ -1,6 +1,32 @@
-import { Action, Bounds, HoverMouseListener, SIssueMarker, SIssueSeverity, SModelElement, SModelElementSchema, SModelRootSchema } from 'sprotty';
+/********************************************************************************
+ * Copyright (c) 2020-2022 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, Bounds } from '@eclipse-glsp/protocol';
+import { HoverMouseListener, IActionHandler, ICommand, SIssueMarker, SIssueSeverity, SModelElement, SModelElementSchema, SModelRootSchema } from 'sprotty';
 import { GIssueMarker } from '../validation/issue-marker';
-export declare class GlspHoverMouseListener extends HoverMouseListener {
+export declare class GlspHoverMouseListener extends HoverMouseListener implements IActionHandler {
+    /**
+     * Stops mouse over timer and remove hover feedback, if focus is lost.
+     *
+     * This fixes strange effects that appear if the mouse left the element via e.g. a context menu,
+     * which explicitly removes the focus of the diagram.
+     * @see SelectionServiceAwareContextMenuMouseListener
+     * @param action should be a `FocusStateChangedAction`
+     * @returns a `HoverFeedbackAction` resetting the state, if the specified action indicates lost focus
+     */
+    handle(action: Action): void | Action | ICommand;
     protected startMouseOverTimer(target: SModelElement, event: MouseEvent): Promise<Action>;
     protected createPopupModel(marker: GIssueMarker, bounds: Bounds): SModelRootSchema;
     protected createMarkerIssuePopup(marker: GIssueMarker): SModelElementSchema;

package/lib/features/hover/hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,MAAM,EAEN,kBAAkB,EAIlB,YAAY,EACZ,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,qBACa,sBAAuB,SAAQ,kBAAkB;IAE1D,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBxF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}
+{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../src/features/hover/hover.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAgD,MAAM,wBAAwB,CAAC;AAEtG,OAAO,EAGH,kBAAkB,EAClB,cAAc,EACd,QAAQ,EAER,YAAY,EACZ,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EACnB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,qBACa,sBAAuB,SAAQ,kBAAmB,YAAW,cAAc;IACpF;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAWhD,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBxF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB;IAYlF,SAAS,CAAC,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB;IAS3E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM;IAI1D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAGjD;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}

package/lib/features/hover/hover.js

@@ -1,38 +1,14 @@
 "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 __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);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSeverity = exports.GlspHoverMouseListener = void 0;
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2022 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
@@ -46,32 +22,48 @@ exports.getSeverity = exports.GlspHoverMouseListener = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var issue_marker_1 = require("../validation/issue-marker");
-var GlspHoverMouseListener = /** @class */ (function (_super) {
-    __extends(GlspHoverMouseListener, _super);
-    function GlspHoverMouseListener() {
-        return _super !== null && _super.apply(this, arguments) || this;
+const protocol_1 = require("@eclipse-glsp/protocol");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const focus_change_action_1 = require("../../base/actions/focus-change-action");
+const issue_marker_1 = require("../validation/issue-marker");
+let GlspHoverMouseListener = class GlspHoverMouseListener extends sprotty_1.HoverMouseListener {
+    /**
+     * Stops mouse over timer and remove hover feedback, if focus is lost.
+     *
+     * This fixes strange effects that appear if the mouse left the element via e.g. a context menu,
+     * which explicitly removes the focus of the diagram.
+     * @see SelectionServiceAwareContextMenuMouseListener
+     * @param action should be a `FocusStateChangedAction`
+     * @returns a `HoverFeedbackAction` resetting the state, if the specified action indicates lost focus
+     */
+    handle(action) {
+        if (focus_change_action_1.isFocusStateChangedAction(action) && !action.hasFocus) {
+            this.stopMouseOverTimer();
+            if (this.lastHoverFeedbackElementId) {
+                const previousTargetId = this.lastHoverFeedbackElementId;
+                this.lastHoverFeedbackElementId = undefined;
+                return new sprotty_1.HoverFeedbackAction(previousTargetId, false);
+            }
+        }
     }
-    GlspHoverMouseListener.prototype.startMouseOverTimer = function (target, event) {
-        var _this = this;
+    startMouseOverTimer(target, event) {
         this.stopMouseOverTimer();
-        return new Promise(function (resolve) {
-            _this.state.mouseOverTimer = window.setTimeout(function () {
-                var popupBounds = _this.computePopupBounds(target, { x: event.pageX, y: event.pageY });
+        return new Promise(resolve => {
+            this.state.mouseOverTimer = window.setTimeout(() => {
+                const popupBounds = this.computePopupBounds(target, { x: event.pageX, y: event.pageY });
                 if (target instanceof issue_marker_1.GIssueMarker) {
-                    resolve(new sprotty_1.SetPopupModelAction(_this.createPopupModel(target, popupBounds)));
+                    resolve(new protocol_1.SetPopupModelAction(this.createPopupModel(target, popupBounds)));
                 }
                 else {
-                    resolve(new sprotty_1.RequestPopupModelAction(target.id, popupBounds));
+                    resolve(new protocol_1.RequestPopupModelAction(target.id, popupBounds));
                 }
-                _this.state.popupOpen = true;
-                _this.state.previousPopupElement = target;
-            }, _this.options.popupOpenDelay);
+                this.state.popupOpen = true;
+                this.state.previousPopupElement = target;
+            }, this.options.popupOpenDelay);
         });
-    };
-    GlspHoverMouseListener.prototype.createPopupModel = function (marker, bounds) {
+    }
+    createPopupModel(marker, bounds) {
         if (marker.issues !== undefined && marker.issues.length > 0) {
             return {
                 type: 'html',
@@ -81,47 +73,35 @@ var GlspHoverMouseListener = /** @class */ (function (_super) {
             };
         }
         return { type: sprotty_1.EMPTY_ROOT.type, id: sprotty_1.EMPTY_ROOT.id };
-    };
-    GlspHoverMouseListener.prototype.createMarkerIssuePopup = function (marker) {
-        var message = this.createIssueMessage(marker);
+    }
+    createMarkerIssuePopup(marker) {
+        const message = this.createIssueMessage(marker);
         return {
             type: 'pre-rendered',
             id: 'popup-title',
-            code: "<div class=\"" + getSeverity(marker) + "\"><div class=\"sprotty-popup-title\">" + message + "</div></div>"
+            code: `<div class="${getSeverity(marker)}"><div class="sprotty-popup-title">${message}</div></div>`
         };
-    };
-    GlspHoverMouseListener.prototype.createIssueMessage = function (marker) {
-        return '<ul>' + marker.issues.map(function (i) { return '<li>' + i.severity.toUpperCase() + ': ' + i.message + '</li>'; }).join('') + '</ul>';
-    };
-    GlspHoverMouseListener.prototype.modifyBounds = function (bounds) {
+    }
+    createIssueMessage(marker) {
+        return '<ul>' + marker.issues.map(i => '<li>' + i.severity.toUpperCase() + ': ' + i.message + '</li>').join('') + '</ul>';
+    }
+    modifyBounds(bounds) {
         return bounds;
-    };
-    GlspHoverMouseListener = __decorate([
-        inversify_1.injectable()
-    ], GlspHoverMouseListener);
-    return GlspHoverMouseListener;
-}(sprotty_1.HoverMouseListener));
+    }
+};
+GlspHoverMouseListener = __decorate([
+    inversify_1.injectable()
+], GlspHoverMouseListener);
 exports.GlspHoverMouseListener = GlspHoverMouseListener;
 function getSeverity(marker) {
-    var e_1, _a;
-    var currentSeverity = 'info';
-    try {
-        for (var _b = __values(marker.issues.map(function (s) { return s.severity; })), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var severity = _c.value;
-            if (severity === 'error') {
-                return severity;
-            }
-            if (severity === 'warning' && currentSeverity === 'info') {
-                currentSeverity = severity;
-            }
+    let currentSeverity = 'info';
+    for (const severity of marker.issues.map(s => s.severity)) {
+        if (severity === 'error') {
+            return severity;
         }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        if (severity === 'warning' && currentSeverity === 'info') {
+            currentSeverity = severity;
         }
-        finally { if (e_1) throw e_1.error; }
     }
     return currentSeverity;
 }