@eclipse-glsp/client 0.10.0-next.ca17587.154 → 1.1.0-RC01

package/lib/features/tools/node-creation-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-creation-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/node-creation-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAoD,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAE7H,OAAO,EAIH,cAAc,EAEd,QAAQ,EACR,aAAa,EAGhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBACa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IACxE,MAAM,CAAC,EAAE,SAAsB;IAEK,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEhE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;IACnE,SAAS,CAAC,aAAa,EAAE,yBAAyB,CAAC;IAEnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IASd,OAAO,IAAI,IAAI;IAKf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAMxC;AAED,qBACa,6BAA8B,SAAQ,sBAAsB;IAGzD,SAAS,CAAC,aAAa,EAAE,yBAAyB;IAAE,SAAS,CAAC,IAAI,EAAE,gBAAgB;IAFhG,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;gBAE5B,aAAa,EAAE,yBAAyB,EAAY,IAAI,EAAE,gBAAgB;IAIhG,SAAS,CAAC,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIrE,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAmBtE,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;CAWhE"}
+{"version":3,"file":"node-creation-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/node-creation-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAuB,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEhG,OAAO,EAIH,cAAc,EAEd,QAAQ,EACR,aAAa,EAGhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE9E,OAAO,EAAE,WAAW,EAAiB,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,qBACa,gBAAiB,SAAQ,YAAa,YAAW,cAAc;IACxE,MAAM,CAAC,EAAE,SAAsB;IAEK,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEhE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;IACnE,SAAS,CAAC,aAAa,EAAE,yBAAyB,CAAC;IAEnD,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IASd,OAAO,IAAI,IAAI;IAKf,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;CAMxC;AAED,qBACa,6BAA8B,SAAQ,sBAAsB;IAGzD,SAAS,CAAC,aAAa,EAAE,yBAAyB;IAAE,SAAS,CAAC,IAAI,EAAE,gBAAgB;IAFhG,SAAS,CAAC,SAAS,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;gBAE5B,aAAa,EAAE,yBAAyB,EAAY,IAAI,EAAE,gBAAgB;IAIhG,SAAS,CAAC,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIrE,IAAI,aAAa,IAAI,MAAM,CAE1B;IAEQ,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAmBtE,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;CAWzE"}

package/lib/features/tools/node-creation-tool.js

@@ -12,7 +12,7 @@ var NodeCreationTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeCreationToolMouseListener = exports.NodeCreationTool = 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
@@ -44,27 +44,27 @@ let NodeCreationTool = NodeCreationTool_1 = class NodeCreationTool extends base_
         }
         this.creationToolMouseListener = new NodeCreationToolMouseListener(this.triggerAction, this);
         this.mouseTool.register(this.creationToolMouseListener);
-        this.dispatchFeedback([css_feedback_1.cursorFeedbackAction(css_feedback_1.CursorCSS.NODE_CREATION)]);
+        this.dispatchFeedback([(0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.NODE_CREATION)]);
     }
     disable() {
         this.mouseTool.deregister(this.creationToolMouseListener);
-        this.deregisterFeedback([css_feedback_1.cursorFeedbackAction()]);
+        this.deregisterFeedback([(0, css_feedback_1.cursorFeedbackAction)()]);
     }
     handle(action) {
-        if (protocol_1.isTriggerNodeCreationAction(action)) {
+        if (protocol_1.TriggerNodeCreationAction.is(action)) {
             this.triggerAction = action;
-            return new sprotty_1.EnableToolsAction([this.id]);
+            return sprotty_1.EnableToolsAction.create([this.id]);
         }
     }
 };
 NodeCreationTool.ID = 'tool_create_node';
 __decorate([
-    inversify_1.inject(sprotty_1.TYPES.ISnapper),
-    inversify_1.optional(),
+    (0, inversify_1.inject)(sprotty_1.TYPES.ISnapper),
+    (0, inversify_1.optional)(),
     __metadata("design:type", Object)
 ], NodeCreationTool.prototype, "snapper", void 0);
 NodeCreationTool = NodeCreationTool_1 = __decorate([
-    inversify_1.injectable()
+    (0, inversify_1.injectable)()
 ], NodeCreationTool);
 exports.NodeCreationTool = NodeCreationTool;
 let NodeCreationToolMouseListener = class NodeCreationToolMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
