@eclipse-glsp/client 0.9.0-next.6d10f92e → 0.9.0-next.75608185

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
@@ -14,24 +14,25 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export const GLSP_TYPES = {
-    IAsyncClipboardService: Symbol.for("IAsyncClipboardService"),
-    ICommandPaletteActionProviderRegistry: Symbol.for("ICommandPaletteActionProviderRegistry"),
-    IEditorContextServiceProvider: Symbol.for("IEditorContextProvider"),
-    IFeedbackActionDispatcher: Symbol.for("IFeedbackActionDispatcher"),
-    IToolFactory: Symbol.for("Factory<Tool>"),
-    ITypeHintProvider: Symbol.for("ITypeHintProvider"),
-    IMovementRestrictor: Symbol.for("IMovmementRestrictor"),
-    SelectionService: Symbol.for("SelectionService"),
-    SelectionListener: Symbol.for("SelectionListener"),
-    SModelRootListener: Symbol.for("SModelRootListener"),
-    MouseTool: Symbol.for("MouseTool"),
-    IContextMenuService: Symbol.for("IContextMenuService"),
-    IContextMenuServiceProvider: Symbol.for("IContextMenuServiceProvider"),
-    IContextMenuProviderRegistry: Symbol.for("IContextMenuProviderRegistry"),
-    IContextMenuProvider: Symbol.for("IContextMenuProvider"),
-    ICopyPasteHandler: Symbol.for("ICopyPasteHandler"),
-    IGLSPToolManager: Symbol.for("IGLSPToolManager"),
-    ITool: Symbol.for("ITool"),
-    IDefaultTool: Symbol.for("IDefaultTool"),
-    IEditModeListener: Symbol.for("IEditModeListener")
+    IAsyncClipboardService: Symbol.for('IAsyncClipboardService'),
+    ICommandPaletteActionProviderRegistry: Symbol.for('ICommandPaletteActionProviderRegistry'),
+    IEditorContextServiceProvider: Symbol.for('IEditorContextProvider'),
+    IFeedbackActionDispatcher: Symbol.for('IFeedbackActionDispatcher'),
+    IToolFactory: Symbol.for('Factory<Tool>'),
+    ITypeHintProvider: Symbol.for('ITypeHintProvider'),
+    IMovementRestrictor: Symbol.for('IMovmementRestrictor'),
+    SelectionService: Symbol.for('SelectionService'),
+    SelectionListener: Symbol.for('SelectionListener'),
+    SModelRootListener: Symbol.for('SModelRootListener'),
+    MouseTool: Symbol.for('MouseTool'),
+    IContextMenuService: Symbol.for('IContextMenuService'),
+    IContextMenuServiceProvider: Symbol.for('IContextMenuServiceProvider'),
+    IContextMenuProviderRegistry: Symbol.for('IContextMenuProviderRegistry'),
+    IContextMenuProvider: Symbol.for('IContextMenuProvider'),
+    ICopyPasteHandler: Symbol.for('ICopyPasteHandler'),
+    IGLSPToolManager: Symbol.for('IGLSPToolManager'),
+    ITool: Symbol.for('ITool'),
+    IDefaultTool: Symbol.for('IDefaultTool'),
+    IEditModeListener: Symbol.for('IEditModeListener'),
+    LayoutRegistration: Symbol.for('LayoutRegistration')
 };

