@eclipse-glsp/client 0.9.0-next.fd1a8bb6 → 0.10.0-next.5dad48d.159

package/lib/features/decoration/decoration-placer.d.ts

@@ -1,4 +1,20 @@
-import { Decoration, DecorationPlacer, Point, SModelElement } from 'sprotty';
+/********************************************************************************
+ * 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
+ * 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 { Point } from '@eclipse-glsp/protocol';
+import { Decoration, DecorationPlacer, SModelElement } from 'sprotty';
 export declare class GlspDecorationPlacer extends DecorationPlacer {
     protected static readonly DECORATION_OFFSET: Point;
     protected getPosition(element: SModelElement & Decoration): Point;

package/lib/features/decoration/decoration-placer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decoration-placer.d.ts","sourceRoot":"","sources":["../../../src/features/decoration/decoration-placer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAA4B,KAAK,EAAiB,aAAa,EAAoB,MAAM,SAAS,CAAC;AAExI,qBACa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAoB;IAEtE,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,UAAU,GAAG,KAAK;CAYpE"}
+{"version":3,"file":"decoration-placer.d.ts","sourceRoot":"","sources":["../../../src/features/decoration/decoration-placer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAA2C,aAAa,EAAoB,MAAM,SAAS,CAAC;AAEjI,qBACa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAoB;IAEtE,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,UAAU,GAAG,KAAK;CAYpE"}

package/lib/features/decoration/decoration-placer.js

@@ -8,21 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var GlspDecorationPlacer_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlspDecorationPlacer = void 0;
-/********************************************************************************
- * 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
- * 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
- ********************************************************************************/
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
 let GlspDecorationPlacer = GlspDecorationPlacer_1 = class GlspDecorationPlacer extends sprotty_1.DecorationPlacer {

package/lib/features/decoration/decoration-placer.js.map

@@ -1 +1 @@
-{"version":3,"file":"decoration-placer.js","sourceRoot":"","sources":["../../../src/features/decoration/decoration-placer.ts"],"names":[],"mappings":";;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AACvC,qCAAwI;AAGxI,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,0BAAgB;IAG5C,WAAW,CAAC,OAAmC;QACrD,IAAI,OAAO,YAAY,uBAAa,IAAI,OAAO,CAAC,MAAM,YAAY,0BAAgB,EAAE;YAChF,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACrC;QACD,IAAI,oBAAU,CAAC,OAAO,CAAC,EAAE;YACrB,OAAO;gBACH,CAAC,EAAE,sBAAoB,CAAC,iBAAiB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK;gBAClE,CAAC,EAAE,sBAAoB,CAAC,iBAAiB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM;aACtE,CAAC;SACL;QACD,OAAO,sBAAY,CAAC;IACxB,CAAC;CACJ,CAAA;AAd6B,sCAAiB,GAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;AAD7D,oBAAoB;IADhC,sBAAU,EAAE;GACA,oBAAoB,CAehC;AAfY,oDAAoB"}
+{"version":3,"file":"decoration-placer.js","sourceRoot":"","sources":["../../../src/features/decoration/decoration-placer.ts"],"names":[],"mappings":";;;;;;;;;;AAgBA,yCAAuC;AACvC,qCAAiI;AAGjI,IAAa,oBAAoB,4BAAjC,MAAa,oBAAqB,SAAQ,0BAAgB;IAG5C,WAAW,CAAC,OAAmC;QACrD,IAAI,OAAO,YAAY,uBAAa,IAAI,OAAO,CAAC,MAAM,YAAY,0BAAgB,EAAE;YAChF,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACrC;QACD,IAAI,oBAAU,CAAC,OAAO,CAAC,EAAE;YACrB,OAAO;gBACH,CAAC,EAAE,sBAAoB,CAAC,iBAAiB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK;gBAClE,CAAC,EAAE,sBAAoB,CAAC,iBAAiB,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM;aACtE,CAAC;SACL;QACD,OAAO,sBAAY,CAAC;IACxB,CAAC;CACJ,CAAA;AAd6B,sCAAiB,GAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;AAD7D,oBAAoB;IADhC,sBAAU,EAAE;GACA,oBAAoB,CAehC;AAfY,oDAAoB"}

package/lib/features/edit-label/edit-label-validator.d.ts

@@ -1,6 +1,21 @@
+/********************************************************************************
+ * 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
+ * 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 { RequestEditValidationAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { Action, EditableLabel, EditLabelValidationResult, IEditLabelValidationDecorator, IEditLabelValidator, SModelElement } from 'sprotty';
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { RequestEditValidationAction, ValidationStatus } from '../../base/actions/edit-validation-actions';
 export declare namespace LabelEditValidation {
     const CONTEXT_ID = "label-edit";
     function toEditLabelValidationResult(status: ValidationStatus): EditLabelValidationResult;

package/lib/features/edit-label/edit-label-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edit-label-validator.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,mBAAmB,EAEnB,aAAa,EAEhB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAmC,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAE5I,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,UAAU,eAAe,CAAC;IAEvC,SAAgB,2BAA2B,CAAC,MAAM,EAAE,gBAAgB,GAAG,yBAAyB,CAS/F;CACJ;AAED,qBAAa,uBAAwB,SAAQ,2BAA2B;gBACxD,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,qBACa,wBAAyB,YAAW,mBAAmB;IAC/B,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAElF,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAKjG,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;CAM7E;AAED,qBACa,+BAAgC,YAAW,6BAA6B;IACjF,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,yBAAyB,GAAG,IAAI;IAuB1E,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;CASzC"}
+{"version":3,"file":"edit-label-validator.d.ts","sourceRoot":"","sources":["../../../src/features/edit-label/edit-label-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAmC,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAExH,OAAO,EACH,MAAM,EACN,aAAa,EACb,yBAAyB,EACzB,6BAA6B,EAC7B,mBAAmB,EAEnB,aAAa,EAEhB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,UAAU,eAAe,CAAC;IAEvC,SAAgB,2BAA2B,CAAC,MAAM,EAAE,gBAAgB,GAAG,yBAAyB,CAS/F;CACJ;AAED,qBAAa,uBAAwB,SAAQ,2BAA2B;gBACxD,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,qBACa,wBAAyB,YAAW,mBAAmB;IAC/B,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAElF,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAKjG,+BAA+B,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB;CAM7E;AAED,qBACa,+BAAgC,YAAW,6BAA6B;IACjF,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,yBAAyB,GAAG,IAAI;IAuB1E,OAAO,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;CASzC"}

package/lib/features/edit-label/edit-label-validator.js

@@ -25,27 +25,27 @@ exports.BalloonLabelValidationDecorator = exports.ServerEditLabelValidator = exp
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
 const action_dispatcher_1 = require("../../base/action-dispatcher");
-const edit_validation_actions_1 = require("../../base/actions/edit-validation-actions");
 var LabelEditValidation;
 (function (LabelEditValidation) {
     LabelEditValidation.CONTEXT_ID = 'label-edit';
     function toEditLabelValidationResult(status) {
         const message = status.message;
         let severity = 'ok';
-        if (edit_validation_actions_1.ValidationStatus.isError(status)) {
+        if (protocol_1.ValidationStatus.isError(status)) {
             severity = 'error';
         }
-        else if (edit_validation_actions_1.ValidationStatus.isWarning(status)) {
+        else if (protocol_1.ValidationStatus.isWarning(status)) {
             severity = 'warning';
         }
         return { message, severity };
     }
     LabelEditValidation.toEditLabelValidationResult = toEditLabelValidationResult;
 })(LabelEditValidation = exports.LabelEditValidation || (exports.LabelEditValidation = {}));
-class ValidateLabelEditAction extends edit_validation_actions_1.RequestEditValidationAction {
+class ValidateLabelEditAction extends protocol_1.RequestEditValidationAction {
     constructor(value, labelId) {
         super(LabelEditValidation.CONTEXT_ID, labelId, value);
     }
@@ -57,7 +57,7 @@ let ServerEditLabelValidator = class ServerEditLabelValidator {
         return this.actionDispatcher.requestUntil(action).then(response => this.getValidationResultFromResponse(response));
     }
     getValidationResultFromResponse(action) {
-        if (edit_validation_actions_1.isSetEditValidationResultAction(action)) {
+        if (protocol_1.isSetEditValidationResultAction(action)) {
             return LabelEditValidation.toEditLabelValidationResult(action.status);
         }
         return { severity: 'ok' };

package/lib/features/edit-label/edit-label-validator.js.map

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

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

@@ -1,18 +1,3 @@
-/********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- ********************************************************************************/
 import { ContainerModule } from 'inversify';
 declare const modelHintsModule: ContainerModule;
 export default modelHintsModule;

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAO5C,QAAA,MAAM,gBAAgB,iBAKpB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAK5C,QAAA,MAAM,gBAAgB,iBAKpB,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * 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
@@ -15,15 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
 const types_1 = require("../../base/types");
-const request_type_hints_action_1 = require("./request-type-hints-action");
 const type_hints_1 = require("./type-hints");
 const modelHintsModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     bind(type_hints_1.TypeHintProvider).toSelf().inSingletonScope();
     bind(types_1.GLSP_TYPES.ITypeHintProvider).toService(type_hints_1.TypeHintProvider);
-    sprotty_1.configureActionHandler({ bind, isBound }, request_type_hints_action_1.SetTypeHintsAction.KIND, type_hints_1.TypeHintProvider);
+    sprotty_1.configureActionHandler({ bind, isBound }, protocol_1.SetTypeHintsAction.KIND, type_hints_1.TypeHintProvider);
     sprotty_1.configureCommand({ bind, isBound }, type_hints_1.ApplyTypeHintsCommand);
 });
 exports.default = modelHintsModule;

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAmE;AAEnE,4CAA8C;AAC9C,2EAAiE;AACjE,6CAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACpE,IAAI,CAAC,6BAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,kBAAU,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,6BAAgB,CAAC,CAAC;IAC/D,gCAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,8CAAkB,CAAC,IAAI,EAAE,6BAAgB,CAAC,CAAC;IACrF,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/hints/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,yCAA4C;AAC5C,qCAAmE;AACnE,4CAA8C;AAC9C,6CAAuE;AAEvE,MAAM,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACpE,IAAI,CAAC,6BAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,kBAAU,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,6BAAgB,CAAC,CAAC;IAC/D,gCAAsB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,6BAAkB,CAAC,IAAI,EAAE,6BAAgB,CAAC,CAAC;IACrF,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAqB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC;AAEH,kBAAe,gBAAgB,CAAC"}