@@ -83,35 +83,35 @@ let NodeCreationToolMouseListener = class NodeCreationToolMouseListener extends
         const result = [];
         if (this.creationAllowed(this.elementTypeId)) {
             const containerId = this.container ? this.container.id : undefined;
-            let location = viewpoint_util_1.getAbsolutePosition(target, event);
+            let location = (0, viewpoint_util_1.getAbsolutePosition)(target, event);
             if (this.tool.snapper) {
                 // Create a 0-bounds proxy element for snapping
                 const elementProxy = new sprotty_1.SNode();
                 elementProxy.size = { width: 0, height: 0 };
                 location = this.tool.snapper.snap(location, elementProxy);
             }
-            result.push(new protocol_1.CreateNodeOperation(this.elementTypeId, location, containerId, this.triggerAction.args));
-            if (!sprotty_1.isCtrlOrCmd(event)) {
-                result.push(new sprotty_1.EnableDefaultToolsAction());
+            result.push(protocol_1.CreateNodeOperation.create(this.elementTypeId, { location, containerId, args: this.triggerAction.args }));
+            if (!(0, sprotty_1.isCtrlOrCmd)(event)) {
+                result.push(sprotty_1.EnableDefaultToolsAction.create());
             }
         }
         return result;
     }
     mouseOver(target, event) {
-        const currentContainer = sprotty_1.findParentByFeature(target, model_1.isContainable);
+        const currentContainer = (0, sprotty_1.findParentByFeature)(target, model_1.isContainable);
         if (!this.container || currentContainer !== this.container) {
             this.container = currentContainer;
             const feedback = this.creationAllowed(this.elementTypeId)
-                ? css_feedback_1.cursorFeedbackAction(css_feedback_1.CursorCSS.NODE_CREATION)
-                : css_feedback_1.cursorFeedbackAction(css_feedback_1.CursorCSS.OPERATION_NOT_ALLOWED);
+                ? (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.NODE_CREATION)
+                : (0, css_feedback_1.cursorFeedbackAction)(css_feedback_1.CursorCSS.OPERATION_NOT_ALLOWED);
             this.tool.dispatchFeedback([feedback]);
         }
         return [];
     }
 };
 NodeCreationToolMouseListener = __decorate([
-    inversify_1.injectable(),
-    __metadata("design:paramtypes", [protocol_1.TriggerNodeCreationAction, NodeCreationTool])
+    (0, inversify_1.injectable)(),
+    __metadata("design:paramtypes", [Object, NodeCreationTool])
 ], NodeCreationToolMouseListener);
 exports.NodeCreationToolMouseListener = NodeCreationToolMouseListener;
 //# sourceMappingURL=node-creation-tool.js.map

package/lib/features/tools/node-creation-tool.js.map

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

package/lib/features/tools/view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/features/tools/view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAO,MAAM,SAAS,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBACa,WAAY,SAAQ,mBAAmB;IAChD,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAiB9D"}
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../../src/features/tools/view.tsx"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAO,MAAM,SAAS,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,qBACa,WAAY,SAAQ,mBAAmB;IACvC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,KAAK;CAiBvE"}

