@eclipse-glsp/client 0.9.0-next.d2f88f00 → 0.9.0-next.d3c64530

package/lib/features/tools/marquee-behavior.js.map

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

package/{src/features/undo-redo/model.ts → lib/features/tools/marquee-behavior.spec.d.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 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
@@ -13,14 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Operation } from '../../base/operations/operation';
-
-export class UndoOperation implements Operation {
-    static readonly KIND = 'glspUndo';
-    constructor(public readonly kind = UndoOperation.KIND) { }
-}
-
-export class RedoOperation implements Operation {
-    static readonly KIND = 'glspRedo';
-    constructor(public readonly kind = RedoOperation.KIND) { }
-}
+export {};
+//# sourceMappingURL=marquee-behavior.spec.d.ts.map

package/lib/features/tools/marquee-behavior.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"marquee-behavior.spec.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-behavior.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}

package/lib/features/tools/marquee-behavior.spec.js

@@ -0,0 +1,165 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const marquee_behavior_1 = require("./marquee-behavior");
+describe('MarqueeUtil', () => {
+    function initUtil(marqueeBehavior) {
+        const util = new marquee_behavior_1.MarqueeUtil(marqueeBehavior);
+        util.updateStartPoint({ x: 0, y: 0 });
+        util.updateCurrentPoint({ x: 0, y: 0 });
+        return util;
+    }
+    describe('Node marquee', () => {
+        const node = { x: 20, y: 20, width: 200, height: 50 };
+        it('touch element', () => {
+            const util = initUtil();
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateCurrentPoint({ x: 30, y: 50 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateCurrentPoint({ x: 250, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateStartPoint({ x: 30, y: 25 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+        });
+        it('touch element (reverse)', () => {
+            const util = initUtil();
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateStartPoint({ x: 30, y: 50 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateStartPoint({ x: 250, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateCurrentPoint({ x: 30, y: 25 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+        });
+        it('mark entire element', () => {
+            const util = initUtil({ entireElement: true, entireEdge: false });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateCurrentPoint({ x: 30, y: 50 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateCurrentPoint({ x: 250, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateStartPoint({ x: 30, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+        });
+        it('mark entire element (reverse)', () => {
+            const util = initUtil({ entireElement: true, entireEdge: false });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateStartPoint({ x: 30, y: 50 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+            util.updateStartPoint({ x: 250, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(true);
+            util.updateCurrentPoint({ x: 30, y: 85 });
+            chai_1.expect(util.isNodeMarked(node)).is.equals(false);
+        });
+    });
+    describe('Edge marquee', () => {
+        const edge = [
+            { x: 20, y: 40 },
+            { x: 40, y: 20 }
+        ];
+        const edge2 = [
+            { x: 20, y: 20 },
+            { x: 40, y: 40 },
+            { x: 50, y: 10 }
+        ];
+        it('touch edge', () => {
+            const util = initUtil();
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateCurrentPoint({ x: 20, y: 20 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateCurrentPoint({ x: 30, y: 30 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateCurrentPoint({ x: 50, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateStartPoint({ x: 25, y: 25 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+        });
+        it('touch edge (reverse)', () => {
+            const util = initUtil();
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateStartPoint({ x: 20, y: 20 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateStartPoint({ x: 30, y: 30 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateStartPoint({ x: 50, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateCurrentPoint({ x: 25, y: 25 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+        });
+        it('mark entire edge', () => {
+            const util = initUtil({ entireElement: false, entireEdge: true });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateCurrentPoint({ x: 20, y: 20 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateCurrentPoint({ x: 30, y: 30 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateCurrentPoint({ x: 45, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateCurrentPoint({ x: 55, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateStartPoint({ x: 25, y: 25 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+        });
+        it('mark entire edge (reverse)', () => {
+            const util = initUtil({ entireElement: false, entireEdge: true });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateStartPoint({ x: 20, y: 20 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateStartPoint({ x: 30, y: 30 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateStartPoint({ x: 45, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+            util.updateStartPoint({ x: 55, y: 50 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(true);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(true);
+            util.updateCurrentPoint({ x: 25, y: 25 });
+            chai_1.expect(util.isEdgeMarked(edge)).is.equals(false);
+            chai_1.expect(util.isEdgeMarked(edge2)).is.equals(false);
+        });
+        it('edge path should be marked', () => {
+            const path = 'M 599.968775008469,272.3972942960205 L 677.0904664855072,232';
+            const util = initUtil({ entireElement: false, entireEdge: true });
+            chai_1.expect(util.isEdgePathMarked(path)).is.equals(false);
+            util.updateCurrentPoint({ x: 600, y: 300 });
+            chai_1.expect(util.isEdgePathMarked(path)).is.equals(false);
+            util.updateCurrentPoint({ x: 700, y: 300 });
+            chai_1.expect(util.isEdgePathMarked(path)).is.equals(true);
+        });
+    });
+});
+//# sourceMappingURL=marquee-behavior.spec.js.map

package/lib/features/tools/marquee-behavior.spec.js.map

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

package/lib/features/tools/marquee-mouse-tool.d.ts

@@ -1,10 +1,28 @@
-import { Action, BoundsAware, KeyListener, Point, SModelElement } from 'sprotty';
+/********************************************************************************
+ * Copyright (c) 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 } from '@eclipse-glsp/protocol';
+import { BoundsAware, KeyListener, SModelElement, SModelRoot } from 'sprotty';
 import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
 import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
-import { BaseGLSPTool } from '../tools/base-glsp-tool';
+import { BaseGLSPTool } from './base-glsp-tool';
+import { IMarqueeBehavior, MarqueeUtil } from './marquee-behavior';
 export declare class MarqueeMouseTool extends BaseGLSPTool {
     static ID: string;
     protected domHelper: DOMHelper;
+    protected marqueeBehavior: IMarqueeBehavior;
     protected marqueeMouseListener: MarqueeMouseListener;
     protected shiftKeyListener: ShiftKeyListener;
     get id(): string;
@@ -12,24 +30,17 @@ export declare class MarqueeMouseTool extends BaseGLSPTool {
     disable(): void;
 }
 export declare class MarqueeMouseListener extends DragAwareMouseListener {
-    protected startPoint: Point;
-    protected currentPoint: Point;
     protected domHelper: DOMHelper;
+    protected marqueeUtil: MarqueeUtil;
+    protected nodes: (SModelElement & BoundsAware)[];
+    protected edges: SVGGElement[];
     protected previouslySelected: string[];
     protected isActive: boolean;
-    constructor(domHelper: DOMHelper);
+    constructor(domHelper: DOMHelper, root: SModelRoot, marqueeBehavior: IMarqueeBehavior | undefined);
     mouseDown(target: SModelElement, event: MouseEvent): Action[];
     mouseMove(target: SModelElement, event: MouseEvent): Action[];
     mouseUp(target: SModelElement, event: MouseEvent): Action[];
-    getMarkedEdges(root: SModelElement): string[];
     isEdgeMarked(element: SVGElement): boolean;
-    isLineMarked(point1: Point, point2: Point): boolean;
-    linesIntersect(p1: Point, p2: Point, p3: Point, p4: Point): boolean;
-    pointInRect(point: Point): boolean;
-    isNodeMarked(element: SModelElement & BoundsAware): boolean;
-    isElementBetweenXAxis(element: SModelElement & BoundsAware, marqueeLeft: number, marqueeRight: number): boolean;
-    isElementBetweenYAxis(element: SModelElement & BoundsAware, marqueeTop: number, marqueeBottom: number): boolean;
-    isBetween(x: number, lower: number, upper: number): boolean;
 }
 export declare class ShiftKeyListener extends KeyListener {
     keyUp(element: SModelElement, event: KeyboardEvent): Action[];

package/lib/features/tools/marquee-mouse-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,MAAM,EACN,WAAW,EAIX,WAAW,EACX,KAAK,EAGL,aAAa,EAGhB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAExD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBACa,oBAAqB,SAAQ,sBAAsB;IAE5D,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;IAE5B,SAAS,CAAC,YAAY,EAAE,KAAK,CAAC;IAE9B,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAEvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS;IAKhC,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAY7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAoB7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQ3D,cAAc,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,EAAE;IAQ7C,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;IAqB1C,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,OAAO;IAmBnD,cAAc,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,GAAG,OAAO;IAanE,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAQlC,YAAY,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,GAAG,OAAO;IAa3D,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAU/G,qBAAqB,CAAC,OAAO,EAAE,aAAa,GAAG,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IAU/G,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;CAO9D;AAED,qBACa,gBAAiB,SAAQ,WAAW;IAE7C,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMhE"}
+{"version":3,"file":"marquee-mouse-tool.d.ts","sourceRoot":"","sources":["../../../src/features/tools/marquee-mouse-tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAgB,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EACH,WAAW,EAIX,WAAW,EAEX,aAAa,EACb,UAAU,EAGb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAI9E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEnE,qBACa,gBAAiB,SAAQ,YAAY;IAC9C,MAAM,CAAC,EAAE,SAA6B;IAEb,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IACP,SAAS,CAAC,eAAe,EAAE,gBAAgB,CAAC;IAE7F,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACrD,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAA0B;IAEtE,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,MAAM,IAAI,IAAI;IAOd,OAAO,IAAI,IAAI;CAKlB;AAED,qBAAa,oBAAqB,SAAQ,sBAAsB;IAC5D,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAC/B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,KAAK,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;IACjD,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC/B,SAAS,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;IACvC,SAAS,CAAC,QAAQ,UAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,eAAe,EAAE,gBAAgB,GAAG,SAAS;IAqBjG,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,SAAS,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAe7D,OAAO,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,GAAG,MAAM,EAAE;IAQ3D,YAAY,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO;CAS7C;AAED,qBACa,gBAAiB,SAAQ,WAAW;IAC7C,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE;CAMhE"}

package/lib/features/tools/marquee-mouse-tool.js

@@ -1,17 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -21,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var MarqueeMouseTool_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShiftKeyListener = exports.MarqueeMouseListener = exports.MarqueeMouseTool = void 0;
 /********************************************************************************
@@ -38,220 +26,123 @@ exports.ShiftKeyListener = exports.MarqueeMouseListener = exports.MarqueeMouseTo
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-var inversify_1 = require("inversify");
-var sprotty_1 = require("sprotty");
-var dom_helper_1 = require("sprotty/lib/base/views/dom-helper");
-var drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
-var viewpoint_util_1 = require("../../utils/viewpoint-util");
-var css_feedback_1 = require("../tool-feedback/css-feedback");
-var marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
-var base_glsp_tool_1 = require("../tools/base-glsp-tool");
-var MarqueeMouseTool = /** @class */ (function (_super) {
-    __extends(MarqueeMouseTool, _super);
-    function MarqueeMouseTool() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.shiftKeyListener = new ShiftKeyListener();
-        return _this;
+const protocol_1 = require("@eclipse-glsp/protocol");
+const inversify_1 = require("inversify");
+const sprotty_1 = require("sprotty");
+const dom_helper_1 = require("sprotty/lib/base/views/dom-helper");
+const types_1 = require("../../base/types");
+const drag_aware_mouse_listener_1 = require("../../base/drag-aware-mouse-listener");
+const viewpoint_util_1 = require("../../utils/viewpoint-util");
+const css_feedback_1 = require("../tool-feedback/css-feedback");
+const marquee_tool_feedback_1 = require("../tool-feedback/marquee-tool-feedback");
+const base_glsp_tool_1 = require("./base-glsp-tool");
+const marquee_behavior_1 = require("./marquee-behavior");
+let MarqueeMouseTool = MarqueeMouseTool_1 = class MarqueeMouseTool extends base_glsp_tool_1.BaseGLSPTool {
+    constructor() {
+        super(...arguments);
+        this.shiftKeyListener = new ShiftKeyListener();
     }
-    MarqueeMouseTool_1 = MarqueeMouseTool;
-    Object.defineProperty(MarqueeMouseTool.prototype, "id", {
-        get: function () {
-            return MarqueeMouseTool_1.ID;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    MarqueeMouseTool.prototype.enable = function () {
-        this.marqueeMouseListener = new MarqueeMouseListener(this.domHelper);
+    get id() {
+        return MarqueeMouseTool_1.ID;
+    }
+    enable() {
+        this.marqueeMouseListener = new MarqueeMouseListener(this.domHelper, this.editorContext.modelRoot, this.marqueeBehavior);
         this.mouseTool.register(this.marqueeMouseListener);
         this.keyTool.register(this.shiftKeyListener);
         this.dispatchFeedback([css_feedback_1.cursorFeedbackAction(css_feedback_1.CursorCSS.MARQUEE)]);
-    };
-    MarqueeMouseTool.prototype.disable = function () {
+    }
+    disable() {
         this.mouseTool.deregister(this.marqueeMouseListener);
         this.keyTool.deregister(this.shiftKeyListener);
         this.deregisterFeedback([css_feedback_1.cursorFeedbackAction()]);
-    };
-    var MarqueeMouseTool_1;
-    MarqueeMouseTool.ID = 'glsp.marquee-mouse-tool';
-    __decorate([
-        inversify_1.inject(sprotty_1.TYPES.DOMHelper),
-        __metadata("design:type", dom_helper_1.DOMHelper)
-    ], MarqueeMouseTool.prototype, "domHelper", void 0);
-    MarqueeMouseTool = MarqueeMouseTool_1 = __decorate([
-        inversify_1.injectable()
-    ], MarqueeMouseTool);
-    return MarqueeMouseTool;
-}(base_glsp_tool_1.BaseGLSPTool));
+    }
+};
+MarqueeMouseTool.ID = 'glsp.marquee-mouse-tool';
+__decorate([
+    inversify_1.inject(sprotty_1.TYPES.DOMHelper),
+    __metadata("design:type", dom_helper_1.DOMHelper)
+], MarqueeMouseTool.prototype, "domHelper", void 0);
+__decorate([
+    inversify_1.inject(types_1.GLSP_TYPES.IMarqueeBehavior),
+    inversify_1.optional(),
+    __metadata("design:type", Object)
+], MarqueeMouseTool.prototype, "marqueeBehavior", void 0);
+MarqueeMouseTool = MarqueeMouseTool_1 = __decorate([
+    inversify_1.injectable()
+], MarqueeMouseTool);
 exports.MarqueeMouseTool = MarqueeMouseTool;
-var MarqueeMouseListener = /** @class */ (function (_super) {
-    __extends(MarqueeMouseListener, _super);
-    function MarqueeMouseListener(domHelper) {
-        var _this = _super.call(this) || this;
-        _this.isActive = false;
-        _this.domHelper = domHelper;
-        return _this;
+class MarqueeMouseListener extends drag_aware_mouse_listener_1.DragAwareMouseListener {
+    constructor(domHelper, root, marqueeBehavior) {
+        super();
+        this.isActive = false;
+        this.domHelper = domHelper;
+        this.marqueeUtil = new marquee_behavior_1.MarqueeUtil(marqueeBehavior);
+        this.nodes = Array.from(root.index
+            .all()
+            .map(e => e)
+            .filter(e => sprotty_1.isSelectable(e))
+            .filter(e => e instanceof sprotty_1.SNode));
+        const sEdges = Array.from(root.index
+            .all()
+            .filter(e => e instanceof sprotty_1.SEdge)
+            .filter(e => sprotty_1.isSelectable(e))
+            .map(e => e.id));
+        this.edges = Array.from(document.querySelectorAll('g')).filter(e => sEdges.includes(this.domHelper.findSModelIdByDOMElement(e)));
     }
-    MarqueeMouseListener.prototype.mouseDown = function (target, event) {
+    mouseDown(target, event) {
         this.isActive = true;
-        this.startPoint = { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y };
+        this.marqueeUtil.updateStartPoint(viewpoint_util_1.getAbsolutePosition(target, event));
         if (event.ctrlKey) {
-            this.previouslySelected = Array.from(target.root.index.all()
-                .map(function (e) { return e; })
-                .filter(function (e) { return sprotty_1.isSelected(e); })
-                .map(function (e) { return e.id; }));
+            this.previouslySelected = Array.from(target.root.index
+                .all()
+                .map(e => e)
+                .filter(e => sprotty_1.isSelected(e))
+                .map(e => e.id));
         }
         return [];
-    };
-    MarqueeMouseListener.prototype.mouseMove = function (target, event) {
-        var _this = this;
-        this.currentPoint = { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y };
+    }
+    mouseMove(target, event) {
+        this.marqueeUtil.updateCurrentPoint(viewpoint_util_1.getAbsolutePosition(target, event));
         if (this.isActive) {
-            var nodeIdsSelected = Array.from(target.root.index.all()
-                .map(function (e) { return e; })
-                .filter(function (e) { return sprotty_1.isSelectable(e); })
-                .filter(function (e) { return e instanceof sprotty_1.SNode; })
-                .filter(function (e) { return _this.isNodeMarked(e); }).map(function (e) { return e.id; }));
-            var edgeIdsSelected = this.getMarkedEdges(target.root);
-            var selected = nodeIdsSelected.concat(edgeIdsSelected);
+            const nodeIdsSelected = this.nodes.filter(e => this.marqueeUtil.isNodeMarked(viewpoint_util_1.toAbsoluteBounds(e))).map(e => e.id);
+            const edgeIdsSelected = this.edges.filter(e => this.isEdgeMarked(e)).map(e => this.domHelper.findSModelIdByDOMElement(e));
+            const selected = nodeIdsSelected.concat(edgeIdsSelected);
             return [
-                new sprotty_1.SelectAction([], Array.from(target.root.index.all().map(function (e) { return e.id; }))),
-                new sprotty_1.SelectAction(selected.concat(this.previouslySelected), []),
-                new marquee_tool_feedback_1.DrawMarqueeAction(this.startPoint, { x: viewpoint_util_1.getAbsolutePosition(target, event).x, y: viewpoint_util_1.getAbsolutePosition(target, event).y })
+                new protocol_1.SelectAction([], Array.from(target.root.index.all().map(e => e.id))),
+                new protocol_1.SelectAction(selected.concat(this.previouslySelected), []),
+                this.marqueeUtil.drawMarqueeAction()
             ];
         }
         return [];
-    };
-    MarqueeMouseListener.prototype.mouseUp = function (target, event) {
+    }
+    mouseUp(target, event) {
         this.isActive = false;
         if (event.shiftKey) {
             return [new marquee_tool_feedback_1.RemoveMarqueeAction()];
         }
         return [new marquee_tool_feedback_1.RemoveMarqueeAction(), new sprotty_1.EnableDefaultToolsAction()];
-    };
-    MarqueeMouseListener.prototype.getMarkedEdges = function (root) {
-        var _this = this;
-        var elements = Array.from(document.querySelectorAll('g'));
-        var edges = Array.from(root.index.all().filter(function (e) { return e instanceof sprotty_1.SEdge; }).
-            filter(function (e) { return sprotty_1.isSelectable(e); }).map(function (e) { return e.id; }));
-        return elements.filter(function (e) { return edges.includes(_this.domHelper.findSModelIdByDOMElement(e)); })
-            .filter(function (e) { return _this.isEdgeMarked(e); }).map(function (e) { return _this.domHelper.findSModelIdByDOMElement(e); });
-    };
-    MarqueeMouseListener.prototype.isEdgeMarked = function (element) {
+    }
+    isEdgeMarked(element) {
         if (!element.getAttribute('transform')) {
             if (element.children[0]) {
-                var path = element.children[0].getAttribute('d');
-                if (path) {
-                    var points = path.split(/M|L/);
-                    for (var i = 0; i < points.length - 1; i++) {
-                        var coord1 = points[i].split(',');
-                        var coord2 = points[i + 1].split(',');
-                        var point1 = { x: parseInt(coord1[0], 10), y: parseInt(coord1[1], 10) };
-                        var point2 = { x: parseInt(coord2[0], 10), y: parseInt(coord2[1], 10) };
-                        if (this.isLineMarked(point1, point2)) {
-                            return true;
-                        }
-                    }
-                }
+                const path = element.children[0].getAttribute('d');
+                return this.marqueeUtil.isEdgePathMarked(path);
             }
         }
         return false;
-    };
-    MarqueeMouseListener.prototype.isLineMarked = function (point1, point2) {
-        if (this.pointInRect(point1) || this.pointInRect(point2)) {
-            return true;
-        }
-        if (this.linesIntersect(point1, point2, this.startPoint, { x: this.startPoint.x, y: this.currentPoint.y })) {
-            return true;
-        }
-        if (this.linesIntersect(point1, point2, this.startPoint, { x: this.currentPoint.x, y: this.startPoint.y })) {
-            return true;
-        }
-        if (this.linesIntersect(point1, point2, { x: this.currentPoint.x, y: this.startPoint.y }, this.currentPoint)) {
-            return true;
-        }
-        if (this.linesIntersect(point1, point2, { x: this.startPoint.x, y: this.currentPoint.y }, this.currentPoint)) {
-            return true;
-        }
-        return false;
-    };
-    MarqueeMouseListener.prototype.linesIntersect = function (p1, p2, p3, p4) {
-        var tCount = ((p1.x - p3.x) * (p3.y - p4.y)) - ((p1.y - p3.y) * (p3.x - p4.x));
-        var tDenom = ((p1.x - p2.x) * (p3.y - p4.y)) - ((p1.y - p2.y) * (p3.x - p4.x));
-        var t = tCount / tDenom;
-        var uCount = ((p2.x - p1.x) * (p1.y - p3.y)) - ((p2.y - p1.y) * (p1.x - p3.x));
-        var uDenom = ((p1.x - p2.x) * (p3.y - p4.y)) - ((p1.y - p2.y) * (p3.x - p4.x));
-        var u = uCount / uDenom;
-        if (t >= 0.0 && t <= 1.0 && u >= 0.0 && u <= 1.0) {
-            return true;
-        }
-        return false;
-    };
-    MarqueeMouseListener.prototype.pointInRect = function (point) {
-        var boolX = this.startPoint.x <= this.currentPoint.x ?
-            this.isBetween(point.x, this.startPoint.x, this.currentPoint.x) : this.isBetween(point.x, this.currentPoint.x, this.startPoint.x);
-        var boolY = this.startPoint.y <= this.currentPoint.y ?
-            this.isBetween(point.y, this.startPoint.y, this.currentPoint.y) : this.isBetween(point.y, this.currentPoint.y, this.startPoint.y);
-        return boolX && boolY;
-    };
-    MarqueeMouseListener.prototype.isNodeMarked = function (element) {
-        var horizontallyIn = this.startPoint.x < this.currentPoint.x ?
-            this.isElementBetweenXAxis(element, this.startPoint.x, this.currentPoint.x) :
-            this.isElementBetweenXAxis(element, this.currentPoint.x, this.startPoint.x);
-        var verticallyIn = this.startPoint.y < this.currentPoint.y ?
-            this.isElementBetweenYAxis(element, this.startPoint.y, this.currentPoint.y) :
-            this.isElementBetweenYAxis(element, this.currentPoint.y, this.startPoint.y);
-        if (horizontallyIn && verticallyIn) {
-            return true;
-        }
-        return false;
-    };
-    MarqueeMouseListener.prototype.isElementBetweenXAxis = function (element, marqueeLeft, marqueeRight) {
-        if (this.isBetween(marqueeLeft, viewpoint_util_1.toAbsoluteBounds(element).x, viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width)
-            || this.isBetween(marqueeRight, viewpoint_util_1.toAbsoluteBounds(element).x, viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width)) {
-            return true;
-        }
-        var leftEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).x, marqueeLeft, marqueeRight);
-        var rightEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).x + viewpoint_util_1.toAbsoluteBounds(element).width, marqueeLeft, marqueeRight);
-        return leftEdge || rightEdge;
-    };
-    MarqueeMouseListener.prototype.isElementBetweenYAxis = function (element, marqueeTop, marqueeBottom) {
-        if (this.isBetween(marqueeTop, viewpoint_util_1.toAbsoluteBounds(element).y, viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height)
-            || this.isBetween(marqueeBottom, viewpoint_util_1.toAbsoluteBounds(element).y, viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height)) {
-            return true;
-        }
-        var topEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).y, marqueeTop, marqueeBottom);
-        var bottomEdge = this.isBetween(viewpoint_util_1.toAbsoluteBounds(element).y + viewpoint_util_1.toAbsoluteBounds(element).height, marqueeTop, marqueeBottom);
-        return topEdge || bottomEdge;
-    };
-    MarqueeMouseListener.prototype.isBetween = function (x, lower, upper) {
-        if (lower <= x && x <= upper) {
-            return true;
-        }
-        return false;
-    };
-    MarqueeMouseListener = __decorate([
-        inversify_1.injectable(),
-        __metadata("design:paramtypes", [dom_helper_1.DOMHelper])
-    ], MarqueeMouseListener);
-    return MarqueeMouseListener;
-}(drag_aware_mouse_listener_1.DragAwareMouseListener));
-exports.MarqueeMouseListener = MarqueeMouseListener;
-var ShiftKeyListener = /** @class */ (function (_super) {
-    __extends(ShiftKeyListener, _super);
-    function ShiftKeyListener() {
-        return _super !== null && _super.apply(this, arguments) || this;
     }
-    ShiftKeyListener.prototype.keyUp = function (element, event) {
+}
+exports.MarqueeMouseListener = MarqueeMouseListener;
+let ShiftKeyListener = class ShiftKeyListener extends sprotty_1.KeyListener {
+    keyUp(element, event) {
         if (event.shiftKey) {
             return [];
         }
         return [new marquee_tool_feedback_1.RemoveMarqueeAction(), new sprotty_1.EnableDefaultToolsAction()];
-    };
-    ShiftKeyListener = __decorate([
-        inversify_1.injectable()
-    ], ShiftKeyListener);
-    return ShiftKeyListener;
-}(sprotty_1.KeyListener));
+    }
+};
+ShiftKeyListener = __decorate([
+    inversify_1.injectable()
+], ShiftKeyListener);
 exports.ShiftKeyListener = ShiftKeyListener;
 //# sourceMappingURL=marquee-mouse-tool.js.map