@eclipse-glsp/client 1.1.0-RC09 → 1.1.0-next.0363f0b.261

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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvider = exports.NavigateToMarkerActionHandler = exports.MarkerNavigator = exports.LeftToRightTopToBottomComparator = exports.SModelElementComparator = exports.NavigateToMarkerAction = void 0;
 /********************************************************************************
- * Copyright (c) 2020-2022 EclipseSource and others.
+ * Copyright (c) 2020-2023 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -25,26 +25,24 @@ exports.MarkerNavigatorKeyListener = exports.MarkerNavigatorContextMenuItemProvi
  *
  * 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 keyboard_1 = require("sprotty/lib/utils/keyboard");
-const types_1 = require("../../base/types");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const action_dispatcher_1 = require("../../base/action-dispatcher");
+const selection_service_1 = require("../../base/selection-service");
 const marker_1 = require("../../utils/marker");
 const smodel_util_1 = require("../../utils/smodel-util");
-const selection_service_1 = require("../select/selection-service");
 var NavigateToMarkerAction;
 (function (NavigateToMarkerAction) {
     NavigateToMarkerAction.KIND = 'navigateToMarker';
     function is(object) {
-        return protocol_1.Action.hasKind(object, NavigateToMarkerAction.KIND) && (0, protocol_1.hasStringProp)(object, 'direction') && (0, protocol_1.hasArrayProp)(object, 'severities');
+        return _glsp_sprotty_1.Action.hasKind(object, NavigateToMarkerAction.KIND) && (0, _glsp_sprotty_1.hasStringProp)(object, 'direction') && (0, _glsp_sprotty_1.hasArrayProp)(object, 'severities');
     }
     NavigateToMarkerAction.is = is;
     function create(options) {
         return Object.assign({ kind: NavigateToMarkerAction.KIND, direction: 'next', severities: MarkerNavigator.ALL_SEVERITIES }, options);
     }
     NavigateToMarkerAction.create = create;
-})(NavigateToMarkerAction = exports.NavigateToMarkerAction || (exports.NavigateToMarkerAction = {}));
+})(NavigateToMarkerAction || (exports.NavigateToMarkerAction = NavigateToMarkerAction = {}));
 class SModelElementComparator {
     compare(_one, _other) {
         return 0;
@@ -52,10 +50,10 @@ class SModelElementComparator {
 }
 exports.SModelElementComparator = SModelElementComparator;
 /** Specifies the order of two selectable and bounds-aware elements left-to-right and top-to-bottom. */
