@eclipse-glsp/client 0.9.0-RC01 → 0.9.0-next.0acab46c

package/src/base/auto-complete/validation-decorator.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ValidationStatus } from '../actions/edit-validation-actions';
+import { codiconCSSString } from 'sprotty/lib/utils/codicon';
+import { ValidationStatus } from '@eclipse-glsp/protocol';
 
 export interface IValidationDecorator {
     decorateValidationResult(status: ValidationStatus): void;
@@ -25,29 +26,29 @@ export interface IValidationDecorator {
 export namespace IValidationDecorator {
     export const NO_DECORATION: IValidationDecorator = {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        decorateValidationResult(_status: ValidationStatus) { },
+        decorateValidationResult(_status: ValidationStatus) {},
         isValidatedOk(): boolean {
             return false;
         },
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        invalidate() { },
+        invalidate() {},
         // eslint-disable-next-line @typescript-eslint/no-empty-function
-        dispose() { }
+        dispose() {}
     };
 }
 
 export class ValidationDecorator implements IValidationDecorator {
     warningClasses = ['warning'];
-    warningIconClasses = ['fa', 'fa-question-circle'];
+    warningIconClasses = codiconCSSString('warning');
     errorClasses = ['error'];
-    errorIconClasses = ['fa', 'fa-exclamation-circle'];
+    errorIconClasses = codiconCSSString('error');
 
     isValidated = false;
     hasValidationError = false;
 
     protected decorationDiv?: HTMLDivElement;
 
-    constructor(protected containerElement: HTMLElement) { }
+    constructor(protected containerElement: HTMLElement) {}
 
     decorateValidationResult(status: ValidationStatus): void {
         if (ValidationStatus.isError(status)) {
@@ -67,7 +68,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.errorClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.errorClasses);
-        div.innerHTML = `<span class="${this.errorIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.errorIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -75,7 +76,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.warningClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.warningClasses);
-        div.innerHTML = `<span class="${this.warningIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.warningIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -96,7 +97,7 @@ export class ValidationDecorator implements IValidationDecorator {
     }
 
     protected decorationContainerWidth(): number {
-        return this.containerElement.clientWidth - 22;
+        return this.containerElement.clientWidth - 5;
     }
 
     protected adjustPosition(): void {

package/src/base/command-stack.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { RedoOperation, UndoOperation } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from 'sprotty';
 
-import { RedoOperation, UndoOperation } from '../features/undo-redo/model';
-
 @injectable()
 export class GLSPCommandStack extends CommandStack {
-
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;
 
     undo(): Promise<SModelRoot> {
@@ -33,4 +31,3 @@ export class GLSPCommandStack extends CommandStack {
         return this.thenUpdate();
     }
 }
-

package/src/base/container-modules.ts

@@ -0,0 +1,112 @@
+/********************************************************************************
+ * 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 { Container, ContainerModule } from 'inversify';
+import {
+    boundsModule,
+    buttonModule,
+    defaultModule,
+    edgeIntersectionModule,
+    edgeLayoutModule,
+    expandModule,
+    exportModule,
+    fadeModule,
+    labelEditUiModule,
+    modelSourceModule,
+    openModule,
+    routingModule,
+    zorderModule
+} from 'sprotty';
+import glspCommandPaletteModule from '../features/command-palette/di.config';
+import glspContextMenuModule from '../features/context-menu/di.config';
+import { glspServerCopyPasteModule } from '../features/copy-paste/di.config';
+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 glspMouseToolModule from '../features/mouse-tool/di.config';
+import { navigationModule } from '../features/navigation/di.config';
+import glspSelectModule from '../features/select/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 { markerNavigatorModule, validationModule } from '../features/validation/di.config';
+import glspViewportModule from '../features/viewport/di.config';
+import defaultGLSPModule from './di.config';
+
+export const DEFAULT_MODULES = [
+    defaultModule,
+    defaultGLSPModule,
+    boundsModule,
+    buttonModule,
+    edgeIntersectionModule,
+    edgeLayoutModule,
+    expandModule,
+    exportModule,
+    fadeModule,
+    glspCommandPaletteModule,
+    glspContextMenuModule,
+    glspDecorationModule,
+    glspEditLabelModule,
+    glspHoverModule,
+    glspMouseToolModule,
+    glspSelectModule,
+    glspServerCopyPasteModule,
+    glspViewportModule,
+    labelEditUiModule,
+    layoutCommandsModule,
+    markerNavigatorModule,
+    modelHintsModule,
+    modelSourceModule,
+    modelSourceWatcherModule,
+    navigationModule,
+    openModule,
+    toolPaletteModule,
+    routingModule,
+    toolFeedbackModule,
+    toolsModule,
+    validationModule,
+    zorderModule
+];
+
+/**
+ * Creates a GLSP Client container with the GLSP default modules and the specified custom `modules`.
+ *
+ * You can still customize the default modules in two ways.
+ *
+ * First, you can unload default modules and load them again with your custom code.
+ *
+ * ```typescript
+ * const container = createClientContainer(myModule1, myModule2);
+ * container.unload(modelSourceWatcherModule);
+ * container.load(myModelSourceWatcherModule);
+ * ```
+ *
+ * Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
+ *
+ * ```typescript
+ * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
+ * ```
+ * @param modules Custom modules to be loaded in addition to the default modules.
+ * @returns The created container.
+ */
+export function createClientContainer(...modules: ContainerModule[]): Container {
+    const container = new Container();
+    container.load(...DEFAULT_MODULES, ...modules);
+    return container;
+}

package/src/base/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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,17 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { InitializeResult, SetEditModeAction } from '@eclipse-glsp/protocol';
+import '@vscode/codicons/dist/codicon.css';
+import { Container, ContainerModule } from 'inversify';
+import { ActionHandlerRegistry, configureActionHandler, configureCommand, ModelSource, SetModelCommand, TYPES } from 'sprotty';
 import '../../css/glsp-sprotty.css';
-
-import { ContainerModule } from 'inversify';
-import { configureActionHandler, configureCommand, SetModelCommand, TYPES } from 'sprotty';
-
 import { GLSPActionDispatcher } from './action-dispatcher';
-import { SetEditModeAction } from './actions/edit-mode-action';
 import { FocusStateChangedAction } from './actions/focus-change-action';
-import { ConfigureServerHandlersAction, ConfigureServerHandlersActionHandler } from './actions/protocol-actions';
 import { GLSPCommandStack } from './command-stack';
-import { EditorContextService } from './editor-context';
+import { EditorContextService } from './editor-context-service';
 import { FocusTracker } from './focus-tracker';
 import { DefaultModelInitializationConstraint, ModelInitializationConstraint } from './model-initialization-constraint';
 import { GLSPModelRegistry } from './model/model-registry';
@@ -36,13 +34,16 @@ import { GLSPViewRegistry } from './view/view-registry';
 const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) => {
     const context = { bind, _unbind, isBound, rebind };
     bind(EditorContextService).toSelf().inSingletonScope();
-    bind(GLSP_TYPES.IEditorContextServiceProvider).toProvider<EditorContextService>(ctx => () => new Promise<EditorContextService>((resolve, reject) => {
-        if (ctx.container.isBound(EditorContextService)) {
-            resolve(ctx.container.get<EditorContextService>(EditorContextService));
-        } else {
-            reject();
-        }
-    }));
+    bind(GLSP_TYPES.IEditorContextServiceProvider).toProvider<EditorContextService>(
+        ctx => () =>
+            new Promise<EditorContextService>((resolve, reject) => {
+                if (ctx.container.isBound(EditorContextService)) {
+                    resolve(ctx.container.get<EditorContextService>(EditorContextService));
+                } else {
+                    reject();
+                }
+            })
+    );
 
     configureActionHandler(context, SetEditModeAction.KIND, EditorContextService);
 
@@ -53,9 +54,6 @@ const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) =
     configureCommand(context, FeedbackAwareUpdateModelCommand);
     configureActionHandler(context, SetModelCommand.KIND, SetModelActionHandler);
 
-    // Dynamically register all server-side action/operation handlers
-    configureActionHandler(context, ConfigureServerHandlersAction.KIND, ConfigureServerHandlersActionHandler);
-
     bind(TYPES.MouseListener).to(SelectionClearingMouseListener);
 
     rebind(TYPES.ICommandStack).to(GLSPCommandStack);
@@ -73,3 +71,20 @@ const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) =
 });
 
 export default defaultGLSPModule;
+
+/**
+ * Utility function to configure the {@link ModelSource}, i.e. the `DiagramServer`, as action handler for all server actions for the given
+ * diagramType.
+ * @param result A promise that resolves after all server actions have been registered.
+ * @param diagramType The diagram type.
+ * @param container The di container.
+ */
+export async function configureServerActions(result: InitializeResult, diagramType: string, container: Container): Promise<void> {
+    const modelSource = container.get<ModelSource>(TYPES.ModelSource);
+    const actionHandlerRegistry = container.get<ActionHandlerRegistry>(ActionHandlerRegistry);
+    const serverActions = result.serverActions[diagramType];
+    if (serverActions.length === 0) {
+        throw new Error(`No server-handled actions could be derived from the initialize result for diagramType: ${diagramType}!`);
+    }
+    serverActions.forEach(actionKind => actionHandlerRegistry.register(actionKind, modelSource));
+}

package/src/base/drag-aware-mouse-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, MouseListener, SModelElement } from 'sprotty';
+import { Action } from '@eclipse-glsp/protocol';
+import { MouseListener, SModelElement } from 'sprotty';
 
 /**
  * A mouse listener that is aware of prior mouse dragging.
@@ -24,7 +25,6 @@ import { Action, MouseListener, SModelElement } from 'sprotty';
  * of mouse up events.
  */
 export class DragAwareMouseListener extends MouseListener {
-
     private _isMouseDown = false;
     private _isMouseDrag = false;
 
@@ -65,5 +65,4 @@ export class DragAwareMouseListener extends MouseListener {
     get isMouseDown(): boolean {
         return this._isMouseDown;
     }
-
 }

package/src/base/{editor-context.ts → editor-context-service.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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,51 +13,25 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Args, distinctAdd, EditMode, EditorContext, isSetEditModeAction, remove } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
-import { Action, IActionHandler, ModelSource, MousePositionTracker, Point, SModelElement, SModelRoot, TYPES } from 'sprotty';
-
+import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot, TYPES } from 'sprotty';
 import { SelectionService } from '../features/select/selection-service';
