@eclipse-glsp/client 2.3.0-next.392 → 2.3.0-next.395
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/base/action-dispatcher.d.ts +4 -1
- package/lib/base/action-dispatcher.d.ts.map +1 -1
- package/lib/base/action-dispatcher.js +10 -4
- package/lib/base/action-dispatcher.js.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.d.ts +15 -0
- package/lib/features/navigation/navigation-target-resolver.d.ts.map +1 -1
- package/lib/features/navigation/navigation-target-resolver.js +5 -3
- package/lib/features/navigation/navigation-target-resolver.js.map +1 -1
- package/lib/features/routing/edge-router.d.ts +1 -2
- package/lib/features/routing/edge-router.d.ts.map +1 -1
- package/lib/features/routing/edge-router.js +0 -45
- package/lib/features/routing/edge-router.js.map +1 -1
- package/package.json +3 -3
- package/src/base/action-dispatcher.ts +11 -5
- package/src/features/navigation/navigation-target-resolver.ts +6 -3
- package/src/features/routing/edge-router.ts +1 -43
|
@@ -14,13 +14,16 @@
|
|
|
14
14
|
*
|
|
15
15
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
********************************************************************************/
|
|
17
|
-
import { Action, ActionDispatcher, GModelRoot, IActionDispatcher, RequestAction, ResponseAction } from '@eclipse-glsp/sprotty';
|
|
17
|
+
import { Action, ActionDispatcher, ActionHandlerRegistry, GModelRoot, IActionDispatcher, RequestAction, ResponseAction } from '@eclipse-glsp/sprotty';
|
|
18
18
|
import { IGModelRootListener } from './editor-context-service';
|
|
19
19
|
import { ModelInitializationConstraint } from './model/model-initialization-constraint';
|
|
20
20
|
export declare class GLSPActionDispatcher extends ActionDispatcher implements IGModelRootListener, IActionDispatcher {
|
|
21
21
|
protected readonly timeouts: Map<string, NodeJS.Timeout>;
|
|
22
22
|
protected initializedConstraint: boolean;
|
|
23
23
|
protected initializationConstraint: ModelInitializationConstraint;
|
|
24
|
+
protected actionHandlerRegistry: ActionHandlerRegistry;
|
|
25
|
+
/** @deprecated No longer in used. The {@link ActionHandlerRegistry} is now directly injected */
|
|
26
|
+
protected actionHandlerRegistryProvider: () => Promise<ActionHandlerRegistry>;
|
|
24
27
|
protected postUpdateQueue: Action[];
|
|
25
28
|
initialize(): Promise<void>;
|
|
26
29
|
protected doInitialize(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,
|
|
1
|
+
{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,qBAAqB,EAErB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,cAAc,EAGjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAiB,YAAW,mBAAmB,EAAE,iBAAiB;IACxG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAElE,UACmB,qBAAqB,EAAE,qBAAqB,CAAC;IAEhE,gGAAgG;IAEhG,UAAgE,6BAA6B,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACpI,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAOpB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7C,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAQ1C,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxD;;;;;;OAMG;IACH,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAInD,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAUpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,SAAO,EAChB,eAAe,UAAQ,GACxB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CA2B9B"}
|
|
@@ -44,10 +44,8 @@ let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDi
|
|
|
44
44
|
return this.initialized;
|
|
45
45
|
}
|
|
46
46
|
async doInitialize() {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
if (registry instanceof action_handler_registry_1.GLSPActionHandlerRegistry) {
|
|
50
|
-
registry.initialize();
|
|
47
|
+
if (this.actionHandlerRegistry instanceof action_handler_registry_1.GLSPActionHandlerRegistry) {
|
|
48
|
+
this.actionHandlerRegistry.initialize();
|
|
51
49
|
}
|
|
52
50
|
this.handleAction(sprotty_1.SetModelAction.create(sprotty_1.EMPTY_ROOT)).catch(() => {
|
|
53
51
|
/* Logged in handleAction method */
|
|
@@ -166,6 +164,14 @@ __decorate([
|
|
|
166
164
|
(0, inversify_1.inject)(model_initialization_constraint_1.ModelInitializationConstraint),
|
|
167
165
|
__metadata("design:type", model_initialization_constraint_1.ModelInitializationConstraint)
|
|
168
166
|
], GLSPActionDispatcher.prototype, "initializationConstraint", void 0);
|
|
167
|
+
__decorate([
|
|
168
|
+
(0, inversify_1.inject)(sprotty_1.ActionHandlerRegistry),
|
|
169
|
+
__metadata("design:type", sprotty_1.ActionHandlerRegistry)
|
|
170
|
+
], GLSPActionDispatcher.prototype, "actionHandlerRegistry", void 0);
|
|
171
|
+
__decorate([
|
|
172
|
+
(0, inversify_1.inject)(sprotty_1.TYPES.ActionHandlerRegistryProvider),
|
|
173
|
+
__metadata("design:type", Function)
|
|
174
|
+
], GLSPActionDispatcher.prototype, "actionHandlerRegistryProvider", void 0);
|
|
169
175
|
exports.GLSPActionDispatcher = GLSPActionDispatcher = __decorate([
|
|
170
176
|
(0, inversify_1.injectable)()
|
|
171
177
|
], GLSPActionDispatcher);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
/********************************************************************************
|
|
2
|
+
* Copyright (c) 2020-2023 EclipseSource and others.
|
|
3
|
+
*
|
|
4
|
+
* This program and the accompanying materials are made available under the
|
|
5
|
+
* terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
* http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
*
|
|
8
|
+
* This Source Code may also be made available under the following Secondary
|
|
9
|
+
* Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
* with the GNU Classpath Exception which is available at
|
|
12
|
+
* https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
*
|
|
14
|
+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
1
16
|
import { IActionDispatcher, ILogger, NavigationTarget, ResponseAction, SetResolvedNavigationTargetAction } from '@eclipse-glsp/sprotty';
|
|
2
17
|
import { IDiagramOptions } from '../../base/model/diagram-loader';
|
|
3
18
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation-target-resolver.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"navigation-target-resolver.d.ts","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,iBAAiB,EACjB,OAAO,EACP,gBAAgB,EAEhB,cAAc,EACd,iCAAiC,EAEpC,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE;;;;;GAKG;AACH,qBACa,wBAAwB;IAEjC,SAAS,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGxC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,SAAS,CAAC,cAAc,EAAE,eAAe,CAAC;IAEpC,OAAO,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAInG,oBAAoB,CACtB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,MAAM,EAAE,gBAAgB,GACzB,OAAO,CAAC,iCAAiC,GAAG,SAAS,CAAC;IAoBzD,SAAS,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;CAGjF"}
|
|
@@ -25,8 +25,8 @@ exports.NavigationTargetResolver = void 0;
|
|
|
25
25
|
*
|
|
26
26
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
27
27
|
********************************************************************************/
|
|
28
|
-
const inversify_1 = require("inversify");
|
|
29
28
|
const sprotty_1 = require("@eclipse-glsp/sprotty");
|
|
29
|
+
const inversify_1 = require("inversify");
|
|
30
30
|
/**
|
|
31
31
|
* Resolves `NavigationTargets` to element ids.
|
|
32
32
|
*
|
|
@@ -39,9 +39,11 @@ let NavigationTargetResolver = class NavigationTargetResolver {
|
|
|
39
39
|
}
|
|
40
40
|
async resolveWithSourceUri(sourceUri, target) {
|
|
41
41
|
const targetUri = decodeURIComponent(target.uri);
|
|
42
|
-
|
|
42
|
+
const normalizedSourceUri = sourceUri === null || sourceUri === void 0 ? void 0 : sourceUri.replace(/^file:\/\//, '');
|
|
43
|
+
const normalizedTargetUri = targetUri.replace(/^file:\/\//, '');
|
|
44
|
+
if (normalizedSourceUri && normalizedSourceUri !== normalizedTargetUri) {
|
|
43
45
|
// different URI, so we can't resolve it locally
|
|
44
|
-
this.logger.info("Source and Target URI are different. Can't resolve locally.",
|
|
46
|
+
this.logger.info("Source and Target URI are different. Can't resolve locally.", normalizedSourceUri, normalizedTargetUri);
|
|
45
47
|
return undefined;
|
|
46
48
|
}
|
|
47
49
|
if (sprotty_1.NavigationTarget.getElementIds(target).length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation-target-resolver.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,
|
|
1
|
+
{"version":3,"file":"navigation-target-resolver.js","sourceRoot":"","sources":["../../../src/features/navigation/navigation-target-resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,mDAQ+B;AAC/B,yCAA+C;AAG/C;;;;;GAKG;AAEI,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAUjC,KAAK,CAAC,OAAO,CAAC,gBAAkC;QAC5C,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,SAA6B,EAC7B,MAAwB;QAExB,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,mBAAmB,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACjE,MAAM,mBAAmB,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QAEhE,IAAI,mBAAmB,IAAI,mBAAmB,KAAK,mBAAmB,EAAE,CAAC;YACrE,gDAAgD;YAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,6DAA6D,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;YAC1H,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,IAAI,0BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,OAAO,2CAAiC,CAAC,MAAM,CAAC,0BAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5F,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,2CAAiC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,OAAO,QAAQ,CAAC;QACpB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,iBAAiB,CAAC,MAAwB;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,uCAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,CAAC;CACJ,CAAA;AAxCY,4DAAwB;AAEvB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,iBAAiB,CAAC;;4DACQ;AAG9B;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,OAAO,CAAC;;wDACI;AAGhB;IADT,IAAA,kBAAM,EAAC,eAAK,CAAC,eAAe,CAAC;;gEACY;mCARjC,wBAAwB;IADpC,IAAA,sBAAU,GAAE;GACA,wBAAwB,CAwCpC"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { AbstractEdgeRouter, BezierEdgeRouter, GConnectableElement, GParentElement, GRoutableElement, ManhattanEdgeRouter, Point, PolylineEdgeRouter
|
|
16
|
+
import { AbstractEdgeRouter, BezierEdgeRouter, GConnectableElement, GParentElement, GRoutableElement, ManhattanEdgeRouter, Point, PolylineEdgeRouter } from '@eclipse-glsp/sprotty';
|
|
17
17
|
export declare abstract class GLSPAbstractEdgeRouter extends AbstractEdgeRouter {
|
|
18
18
|
getTranslatedAnchor(connectable: GConnectableElement, refPoint: Point, refContainer: GParentElement, edge: GRoutableElement, anchorCorrection?: number | undefined): Point;
|
|
19
19
|
cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void;
|
|
@@ -24,7 +24,6 @@ export declare class GLSPPolylineEdgeRouter extends PolylineEdgeRouter {
|
|
|
24
24
|
}
|
|
25
25
|
export declare class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
|
|
26
26
|
getTranslatedAnchor(connectable: GConnectableElement, refPoint: Point, refContainer: GParentElement, edge: GRoutableElement, anchorCorrection?: number | undefined): Point;
|
|
27
|
-
protected applyInnerHandleMoves(edge: GRoutableElement, moves: ResolvedHandleMove[]): void;
|
|
28
27
|
cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void;
|
|
29
28
|
}
|
|
30
29
|
export declare class GLSPBezierEdgeRouter extends BezierEdgeRouter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-router.d.ts","sourceRoot":"","sources":["../../../src/features/routing/edge-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,EACL,kBAAkB,
|
|
1
|
+
{"version":3,"file":"edge-router.d.ts","sourceRoot":"","sources":["../../../src/features/routing/edge-router.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,EACL,kBAAkB,EACrB,MAAM,uBAAuB,CAAC;AAG/B,8BACsB,sBAAuB,SAAQ,kBAAkB;IAC1D,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;IAMC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,IAAI;CAMzI;AAED,qBACa,sBAAuB,SAAQ,kBAAkB;IACjD,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;IAMC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,IAAI;CAMzI;AAED,qBACa,uBAAwB,SAAQ,mBAAmB;IACnD,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;IAMC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,IAAI;CAMzI;AAED,qBACa,oBAAqB,SAAQ,gBAAgB;IAC7C,mBAAmB,CACxB,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,cAAc,EAC5B,IAAI,EAAE,gBAAgB,EACtB,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GACtC,KAAK;IAMC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE,OAAO,GAAG,IAAI;CAMzI"}
|
|
@@ -64,51 +64,6 @@ let GLSPManhattanEdgeRouter = class GLSPManhattanEdgeRouter extends sprotty_1.Ma
|
|
|
64
64
|
const anchor = super.getTranslatedAnchor(connectable, refPoint, refContainer, edge, anchorCorrection);
|
|
65
65
|
return sprotty_1.Point.isValid(anchor) ? anchor : refPoint;
|
|
66
66
|
}
|
|
67
|
-
applyInnerHandleMoves(edge, moves) {
|
|
68
|
-
const route = this.route(edge);
|
|
69
|
-
const routingPoints = edge.routingPoints;
|
|
70
|
-
const minimalPointDistance = this.getOptions(edge).minimalPointDistance;
|
|
71
|
-
moves.forEach(move => {
|
|
72
|
-
const handle = move.handle;
|
|
73
|
-
const index = handle.pointIndex;
|
|
74
|
-
const correctedX = this.correctX(routingPoints, index, move.toPosition.x, minimalPointDistance);
|
|
75
|
-
const correctedY = this.correctY(routingPoints, index, move.toPosition.y, minimalPointDistance);
|
|
76
|
-
switch (handle.kind) {
|
|
77
|
-
case 'manhattan-50%':
|
|
78
|
-
if (index < 0) {
|
|
79
|
-
if (routingPoints.length === 0) {
|
|
80
|
-
routingPoints.push({ x: correctedX, y: correctedY });
|
|
81
|
-
move.handle.pointIndex = 0;
|
|
82
|
-
}
|
|
83
|
-
else if ((0, sprotty_1.almostEquals)(route[0].x, route[1].x)) {
|
|
84
|
-
this.alignX(routingPoints, 0, correctedX);
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
this.alignY(routingPoints, 0, correctedY);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
else if (index < routingPoints.length - 1) {
|
|
91
|
-
if ((0, sprotty_1.almostEquals)(routingPoints[index].x, routingPoints[index + 1].x)) {
|
|
92
|
-
this.alignX(routingPoints, index, correctedX);
|
|
93
|
-
this.alignX(routingPoints, index + 1, correctedX);
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
this.alignY(routingPoints, index, correctedY);
|
|
97
|
-
this.alignY(routingPoints, index + 1, correctedY);
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
else {
|
|
101
|
-
if ((0, sprotty_1.almostEquals)(route[route.length - 2].x, route[route.length - 1].x)) {
|
|
102
|
-
this.alignX(routingPoints, routingPoints.length - 1, correctedX);
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
this.alignY(routingPoints, routingPoints.length - 1, correctedY);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
break;
|
|
109
|
-
}
|
|
110
|
-
});
|
|
111
|
-
}
|
|
112
67
|
cleanupRoutingPoints(edge, routingPoints, updateHandles, addRoutingPoints) {
|
|
113
68
|
// sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
|
|
114
69
|
if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"edge-router.js","sourceRoot":"","sources":["../../../src/features/routing/edge-router.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,
|
|
1
|
+
{"version":3,"file":"edge-router.js","sourceRoot":"","sources":["../../../src/features/routing/edge-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eclipse-glsp/client",
|
|
3
|
-
"version": "2.3.0-next.
|
|
3
|
+
"version": "2.3.0-next.395+8de5d13",
|
|
4
4
|
"description": "A sprotty-based client for GLSP",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"eclipse",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"watch": "tsc -w"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@eclipse-glsp/sprotty": "2.3.0-next.
|
|
49
|
+
"@eclipse-glsp/sprotty": "2.3.0-next.395+8de5d13",
|
|
50
50
|
"autocompleter": "^9.1.2",
|
|
51
51
|
"file-saver": "^2.0.5",
|
|
52
52
|
"lodash": "4.17.21",
|
|
@@ -63,5 +63,5 @@
|
|
|
63
63
|
"publishConfig": {
|
|
64
64
|
"access": "public"
|
|
65
65
|
},
|
|
66
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "8de5d139f94af875d6c073bf8d89107020f7a64d"
|
|
67
67
|
}
|
|
@@ -16,12 +16,14 @@
|
|
|
16
16
|
import {
|
|
17
17
|
Action,
|
|
18
18
|
ActionDispatcher,
|
|
19
|
+
ActionHandlerRegistry,
|
|
19
20
|
EMPTY_ROOT,
|
|
20
21
|
GModelRoot,
|
|
21
22
|
IActionDispatcher,
|
|
22
23
|
RequestAction,
|
|
23
24
|
ResponseAction,
|
|
24
|
-
SetModelAction
|
|
25
|
+
SetModelAction,
|
|
26
|
+
TYPES
|
|
25
27
|
} from '@eclipse-glsp/sprotty';
|
|
26
28
|
import { inject, injectable } from 'inversify';
|
|
27
29
|
import { GLSPActionHandlerRegistry } from './action-handler-registry';
|
|
@@ -37,6 +39,12 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
|
|
|
37
39
|
@inject(ModelInitializationConstraint)
|
|
38
40
|
protected initializationConstraint: ModelInitializationConstraint;
|
|
39
41
|
|
|
42
|
+
@inject(ActionHandlerRegistry)
|
|
43
|
+
protected override actionHandlerRegistry: ActionHandlerRegistry;
|
|
44
|
+
|
|
45
|
+
/** @deprecated No longer in used. The {@link ActionHandlerRegistry} is now directly injected */
|
|
46
|
+
// eslint-disable-next-line deprecation/deprecation
|
|
47
|
+
@inject(TYPES.ActionHandlerRegistryProvider) protected override actionHandlerRegistryProvider: () => Promise<ActionHandlerRegistry>;
|
|
40
48
|
protected postUpdateQueue: Action[] = [];
|
|
41
49
|
|
|
42
50
|
override initialize(): Promise<void> {
|
|
@@ -47,10 +55,8 @@ export class GLSPActionDispatcher extends ActionDispatcher implements IGModelRoo
|
|
|
47
55
|
}
|
|
48
56
|
|
|
49
57
|
protected async doInitialize(): Promise<void> {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
if (registry instanceof GLSPActionHandlerRegistry) {
|
|
53
|
-
registry.initialize();
|
|
58
|
+
if (this.actionHandlerRegistry instanceof GLSPActionHandlerRegistry) {
|
|
59
|
+
this.actionHandlerRegistry.initialize();
|
|
54
60
|
}
|
|
55
61
|
this.handleAction(SetModelAction.create(EMPTY_ROOT)).catch(() => {
|
|
56
62
|
/* Logged in handleAction method */
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
*
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
|
-
import { inject, injectable } from 'inversify';
|
|
17
16
|
import {
|
|
18
17
|
IActionDispatcher,
|
|
19
18
|
ILogger,
|
|
@@ -23,6 +22,7 @@ import {
|
|
|
23
22
|
SetResolvedNavigationTargetAction,
|
|
24
23
|
TYPES
|
|
25
24
|
} from '@eclipse-glsp/sprotty';
|
|
25
|
+
import { inject, injectable } from 'inversify';
|
|
26
26
|
import { IDiagramOptions } from '../../base/model/diagram-loader';
|
|
27
27
|
|
|
28
28
|
/**
|
|
@@ -51,9 +51,12 @@ export class NavigationTargetResolver {
|
|
|
51
51
|
target: NavigationTarget
|
|
52
52
|
): Promise<SetResolvedNavigationTargetAction | undefined> {
|
|
53
53
|
const targetUri = decodeURIComponent(target.uri);
|
|
54
|
-
|
|
54
|
+
const normalizedSourceUri = sourceUri?.replace(/^file:\/\//, '');
|
|
55
|
+
const normalizedTargetUri = targetUri.replace(/^file:\/\//, '');
|
|
56
|
+
|
|
57
|
+
if (normalizedSourceUri && normalizedSourceUri !== normalizedTargetUri) {
|
|
55
58
|
// different URI, so we can't resolve it locally
|
|
56
|
-
this.logger.info("Source and Target URI are different. Can't resolve locally.",
|
|
59
|
+
this.logger.info("Source and Target URI are different. Can't resolve locally.", normalizedSourceUri, normalizedTargetUri);
|
|
57
60
|
return undefined;
|
|
58
61
|
}
|
|
59
62
|
if (NavigationTarget.getElementIds(target).length > 0) {
|
|
@@ -22,9 +22,7 @@ import {
|
|
|
22
22
|
GRoutableElement,
|
|
23
23
|
ManhattanEdgeRouter,
|
|
24
24
|
Point,
|
|
25
|
-
PolylineEdgeRouter
|
|
26
|
-
ResolvedHandleMove,
|
|
27
|
-
almostEquals
|
|
25
|
+
PolylineEdgeRouter
|
|
28
26
|
} from '@eclipse-glsp/sprotty';
|
|
29
27
|
import { injectable } from 'inversify';
|
|
30
28
|
|
|
@@ -86,46 +84,6 @@ export class GLSPManhattanEdgeRouter extends ManhattanEdgeRouter {
|
|
|
86
84
|
return Point.isValid(anchor) ? anchor : refPoint;
|
|
87
85
|
}
|
|
88
86
|
|
|
89
|
-
protected override applyInnerHandleMoves(edge: GRoutableElement, moves: ResolvedHandleMove[]): void {
|
|
90
|
-
const route = this.route(edge);
|
|
91
|
-
const routingPoints = edge.routingPoints;
|
|
92
|
-
const minimalPointDistance = this.getOptions(edge).minimalPointDistance;
|
|
93
|
-
moves.forEach(move => {
|
|
94
|
-
const handle = move.handle;
|
|
95
|
-
const index = handle.pointIndex;
|
|
96
|
-
const correctedX = this.correctX(routingPoints, index, move.toPosition.x, minimalPointDistance);
|
|
97
|
-
const correctedY = this.correctY(routingPoints, index, move.toPosition.y, minimalPointDistance);
|
|
98
|
-
switch (handle.kind) {
|
|
99
|
-
case 'manhattan-50%':
|
|
100
|
-
if (index < 0) {
|
|
101
|
-
if (routingPoints.length === 0) {
|
|
102
|
-
routingPoints.push({ x: correctedX, y: correctedY });
|
|
103
|
-
move.handle.pointIndex = 0;
|
|
104
|
-
} else if (almostEquals(route[0].x, route[1].x)) {
|
|
105
|
-
this.alignX(routingPoints, 0, correctedX);
|
|
106
|
-
} else {
|
|
107
|
-
this.alignY(routingPoints, 0, correctedY);
|
|
108
|
-
}
|
|
109
|
-
} else if (index < routingPoints.length - 1) {
|
|
110
|
-
if (almostEquals(routingPoints[index].x, routingPoints[index + 1].x)) {
|
|
111
|
-
this.alignX(routingPoints, index, correctedX);
|
|
112
|
-
this.alignX(routingPoints, index + 1, correctedX);
|
|
113
|
-
} else {
|
|
114
|
-
this.alignY(routingPoints, index, correctedY);
|
|
115
|
-
this.alignY(routingPoints, index + 1, correctedY);
|
|
116
|
-
}
|
|
117
|
-
} else {
|
|
118
|
-
if (almostEquals(route[route.length - 2].x, route[route.length - 1].x)) {
|
|
119
|
-
this.alignX(routingPoints, routingPoints.length - 1, correctedX);
|
|
120
|
-
} else {
|
|
121
|
-
this.alignY(routingPoints, routingPoints.length - 1, correctedY);
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
break;
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
|
|
129
87
|
override cleanupRoutingPoints(edge: GRoutableElement, routingPoints: Point[], updateHandles: boolean, addRoutingPoints: boolean): void {
|
|
130
88
|
// sometimes it might happen that the source or target has the bounds not properly set when using the feedback edge
|
|
131
89
|
if (ensureBounds(edge.source) && ensureBounds(edge.target)) {
|