package/src/{features/model-source-watcher/model-source-changed-action.ts → base/view/view-registry.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,14 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from "sprotty";
+import { injectable } from 'inversify';
+import { IView, ViewRegistry } from 'sprotty';
 
-export class ModelSourceChangedAction implements Action {
-    static KIND = 'modelSourceChanged';
-    readonly kind = ModelSourceChangedAction.KIND;
-    constructor(public readonly modelSourceName: string) { }
-}
-
-export function isModelSourceChangedAction(action: Action): action is ModelSourceChangedAction {
-    return action.kind === ModelSourceChangedAction.KIND;
+@injectable()
+export class GLSPViewRegistry extends ViewRegistry {
+    register(key: string, instance: IView): void {
+        if (key === undefined) {
+            throw new Error('Key is undefined');
+        }
+        if (this.hasKey(key)) {
+            // do not throw error but log overwriting
+            console.log(`View instance for type '${key}' will be overwritten.`);
+        }
+        this.elements.set(key, instance);
+    }
 }

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
@@ -25,22 +25,22 @@ import {
     Selectable,
     SModelElement,
     SParentElement
-} from "sprotty";
+} from 'sprotty';
 
-export const resizeFeature = Symbol("resizeFeature");
+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",
-    BottomLeft = "bottom-left",
-    BottomRight = "bottom-right"
+    TopLeft = 'top-left',
+    TopRight = 'top-right',
+    BottomLeft = 'bottom-left',
+    BottomRight = 'bottom-right'
 }
 
 export function isBoundsAwareMoveable(element: SModelElement): element is SModelElement & Locateable & BoundsAware {
@@ -50,18 +50,28 @@ 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) {
+export function addResizeHandles(element: SParentElement): void {
     removeResizeHandles(element);
     element.add(new SResizeHandle(ResizeHandleLocation.TopLeft));
     element.add(new SResizeHandle(ResizeHandleLocation.TopRight));
@@ -69,6 +79,6 @@ export function addResizeHandles(element: SParentElement) {
     element.add(new SResizeHandle(ResizeHandleLocation.BottomRight));
 }
 
-export function removeResizeHandles(element: SParentElement) {
+export function removeResizeHandles(element: SParentElement): void {
     element.removeAll(child => child instanceof SResizeHandle);
 }

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,28 +13,33 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from "inversify";
-import { BoundsAware, Point, SModelElement, SNode, SParentElement } from "sprotty";
-
-import { toAbsoluteBounds } from "../../utils/viewpoint-util";
-import { ModifyCSSFeedbackAction } from "../tool-feedback/css-feedback";
-import { isBoundsAwareMoveable, SResizeHandle } from "./model";
+import { Point } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+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';
 
 export interface IMovementRestrictor {
     validate(newLocation: Point, element: SModelElement): boolean;
     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));
@@ -45,7 +50,7 @@ export function removeMovementRestrictionFeedback(element: SModelElement, moveme
 
 @injectable()
 export class NoOverlapMovmentRestrictor implements IMovementRestrictor {
-    cssClasses = ["movement-not-allowed"];
+    cssClasses = ['movement-not-allowed'];
 
     validate(newLocation: Point, element: SModelElement): boolean {
         if (!isBoundsAwareMoveable(element)) {
@@ -59,14 +64,18 @@ export class NoOverlapMovmentRestrictor implements IMovementRestrictor {
             width: element.bounds.width,
             height: element.bounds.height
         };
-        ghostElement.type = "Ghost";
+        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));
     }
 }
 
-export function areOverlapping(element1: SModelElement & BoundsAware, element2: SModelElement & BoundsAware) {
+export function areOverlapping(element1: SModelElement & BoundsAware, element2: SModelElement & BoundsAware): boolean {
     const b1 = toAbsoluteBounds(element1);
     const b2 = toAbsoluteBounds(element2);
     const r1TopLeft: Point = b1;
@@ -75,13 +84,14 @@ export function areOverlapping(element1: SModelElement & BoundsAware, element2:
     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)
+    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)
+    if (r1BottomRight.y < r2TopLeft.y || r2BottomRight.y < r1TopLeft.y) {
         return false;
+    }
 
     return true;
-
 }

package/src/features/change-bounds/snap.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,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { injectable } from "inversify";
-import { ISnapper, Point, SModelElement } from "sprotty";
+import { Point } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { ISnapper, SModelElement } from 'sprotty';
 
 @injectable()
 export class GridSnapper implements ISnapper {
-    get gridX() {
+    get gridX(): number {
         return 10;
     }
 
-    get gridY() {
+    get gridY(): number {
         return 10;
     }
 

package/src/features/command-palette/command-palette-tool.ts

@@ -13,18 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, postConstruct } from "inversify";
-import { CommandPaletteKeyListener, KeyListener, KeyTool, Tool } from "sprotty";
+import { inject, injectable, postConstruct } from 'inversify';
+import { CommandPaletteKeyListener, KeyListener, KeyTool, Tool } from 'sprotty';
 
 @injectable()
 export class CommandPaletteTool implements Tool {
-    static ID = "glsp.command-palette-tool";
+    static ID = 'glsp.command-palette-tool';
 
     protected commandPaletteKeyListener: KeyListener;
     @inject(KeyTool) protected keyTool: KeyTool;
 
     @postConstruct()
-    protected postConstruct() {
+    protected postConstruct(): void {
         this.commandPaletteKeyListener = this.createCommandPaleteKeyListener();
     }
 

package/src/features/command-palette/di.config.ts

@@ -13,16 +13,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import "../../../css/command-palette.css";
+import '../../../css/command-palette.css';
 
-import { ContainerModule } from "inversify";
-import { CommandPalette, CommandPaletteActionProviderRegistry, TYPES } from "sprotty";
+import { ContainerModule } from 'inversify';
+import { CommandPalette, CommandPaletteActionProviderRegistry, TYPES } from 'sprotty';
 
-import { GLSP_TYPES } from "../../base/types";
-import { CommandPaletteTool } from "./command-palette-tool";
-import { ServerCommandPaletteActionProvider } from "./server-command-palette-provider";
+import { GLSP_TYPES } from '../../base/types';
+import { CommandPaletteTool } from './command-palette-tool';
+import { ServerCommandPaletteActionProvider } from './server-command-palette-provider';
 
-const glspCommandPaletteModule = new ContainerModule((bind) => {
+const glspCommandPaletteModule = new ContainerModule(bind => {
     bind(CommandPalette).toSelf().inSingletonScope();
     bind(TYPES.IUIExtension).toService(CommandPalette);
     bind(CommandPaletteActionProviderRegistry).toSelf().inSingletonScope();

package/src/features/command-palette/server-command-palette-provider.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,16 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
-import { Action, ICommandPaletteActionProvider, LabeledAction, Point, SModelElement, TYPES } from "sprotty";
-
-import { GLSPActionDispatcher } from "../../base/action-dispatcher";
-import { isSetContextActionsAction, RequestContextActions } from "../../base/actions/context-actions";
-import { EditorContextService } from "../../base/editor-context";
+import { Action, isSetContextActionsAction, LabeledAction, Point, RequestContextActions } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { ICommandPaletteActionProvider, SModelElement, TYPES } from 'sprotty';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { EditorContextService } from '../../base/editor-context-service';
 
 export namespace ServerCommandPalette {
-    export const CONTEXT_ID = "command-palette";
-    export const TEXT = "text";
-    export const INDEX = "index";
+    export const CONTEXT_ID = 'command-palette';
+    export const TEXT = 'text';
+    export const INDEX = 'index';
 }
 
 @injectable()
@@ -32,10 +31,13 @@ export class ServerCommandPaletteActionProvider implements ICommandPaletteAction
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     getActions(_root: Readonly<SModelElement>, text: string, _lastMousePosition?: Point, index?: number): Promise<LabeledAction[]> {
-        const requestAction = new RequestContextActions(ServerCommandPalette.CONTEXT_ID, this.editorContext.get({
-            [ServerCommandPalette.TEXT]: text,
-            [ServerCommandPalette.INDEX]: index ? index : 0
-        }));
+        const requestAction = new RequestContextActions(
+            ServerCommandPalette.CONTEXT_ID,
+            this.editorContext.get({
+                [ServerCommandPalette.TEXT]: text,
+                [ServerCommandPalette.INDEX]: index ? index : 0
+            })
+        );
         return this.actionDispatcher.requestUntil(requestAction).then(response => this.getPaletteActionsFromResponse(response));
     }
 

package/src/features/context-menu/delete-element-context-menu.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,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
-import { IContextMenuItemProvider, MenuItem, Point, SModelRoot } from "sprotty";
-
-import { EditorContextService, EditorContextServiceProvider } from "../../base/editor-context";
-import { DeleteElementOperation } from "../../base/operations/operation";
-import { GLSP_TYPES } from "../../base/types";
+import { DeleteElementOperation } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { IContextMenuItemProvider, MenuItem, Point, SModelRoot } from 'sprotty';
+import { EditorContextService, EditorContextServiceProvider } from '../../base/editor-context-service';
+import { GLSP_TYPES } from '../../base/types';
 
 @injectable()
 export class DeleteElementContextMenuItemProvider implements IContextMenuItemProvider {
@@ -31,10 +30,10 @@ export class DeleteElementContextMenuItemProvider implements IContextMenuItemPro
 
     protected createDeleteMenuItem(editorContextService: EditorContextService): MenuItem {
         return {
-            id: "delete",
-            label: "Delete",
-            sortString: "d",
-            group: "edit",
+            id: 'delete',
+            label: 'Delete',
+            sortString: 'd',
+            group: 'edit',
             actions: [new DeleteElementOperation(editorContextService.selectedElements.map(e => e.id))],
             isEnabled: () => !editorContextService.isReadonly && editorContextService.selectedElements.length > 0
         };

package/src/features/context-menu/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,24 +13,22 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from "inversify";
-import { ContextMenuProviderRegistry, IContextMenuService, TYPES } from "sprotty";
-
-import { SelectionServiceAwareContextMenuMouseListener } from "./selection-service-aware-context-menu-mouse-listener";
-import { ServerContextMenuItemProvider } from "./server-context-menu-provider";
+import { ContainerModule } from 'inversify';
+import { ContextMenuProviderRegistry, IContextMenuService, TYPES } from 'sprotty';
+import { SelectionServiceAwareContextMenuMouseListener } from './selection-service-aware-context-menu-mouse-listener';
+import { ServerContextMenuItemProvider } from './server-context-menu-provider';
 
 const glspContextMenuModule = new ContainerModule(bind => {
-    bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(ctx => {
-        return () => {
-            return new Promise<IContextMenuService>((resolve, reject) => {
+    bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(
+        ctx => () =>
+            new Promise<IContextMenuService>((resolve, reject) => {
                 if (ctx.container.isBound(TYPES.IContextMenuService)) {
                     resolve(ctx.container.get<IContextMenuService>(TYPES.IContextMenuService));
                 } else {
                     reject();
                 }
-            });
-        };
-    });
+            })
+    );
     bind(TYPES.MouseListener).to(SelectionServiceAwareContextMenuMouseListener);
     bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
     bind(TYPES.IContextMenuItemProvider).to(ServerContextMenuItemProvider);

package/src/features/context-menu/selection-service-aware-context-menu-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,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, optional } from "inversify";
+import { inject, injectable, optional } from 'inversify';
 import {
     Action,
     ContextMenuProviderRegistry,
@@ -23,10 +23,10 @@ import {
     MouseListener,
     SModelElement,
     TYPES
-} from "sprotty";
+} from 'sprotty';
 
-import { GLSP_TYPES } from "../../base/types";
-import { SelectionService } from "../select/selection-service";
+import { GLSP_TYPES } from '../../base/types';
+import { SelectionService } from '../select/selection-service';
 
 @injectable()
 export class SelectionServiceAwareContextMenuMouseListener extends MouseListener {
@@ -42,8 +42,9 @@ export class SelectionServiceAwareContextMenuMouseListener extends MouseListener
                 selectableTarget.selected = true;
                 this.selectionService.updateSelection(target.root, [selectableTarget.id], []);
             }
-            Promise.all([this.contextMenuService(), this.menuProvider.getItems(target.root, mousePosition)])
-                .then(([menuService, menuItems]) => menuService.show(menuItems, mousePosition));
+            Promise.all([this.contextMenuService(), this.menuProvider.getItems(target.root, mousePosition)]).then(
+                ([menuService, menuItems]) => menuService.show(menuItems, mousePosition)
+            );
         }
         return [];
     }

package/src/features/context-menu/server-context-menu-provider.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,25 +13,28 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
-import { Action, IContextMenuItemProvider, isSelected, LabeledAction, Point, SModelElement, TYPES } from "sprotty";
-
-import { GLSPActionDispatcher } from "../../base/action-dispatcher";
-import { isSetContextActionsAction, RequestContextActions } from "../../base/actions/context-actions";
-import { EditorContextService } from "../../base/editor-context";
+import { Action, isSetContextActionsAction, LabeledAction, Point, RequestContextActions } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { IContextMenuItemProvider, isSelected, SModelElement, TYPES } from 'sprotty';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { EditorContextService } from '../../base/editor-context-service';
 
 export namespace ServerContextMenu {
-    export const CONTEXT_ID = "context-menu";
+    export const CONTEXT_ID = 'context-menu';
 }
 
 @injectable()
 export class ServerContextMenuItemProvider implements IContextMenuItemProvider {
-
     @inject(TYPES.IActionDispatcher) protected actionDispatcher: GLSPActionDispatcher;
     @inject(EditorContextService) protected editorContext: EditorContextService;
 
     getItems(root: Readonly<SModelElement>, lastMousePosition?: Point): Promise<LabeledAction[]> {
-        const selectedElementIds = Array.from(root.index.all().filter(isSelected).map(e => e.id));
+        const selectedElementIds = Array.from(
+            root.index
+                .all()
+                .filter(isSelected)
+                .map(e => e.id)
+        );
         const context = this.editorContext.getWithSelection(selectedElementIds);
         const requestAction = new RequestContextActions(ServerContextMenu.CONTEXT_ID, context);
         return this.actionDispatcher.requestUntil(requestAction).then(response => this.getContextActionsFromResponse(response));