-import { distinctAdd, remove } from '../utils/array-utils';
-import { EditMode, isSetEditModeAction } from './actions/edit-mode-action';
-import { Args } from './args';
 import { isSourceUriAware } from './source-uri-aware';
 import { GLSP_TYPES } from './types';
 
-/**
- * The `EditorContext` may be used to represent the current state of the editor for particular actions.
- * It encompasses the last recorded mouse position, the list of selected elements, and may contain
- * custom arguments to encode additional state information.
- */
-export interface EditorContext {
-    /**
-     * The list of selected element identifiers.
-     */
-    readonly selectedElementIds: string[];
-
-    /**
-     * The last recorded mouse position.
-     */
-    readonly lastMousePosition?: Point;
-
-    /**
-     * Custom arguments.
-     */
-    readonly args?: Args;
-}
-
 export interface EditModeListener {
     editModeChanged(newValue: string, oldvalue: string): void;
 }
 
 @injectable()
 export class EditorContextService implements IActionHandler {
-
     @inject(GLSP_TYPES.SelectionService) protected selectionService: SelectionService;
     @inject(MousePositionTracker) protected mousePositionTracker: MousePositionTracker;
     @inject(TYPES.ModelSourceProvider) protected modelSource: () => Promise<ModelSource>;
     protected _editMode: string;
 
-    constructor(@multiInject(GLSP_TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) { }
+    constructor(@multiInject(GLSP_TYPES.IEditModeListener) @optional() protected editModeListeners: EditModeListener[] = []) {}
 
     register(editModeListener: EditModeListener): void {
         distinctAdd(this.editModeListeners, editModeListener);
@@ -121,4 +95,3 @@ export class EditorContextService implements IActionHandler {
 }
 
 export type EditorContextServiceProvider = () => Promise<EditorContextService>;
-

package/src/base/focus-tracker.ts

@@ -13,14 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Action, IActionHandler, ICommand, TYPES, ViewerOptions } from 'sprotty';
-
+import { IActionHandler, ICommand, TYPES, ViewerOptions } from 'sprotty';
 import { isFocusStateChangedAction } from './actions/focus-change-action';
 
 @injectable()
 export class FocusTracker implements IActionHandler {
-
     protected inActiveCssClass = 'inactive';
     protected _hasFocus = true;
 
@@ -46,5 +45,4 @@ export class FocusTracker implements IActionHandler {
             }
         }
     }
-
 }

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isSetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import {
-    Action,
     ActionHandlerRegistry,
     Command,
     CommandActionHandler,
@@ -23,19 +23,16 @@ import {
     CommandReturn,
     IActionHandler,
     ILogger,
-    SetModelAction,
-    SetModelCommand,
     SModelRoot,
-    TYPES
+    TYPES,
+    UpdateModelCommand
 } from 'sprotty';
-import { UpdateModelAction, UpdateModelCommand } from 'sprotty/lib/features/update/update-model';
-
 import { IFeedbackActionDispatcher } from '../../features/tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../features/tool-feedback/model';
 import { GLSP_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.*/
+ *  UpdateModel behaves the same as SetModel if no model is present yet.*/
 @injectable()
 export class SetModelActionHandler implements IActionHandler {
     handle(action: Action): Action | void {
@@ -45,18 +42,13 @@ export class SetModelActionHandler implements IActionHandler {
     }
 }
 
-export function isSetModelAction(action: Action): action is SetModelAction {
-    return action !== undefined && (action.kind === SetModelCommand.KIND)
-        && (action as SetModelAction).newRoot !== undefined;
-}
-
 export interface SModelRootListener {
     modelRootChanged(root: Readonly<SModelRoot>): void;
 }
 
 /**
- * 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`UpdateModelCommand` that retrieves all registered `actions` from the `IFeedbackActionDispatcher` (if present) and applies their
+ * feedback to the `newRoot` before performing the update
  */
 @injectable()
 export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
@@ -73,7 +65,7 @@ export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {
 
     @postConstruct()
     protected initialize(): void {
-        this.actionHandlerRegistryProvider().then(registry => this.actionHandlerRegistry = registry);
+        this.actionHandlerRegistryProvider().then(registry => (this.actionHandlerRegistry = registry));
     }
 
     protected performUpdate(oldRoot: SModelRoot, newRoot: SModelRoot, context: CommandExecutionContext): CommandReturn {

package/src/base/model-initialization-constraint.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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,8 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { Action, InitializeCanvasBoundsAction, UpdateModelAction } from 'sprotty';
+import { InitializeCanvasBoundsAction } from 'sprotty';
 import { Deferred } from 'sprotty/lib/utils/async';
 
 /**

package/src/base/tool-manager/glsp-tool-manager.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-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,12 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { distinctAdd, EditMode } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import { Tool, ToolManager } from 'sprotty';
-
-import { distinctAdd } from '../../utils/array-utils';
-import { EditMode } from '../actions/edit-mode-action';
-import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context';
+import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
 import { GLSP_TYPES } from '../types';
 
 export interface IGLSPToolManager extends ToolManager {

package/src/base/types.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -33,5 +33,7 @@ export const GLSP_TYPES = {
     IGLSPToolManager: Symbol.for('IGLSPToolManager'),
     ITool: Symbol.for('ITool'),
     IDefaultTool: Symbol.for('IDefaultTool'),
-    IEditModeListener: Symbol.for('IEditModeListener')
+    IEditModeListener: Symbol.for('IEditModeListener'),
+    LayoutRegistration: Symbol.for('LayoutRegistration'),
+    IMarqueeBehavior: Symbol.for('IMarqueeBehavior')
 };

package/src/features/change-bounds/model.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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
@@ -29,13 +29,13 @@ import {
 
 export const resizeFeature = Symbol('resizeFeature');
 
-export interface Resizable extends BoundsAware, Selectable {
-}
+export interface Resizable extends BoundsAware, Selectable {}
 
 export function isResizable(element: SModelElement): element is SParentElement & Resizable {
     return isBoundsAware(element) && isSelectable(element) && element instanceof SParentElement && element.hasFeature(resizeFeature);
 }
 
+// eslint-disable-next-line no-shadow
 export enum ResizeHandleLocation {
     TopLeft = 'top-left',
     TopRight = 'top-right',
@@ -50,15 +50,25 @@ export function isBoundsAwareMoveable(element: SModelElement): element is SModel
 export class SResizeHandle extends SChildElement implements Hoverable {
     static readonly TYPE = 'resize-handle';
 
-    constructor(public readonly location?: ResizeHandleLocation,
+    constructor(
+        public readonly location?: ResizeHandleLocation,
         public readonly type: string = SResizeHandle.TYPE,
-        public readonly hoverFeedback: boolean = false) {
+        public readonly hoverFeedback: boolean = false
+    ) {
         super();
     }
 
     hasFeature(feature: symbol): boolean {
         return feature === hoverFeedbackFeature;
     }
+
+    isNwSeResize(): boolean {
+        return this.location === ResizeHandleLocation.TopLeft || this.location === ResizeHandleLocation.BottomRight;
+    }
+
+    isNeSwResize(): boolean {
+        return this.location === ResizeHandleLocation.TopRight || this.location === ResizeHandleLocation.BottomLeft;
+    }
 }
 
 export function addResizeHandles(element: SParentElement): void {

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-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,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { BoundsAware, Point, SModelElement, SNode, SParentElement } from 'sprotty';
-
+import { BoundsAware, SModelElement, SNode, SParentElement } from 'sprotty';
 import { toAbsoluteBounds } from '../../utils/viewpoint-util';
 import { ModifyCSSFeedbackAction } from '../tool-feedback/css-feedback';
 import { isBoundsAwareMoveable, SResizeHandle } from './model';
@@ -25,16 +25,21 @@ export interface IMovementRestrictor {
     cssClasses?: string[];
 }
 
-export function createMovementRestrictionFeedback(element: SModelElement, movementRestrictor: IMovementRestrictor): 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 new ModifyCSSFeedbackAction(elements, movementRestrictor.cssClasses);
-
 }
 
-export function removeMovementRestrictionFeedback(element: SModelElement, movementRestrictor: IMovementRestrictor): 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));
@@ -61,8 +66,12 @@ export class NoOverlapMovmentRestrictor implements IMovementRestrictor {
         };
         ghostElement.type = 'Ghost';
         ghostElement.id = element.id;
-        return !Array.from(element.root.index.all().filter(e => e.id !== ghostElement.id && e !== ghostElement.root && (e instanceof SNode))
-            .map(e => e as SModelElement & BoundsAware)).some(e => areOverlapping(e, ghostElement));
+        return !Array.from(
+            element.root.index
+                .all()
+                .filter(e => e.id !== ghostElement.id && e !== ghostElement.root && e instanceof SNode)
+                .map(e => e as SModelElement & BoundsAware)
+        ).some(e => areOverlapping(e, ghostElement));
     }
 }
 
@@ -85,5 +94,4 @@ export function areOverlapping(element1: SModelElement & BoundsAware, element2:
     }
 
     return true;
-
 }