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

package/src/features/layout/vbox-layout.ts

@@ -0,0 +1,256 @@
+/********************************************************************************
+ * 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 { injectable } from 'inversify';
+import {
+    Bounds,
+    BoundsData,
+    Dimension,
+    EMPTY_BOUNDS,
+    isBoundsAware,
+    isLayoutableChild,
+    isValidDimension,
+    LayoutContainer,
+    Point,
+    SChildElement,
+    SModelElement,
+    SParentElement,
+    StatefulLayouter,
+    VBoxLayouter,
+    VBoxLayoutOptions
+} from 'sprotty';
+
+export interface VBoxLayoutOptionsExt extends VBoxLayoutOptions {
+    hGrab: boolean;
+    vGrab: boolean;
+    prefWidth: number | null;
+    prefHeight: number | null;
+}
+
+/**
+ * Extends VBoxLayouter to support additional layout options
+ */
+@injectable()
+export class VBoxLayouterExt extends VBoxLayouter {
+    static KIND = VBoxLayouter.KIND;
+
+    layout(container: SParentElement & LayoutContainer, layouter: StatefulLayouter): void {
+        const boundsData = layouter.getBoundsData(container);
+        const options = this.getLayoutOptions(container);
+        const childrenSize = this.getChildrenSize(container, options, layouter);
+
+        const fixedSize = this.getFixedContainerBounds(container, options, layouter);
+
+        const maxWidth =
+            options.paddingFactor *
+            (options.resizeContainer
+                ? Math.max(fixedSize.width - options.paddingLeft - options.paddingRight, childrenSize.width)
+                : Math.max(0, fixedSize.width - options.paddingLeft - options.paddingRight));
+        const maxHeight =
+            options.paddingFactor *
+            (options.resizeContainer
+                ? Math.max(fixedSize.height - options.paddingTop - options.paddingBottom, childrenSize.height)
+                : Math.max(0, fixedSize.height - options.paddingTop - options.paddingBottom));
+
+        // Remaining size that can be grabbed by children with the vGrab option
+        const grabHeight: number = maxHeight - childrenSize.height;
+        // Number of children that request vGrab
+        // FIXME: This approach works fine when only 1 child uses VGrab, but may cause rounding issues
+        // when the grabHeight can't be equally shared by all children.
+        const grabbingChildren = container.children
+            .map(child => this.getChildLayoutOptions(child, options))
+            .filter(opt => opt.vGrab).length;
+
+        if (maxWidth > 0 && maxHeight > 0) {
+            const offset = this.layoutChildren(container, layouter, options, maxWidth, maxHeight, grabHeight, grabbingChildren);
+            boundsData.bounds = this.getFinalContainerBounds(container, offset, options, childrenSize.width, childrenSize.height);
+            boundsData.boundsChanged = true;
+        }
+    }
+
+    protected getChildrenSize(
+        container: SParentElement & LayoutContainer,
+        containerOptions: VBoxLayoutOptionsExt,
+        layouter: StatefulLayouter
+    ): Dimension {
+        let maxWidth = -1;
+        let maxHeight = 0;
+        let isFirst = true;
+        container.children.forEach(child => {
+            if (isLayoutableChild(child)) {
+                const bounds = layouter.getBoundsData(child).bounds;
+                if (bounds !== undefined && isValidDimension(bounds)) {
+                    maxHeight += bounds.height;
+                    if (isFirst) {
+                        isFirst = false;
+                    } else {
+                        maxHeight += containerOptions.vGap;
+                    }
+                    maxWidth = Math.max(maxWidth, bounds.width);
+                }
+            }
+        });
+        const result = {
+            width: maxWidth,
+            height: maxHeight
+        };
+        return result;
+    }
+
+    protected layoutChildren(
+        container: SParentElement & LayoutContainer,
+        layouter: StatefulLayouter,
+        containerOptions: VBoxLayoutOptionsExt,
+        maxWidth: number,
+        maxHeight: number,
+        grabHeight?: number,
+        grabbingChildren?: number
+    ): Point {
+        let currentOffset: Point = {
+            x: containerOptions.paddingLeft + 0.5 * (maxWidth - maxWidth / containerOptions.paddingFactor),
+            y: containerOptions.paddingTop + 0.5 * (maxHeight - maxHeight / containerOptions.paddingFactor)
+        };
+
+        container.children.forEach(child => {
+            if (isLayoutableChild(child)) {
+                const boundsData = layouter.getBoundsData(child);
+                const bounds = boundsData.bounds;
+                const childOptions = this.getChildLayoutOptions(child, containerOptions);
+                if (bounds !== undefined && isValidDimension(bounds)) {
+                    currentOffset = this.layoutChild(
+                        child,
+                        boundsData,
+                        bounds,
+                        childOptions,
+                        containerOptions,
+                        currentOffset,
+                        maxWidth,
+                        maxHeight,
+                        grabHeight,
+                        grabbingChildren
+                    );
+                }
+            }
+        });
+        return currentOffset;
+    }
+
+    protected layoutChild(
+        child: SChildElement,
+        boundsData: BoundsData,
+        bounds: Bounds,
+        childOptions: VBoxLayoutOptionsExt,
+        containerOptions: VBoxLayoutOptionsExt,
+        currentOffset: Point,
+        maxWidth: number,
+        maxHeight: number,
+        grabHeight?: number,
+        grabbingChildren?: number
+    ): Point {
+        let offset = super.layoutChild(child, boundsData, bounds, childOptions, containerOptions, currentOffset, maxWidth, maxHeight);
+        if (childOptions.hGrab) {
+            boundsData.bounds = {
+                x: boundsData.bounds!.x,
+                y: boundsData.bounds!.y,
+                width: maxWidth,
+                height: boundsData.bounds!.height
+            };
+            boundsData.boundsChanged = true;
+        }
+        if (childOptions.vGrab && grabHeight && grabbingChildren) {
+            const height = boundsData.bounds!.height + grabHeight / grabbingChildren;
+            boundsData.bounds = {
+                x: boundsData.bounds!.x,
+                y: boundsData.bounds!.y,
+                width: boundsData.bounds!.width,
+                height: height
+            };
+            boundsData.boundsChanged = true;
+            offset = { x: currentOffset.x, y: currentOffset.y + height };
+        }
+        return offset;
+    }
+
+    protected getFixedContainerBounds(container: SModelElement, layoutOptions: VBoxLayoutOptionsExt, layouter: StatefulLayouter): Bounds {
+        const currentContainer = container;
+        // eslint-disable-next-line no-constant-condition
+        if (isBoundsAware(currentContainer)) {
+            const bounds = currentContainer.bounds;
+            const elementOptions = this.getElementLayoutOptions(currentContainer);
+            const width = elementOptions?.prefWidth ?? 0;
+            const height = elementOptions?.prefHeight ?? 0;
+            return { ...bounds, width, height };
+        }
+        return EMPTY_BOUNDS;
+    }
+
+    protected getChildLayoutOptions(child: SChildElement, containerOptions: VBoxLayoutOptionsExt): VBoxLayoutOptionsExt {
+        return super.getChildLayoutOptions(child, containerOptions) as VBoxLayoutOptionsExt;
+    }
+
+    protected getLayoutOptions(element: SModelElement): VBoxLayoutOptionsExt {
+        return super.getLayoutOptions(element) as VBoxLayoutOptionsExt;
+    }
+
+    protected getElementLayoutOptions(element: SModelElement): VBoxLayoutOptionsExt | undefined {
+        return (element as any).layoutOptions;
+    }
+
+    protected getFinalContainerBounds(
+        container: SParentElement & LayoutContainer,
+        lastOffset: Point,
+        options: VBoxLayoutOptionsExt,
+        maxWidth: number,
+        maxHeight: number
+    ): Bounds {
+        const elementOptions = this.getElementLayoutOptions(container);
+        const width = elementOptions?.prefWidth ?? options.minWidth;
+        const height = elementOptions?.prefHeight ?? options.minHeight;
+
+        const result = {
+            x: container.bounds.x,
+            y: container.bounds.y,
+            width: Math.max(width, maxWidth + options.paddingLeft + options.paddingRight),
+            height: Math.max(height, maxHeight + options.paddingTop + options.paddingBottom)
+        };
+
+        return result;
+    }
+
+    protected getDefaultLayoutOptions(): VBoxLayoutOptionsExt {
+        return {
+            resizeContainer: true,
+            paddingTop: 5,
+            paddingBottom: 5,
+            paddingLeft: 5,
+            paddingRight: 5,
+            paddingFactor: 1,
+            vGap: 1,
+            hAlign: 'center',
+            minWidth: 0,
+            minHeight: 0,
+            hGrab: false,
+            vGrab: false,
+            // eslint-disable-next-line no-null/no-null
+            prefHeight: null,
+            // eslint-disable-next-line no-null/no-null
+            prefWidth: null
+        };
+    }
+
+    protected spread(a: VBoxLayoutOptionsExt, b: VBoxLayoutOptionsExt): VBoxLayoutOptionsExt {
+        return { ...a, ...b };
+    }
+}

