@eclipse-glsp/client 0.10.0-next.e5fcffe.169 → 1.0.0

package/lib/views/base-view-module.js.map

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

package/lib/views/glsp-projection-view.d.ts

@@ -0,0 +1,30 @@
+/********************************************************************************
+ * Copyright (c) 2017-2018 TypeFox 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
+ ********************************************************************************/
+/** @jsx html */
+import { Bounds } from '@eclipse-glsp/protocol';
+import { VNode } from 'snabbdom';
+import { IViewArgs, ProjectedViewportView, ProjectionParams, RenderingContext, ViewportRootElement, ViewProjection } from 'sprotty';
+/**
+ * Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
+ */
+export declare class GLSPProjectionView extends ProjectedViewportView {
+    render(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
+    protected renderSvg(model: Readonly<ViewportRootElement>, context: RenderingContext, args?: IViewArgs): VNode;
+    protected renderProjectionBar(projections: ViewProjection[], model: Readonly<ViewportRootElement>, modelBounds: Bounds, orientation: 'horizontal' | 'vertical'): VNode;
+    protected renderViewport(model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
+    protected renderProjection(projection: ViewProjection, model: Readonly<ViewportRootElement>, params: ProjectionParams): VNode;
+}
+//# sourceMappingURL=glsp-projection-view.d.ts.map

package/lib/views/glsp-projection-view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-projection-view.d.ts","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,gBAAgB;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAK,KAAK,EAAc,MAAM,UAAU,CAAC;AAChD,OAAO,EAGH,SAAS,EACT,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EAEhB,mBAAmB,EACnB,cAAc,EACjB,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,qBACa,kBAAmB,SAAQ,qBAAqB;IAChD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAStF,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,SAAS,GAAG,KAAK;cAOnG,mBAAmB,CAClC,WAAW,EAAE,cAAc,EAAE,EAC7B,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EACpC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,YAAY,GAAG,UAAU,GACvC,KAAK;cAoBW,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;cAwCrF,gBAAgB,CAAC,UAAU,EAAE,cAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,gBAAgB,GAAG,KAAK;CA+CzI"}

package/lib/views/glsp-projection-view.js

@@ -0,0 +1,142 @@
+"use strict";
+/********************************************************************************
+ * Copyright (c) 2017-2018 TypeFox 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
+ ********************************************************************************/
+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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLSPProjectionView = void 0;
+const inversify_1 = require("inversify");
+const snabbdom_1 = require("snabbdom");
+const sprotty_1 = require("sprotty");
+/**
+ * Special viewport root view that renders horizontal and vertical projection bars for quick navigation.
+ */
+let GLSPProjectionView = class GLSPProjectionView extends sprotty_1.ProjectedViewportView {
+    render(model, context, args) {
+        return ((0, sprotty_1.html)("div", { "class-sprotty-graph": true, style: { width: '100%' } },
+            this.renderSvg(model, context, args),
+            this.renderProjections(model, context, args)));
+    }
+    renderSvg(model, context, args) {
+        const transform = `scale(${model.zoom}) translate(${-model.scroll.x},${-model.scroll.y})`;
+        const ns = 'http://www.w3.org/2000/svg';
+        const svg = (0, snabbdom_1.h)('svg', { ns, style: { height: '100%' } }, (0, snabbdom_1.h)('g', { ns, attrs: { transform } }, context.renderChildren(model)));
+        return svg;
+    }
+    renderProjectionBar(projections, model, modelBounds, orientation) {
+        const params = { modelBounds, orientation };
+        // NOTE: Here we assume that the projection bars have the same size as the diagram canvas,
+        // i.e. they are drawn as overlay above the canvas.
+        params.factor =
+            orientation === 'horizontal' ? model.canvasBounds.width / modelBounds.width : model.canvasBounds.height / modelBounds.height;
+        params.zoomedFactor = params.factor / model.zoom;
+        return ((0, sprotty_1.html)("div", { "class-sprotty-projection-bar": true, "class-horizontal": orientation === 'horizontal', "class-vertical": orientation === 'vertical', "class-bordered-projection-bar": true },
+            this.renderViewport(model, params),
+            projections.map(p => this.renderProjection(p, model, params))));
+    }
+    renderViewport(model, params) {
+        let canvasSize;
+        let viewportPos;
+        if (params.orientation === 'horizontal') {
+            canvasSize = model.canvasBounds.width;
+            viewportPos = (model.scroll.x - params.modelBounds.x) * params.factor;
+        }
+        else {
+            canvasSize = model.canvasBounds.height;
+            viewportPos = (model.scroll.y - params.modelBounds.y) * params.factor;
+        }
+        let viewportSize = canvasSize * params.zoomedFactor;
+        if (viewportPos < 0) {
+            viewportSize += viewportPos;
+            viewportPos = 0;
+        }
+        else if (viewportPos > canvasSize) {
+            viewportPos = canvasSize;
+        }
+        if (viewportSize < 0) {
+            viewportSize = 0;
+        }
+        else if (viewportPos + viewportSize > canvasSize) {
+            viewportSize = canvasSize - viewportPos;
+        }
+        if (Math.abs(viewportSize - canvasSize) < 1) {
+            viewportSize = 0;
+        }
+        const style = params.orientation === 'horizontal'
+            ? {
+                left: `${viewportPos}px`,
+                width: `${viewportSize}px`,
+                border: 'none'
+            }
+            : {
+                top: `${viewportPos}px`,
+                height: `${viewportSize}px`,
+                border: 'none'
+            };
+        return (0, sprotty_1.html)("div", { "class-sprotty-viewport": viewportSize !== 0, "class-projection-scroll-bar": true, style: style });
+    }
+    renderProjection(projection, model, params) {
+        let canvasSize;
+        let projPos;
+        let projSize;
+        if (params.orientation === 'horizontal') {
+            canvasSize = model.canvasBounds.width;
+            projPos = (projection.projectedBounds.x - params.modelBounds.x) * params.factor;
+            projSize = projection.projectedBounds.width * params.factor;
+        }
+        else {
+            canvasSize = model.canvasBounds.height;
+            projPos = (projection.projectedBounds.y - params.modelBounds.y) * params.factor;
+            projSize = projection.projectedBounds.height * params.factor;
+        }
+        if (projPos < 0) {
+            projSize += projPos;
+            projPos = 0;
+        }
+        else if (projPos > canvasSize) {
+            projPos = canvasSize;
+        }
+        if (projSize < 0) {
+            projSize = 0;
+        }
+        else if (projPos + projSize > canvasSize) {
+            projSize = canvasSize - projPos;
+        }
+        const style = params.orientation === 'horizontal'
+            ? {
+                left: `${projPos}px`,
+                width: `${projSize}px`,
+                height: '60%'
+            }
+            : {
+                top: `${projPos}px`,
+                height: `${projSize}px`,
+                width: '60%'
+            };
+        const result = ((0, sprotty_1.html)("div", { id: `${params.orientation}-projection:${projection.elementId}`, "class-sprotty-projection": true, "class-glsp-projection": true, style: style }));
+        projection.cssClasses.forEach(cl => (0, sprotty_1.setClass)(result, cl, true));
+        return result;
+    }
+};
+GLSPProjectionView = __decorate([
+    (0, inversify_1.injectable)()
+], GLSPProjectionView);
+exports.GLSPProjectionView = GLSPProjectionView;
+//# sourceMappingURL=glsp-projection-view.js.map

package/lib/views/glsp-projection-view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glsp-projection-view.js","sourceRoot":"","sources":["../../src/views/glsp-projection-view.tsx"],"names":[],"mappings":"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"}

package/lib/views/index.d.ts

@@ -16,6 +16,7 @@
 export * from './base-view-module';
 export * from './compartments';
 export * from './glsp-edge-view';
+export * from './glsp-projection-view';
 export * from './issue-marker-view';
 export * from './rounded-corner';
 export * from './rounded-corner-view';

package/lib/views/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/lib/views/index.js

@@ -32,6 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./base-view-module"), exports);
 __exportStar(require("./compartments"), exports);
 __exportStar(require("./glsp-edge-view"), exports);
+__exportStar(require("./glsp-projection-view"), exports);
 __exportStar(require("./issue-marker-view"), exports);
 __exportStar(require("./rounded-corner"), exports);
 __exportStar(require("./rounded-corner-view"), exports);

package/lib/views/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,qDAAmC;AACnC,iDAA+B;AAC/B,mDAAiC;AACjC,yDAAuC;AACvC,sDAAoC;AACpC,mDAAiC;AACjC,wDAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/client",
-  "version": "0.10.0-next.e5fcffe.169+e5fcffe",
+  "version": "1.0.0",
   "description": "A sprotty-based client for GLSP",
   "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
   "keywords": [
@@ -34,9 +34,9 @@
     "css"
   ],
   "dependencies": {
-    "@eclipse-glsp/protocol": "0.10.0-next.e5fcffe.169+e5fcffe",
+    "@eclipse-glsp/protocol": "^1.0.0",
     "autocompleter": "5.1.0",
-    "sprotty": "next"
+    "sprotty": "0.12.0"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",
@@ -57,5 +57,5 @@
   },
   "main": "lib/index",
   "types": "lib/index",
-  "gitHead": "e5fcffe323165bf82385707b49dcc02903ac9a2b"
+  "gitHead": "fe0b29761e9844d8541ce4cafeaf7e00976157e1"
 }

package/src/base/container-modules.ts

@@ -37,14 +37,14 @@ import glspDecorationModule from '../features/decoration/di.config';
 import glspEditLabelModule from '../features/edit-label/di.config';
 import modelHintsModule from '../features/hints/di.config';
 import glspHoverModule from '../features/hover/di.config';
-import layoutCommandsModule from '../features/layout/di.config';
-import modelSourceWatcherModule from '../features/model-source-watcher/di.config';
+import layoutModule from '../features/layout/di.config';
 import glspMouseToolModule from '../features/mouse-tool/di.config';
 import { navigationModule } from '../features/navigation/di.config';
 import glspSelectModule from '../features/select/di.config';
+import sourceModelWatcherModule from '../features/source-model-watcher/di.config';
 import toolFeedbackModule from '../features/tool-feedback/di.config';
 import toolPaletteModule from '../features/tool-palette/di.config';
-import toolsModule from '../features/tools/di.config';
+import { enableDefaultToolsOnFocusLossModule, toolsModule } from '../features/tools/di.config';
 import { markerNavigatorModule, validationModule } from '../features/validation/di.config';
 import glspViewportModule from '../features/viewport/di.config';
 import defaultGLSPModule from './di.config';
@@ -69,17 +69,18 @@ export const DEFAULT_MODULES = [
     glspServerCopyPasteModule,
     glspViewportModule,
     labelEditUiModule,
-    layoutCommandsModule,
+    layoutModule,
     markerNavigatorModule,
     modelHintsModule,
     modelSourceModule,
-    modelSourceWatcherModule,
+    sourceModelWatcherModule,
     navigationModule,
     openModule,
     toolPaletteModule,
     routingModule,
     toolFeedbackModule,
     toolsModule,
+    enableDefaultToolsOnFocusLossModule,
     validationModule,
     zorderModule
 ];

package/src/base/editor-context-service.ts

@@ -38,12 +38,20 @@ export interface EditModeListener {
  */
 @injectable()
 export class EditorContextService implements IActionHandler {
-    @inject(TYPES.SelectionService) protected selectionService: SelectionService;
-    @inject(MousePositionTracker) protected mousePositionTracker: MousePositionTracker;
-    @inject(TYPES.ModelSourceProvider) protected modelSource: () => Promise<ModelSource>;
-    protected _editMode: string;
+    @inject(TYPES.SelectionService)
+    protected selectionService: SelectionService;
+
+    @inject(MousePositionTracker)
+    protected mousePositionTracker: MousePositionTracker;
+
+    @multiInject(TYPES.IEditModeListener)
+    @optional()
+    protected editModeListeners: EditModeListener[] = [];
 
-    constructor(@multiInject(TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) {}
+    @inject(TYPES.ModelSourceProvider)
+    protected modelSourceProvider: () => Promise<ModelSource>;
+
+    protected _editMode: string;
 
     register(editModeListener: EditModeListener): void {
         distinctAdd(this.editModeListeners, editModeListener);
@@ -82,9 +90,9 @@ export class EditorContextService implements IActionHandler {
     }
 
     async getSourceUri(): Promise<string | undefined> {
-        const modelSource = await this.modelSource();
+        const modelSource = await this.modelSourceProvider();
         if (isSourceUriAware(modelSource)) {
-            return modelSource.getSourceURI();
+            return modelSource.sourceURI;
         }
         return undefined;
     }

package/src/base/model/update-model-command.ts

@@ -13,25 +13,31 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, SetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
-import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
+import { Action, SetModelAction, toTypeGuard, UpdateModelAction } from '@eclipse-glsp/protocol';
+import { inject, injectable, multiInject, optional } from 'inversify';
 import {
     ActionHandlerRegistry,
+    Animation,
     Command,
     CommandActionHandler,
     CommandExecutionContext,
     CommandReturn,
     IActionHandler,
     ILogger,
+    MorphEdgesAnimation,
     SModelRoot,
+    UpdateAnimationData,
     UpdateModelCommand
 } from 'sprotty';
 import { IFeedbackActionDispatcher } from '../../features/tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../features/tool-feedback/model';
 import { TYPES } from '../types';
 
-/* ActionHandler that transforms a SetModelAction into an (feedback-aware) UpdateModelAction. This can be done because in sprotty
- *  UpdateModel behaves the same as SetModel if no model is present yet.*/
+/**
+ * ActionHandler that transforms a {@link SetModelAction} into an {@link UpdateModelAction} that can be handled
+ * by the {@link FeedbackAwareUpdateModelCommand}. This can be done because in sprotty an {@link UpdateModelCommand} and
+ * a {@link SetModelCommand} have the same behavior of no model is present yet.
+ */
 @injectable()
 export class SetModelActionHandler implements IActionHandler {
     handle(action: Action): Action | void {
@@ -46,38 +52,41 @@ export interface SModelRootListener {
 }
 
 /**
- * A special`UpdateModelCommand` that retrieves all registered `actions` from the `IFeedbackActionDispatcher` (if present) and applies their
- * feedback to the `newRoot` before performing the update
+ * A special {@link UpdateModelCommand} that retrieves all registered {@link Action}s from the {@link IFeedbackActionDispatcher}
+ * (if present) and applies their feedback to the `newRoot` before performing the update. This enables persistent client-side feedback
+ * across model updates initiated by the GLSP server.
  */
 @injectable()
 export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
-    @inject(TYPES.ILogger) protected logger: ILogger;
-    @inject(TYPES.IFeedbackActionDispatcher) @optional() protected readonly feedbackActionDispatcher: IFeedbackActionDispatcher;
-    @inject(TYPES.ActionHandlerRegistryProvider) protected actionHandlerRegistryProvider: () => Promise<ActionHandlerRegistry>;
-    @multiInject(TYPES.SModelRootListener) @optional() protected modelRootListeners: SModelRootListener[] = [];
+    @inject(TYPES.ILogger)
+    protected logger: ILogger;
+
+    @inject(TYPES.IFeedbackActionDispatcher)
+    @optional()
+    protected feedbackActionDispatcher: IFeedbackActionDispatcher;
+
+    @multiInject(TYPES.SModelRootListener)
+    @optional()
+    protected modelRootListeners: SModelRootListener[] = [];
 
     protected actionHandlerRegistry?: ActionHandlerRegistry;
 
-    constructor(@inject(TYPES.Action) action: UpdateModelAction) {
+    constructor(
+        @inject(TYPES.Action) action: UpdateModelAction,
+        @inject(TYPES.ActionHandlerRegistryProvider)
+        actionHandlerRegistryProvider: () => Promise<ActionHandlerRegistry>
+    ) {
         super({ animate: true, ...action });
-    }
-
-    @postConstruct()
-    protected initialize(): void {
-        this.actionHandlerRegistryProvider().then(registry => (this.actionHandlerRegistry = registry));
+        actionHandlerRegistryProvider().then(registry => (this.actionHandlerRegistry = registry));
     }
 
     protected override performUpdate(oldRoot: SModelRoot, newRoot: SModelRoot, context: CommandExecutionContext): CommandReturn {
         if (this.feedbackActionDispatcher && this.actionHandlerRegistry) {
-            // Create a temporary context wich defines the `newRoot` as `root`
+            // Create a temporary context which defines the `newRoot` as `root`
             // This way we do not corrupt the redo/undo behavior of the super class
             const tempContext: CommandExecutionContext = {
-                root: newRoot,
-                duration: context.duration,
-                logger: context.logger,
-                modelChanged: context.modelChanged,
-                modelFactory: context.modelFactory,
-                syncer: context.syncer
+                ...context,
+                root: newRoot
             };
 
             const feedbackCommands = this.getFeedbackCommands(this.actionHandlerRegistry);
@@ -91,19 +100,24 @@ export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
     protected getFeedbackCommands(registry: ActionHandlerRegistry): Command[] {
         const result: Command[] = [];
         this.feedbackActionDispatcher.getRegisteredFeedback().forEach(action => {
-            const handler = registry.get(action.kind).find(h => h instanceof CommandActionHandler);
-            if (handler instanceof CommandActionHandler) {
-                result.push(handler.handle(action));
-            }
+            const commands = registry
+                .get(action.kind)
+                .filter<CommandActionHandler>(toTypeGuard(CommandActionHandler))
+                .map(handler => handler.handle(action));
+            result.push(...commands);
         });
-        // sort commands descanding by priority
-        return result.sort((a, b) => getPriority(b) - getPriority(a));
+        // sort commands descanting by priority
+        return result.sort((a, b) => this.getPriority(b) - this.getPriority(a));
+    }
+
+    protected getPriority(command: Partial<FeedbackCommand>): number {
+        return command.priority ?? 0;
     }
-}
 
-function getPriority(command: Command): number {
-    if (command instanceof FeedbackCommand) {
-        return command.priority;
+    // Override the `createAnimations` implementation and remove the animation for edge morphing. Otherwise routing & reconnect
+    // handles flicker after each server update.
+    protected override createAnimations(data: UpdateAnimationData, root: SModelRoot, context: CommandExecutionContext): Animation[] {
+        const animations = super.createAnimations(data, root, context);
+        return animations.filter(animation => !(animation instanceof MorphEdgesAnimation));
     }
-    return 0;
 }

package/src/base/source-uri-aware.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2022 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,10 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export abstract class SourceUriAware {
-    abstract getSourceURI(): string;
+import { AnyObject, hasStringProp } from '@eclipse-glsp/protocol';
+export interface SourceUriAware {
+    sourceURI: string;
 }
 
 export function isSourceUriAware(obj: any): obj is SourceUriAware {
-    return obj !== undefined && typeof obj.getSourceURI === 'function';
+    return AnyObject.is(obj) && hasStringProp(obj, 'sourceURI');
 }

package/src/features/change-bounds/movement-restrictor.ts

@@ -20,40 +20,35 @@ import { toAbsoluteBounds } from '../../utils/viewpoint-util';
 import { ModifyCSSFeedbackAction } from '../tool-feedback/css-feedback';
 import { isBoundsAwareMoveable, SResizeHandle } from './model';
 
+/**
+ * A `MovementRestrictor` is an optional service that can be used by tools to validate
+ * whether a certain move operation (e.g. `ChangeBoundsOperation`) in the diagram is valid.
+ */
 export interface IMovementRestrictor {
-    validate(newLocation: Point, element: SModelElement): boolean;
+    /**
+     * Validate whether moving the given element to a new given location is allowed.
+     * @param element The element that should be moved.
+     * @param newLocation The new location of the element.
+     * @returns `true` if the the element is movable and moving to the given location is allowed, `false` otherwise.
+     *          Should also return `false` if the newLocation is `undefined`:
+     */
+    validate(element: SModelElement, newLocation?: Point): boolean;
+    /**
+     * Feedback css-classes. Can be applied to elements that did fail the validation.
+     */
     cssClasses?: string[];
 }
 
-export function createMovementRestrictionFeedback(
-    element: SModelElement,
-    movementRestrictor: IMovementRestrictor
-): ModifyCSSFeedbackAction {
-    const elements: SModelElement[] = [element];
-    if (element instanceof SParentElement) {
-        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
-    }
-    return ModifyCSSFeedbackAction.create({ elements, add: movementRestrictor.cssClasses });
-}
-
-export function removeMovementRestrictionFeedback(
-    element: SModelElement,
-    movementRestrictor: IMovementRestrictor
-): ModifyCSSFeedbackAction {
-    const elements: SModelElement[] = [element];
-    if (element instanceof SParentElement) {
-        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
-    }
-
-    return ModifyCSSFeedbackAction.create({ elements, remove: movementRestrictor.cssClasses });
-}
-
+/**
+ *  A `IMovementRestrictor` that checks for overlapping elements. Move operations
+ *  are only valid if the element does not collide with another element after moving.
+ */
 @injectable()
-export class NoOverlapMovmentRestrictor implements IMovementRestrictor {
+export class NoOverlapMovementRestrictor implements IMovementRestrictor {
     cssClasses = ['movement-not-allowed'];
 
-    validate(newLocation: Point, element: SModelElement): boolean {
-        if (!isBoundsAwareMoveable(element)) {
+    validate(element: SModelElement, newLocation?: Point): boolean {
+        if (!isBoundsAwareMoveable(element) || !newLocation) {
             return false;
         }
         // Create ghost element at the newLocation
@@ -71,27 +66,62 @@ export class NoOverlapMovmentRestrictor implements IMovementRestrictor {
                 .all()
                 .filter(e => e.id !== ghostElement.id && e !== ghostElement.root && e instanceof SNode)
                 .map(e => e as SModelElement & BoundsAware)
-        ).some(e => areOverlapping(e, ghostElement));
+        ).some(e => this.areOverlapping(e, ghostElement));
     }
-}
 
-export function areOverlapping(element1: SModelElement & BoundsAware, element2: SModelElement & BoundsAware): boolean {
-    const b1 = toAbsoluteBounds(element1);
-    const b2 = toAbsoluteBounds(element2);
-    const r1TopLeft: Point = b1;
-    const r1BottomRight = { x: b1.x + b1.width, y: b1.y + b1.height };
-    const r2TopLeft: Point = b2;
-    const r2BottomRight = { x: b2.x + b2.width, y: b2.y + b2.height };
+    protected areOverlapping(element1: SModelElement & BoundsAware, element2: SModelElement & BoundsAware): boolean {
+        const b1 = toAbsoluteBounds(element1);
+        const b2 = toAbsoluteBounds(element2);
+        const r1TopLeft: Point = b1;
+        const r1BottomRight = { x: b1.x + b1.width, y: b1.y + b1.height };
+        const r2TopLeft: Point = b2;
+        const r2BottomRight = { x: b2.x + b2.width, y: b2.y + b2.height };
+
+        // If one rectangle is on left side of other
+        if (r1TopLeft.x > r2BottomRight.x || r2TopLeft.x > r1BottomRight.x) {
+            return false;
+        }
 
-    // If one rectangle is on left side of other
-    if (r1TopLeft.x > r2BottomRight.x || r2TopLeft.x > r1BottomRight.x) {
-        return false;
+        // If one rectangle is above other
+        if (r1BottomRight.y < r2TopLeft.y || r2BottomRight.y < r1TopLeft.y) {
+            return false;
+        }
+
+        return true;
     }
+}
 
-    // If one rectangle is above other
-    if (r1BottomRight.y < r2TopLeft.y || r2BottomRight.y < r1TopLeft.y) {
-        return false;
+/**
+ * Utility function to create an action that applies the given {@link IMovementRestrictor.cssClasses} to the given element.
+ * @param element The element on which the css classes should be applied.
+ * @param movementRestrictor The movement restrictor whose cssClasses should be applied.
+ * @returns The corresponding {@link ModifyCSSFeedbackAction}
+ */
+export function createMovementRestrictionFeedback(
+    element: SModelElement,
+    movementRestrictor: IMovementRestrictor
+): ModifyCSSFeedbackAction {
+    const elements: SModelElement[] = [element];
+    if (element instanceof SParentElement) {
+        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
+    }
+    return ModifyCSSFeedbackAction.create({ elements, add: movementRestrictor.cssClasses });
+}
+
+/**
+ * Utility function to create an action that removes the given {@link IMovementRestrictor.cssClasses} from the given element.
+ * @param element The element from which the css classes should be removed.
+ * @param movementRestrictor The movement restrictor whose cssClasses should be removed.
+ * @returns The corresponding {@link ModifyCSSFeedbackAction}
+ */
+export function removeMovementRestrictionFeedback(
+    element: SModelElement,
+    movementRestrictor: IMovementRestrictor
+): ModifyCSSFeedbackAction {
+    const elements: SModelElement[] = [element];
+    if (element instanceof SParentElement) {
+        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
     }
 
-    return true;
+    return ModifyCSSFeedbackAction.create({ elements, remove: movementRestrictor.cssClasses });
 }