package/lib/features/hints/model.d.ts

@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElement, SModelElementSchema, SModelExtension } from 'sprotty';
+import { SModelElementSchema } from '@eclipse-glsp/protocol';
+import { SModelElement, SModelExtension } from 'sprotty';
 export declare const containerFeature: unique symbol;
 export interface Containable extends SModelExtension {
     isContainableElement(input: SModelElement | SModelElementSchema | string): boolean;

package/lib/features/hints/model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE9E,eAAO,MAAM,gBAAgB,eAAwB,CAAC;AAEtD,MAAM,WAAW,WAAY,SAAQ,eAAe;IAChD,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC;CACtF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,WAAW,CAE5F;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,YAAa,SAAQ,eAAe;CAAG;AAExD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,YAAY,CAE9F"}
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEzD,eAAO,MAAM,gBAAgB,eAAwB,CAAC;AAEtD,MAAM,WAAW,WAAY,SAAQ,eAAe;IAChD,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO,CAAC;CACtF;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,WAAW,CAE5F;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AAEzD,MAAM,WAAW,YAAa,SAAQ,eAAe;CAAG;AAExD,wBAAgB,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,aAAa,GAAG,YAAY,CAE9F"}

package/lib/features/hints/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":";;;AAiBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAMtD,SAAgB,aAAa,CAAC,OAAsB;IAChD,OAAO,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AAChD,CAAC;AAFD,sCAEC;AAEY,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIzD,SAAgB,cAAc,CAAC,OAAsB;IACjD,OAAO,OAAO,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;AAC/C,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../src/features/hints/model.ts"],"names":[],"mappings":";;;AAkBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAMtD,SAAgB,aAAa,CAAC,OAAsB;IAChD,OAAO,OAAO,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;AAChD,CAAC;AAFD,sCAEC;AAEY,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAIzD,SAAgB,cAAc,CAAC,OAAsB;IACjD,OAAO,OAAO,CAAC,UAAU,CAAC,uBAAe,CAAC,CAAC;AAC/C,CAAC;AAFD,wCAEC"}

package/lib/features/hints/type-hints.d.ts

@@ -1,50 +1,22 @@
-import { Action, CommandExecutionContext, CommandReturn, IActionHandler, ICommand, SModelElement, SModelElementSchema } from 'sprotty';
+/********************************************************************************
+ * 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
+ * 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, EdgeTypeHint, ShapeTypeHint } from '@eclipse-glsp/protocol';
+import { CommandExecutionContext, CommandReturn, IActionHandler, ICommand, SModelElement } from 'sprotty';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../tool-feedback/model';
-export declare abstract class TypeHint {
-    /**
-    The id of the element.
-    */
-    readonly elementTypeId: string;
-    /**
-     * Specifies whether the element can be relocated.
-     */
-    readonly repositionable: boolean;
-    /**
-     * Specifices wheter the element can be deleted
-     */
-    readonly deletable: boolean;
-}
-export declare class ShapeTypeHint extends TypeHint {
-    /**
-     * Specifies whether the element can be resized.
-     */
-    readonly resizable: boolean;
-    /**
-     * Specifies whether the element can be moved to another parent
-     */
-    readonly reparentable: boolean;
-    /**
-     * The types of elements that can be contained by this element (if any)
-     */
-    readonly containableElementTypeIds?: string[];
-}
-export declare class EdgeTypeHint extends TypeHint {
-    /**
-     * Specifies whether the routing of this element can be changed.
-     */
-    readonly routable: boolean;
-    /**
-     * Allowed source element types for this edge type
-     */
-    readonly sourceElementTypeIds: string[];
-    /**
-     * Allowed targe element types for this edge type
-     */
-    readonly targetElementTypeIds: string[];
-    isAllowedSource(input: SModelElement | SModelElementSchema | string): boolean;
-    isAllowedTarget(input: SModelElement | SModelElementSchema | string): boolean;
-}
 export declare class ApplyTypeHintsAction implements Action {
     readonly kind: string;
 }