-let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
+let LeftToRightTopToBottomComparator = exports.LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
     compare(one, other) {
-        const boundsOne = (0, sprotty_1.findParentByFeature)(one, smodel_util_1.isSelectableAndBoundsAware);
-        const boundsOther = (0, sprotty_1.findParentByFeature)(other, smodel_util_1.isSelectableAndBoundsAware);
+        const boundsOne = (0, _glsp_sprotty_1.findParentByFeature)(one, smodel_util_1.isSelectableAndBoundsAware);
+        const boundsOther = (0, _glsp_sprotty_1.findParentByFeature)(other, smodel_util_1.isSelectableAndBoundsAware);
         if (boundsOne && boundsOther) {
             if (boundsOne.bounds.y !== boundsOther.bounds.y) {
                 return boundsOne.bounds.y - boundsOther.bounds.y;
@@ -67,16 +65,15 @@ let LeftToRightTopToBottomComparator = class LeftToRightTopToBottomComparator {
         return 0;
     }
 };
-LeftToRightTopToBottomComparator = __decorate([
+exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator = __decorate([
     (0, inversify_1.injectable)()
 ], LeftToRightTopToBottomComparator);
-exports.LeftToRightTopToBottomComparator = LeftToRightTopToBottomComparator;
 /**
  * Specifies the next/previous marker in a graph model.
  *
  * This navigator uses a `MarkerComparator` to determine the order of markers. It can also return next/previous
  */
-let MarkerNavigator = class MarkerNavigator {
+let MarkerNavigator = exports.MarkerNavigator = class MarkerNavigator {
     next(root, current, predicate = marker_1.MarkerPredicates.ALL) {
         const markers = this.getMarkers(root, predicate);
         if (current === undefined) {
@@ -117,30 +114,29 @@ __decorate([
     (0, inversify_1.inject)(SModelElementComparator),
     __metadata("design:type", SModelElementComparator)
 ], MarkerNavigator.prototype, "markerComparator", void 0);
-MarkerNavigator = __decorate([
+exports.MarkerNavigator = MarkerNavigator = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigator);
-exports.MarkerNavigator = MarkerNavigator;
-let NavigateToMarkerActionHandler = class NavigateToMarkerActionHandler {
+let NavigateToMarkerActionHandler = exports.NavigateToMarkerActionHandler = class NavigateToMarkerActionHandler {
     handle(action) {
         const selected = this.getSelectedElements(action);
         const target = this.getTarget(action, selected);
-        const selectableTarget = target ? (0, sprotty_1.findParentByFeature)(target, sprotty_1.isSelectable) : undefined;
+        const selectableTarget = target ? (0, _glsp_sprotty_1.findParentByFeature)(target, _glsp_sprotty_1.isSelectable) : undefined;
         if (selectableTarget) {
             const deselectedElementsIDs = selected.map(e => e.id).filter(id => id !== selectableTarget.id);
-            this.actionDispatcher.dispatch(protocol_1.SelectAction.create({ selectedElementsIDs: [selectableTarget.id], deselectedElementsIDs }));
-            this.actionDispatcher.dispatch(protocol_1.CenterAction.create([selectableTarget.id]));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.SelectAction.create({ selectedElementsIDs: [selectableTarget.id], deselectedElementsIDs }));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.CenterAction.create([selectableTarget.id]));
         }
     }
     getSelectedElements(action) {
         if (action.selectedElementIds && action.selectedElementIds.length > 0) {
-            return (0, smodel_util_1.getElements)(this.selectionService.getModelRoot().index, action.selectedElementIds, sprotty_1.isSelectable);
+            return (0, smodel_util_1.getElements)(this.selectionService.getModelRoot().index, action.selectedElementIds, _glsp_sprotty_1.isSelectable);
         }
         return this.selectionService.getSelectedElements();
     }
     getTarget(action, selected) {
         const root = this.selectionService.getModelRoot();
-        const target = selected.sort(this.markerComparator.compare).find(sprotty_1.isBoundsAware);
+        const target = selected.sort(this.markerComparator.compare).find(_glsp_sprotty_1.isBoundsAware);
         if (action.direction === 'previous') {
             return this.markerNavigator.previous(root, target, marker => this.matchesSeverities(action, marker));
         }
@@ -161,18 +157,17 @@ __decorate([
     __metadata("design:type", MarkerNavigator)
 ], NavigateToMarkerActionHandler.prototype, "markerNavigator", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], NavigateToMarkerActionHandler.prototype, "selectionService", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcher),
-    __metadata("design:type", sprotty_1.ActionDispatcher)
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcher),
+    __metadata("design:type", action_dispatcher_1.GLSPActionDispatcher)
 ], NavigateToMarkerActionHandler.prototype, "actionDispatcher", void 0);
-NavigateToMarkerActionHandler = __decorate([
+exports.NavigateToMarkerActionHandler = NavigateToMarkerActionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], NavigateToMarkerActionHandler);
-exports.NavigateToMarkerActionHandler = NavigateToMarkerActionHandler;
-let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
+let MarkerNavigatorContextMenuItemProvider = exports.MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuItemProvider {
     getItems(root, lastMousePosition) {
         const selectedElementIds = Array.from(this.selectionService.getSelectedElementIDs());
         const hasMarkers = (0, marker_1.collectIssueMarkers)(root).length > 0;
@@ -203,26 +198,24 @@ let MarkerNavigatorContextMenuItemProvider = class MarkerNavigatorContextMenuIte
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.SelectionService),
+    (0, inversify_1.inject)(selection_service_1.SelectionService),
     __metadata("design:type", selection_service_1.SelectionService)
 ], MarkerNavigatorContextMenuItemProvider.prototype, "selectionService", void 0);
-MarkerNavigatorContextMenuItemProvider = __decorate([
+exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigatorContextMenuItemProvider);
-exports.MarkerNavigatorContextMenuItemProvider = MarkerNavigatorContextMenuItemProvider;
-let MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends sprotty_1.KeyListener {
+let MarkerNavigatorKeyListener = exports.MarkerNavigatorKeyListener = class MarkerNavigatorKeyListener extends _glsp_sprotty_1.KeyListener {
     keyDown(_element, event) {
-        if ((0, keyboard_1.matchesKeystroke)(event, 'Period', 'ctrl')) {
+        if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Period', 'ctrl')) {
             return [NavigateToMarkerAction.create({ direction: 'next' })];
         }
-        else if ((0, keyboard_1.matchesKeystroke)(event, 'Comma', 'ctrl')) {
+        else if ((0, _glsp_sprotty_1.matchesKeystroke)(event, 'Comma', 'ctrl')) {
             return [NavigateToMarkerAction.create({ direction: 'previous' })];
         }
         return [];
     }
 };
-MarkerNavigatorKeyListener = __decorate([
+exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener = __decorate([
     (0, inversify_1.injectable)()
 ], MarkerNavigatorKeyListener);
-exports.MarkerNavigatorKeyListener = MarkerNavigatorKeyListener;
 //# sourceMappingURL=marker-navigator.js.map

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

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

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

@@ -0,0 +1,3 @@
+import 'mocha';
+import 'reflect-metadata';
+//# sourceMappingURL=marker-navigator.spec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"marker-navigator.spec.d.ts","sourceRoot":"","sources":["../../../src/features/validation/marker-navigator.spec.ts"],"names":[],"mappings":"AAiBA,OAAO,OAAO,CAAC;AACf,OAAO,kBAAkB,CAAC"}

package/lib/features/validation/marker-navigator.spec.js

@@ -0,0 +1,184 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/********************************************************************************
+ * Copyright (c) 2020-2023 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * 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 chai_1 = require("chai");
+const inversify_1 = require("inversify");
+require("mocha");
+require("reflect-metadata");
+const _glsp_sprotty_1 = require("../../glsp-sprotty/index");
+const default_module_1 = require("../../base/default.module");
+const decoration_module_1 = require("../decoration/decoration-module");
+const marker_navigator_1 = require("./marker-navigator");
+const validation_modules_1 = require("./validation-modules");
+describe('MarkerNavigator', () => {
+    const container = new inversify_1.Container();
+    container.load(default_module_1.defaultModule, decoration_module_1.decorationModule, validation_modules_1.markerNavigatorModule);
+    // eslint-disable-next-line deprecation/deprecation
+    container.rebind(_glsp_sprotty_1.TYPES.IModelFactory).to(_glsp_sprotty_1.SGraphFactory).inSingletonScope();
+    // eslint-disable-next-line deprecation/deprecation
+    const graphFactory = container.get(_glsp_sprotty_1.TYPES.IModelFactory);
+    const markerNavigator = container.get(marker_navigator_1.MarkerNavigator);
+    const rootWithoutAnyMarkers = graphFactory.createRoot({
+        id: 'root',
+        type: 'graph',
+        children: [
+            {
+                id: '1',
+                type: 'node'
+            }
+        ]
+    });
+    const rootWithMarkers = graphFactory.createRoot({
+        id: 'root',
+        type: 'graph',
+        children: [
+            {
+                id: 'bottom-right',
+                type: 'node'
+            },
+            {
+                id: 'top-right',
+                type: 'node'
+            },
+            {
+                id: 'top-left',
+                type: 'node'
+            },
+            {
+                id: 'bottom-left',
+                type: 'node'
+            }
+        ]
+    });
+    const elementTopLeft = rootWithMarkers.children[2];
+    elementTopLeft.bounds = { width: 10, height: 10, x: 100, y: 100 };
+    const elementTopRight = rootWithMarkers.children[1];
+    elementTopRight.bounds = { width: 10, height: 10, x: 200, y: 100 };
+    const elementBottomLeft = rootWithMarkers.children[3];
+    elementBottomLeft.bounds = { width: 10, height: 10, x: 100, y: 200 };
+    const elementBottomRight = rootWithMarkers.children[0];
+    elementBottomRight.bounds = { width: 10, height: 10, x: 200, y: 200 };
+    beforeEach('clear issue marker', () => {
+        [elementTopLeft, elementTopRight, elementBottomLeft, elementBottomRight].forEach(clearMarker);
+    });
+    it('next(undefined) without any markers returns undefined', () => {
+        (0, chai_1.expect)(markerNavigator.next(rootWithoutAnyMarkers)).to.be.undefined;
+    });
+    it('previous(undefined) without any markers returns undefined', () => {
+        (0, chai_1.expect)(markerNavigator.previous(rootWithoutAnyMarkers)).to.be.undefined;
+    });
+    it('next(undefined) with one marker returns the one marker', () => {
+        const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const next = markerNavigator.next(rootWithMarkers);
+        (0, chai_1.expect)(next).to.eql(marker);
+    });
+    it('next(firstMarker) with only one marker returns again the first marker', () => {
+        const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const next = markerNavigator.next(rootWithMarkers, marker);
+        (0, chai_1.expect)(next).to.eql(marker);
+        // and again and again
+        const nextNext = markerNavigator.next(rootWithMarkers, next);
+        (0, chai_1.expect)(nextNext).to.eql(marker);
+    });
+    it('previous(firstMarker) with only one marker returns again the first marker', () => {
+        const marker = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const previous = markerNavigator.previous(rootWithMarkers, marker);
+        (0, chai_1.expect)(previous).to.eql(marker);
+        // and again and again
+        const previousPrevious = markerNavigator.previous(rootWithMarkers, previous);
+        (0, chai_1.expect)(previousPrevious).to.eql(marker);
+    });
+    it('next(firstMarker) with two marker returns second marker then again first marker', () => {
+        const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
+        const next = markerNavigator.next(rootWithMarkers, marker1);
+        (0, chai_1.expect)(next).to.eql(marker2);
+        // and again and again
+        const nextNext = markerNavigator.next(rootWithMarkers, next);
+        (0, chai_1.expect)(nextNext).to.eql(marker1);
+    });
+    it('previous(firstMarker) with two marker returns second marker then again first marker', () => {
+        const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
+        const next = markerNavigator.previous(rootWithMarkers, marker1);
+        (0, chai_1.expect)(next).to.eql(marker2);
+        // and again and again
+        const nextNext = markerNavigator.previous(rootWithMarkers, next);
+        (0, chai_1.expect)(nextNext).to.eql(marker1);
+    });
+    it('returns markers in the order left-to-right, top-to-bottom with next()', () => {
+        const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
+        const marker3 = setIssues(elementBottomLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker4 = setIssues(elementBottomRight, [{ message: 'msg', severity: 'error' }]);
+        const found1 = markerNavigator.next(rootWithMarkers);
+        const found2 = markerNavigator.next(rootWithMarkers, found1);
+        const found3 = markerNavigator.next(rootWithMarkers, found2);
+        const found4 = markerNavigator.next(rootWithMarkers, found3);
+        const found5 = markerNavigator.next(rootWithMarkers, found4);
+        (0, chai_1.expect)(found1).to.eql(marker1);
+        (0, chai_1.expect)(found2).to.eql(marker2);
+        (0, chai_1.expect)(found3).to.eql(marker3);
+        (0, chai_1.expect)(found4).to.eql(marker4);
+        (0, chai_1.expect)(found5).to.eql(marker1);
+    });
+    it('returns markers in the order left-to-right, top-to-bottom with previous()', () => {
+        const marker1 = setIssues(elementTopLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker2 = setIssues(elementTopRight, [{ message: 'msg', severity: 'error' }]);
+        const marker3 = setIssues(elementBottomLeft, [{ message: 'msg', severity: 'error' }]);
+        const marker4 = setIssues(elementBottomRight, [{ message: 'msg', severity: 'error' }]);
+        const found1 = markerNavigator.previous(rootWithMarkers);
+        const found2 = markerNavigator.previous(rootWithMarkers, found1);
+        const found3 = markerNavigator.previous(rootWithMarkers, found2);
+        const found4 = markerNavigator.previous(rootWithMarkers, found3);
+        const found5 = markerNavigator.previous(rootWithMarkers, found4);
+        (0, chai_1.expect)(found1).to.eql(marker1);
+        (0, chai_1.expect)(found2).to.eql(marker4);
+        (0, chai_1.expect)(found3).to.eql(marker3);
+        (0, chai_1.expect)(found4).to.eql(marker2);
+        (0, chai_1.expect)(found5).to.eql(marker1);
+    });
+});
+function clearMarker(elem) {
+    elem.children.filter(isMarker).forEach(marker => elem.remove(marker));
+}
+function setIssues(elem, issues) {
+    const marker = getOrCreateMarker(elem);
+    marker.issues = issues;
+    return marker;
+}
+function getOrCreateMarker(elem) {
+    const marker = findMarker(elem);
+    if (marker instanceof _glsp_sprotty_1.SIssueMarker) {
+        return marker;
+    }
+    return createMarker(elem);
+}
+function findMarker(elem) {
+    return elem.children.find(isMarker);
+}
+function isMarker(element) {
+    return element instanceof _glsp_sprotty_1.SIssueMarker;
+}
+function createMarker(elem) {
+    const newMarker = new _glsp_sprotty_1.SIssueMarker();
+    newMarker.type = 'marker';
+    newMarker.id = `${elem.id}_marker`;
+    elem.add(newMarker);
+    return newMarker;
+}
+//# sourceMappingURL=marker-navigator.spec.js.map

package/lib/features/validation/marker-navigator.spec.js.map

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

package/lib/features/validation/validate.d.ts

@@ -1,23 +1,7 @@
-/********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * 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, DeleteMarkersAction, Marker, SetMarkersAction } from '@eclipse-glsp/protocol';
-import { CommandExecutionContext, CommandReturn, IActionDispatcher, IActionHandler, ICommand } from 'sprotty';
+import { Action, CommandExecutionContext, CommandReturn, DeleteMarkersAction, IActionDispatcher, IActionHandler, ICommand, Marker, SetMarkersAction } from '../../glsp-sprotty/index';
 import { EditorContextService } from '../../base/editor-context-service';
-import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
-import { FeedbackCommand } from '../tool-feedback/model';
+import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../../base/feedback/feedback-action-dispatcher';
+import { FeedbackCommand } from '../../base/feedback/feedback-command';
 /**
  * Feedback emitter sending actions for visualizing model validation feedback and
  * re-establishing this feedback visualization after the model has been updated.

package/lib/features/validation/validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAgB,MAAM,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE7G,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAgC,MAAM,SAAS,CAAC;AAC5I,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAGzE,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,qBACa,yBAA0B,YAAW,gBAAgB;IACrB,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtG,SAAS,CAAC,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAElF;;;;OAIG;IACH,gCAAgC,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,SAAK,GAAG,IAAI;CAalF;AAED;;;;;GAKG;AACH,8BACsB,qBAAqB;IACvC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAE/C,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,GAAG,IAAI;IAIlD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMtC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;CACpF;AAED,qBACa,uBAAwB,YAAW,cAAc;IAE1D,SAAS,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAI/D,SAAS,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAGxD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAKpD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAMjF;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM;IAC9C,IAAI,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,IAAI,iBAAiB,CAAC;IAEnC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAE5D;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAK5D;CACJ;AAED;;;GAGG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IAGlB,SAAS,CAAC,MAAM,EAAE,kBAAkB;IAFtE,MAAM,CAAC,IAAI,SAA2B;gBAEM,MAAM,EAAE,kBAAkB;IAItE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAe3D;AAiBD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,eAAe;IAGnB,SAAS,CAAC,MAAM,EAAE,mBAAmB;IAFvE,MAAM,CAAC,IAAI,SAA4B;gBAEK,MAAM,EAAE,mBAAmB;IAIvE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAwB3D"}
+{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/features/validation/validate.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,uBAAuB,EACvB,aAAa,EACb,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACd,QAAQ,EACR,MAAM,EAGN,gBAAgB,EAGnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAIvE;;;GAGG;AACH,qBACa,yBAA0B,YAAW,gBAAgB;IACrB,SAAS,CAAC,wBAAwB,EAAE,yBAAyB,CAAC;IAE9D,SAAS,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtG,SAAS,CAAC,0BAA0B,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAa;IAElF;;;;OAIG;IACH,gCAAgC,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,SAAK,GAAG,IAAI;CAalF;AAED;;;;;GAKG;AACH,8BACsB,qBAAqB;IACvC,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IAE/C,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,GAAG,IAAI;IAIlD,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAMtC,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI;CACpF;AAED,qBACa,uBAAwB,YAAW,cAAc;IAE1D,SAAS,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAI/D,SAAS,CAAC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAGxD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAErD,MAAM,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ;IAKpD,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAMjF;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,MAAM;IAC9C,IAAI,EAAE,OAAO,kBAAkB,CAAC,IAAI,CAAC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,yBAAiB,kBAAkB,CAAC;IACzB,MAAM,IAAI,iBAAiB,CAAC;IAEnC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,kBAAkB,CAE5D;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,kBAAkB,CAK5D;CACJ;AAED;;;GAGG;AACH,qBACa,mBAAoB,SAAQ,eAAe;IAGlB,SAAS,CAAC,MAAM,EAAE,kBAAkB;IAFtE,MAAM,CAAC,IAAI,SAA2B;gBAEM,MAAM,EAAE,kBAAkB;IAItE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAe3D;AAiBD;;GAEG;AACH,qBACa,oBAAqB,SAAQ,eAAe;IAGnB,SAAS,CAAC,MAAM,EAAE,mBAAmB;IAFvE,MAAM,CAAC,IAAI,SAA4B;gBAEK,MAAM,EAAE,mBAAmB;IAIvE,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa;CAwB3D"}

package/lib/features/validation/validate.js

@@ -28,19 +28,17 @@ exports.DeleteMarkersCommand = exports.ApplyMarkersCommand = exports.ApplyMarker
  *
  * 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 _glsp_sprotty_1 = require("../../glsp-sprotty/index");
 const editor_context_service_1 = require("../../base/editor-context-service");
-const types_1 = require("../../base/types");
+const feedback_command_1 = require("../../base/feedback/feedback-command");
 const smodel_util_1 = require("../../utils/smodel-util");
-const model_1 = require("../tool-feedback/model");
 const issue_marker_1 = require("./issue-marker");
 /**
  * Feedback emitter sending actions for visualizing model validation feedback and
  * re-establishing this feedback visualization after the model has been updated.
  */
-let ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
+let ValidationFeedbackEmitter = exports.ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
     constructor() {
         this.registeredFeedbackByReason = new Map();
     }
@@ -54,7 +52,7 @@ let ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
         const previousFeedbackWithSameReason = this.registeredFeedbackByReason.get(reason);
         if (previousFeedbackWithSameReason) {
             this.feedbackActionDispatcher.deregisterFeedback(this, [previousFeedbackWithSameReason]);
-            const deleteMarkersAction = protocol_1.DeleteMarkersAction.create(previousFeedbackWithSameReason.markers);
+            const deleteMarkersAction = _glsp_sprotty_1.DeleteMarkersAction.create(previousFeedbackWithSameReason.markers);
             this.actionDispatcher().then(dispatcher => dispatcher.dispatch(deleteMarkersAction));
         }
         // Register new action responsible for applying markers and re-applying them when the model is updated
@@ -63,38 +61,36 @@ let ValidationFeedbackEmitter = class ValidationFeedbackEmitter {
     }
 };
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IFeedbackActionDispatcher),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IFeedbackActionDispatcher),
     __metadata("design:type", Object)
 ], ValidationFeedbackEmitter.prototype, "feedbackActionDispatcher", void 0);
 __decorate([
-    (0, inversify_1.inject)(types_1.TYPES.IActionDispatcherProvider),
+    (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.IActionDispatcherProvider),
     __metadata("design:type", Function)
 ], ValidationFeedbackEmitter.prototype, "actionDispatcher", void 0);
-ValidationFeedbackEmitter = __decorate([
+exports.ValidationFeedbackEmitter = ValidationFeedbackEmitter = __decorate([
     (0, inversify_1.injectable)()
 ], ValidationFeedbackEmitter);
-exports.ValidationFeedbackEmitter = ValidationFeedbackEmitter;
 /**
  * Manages current markers for the outside of the GLSP.
  *
  * Typically this is rebound by the surrounding tool, e.g. Theia, to be aware of
  * and propagate current markers.
  */
-let ExternalMarkerManager = class ExternalMarkerManager {
+let ExternalMarkerManager = exports.ExternalMarkerManager = class ExternalMarkerManager {
     connect(actionDispatcher) {
         this.actionDispatcher = actionDispatcher;
     }
     removeMarkers(markers) {
         if (this.actionDispatcher) {
-            this.actionDispatcher.dispatch(protocol_1.DeleteMarkersAction.create(markers));
+            this.actionDispatcher.dispatch(_glsp_sprotty_1.DeleteMarkersAction.create(markers));
         }
     }
 };
-ExternalMarkerManager = __decorate([
+exports.ExternalMarkerManager = ExternalMarkerManager = __decorate([
     (0, inversify_1.injectable)()
 ], ExternalMarkerManager);
-exports.ExternalMarkerManager = ExternalMarkerManager;
-let SetMarkersActionHandler = class SetMarkersActionHandler {
+let SetMarkersActionHandler = exports.SetMarkersActionHandler = class SetMarkersActionHandler {
     handle(action) {
         const markers = action.markers;
         this.setMarkers(markers, action.reason);
@@ -120,15 +116,14 @@ __decorate([
     (0, inversify_1.inject)(editor_context_service_1.EditorContextService),
     __metadata("design:type", editor_context_service_1.EditorContextService)
 ], SetMarkersActionHandler.prototype, "editorContextService", void 0);
-SetMarkersActionHandler = __decorate([
+exports.SetMarkersActionHandler = SetMarkersActionHandler = __decorate([
     (0, inversify_1.injectable)()
 ], SetMarkersActionHandler);
-exports.SetMarkersActionHandler = SetMarkersActionHandler;
 var ApplyMarkersAction;
 (function (ApplyMarkersAction) {
     ApplyMarkersAction.KIND = 'applyMarkers';
     function is(object) {
-        return protocol_1.Action.hasKind(object, ApplyMarkersAction.KIND) && (0, protocol_1.hasArrayProp)(object, 'markers');
+        return _glsp_sprotty_1.Action.hasKind(object, ApplyMarkersAction.KIND) && (0, _glsp_sprotty_1.hasArrayProp)(object, 'markers');
     }
     ApplyMarkersAction.is = is;
     function create(markers) {
@@ -138,12 +133,12 @@ var ApplyMarkersAction;
         };
     }
     ApplyMarkersAction.create = create;
-})(ApplyMarkersAction = exports.ApplyMarkersAction || (exports.ApplyMarkersAction = {}));
+})(ApplyMarkersAction || (exports.ApplyMarkersAction = ApplyMarkersAction = {}));
 /**
  * Handles {@link ApplyMarkersAction}s by creating the corresponding {@link SIssueMarker}s and
  * adding them to the graphical model.
  */
-let ApplyMarkersCommand = class ApplyMarkersCommand extends model_1.FeedbackCommand {
+let ApplyMarkersCommand = exports.ApplyMarkersCommand = class ApplyMarkersCommand extends feedback_command_1.FeedbackCommand {
     constructor(action) {
         super();
         this.action = action;
@@ -151,7 +146,7 @@ let ApplyMarkersCommand = class ApplyMarkersCommand extends model_1.FeedbackComm
     execute(context) {
         this.action.markers.forEach(marker => {
             const modelElement = context.root.index.getById(marker.elementId);
-            if (modelElement instanceof sprotty_1.SParentElement) {
+            if (modelElement instanceof _glsp_sprotty_1.SParentElement) {
                 const issueMarker = (0, issue_marker_1.getOrCreateSIssueMarker)(modelElement);
                 const issue = (0, issue_marker_1.createSIssue)(marker);
                 issueMarker.issues.push(issue);
@@ -165,12 +160,11 @@ let ApplyMarkersCommand = class ApplyMarkersCommand extends model_1.FeedbackComm
     }
 };
 ApplyMarkersCommand.KIND = ApplyMarkersAction.KIND;
-ApplyMarkersCommand = __decorate([
+exports.ApplyMarkersCommand = ApplyMarkersCommand = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
+    __param(0, (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action)),
     __metadata("design:paramtypes", [Object])
 ], ApplyMarkersCommand);
-exports.ApplyMarkersCommand = ApplyMarkersCommand;
 function addMaxSeverityCSSClassToIssueParent(modelElement, issueMarker) {
     const maxSeverityCSSClass = (0, issue_marker_1.getSeverity)(issueMarker);
     if (!modelElement.cssClasses) {
@@ -188,7 +182,7 @@ function removeCSSClassFromIssueParent(modelElement, issueMarker) {
 /**
  * Command for handling `DeleteMarkersAction`
  */
-let DeleteMarkersCommand = class DeleteMarkersCommand extends model_1.FeedbackCommand {
+let DeleteMarkersCommand = exports.DeleteMarkersCommand = class DeleteMarkersCommand extends feedback_command_1.FeedbackCommand {
     constructor(action) {
         super();
         this.action = action;
@@ -196,7 +190,7 @@ let DeleteMarkersCommand = class DeleteMarkersCommand extends model_1.FeedbackCo
     execute(context) {
         this.action.markers.forEach(marker => {
             const modelElement = context.root.index.getById(marker.elementId);
-            if (modelElement instanceof sprotty_1.SParentElement) {
+            if (modelElement instanceof _glsp_sprotty_1.SParentElement) {
                 const issueMarker = (0, issue_marker_1.getSIssueMarker)(modelElement);
                 if (issueMarker) {
                     removeCSSClassFromIssueParent(modelElement, issueMarker);
@@ -218,11 +212,10 @@ let DeleteMarkersCommand = class DeleteMarkersCommand extends model_1.FeedbackCo
         return context.root;
     }
 };
-DeleteMarkersCommand.KIND = protocol_1.DeleteMarkersAction.KIND;
-DeleteMarkersCommand = __decorate([
+DeleteMarkersCommand.KIND = _glsp_sprotty_1.DeleteMarkersAction.KIND;
+exports.DeleteMarkersCommand = DeleteMarkersCommand = __decorate([
     (0, inversify_1.injectable)(),
-    __param(0, (0, inversify_1.inject)(types_1.TYPES.Action)),
+    __param(0, (0, inversify_1.inject)(_glsp_sprotty_1.TYPES.Action)),
     __metadata("design:paramtypes", [Object])
 ], DeleteMarkersCommand);
-exports.DeleteMarkersCommand = DeleteMarkersCommand;
 //# sourceMappingURL=validate.js.map