package/lib/features/tools/view.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarqueeView = void 0;
 /********************************************************************************
- * Copyright (c) 2021 EclipseSource and others.
+ * Copyright (c) 2021-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
@@ -34,7 +34,7 @@ let MarqueeView = class MarqueeView extends sprotty_1.RectangularNodeView {
     }
 };
 MarqueeView = __decorate([
-    inversify_1.injectable()
+    (0, inversify_1.injectable)()
 ], MarqueeView);
 exports.MarqueeView = MarqueeView;
 //# sourceMappingURL=view.js.map

package/lib/features/tools/view.js.map

@@ -1 +1 @@
-{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/features/tools/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAqE;AAIrE,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAGnC,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,6BAAmB;IAChD,MAAM,CAAC,IAAiB,EAAE,OAAyB;QAC/C,MAAM,KAAK,GAAG,CACV;YACI,kDACwB,IAAI,mBACT,IAAI,EACnB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EACpD,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GACjD,CACR,CACP,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAlBY,WAAW;IADvB,sBAAU,EAAE;GACA,WAAW,CAkBvB;AAlBY,kCAAW"}
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../../src/features/tools/view.tsx"],"names":[],"mappings":";;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAAuC;AAEvC,qCAAqE;AAGrE,6DAA6D;AAC7D,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,aAAG,EAAE,CAAC;AAGnC,IAAa,WAAW,GAAxB,MAAa,WAAY,SAAQ,6BAAmB;IACvC,MAAM,CAAC,IAAiB,EAAE,OAAyB;QACxD,MAAM,KAAK,GAAG,CACV;YACI,kDACwB,IAAI,mBACT,IAAI,EACnB,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EACjF,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,EACL,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EACpD,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GACjD,CACR,CACP,CAAC;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAlBY,WAAW;IADvB,IAAA,sBAAU,GAAE;GACA,WAAW,CAkBvB;AAlBY,kCAAW"}

package/lib/features/validation/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';
 export declare const validationModule: ContainerModule;
 export declare const markerNavigatorModule: ContainerModule;

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAc5C,eAAO,MAAM,gBAAgB,iBAK3B,CAAC;AAEH,eAAO,MAAM,qBAAqB,iBAIhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,iBAG3C,CAAC"}
+{"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAc5C,eAAO,MAAM,gBAAgB,iBAM3B,CAAC;AAEH,eAAO,MAAM,qBAAqB,iBAIhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,iBAG3C,CAAC"}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.markerNavigatorContextMenuModule = exports.markerNavigatorModule = exports.validationModule = void 0;
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -16,21 +16,23 @@ exports.markerNavigatorContextMenuModule = exports.markerNavigatorModule = expor
  *
  * 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 marker_navigator_1 = require("./marker-navigator");
 const validate_1 = require("./validate");
 exports.validationModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
-    sprotty_1.configureCommand({ bind, isBound }, validate_1.SetMarkersCommand);
-    sprotty_1.configureCommand({ bind, isBound }, validate_1.ApplyMarkersCommand);
-    sprotty_1.configureCommand({ bind, isBound }, validate_1.DeleteMarkersCommand);
+    const context = { bind, isBound };
+    (0, sprotty_1.configureActionHandler)(context, protocol_1.SetMarkersAction.KIND, validate_1.SetMarkersActionHandler);
+    (0, sprotty_1.configureCommand)(context, validate_1.ApplyMarkersCommand);
+    (0, sprotty_1.configureCommand)(context, validate_1.DeleteMarkersCommand);
     bind(validate_1.ValidationFeedbackEmitter).toSelf().inSingletonScope();
 });
 exports.markerNavigatorModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
     bind(marker_navigator_1.SModelElementComparator).to(marker_navigator_1.LeftToRightTopToBottomComparator).inSingletonScope();
     bind(marker_navigator_1.MarkerNavigator).toSelf().inSingletonScope();
-    sprotty_1.configureCommand({ bind, isBound }, marker_navigator_1.NavigateToMarkerCommand);
+    (0, sprotty_1.configureActionHandler)({ bind, isBound }, marker_navigator_1.NavigateToMarkerAction.KIND, marker_navigator_1.NavigateToMarkerActionHandler);
 });
 /**
  * This module is not required if the diagram is deployed in Theia but only intended to be used
@@ -38,7 +40,7 @@ exports.markerNavigatorModule = new inversify_1.ContainerModule((bind, _unbind,
  * `registerMarkerNavigationCommands()` in `glsp-theia-integration` instead.
  */
 exports.markerNavigatorContextMenuModule = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