package/lib/features/hints/type-hints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,uBAAuB,EACvB,aAAa,EAMb,cAAc,EACd,QAAQ,EAGR,aAAa,EACb,mBAAmB,EAItB,MAAM,SAAS,CAAC;AAMjB,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,8BAAsB,QAAQ;IAC1B;;MAEE;IACF,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,aAAc,SAAQ,QAAQ;IACvC;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjD;AAED,qBAAa,YAAa,SAAQ,QAAQ;IACtC;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAExC;;OAEG;IACH,QAAQ,CAAC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAExC,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO;IAI7E,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,mBAAmB,GAAG,MAAM,GAAG,OAAO;CAIhF;AAED,qBACa,oBAAqB,YAAW,MAAM;IAC/C,QAAQ,CAAC,IAAI,SAA8B;CAC9C;AAED,qBACa,qBAAsB,SAAQ,eAAe;IAMpB,SAAS,CAAC,MAAM,EAAE,oBAAoB;IALxE,OAAc,IAAI,SAAoB;IACtC,SAAgB,QAAQ,MAAM;IAEQ,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;gBAExC,MAAM,EAAE,oBAAoB;IAIxE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWxD,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASzD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAmB7D;AA4BD,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAC3F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACzF,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;CAChH;AAED,qBACa,gBAAiB,YAAW,cAAc,EAAE,iBAAiB;IAEtE,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAC7D,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE;IAqB5G,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS;CAG3F"}
+{"version":3,"file":"type-hints.d.ts","sourceRoot":"","sources":["../../../src/features/hints/type-hints.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,YAAY,EAAwB,aAAa,EAAY,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EACH,uBAAuB,EACvB,aAAa,EAMb,cAAc,EACd,QAAQ,EAGR,aAAa,EAIhB,MAAM,SAAS,CAAC;AAKjB,OAAO,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD,qBACa,oBAAqB,YAAW,MAAM;IAC/C,QAAQ,CAAC,IAAI,SAA8B;CAC9C;AAED,qBACa,qBAAsB,SAAQ,eAAe;IAMpB,SAAS,CAAC,MAAM,EAAE,oBAAoB;IALxE,OAAc,IAAI,SAAoB;IACtC,SAAgB,QAAQ,MAAM;IAEQ,SAAS,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;gBAExC,MAAM,EAAE,oBAAoB;IAIxE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;IAWxD,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;IASzD,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;CAmB7D;AA4BD,MAAM,WAAW,iBAAiB;IAC9B,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,CAAC;IAC3F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACzF,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE,CAAC;CAChH;AAED,qBACa,gBAAiB,YAAW,cAAc,EAAE,iBAAiB;IAEtE,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAC7D,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAE3D,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI;IAQhD,wBAAwB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,MAAM,EAAE;IAqB5G,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS;IAI1F,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,SAAS;CAG3F"}

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

@@ -12,7 +12,7 @@ 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-2021 EclipseSource and others.
  *
@@ -28,6 +28,7 @@ exports.TypeHintProvider = exports.ApplyTypeHintsCommand = exports.ApplyTypeHint
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
 const types_1 = require("../../base/types");
@@ -36,24 +37,6 @@ 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");
-const request_type_hints_action_1 = require("./request-type-hints-action");
-class TypeHint {
-}
-exports.TypeHint = TypeHint;
-class ShapeTypeHint extends TypeHint {
-}
-exports.ShapeTypeHint = ShapeTypeHint;
-class EdgeTypeHint extends TypeHint {
-    isAllowedSource(input) {
-        const type = smodel_util_1.getElementTypeId(input);
-        return this.sourceElementTypeIds.includes(type);
-    }
-    isAllowedTarget(input) {
-        const type = smodel_util_1.getElementTypeId(input);
-        return this.targetElementTypeIds.includes(type);
-    }
-}
-exports.EdgeTypeHint = EdgeTypeHint;
 let ApplyTypeHintsAction = class ApplyTypeHintsAction {
     constructor() {
         this.kind = ApplyTypeHintsCommand.KIND;
@@ -144,7 +127,7 @@ let TypeHintProvider = class TypeHintProvider {
         this.edgeHints = new Map();
     }
     handle(action) {
-        if (request_type_hints_action_1.isSetTypeHintsAction(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()]);

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
@@ -22,7 +22,8 @@ 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({
@@ -41,6 +42,7 @@ const glspHoverModule = new inversify_1.ContainerModule((bind, _unbind, isBound)
     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,yCAA4C;AAC5C,qCAciB;AACjB,8FAAyF;AAEzF,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,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,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;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;IAC1D,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

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSeverity = exports.GlspHoverMouseListener = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2021 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
@@ -22,20 +22,41 @@ exports.getSeverity = exports.GlspHoverMouseListener = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+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);
+            }
+        }
+    }
     startMouseOverTimer(target, event) {
         this.stopMouseOverTimer();
         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;

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

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

package/lib/features/layout/di.config.d.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

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/layout/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAK5C,QAAA,MAAM,oBAAoB,iBAGxB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/layout/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAM5C,QAAA,MAAM,oBAAoB,iBAMxB,CAAC;AAEH,eAAe,oBAAoB,CAAC"}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 /********************************************************************************
- * 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
@@ -17,10 +17,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
  ********************************************************************************/
 const inversify_1 = require("inversify");
 const sprotty_1 = require("sprotty");
+const freeform_layout_1 = require("./freeform-layout");
 const layout_commands_1 = require("./layout-commands");
-const layoutCommandsModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
+const vbox_layout_1 = require("./vbox-layout");
+const layoutCommandsModule = new inversify_1.ContainerModule((bind, _unbind, isBound, rebind) => {
     sprotty_1.configureCommand({ bind, isBound }, layout_commands_1.ResizeElementsCommand);
     sprotty_1.configureCommand({ bind, isBound }, layout_commands_1.AlignElementsCommand);
+    rebind(sprotty_1.VBoxLayouter).to(vbox_layout_1.VBoxLayouterExt);
+    sprotty_1.configureLayout({ bind, isBound }, freeform_layout_1.FreeFormLayouter.KIND, freeform_layout_1.FreeFormLayouter);
 });
 exports.default = layoutCommandsModule;
 //# sourceMappingURL=di.config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/layout/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAA2C;AAE3C,uDAAgF;AAEhF,MAAM,oBAAoB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IACxE,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uCAAqB,CAAC,CAAC;IAC3D,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sCAAoB,CAAC,CAAC;AAC9D,CAAC,CAAC,CAAC;AAEH,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/layout/di.config.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAA0E;AAC1E,uDAAqD;AACrD,uDAAgF;AAChF,+CAAgD;AAEhD,MAAM,oBAAoB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IAChF,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,uCAAqB,CAAC,CAAC;IAC3D,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,sCAAoB,CAAC,CAAC;IAE1D,MAAM,CAAC,sBAAY,CAAC,CAAC,EAAE,CAAC,6BAAe,CAAC,CAAC;IACzC,yBAAe,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,kCAAgB,CAAC,IAAI,EAAE,kCAAgB,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC;AAEH,kBAAe,oBAAoB,CAAC"}