package/src/features/model-source-watcher/di.config.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,10 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { ModelSourceChangedAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty/lib';
-
-import { ModelSourceChangedAction } from './model-source-changed-action';
+import { configureActionHandler } from 'sprotty';
 import { ModelSourceChangedActionHandler } from './model-source-changed-action-handler';
 
 const modelSourceWatcherModule = new ContainerModule((bind, _unbind, isBound) => {

package/src/features/model-source-watcher/model-source-changed-action-handler.ts

@@ -13,11 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import {
+    Action,
+    GLSPServerStatusAction,
+    isModelSourceChangedAction,
+    ModelSourceChangedAction,
+    ServerMessageAction
+} from '@eclipse-glsp/protocol';
 import { inject, injectable, optional } from 'inversify';
-import { Action, IActionDispatcher, IActionHandler, TYPES, ViewerOptions } from 'sprotty/lib';
-
-import { GLSPServerStatusAction, ServerMessageAction } from '../../model-source/glsp-server-status';
-import { isModelSourceChangedAction, ModelSourceChangedAction } from './model-source-changed-action';
+import { IActionDispatcher, IActionHandler, TYPES, ViewerOptions } from 'sprotty';
 
 /**
  * An external handler of the model source change event.

package/src/features/mouse-tool/mouse-tool.ts

@@ -13,9 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isAction } from '@eclipse-glsp/protocol';
 import { injectable, multiInject, optional } from 'inversify';
 import { On, VNode, VNodeData } from 'snabbdom';
-import { Action, isAction, MouseListener, MouseTool, SModelElement, SModelRoot, TYPES } from 'sprotty';
+import { MouseListener, MouseTool, SModelElement, SModelRoot, TYPES } from 'sprotty';
 import { getRank } from '../rank/model';
 
 export interface IMouseTool {

package/src/features/navigation/di.config.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,16 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { NavigateToExternalTargetAction, NavigateToTargetAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty/lib';
-
-import {
-    NavigateAction,
-    NavigateToExternalTargetAction,
-    NavigateToTargetAction,
-    NavigationActionHandler,
-    ProcessNavigationArgumentsAction
-} from './navigation-action-handler';
+import { configureActionHandler } from 'sprotty';
+import { NavigateAction, NavigationActionHandler, ProcessNavigationArgumentsAction } from './navigation-action-handler';
 import { NavigationTargetResolver } from './navigation-target-resolver';
 
 export const navigationModule = new ContainerModule((bind, _unbind, isBound) => {

package/src/features/navigation/navigation-action-handler.ts

@@ -13,28 +13,29 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from 'inversify';
 import {
     Action,
-    ActionHandlerRegistry,
+    Args,
     CenterAction,
-    generateRequestId,
-    IActionDispatcher,
-    IActionHandler,
-    ICommand,
-    ILogger,
-    RequestAction,
-    ResponseAction,
+    GLSPServerStatusAction,
+    isNavigateToExternalTargetAction,
+    isNavigateToTargetAction,
+    isSetNavigationTargetsAction,
+    NavigateToExternalTargetAction,
+    NavigateToTargetAction,
+    NavigationTarget,
+    RequestNavigationTargetsAction,
     SelectAction,
     SelectAllAction,
-    TYPES
-} from 'sprotty';
+    ServerMessageAction,
+    SetResolvedNavigationTargetAction
+} from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { ActionHandlerRegistry, IActionDispatcher, IActionHandler, ICommand, ILogger, TYPES } from 'sprotty';
 
-import { Args } from '../../base/args';
-import { EditorContext, EditorContextServiceProvider } from '../../base/editor-context';
+import { EditorContextServiceProvider } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
-import { GLSPServerStatusAction, ServerMessageAction } from '../../model-source/glsp-server-status';
-import { NavigationTarget, NavigationTargetResolver, SetResolvedNavigationTargetAction } from './navigation-target-resolver';
+import { NavigationTargetResolver } from './navigation-target-resolver';
 
 /**
  * Action for triggering a navigation of a certain target type.
@@ -57,53 +58,6 @@ export function isNavigateAction(action: Action): action is NavigateAction {
     return action !== undefined && action.kind === NavigateAction.KIND && (action as NavigateAction).targetTypeId !== undefined;
 }
 
-/** Action that is usually sent to the server to request navigation targets for a navigation type. */
-export class RequestNavigationTargetsAction implements RequestAction<SetNavigationTargetsAction> {
-    static readonly KIND = 'requestNavigationTargets';
-    kind = RequestNavigationTargetsAction.KIND;
-    constructor(readonly targetTypeId: string, readonly editorContext: EditorContext, readonly requestId: string = generateRequestId()) {}
-}
-
-/** Action that is usually sent from the server to the client as a repsonse to a `RequestNavigationTargetsAction`. */
-export class SetNavigationTargetsAction implements ResponseAction {
-    static readonly KIND = 'setNavigationTargets';
-    kind = SetNavigationTargetsAction.KIND;
-    constructor(readonly targets: NavigationTarget[], readonly responseId: string = '', readonly args?: Args) {}
-}
-
-export function isSetNavigationTargetsAction(action: Action): action is SetNavigationTargetsAction {
-    return (
-        action !== undefined &&
-        action.kind === SetNavigationTargetsAction.KIND &&
-        (action as SetNavigationTargetsAction).targets !== undefined
-    );
-}
-
-/** Action that triggers the navigation to a particular navigation target, such as element IDs, queries, etc.. */
-export class NavigateToTargetAction implements Action {
-    static readonly KIND = 'navigateToTarget';
-    readonly kind = NavigateToTargetAction.KIND;
-    constructor(readonly target: NavigationTarget) {}
-}
-
-export function isNavigateToTargetAction(action: Action): action is NavigateToTargetAction {
-    return action !== undefined && action.kind === NavigateToTargetAction.KIND && (action as NavigateToTargetAction).target !== undefined;
-}
-
-export class NavigateToExternalTargetAction implements Action {
-    static readonly KIND = 'navigateToExternalTarget';
-    readonly kind = NavigateToExternalTargetAction.KIND;
-    constructor(readonly target: NavigationTarget) {}
-}
-
-export function isNavigateToExternalTargetAction(action: Action): action is NavigateToExternalTargetAction {
-    return (
-        action !== undefined &&
-        action.kind === NavigateToExternalTargetAction.KIND &&
-        (action as NavigateToExternalTargetAction).target !== undefined
-    );
-}
-
 /** Action to trigger the processing of additional navigation arguments.
  *
  * The resolution of a `NavigationTarget` may entail additional arguments. In this case, this action is

package/src/features/navigation/navigation-target-resolver.spec.ts

@@ -14,13 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable no-unused-expressions */
+import { NavigationTarget } from '@eclipse-glsp/protocol';
+import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 
-import { expect } from 'chai';
-
-import { NavigationTarget } from './navigation-target-resolver';
-
 describe('NavigationTarget', () => {
     it('should be able to set and get element IDs', () => {
         const navigationTarget: NavigationTarget = { uri: 'uri' };

package/src/features/navigation/navigation-target-resolver.ts

@@ -13,97 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import {
+    isSetResolvedNavigationTargets,
+    NavigationTarget,
+    ResolveNavigationTargetAction,
+    SetResolvedNavigationTargetAction
+} from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Action, generateRequestId, IActionDispatcher, ILogger, RequestAction, ResponseAction, TYPES } from 'sprotty';
-
-import { Args } from '../../base/args';
-import { EditorContextServiceProvider } from '../../base/editor-context';
+import { IActionDispatcher, ILogger, ResponseAction, TYPES } from 'sprotty';
+import { EditorContextServiceProvider } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
 
-export interface NavigationTarget {
-    uri: string;
-    label?: string;
-    args?: Args;
-}
-
-export namespace NavigationTarget {
-    export const ELEMENT_IDS = 'elementIds';
-    export const ELEMENT_IDS_SEPARATOR = '&';
-    export const TEXT_LINE = 'line';
-    export const TEXT_COLUMN = 'column';
-
-    export function hasArguments(target: NavigationTarget): boolean {
-        return target.args !== undefined && Object.keys(target.args).length > 0;
-    }
-
-    export function addArgument(target: NavigationTarget, key: string, value: string | number | boolean): void {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        target.args[key] = value;
-    }
-
-    export function getElementIds(target: NavigationTarget): string[] {
-        if (target.args === undefined || target.args[NavigationTarget.ELEMENT_IDS] === undefined) {
-            return [];
-        }
-        const elementIdsValue = target.args[NavigationTarget.ELEMENT_IDS].toString();
-        return elementIdsValue.split(NavigationTarget.ELEMENT_IDS_SEPARATOR);
-    }
-
-    export function setElementIds(target: NavigationTarget, elementIds: string[]): string {
-        if (target.args === undefined) {
-            target.args = {};
-        }
-        return (target.args[NavigationTarget.ELEMENT_IDS] = elementIds.join(NavigationTarget.ELEMENT_IDS_SEPARATOR));
-    }
-
-    export function setTextPosition(target: NavigationTarget, position: TextPosition | undefined): void {
-        if (position) {
-            if (target.args === undefined) {
-                target.args = {};
-            }
-            target.args[NavigationTarget.TEXT_LINE] = position.line;
-            target.args[NavigationTarget.TEXT_COLUMN] = position.character;
-        }
-    }
-
-    export function getTextPosition(target: NavigationTarget): TextPosition | undefined {
-        if (
-            target.args === undefined ||
-            target.args[NavigationTarget.TEXT_LINE] === undefined ||
-            target.args[NavigationTarget.TEXT_COLUMN] === undefined
-        ) {
-            return undefined;
-        }
-        return {
-            line: Number(target.args[NavigationTarget.TEXT_LINE]),
-            character: Number(target.args[NavigationTarget.TEXT_COLUMN])
-        };
-    }
-}
-
-export interface TextPosition {
-    line: number;
-    character: number;
-}
-
-export class ResolveNavigationTargetAction implements RequestAction<SetResolvedNavigationTargetAction> {
-    static readonly KIND = 'resolveNavigationTarget';
-    kind = ResolveNavigationTargetAction.KIND;
-    constructor(readonly navigationTarget: NavigationTarget, public readonly requestId: string = generateRequestId()) {}
-}
-
-export class SetResolvedNavigationTargetAction implements ResponseAction {
-    static readonly KIND = 'setResolvedNavigationTarget';
-    kind = SetResolvedNavigationTargetAction.KIND;
-    constructor(readonly elementIds: string[] = [], readonly args?: Args, readonly responseId: string = '') {}
-}
-
-export function isSetResolvedNavigationTargets(action: Action): action is SetResolvedNavigationTargetAction {
-    return action !== undefined && action.kind === SetResolvedNavigationTargetAction.KIND;
-}
-
 /**
  * Resolves `NavigationTargets` to element ids.
  *

package/src/features/save/di.config.ts

@@ -16,7 +16,7 @@
 import { ContainerModule } from 'inversify';
 import { TYPES } from 'sprotty';
 
-import { SaveModelKeyboardListener } from './save';
+import { SaveModelKeyboardListener } from './save-keylistener';
 
 /**
  * This module is not required the diagram is deployed in Theia with the `GLSPDiagramWidget`

package/src/features/save/{save.ts → save-keylistener.ts}

@@ -13,18 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, KeyListener, SModelRoot } from 'sprotty';
+import { Action, SaveModelAction } from '@eclipse-glsp/protocol';
+import { KeyListener, SModelRoot } from 'sprotty';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 
-export class SaveModelAction implements Action {
-    static readonly KIND = 'saveModel';
-    constructor(public readonly fileUri?: string, public readonly kind: string = SaveModelAction.KIND) {}
-}
-
-export function isSaveModelAction(action: Action): action is SaveModelAction {
-    return action.kind === SaveModelAction.KIND;
-}
-
 export class SaveModelKeyboardListener extends KeyListener {
     keyDown(_element: SModelRoot, event: KeyboardEvent): Action[] {
         if (matchesKeystroke(event, 'KeyS', 'ctrlCmd')) {

package/src/features/select/selection-service.spec.ts

@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 /* eslint-disable import/no-deprecated,no-unused-expressions */
+import { Action } from '@eclipse-glsp/protocol';
 import { AssertionError, expect } from 'chai';
 import { Container, injectable } from 'inversify';
-import { Action, defaultModule, SGraphFactory, SModelElementSchema, SModelRoot, TYPES } from 'sprotty';
-
+import { defaultModule, SGraphFactory, SModelElementSchema, SModelRoot, TYPES } from 'sprotty';
 import { GLSP_TYPES } from '../../base/types';
 import { IFeedbackActionDispatcher, IFeedbackEmitter } from '../tool-feedback/feedback-action-dispatcher';
 import { SelectFeedbackAction } from './select-feedback-action';

package/src/features/select/selection-service.ts

@@ -13,17 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, distinctAdd, remove, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
 import {
-    Action,
     Command,
     CommandExecutionContext,
     ILogger,
     isSelectable,
     isSelected,
     SChildElement,
-    SelectAction,
-    SelectAllAction,
     SelectAllCommand as SprottySelectAllCommand,
     SelectCommand as SprottySelectCommand,
     SModelElement,
@@ -31,10 +29,8 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-
 import { SModelRootListener } from '../../base/model/update-model-command';
 import { GLSP_TYPES } from '../../base/types';
-import { distinctAdd, remove } from '../../utils/array-utils';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import { SelectFeedbackAction } from './select-feedback-action';
 

package/src/features/tool-feedback/change-bounds-tool-feedback.ts

@@ -13,10 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Point } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { VNode } from 'snabbdom';
 import {
-    Action,
     CommandExecutionContext,
     CommandReturn,
     ElementMove,
@@ -26,7 +26,6 @@ import {
     isViewport,
     MouseListener,
     MoveAction,
-    Point,
     SChildElement,
     SModelElement,
     SModelRoot,
@@ -128,9 +127,7 @@ export class FeedbackMoveMouseListener extends MouseListener {
     }
 
     protected collectStartPositions(root: SModelRoot): void {
-        const selectedElements = root.index
-            .all()
-            .filter(element => isSelectable(element) && element.selected);
+        const selectedElements = root.index.all().filter(element => isSelectable(element) && element.selected);
         const elementsSet = new Set(selectedElements);
         selectedElements
             .filter(element => !this.isChildOfSelected(elementsSet, element))