-    bind(types_1.GLSP_TYPES.IContextMenuProvider).to(marker_navigator_1.MarkerNavigatorContextMenuItemProvider).inSingletonScope();
-    bind(sprotty_1.TYPES.KeyListener).to(marker_navigator_1.MarkerNavigatorKeyListener).inSingletonScope();
+    bind(types_1.TYPES.IContextMenuProvider).to(marker_navigator_1.MarkerNavigatorContextMenuItemProvider).inSingletonScope();
+    bind(types_1.TYPES.KeyListener).to(marker_navigator_1.MarkerNavigatorKeyListener).inSingletonScope();
 });
 //# sourceMappingURL=di.config.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,yCAA4C;AAC5C,qCAAkD;AAElD,4CAA8C;AAC9C,yDAO4B;AAC5B,yCAAqH;AAExG,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,4BAAiB,CAAC,CAAC;IACvD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,8BAAmB,CAAC,CAAC;IACzD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,+BAAoB,CAAC,CAAC;IAC1D,IAAI,CAAC,oCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,0CAAuB,CAAC,CAAC,EAAE,CAAC,mDAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,0BAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,0CAAuB,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACU,QAAA,gCAAgC,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3F,IAAI,CAAC,kBAAU,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,yDAAsC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpG,IAAI,CAAC,eAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,6CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC9E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../../src/features/validation/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA0D;AAC1D,yCAA4C;AAC5C,qCAAmE;AACnE,4CAAyC;AACzC,yDAQ4B;AAC5B,yCAA2H;AAE9G,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,MAAM,OAAO,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAClC,IAAA,gCAAsB,EAAC,OAAO,EAAE,2BAAgB,CAAC,IAAI,EAAE,kCAAuB,CAAC,CAAC;IAChF,IAAA,0BAAgB,EAAC,OAAO,EAAE,8BAAmB,CAAC,CAAC;IAC/C,IAAA,0BAAgB,EAAC,OAAO,EAAE,+BAAoB,CAAC,CAAC;IAChD,IAAI,CAAC,oCAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAChF,IAAI,CAAC,0CAAuB,CAAC,CAAC,EAAE,CAAC,mDAAgC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtF,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,yCAAsB,CAAC,IAAI,EAAE,gDAA6B,CAAC,CAAC;AAC1G,CAAC,CAAC,CAAC;AAEH;;;;GAIG;AACU,QAAA,gCAAgC,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3F,IAAI,CAAC,aAAK,CAAC,oBAAoB,CAAC,CAAC,EAAE,CAAC,yDAAsC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC/F,IAAI,CAAC,aAAK,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,6CAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC9E,CAAC,CAAC,CAAC"}

package/lib/features/validation/issue-marker.d.ts

@@ -13,10 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Marker } from '@eclipse-glsp/protocol';
-import { SIssue, SIssueMarker, SParentElement } from 'sprotty';
-export declare class GIssueMarker extends SIssueMarker {
+import { Bounds, Marker } from '@eclipse-glsp/protocol';
+import { Projectable, SIssue, SIssueMarker, SIssueSeverity, SParentElement } from 'sprotty';
+export declare class GIssueMarker extends SIssueMarker implements Projectable {
     constructor();
+    projectionCssClasses: string[];
+    projectedBounds?: Bounds;
+    issues: SIssue[];
+    type: string;
+    computeProjectionCssClasses(): void;
 }
 /**
  * Retrieves the `SIssueMarker` contained by the provided model element as
@@ -32,12 +37,13 @@ export declare function getOrCreateSIssueMarker(modelElement: SParentElement): S
  * @param modelElement for which the `SIssueMarker` should be retrieved.
  * @returns the child `SIssueMarker` or `undefined` if no such child exists.
  */
-export declare function getSIssueMarker(modelElement: SParentElement): SIssueMarker | undefined;
+export declare function getSIssueMarker(modelElement: SParentElement): GIssueMarker | undefined;
 /**
  * Creates an `SIssue` with `severity` and `message` set according to
  * the `kind` and `description` of the provided `Marker`.
  * @param marker `Marker` for that an `SIssue` should be created.
  * @returns the created `SIssue`.
  */
-export declare function createSIssue(marker: Marker): SIssue;
+export declare function createSIssue(marker: Marker, parent?: SParentElement): SIssue;
+export declare function getSeverity(marker: SIssueMarker): SIssueSeverity;
 //# sourceMappingURL=issue-marker.d.ts.map

package/lib/features/validation/issue-marker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5E,qBAAa,YAAa,SAAQ,YAAY;;CAK7C;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAalF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAoBnD"}
+{"version":3,"file":"issue-marker.d.ts","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAiB,WAAW,EAAe,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAExH,qBAAa,YAAa,SAAQ,YAAa,YAAW,WAAW;;IAKjE,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAM;IACtB,IAAI,SAAY;IAEzB,2BAA2B,IAAI,IAAI;CAItC;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,CAclF;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAUtF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,MAAM,CAmB5E;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAWhE"}

package/lib/features/validation/issue-marker.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
+exports.getSeverity = exports.createSIssue = exports.getSIssueMarker = exports.getOrCreateSIssueMarker = exports.GIssueMarker = void 0;
 /********************************************************************************
  * Copyright (c) 2019-2021 EclipseSource and others.
  *
@@ -21,8 +21,14 @@ const sprotty_1 = require("sprotty");
 class GIssueMarker extends sprotty_1.SIssueMarker {
     constructor() {
         super();
+        this.issues = [];
+        this.type = 'marker';
         this.features = new Set(sprotty_1.SDecoration.DEFAULT_FEATURES);
     }
+    computeProjectionCssClasses() {
+        const severityCss = getSeverity(this);
+        this.projectionCssClasses = ['sprotty-issue', 'sprotty-' + severityCss];
+    }
 }
 exports.GIssueMarker = GIssueMarker;
 /**
@@ -37,8 +43,9 @@ function getOrCreateSIssueMarker(modelElement) {
     issueMarker = getSIssueMarker(modelElement);
     if (issueMarker === undefined) {
         issueMarker = new GIssueMarker();
-        issueMarker.type = 'marker';
-        issueMarker.issues = new Array();
+        if ((0, sprotty_1.isBoundsAware)(modelElement)) {
+            issueMarker.projectedBounds = modelElement.parentToLocal(modelElement.bounds);
+        }
         modelElement.add(issueMarker);
     }
     return issueMarker;
@@ -53,7 +60,7 @@ exports.getOrCreateSIssueMarker = getOrCreateSIssueMarker;
 function getSIssueMarker(modelElement) {
     let issueMarker;
     for (const child of modelElement.children) {
-        if (child instanceof sprotty_1.SIssueMarker) {
+        if (child instanceof GIssueMarker) {
             issueMarker = child;
         }
     }
@@ -66,7 +73,7 @@ exports.getSIssueMarker = getSIssueMarker;
  * @param marker `Marker` for that an `SIssue` should be created.
  * @returns the created `SIssue`.
  */
-function createSIssue(marker) {
+function createSIssue(marker, parent) {
     const issue = new sprotty_1.SIssue();
     issue.message = marker.description;
     switch (marker.kind) {
@@ -86,4 +93,17 @@ function createSIssue(marker) {
     return issue;
 }
 exports.createSIssue = createSIssue;
+function getSeverity(marker) {
+    let currentSeverity = 'info';
+    for (const severity of marker.issues.map(s => s.severity)) {
+        if (severity === 'error') {
+            return severity;
+        }
+        if (severity === 'warning' && currentSeverity === 'info') {
+            currentSeverity = severity;
+        }
+    }
+    return currentSeverity;
+}
+exports.getSeverity = getSeverity;
 //# sourceMappingURL=issue-marker.js.map

package/lib/features/validation/issue-marker.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAA4D;AAC5D,qCAA4E;AAE5E,MAAa,YAAa,SAAQ,sBAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,qBAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;CACJ;AALD,oCAKC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,WAAW,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC5B,WAAW,CAAC,MAAM,GAAG,IAAI,KAAK,EAAU,CAAC;QACzC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAbD,0DAaC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,sBAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc;IACvC,MAAM,KAAK,GAAW,IAAI,gBAAM,EAAE,CAAC;IACnC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,qBAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AApBD,oCAoBC"}
+{"version":3,"file":"issue-marker.js","sourceRoot":"","sources":["../../../src/features/validation/issue-marker.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAoE;AACpE,qCAAwH;AAExH,MAAa,YAAa,SAAQ,sBAAY;IAC1C;QACI,KAAK,EAAE,CAAC;QAKH,WAAM,GAAa,EAAE,CAAC;QACtB,SAAI,GAAG,QAAQ,CAAC;QALrB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAS,qBAAW,CAAC,gBAAgB,CAAC,CAAC;IAClE,CAAC;IAMD,2BAA2B;QACvB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,oBAAoB,GAAG,CAAC,eAAe,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;IAC5E,CAAC;CACJ;AAdD,oCAcC;AAED;;;;;;GAMG;AACH,SAAgB,uBAAuB,CAAC,YAA4B;IAChE,IAAI,WAAqC,CAAC;IAE1C,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,WAAW,KAAK,SAAS,EAAE;QAC3B,WAAW,GAAG,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,IAAA,uBAAa,EAAC,YAAY,CAAC,EAAE;YAC7B,WAAW,CAAC,eAAe,GAAG,YAAY,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SACjF;QACD,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACjC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAdD,0DAcC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,YAA4B;IACxD,IAAI,WAAqC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,QAAQ,EAAE;QACvC,IAAI,KAAK,YAAY,YAAY,EAAE;YAC/B,WAAW,GAAG,KAAK,CAAC;SACvB;KACJ;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAVD,0CAUC;AAED;;;;;GAKG;AACH,SAAgB,YAAY,CAAC,MAAc,EAAE,MAAuB;IAChE,MAAM,KAAK,GAAG,IAAI,gBAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC;IAEnC,QAAQ,MAAM,CAAC,IAAI,EAAE;QACjB,KAAK,qBAAU,CAAC,KAAK,CAAC,CAAC;YACnB,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC;YACzB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,IAAI,CAAC,CAAC;YAClB,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;YACxB,MAAM;SACT;QACD,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,MAAM;SACT;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAnBD,oCAmBC;AAED,SAAgB,WAAW,CAAC,MAAoB;IAC5C,IAAI,eAAe,GAAmB,MAAM,CAAC;IAC7C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE;QACvD,IAAI,QAAQ,KAAK,OAAO,EAAE;YACtB,OAAO,QAAQ,CAAC;SACnB;QACD,IAAI,QAAQ,KAAK,SAAS,IAAI,eAAe,KAAK,MAAM,EAAE;YACtD,eAAe,GAAG,QAAQ,CAAC;SAC9B;KACJ;IACD,OAAO,eAAe,CAAC;AAC3B,CAAC;AAXD,kCAWC"}

package/lib/features/validation/marker-navigator.d.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * 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
@@ -14,15 +14,23 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Action, Point } from '@eclipse-glsp/protocol';
-import { BoundsAware, CenterCommand, Command, CommandExecutionContext, CommandReturn, IContextMenuItemProvider, KeyListener, MenuItem, Selectable, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot } from 'sprotty';
-import { SelectCommand, SelectionService } from '../select/selection-service';
-export declare class NavigateToMarkerAction implements Action {
-    readonly direction: 'next' | 'previous';
-    readonly selectedElementIds?: string[] | undefined;
-    readonly severities: SIssueSeverity[];
-    kind: string;
-    static readonly KIND = "navigateToMarker";
-    constructor(direction?: 'next' | 'previous', selectedElementIds?: string[] | undefined, severities?: SIssueSeverity[], kind?: string);
+import { ActionDispatcher, BoundsAware, IActionHandler, IContextMenuItemProvider, KeyListener, MenuItem, Selectable, SIssueMarker, SIssueSeverity, SModelElement, SModelRoot } from 'sprotty';
+import { SelectionService } from '../select/selection-service';
+export interface NavigateToMarkerAction extends Action {
+    kind: typeof NavigateToMarkerAction.KIND;
+    direction: MarkerNavigationDirection;
+    selectedElementIds?: string[];
+    severities: SIssueSeverity[];
+}
+export declare type MarkerNavigationDirection = 'next' | 'previous';
+export declare namespace NavigateToMarkerAction {
+    const KIND = "navigateToMarker";
+    function is(object: any): object is NavigateToMarkerAction;
+    function create(options: {
+        direction?: MarkerNavigationDirection;
+        selectedElementIds?: string[];
+        severities?: SIssueSeverity[];
+    }): NavigateToMarkerAction;
 }
 export declare class SModelElementComparator {
     compare(_one: SModelElement, _other: SModelElement): number;
@@ -39,27 +47,21 @@ export declare class LeftToRightTopToBottomComparator {
 export declare class MarkerNavigator {
     static readonly ALL_SEVERITIES: SIssueSeverity[];
     protected markerComparator: SModelElementComparator;
-    next(root: SModelRoot, current?: SModelElement & BoundsAware, predicate?: (marker: SIssueMarker) => boolean): SIssueMarker | undefined;
-    previous(root: SModelRoot, current?: SModelElement & BoundsAware, predicate?: (marker: SIssueMarker) => boolean): SIssueMarker | undefined;
-    protected getMarkers(root: SModelRoot, predicate: (marker: SIssueMarker) => boolean): SIssueMarker[];
+    next(root: Readonly<SModelRoot>, current?: SModelElement & BoundsAware, predicate?: (marker: SIssueMarker) => boolean): SIssueMarker | undefined;
+    previous(root: Readonly<SModelRoot>, current?: SModelElement & BoundsAware, predicate?: (marker: SIssueMarker) => boolean): SIssueMarker | undefined;
+    protected getMarkers(root: Readonly<SModelRoot>, predicate: (marker: SIssueMarker) => boolean): SIssueMarker[];
     protected getNextIndex(current: SModelElement & BoundsAware, markers: SIssueMarker[]): number;
     protected getPreviousIndex(current: SModelElement & BoundsAware, markers: SIssueMarker[]): number;
 }
-export declare class NavigateToMarkerCommand extends Command {
-    protected action: NavigateToMarkerAction;
-    static KIND: string;
+export declare class NavigateToMarkerActionHandler implements IActionHandler {
     protected markerComparator: SModelElementComparator;
     protected markerNavigator: MarkerNavigator;
     protected selectionService: SelectionService;
-    protected selectCommand: SelectCommand;
-    protected centerCommand: CenterCommand;
-    constructor(action: NavigateToMarkerAction);
-    execute(context: CommandExecutionContext): CommandReturn;
-    protected getSelectedElements(root: SModelRoot): (SModelElement & Selectable)[];
-    protected getTarget(selected: SModelElement[], root: SModelRoot): SIssueMarker | undefined;
-    protected matchesSeverities(marker: SIssueMarker): boolean;
-    undo(context: CommandExecutionContext): CommandReturn;
-    redo(context: CommandExecutionContext): CommandReturn;
+    protected actionDispatcher: ActionDispatcher;
+    handle(action: NavigateToMarkerAction): void;
+    protected getSelectedElements(action: NavigateToMarkerAction): (SModelElement & Selectable)[];
+    protected getTarget(action: NavigateToMarkerAction, selected: SModelElement[]): SIssueMarker | undefined;
+    protected matchesSeverities(action: NavigateToMarkerAction, marker: SIssueMarker): boolean;
 }
 export declare class MarkerNavigatorContextMenuItemProvider implements IContextMenuItemProvider {
     protected selectionService: SelectionService;

package/lib/features/validation/marker-navigator.d.ts.map

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