@eclipse-glsp/client 2.2.0-next.343 → 2.2.0-next.345

package/src/features/accessibility/element-navigation/element-navigation-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,31 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { BindingContext, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
-import { PositionNavigator } from './position-navigator';
-import { LocalElementNavigator } from './local-element-navigator';
-import { ElementNavigatorTool } from './diagram-navigation-tool';
+import { BindingContext, FeatureModule, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 import '../../../../css/navigation.css';
+import { ElementNavigatorTool } from './diagram-navigation-tool';
+import { LocalElementNavigator } from './local-element-navigator';
+import { PositionNavigator } from './position-navigator';
 
 /**
  * Handles element navigation actions.
  */
 
-export const glspElementNavigationModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureElementNavigationTool(context);
-});
+export const elementNavigationModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureElementNavigationTool(context);
+    },
+    { featureId: Symbol('elementNavigation') }
+);
 
 export function configureElementNavigationTool(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, ElementNavigatorTool);
     bindAsService(context, TYPES.IElementNavigator, PositionNavigator);
     bindAsService(context, TYPES.ILocalElementNavigator, LocalElementNavigator);
 }
+
+export {
+    /** Deprecated use {@link elementNavigationModule} instead */
+    elementNavigationModule as glspElementNavigationModule
+};

package/src/features/accessibility/focus-tracker/focus-tracker-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,19 +14,26 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
+import { BindingContext, FeatureModule, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 import { FocusTrackerTool } from './focus-tracker-tool';
-import { BindingContext, TYPES, bindAsService } from '@eclipse-glsp/sprotty';
 
 /**
  * Handles actions for tracking the focus of the cursor.
  */
 
-export const glspFocusTrackerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureFocusTrackerTool(context);
-});
+export const focusTrackerModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureFocusTrackerTool(context);
+    },
+    { featureId: Symbol('focusTracker') }
+);
 
 export function configureFocusTrackerTool(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, FocusTrackerTool);
 }
+
+export {
+    /** Deprecated use {@link focusTrackerModule} instead */
+    focusTrackerModule as glspFocusTrackerModule
+};

package/src/features/accessibility/key-shortcut/{di.config.ts → shortcut-help-module.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, configureActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import '../../../../css/key-shortcut.css';
 import { KeyShortcutUIExtension, SetAccessibleKeyShortcutAction } from './accessible-key-shortcut';
 import { AccessibleKeyShortcutTool } from './accessible-key-shortcut-tool';
@@ -23,13 +22,21 @@ import { AccessibleKeyShortcutTool } from './accessible-key-shortcut-tool';
 /**
  * Handles actions for displaying help/information about keyboard shortcuts.
  */
-export const glspShortcutHelpModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureShortcutHelpTool(context);
-});
+export const shortcutHelpModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureShortcutHelpTool(context);
+    },
+    { featureId: Symbol('shortcutHelp') }
+);
 
 export function configureShortcutHelpTool(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, AccessibleKeyShortcutTool);
     bindAsService(context, TYPES.IUIExtension, KeyShortcutUIExtension);
     configureActionHandler(context, SetAccessibleKeyShortcutAction.KIND, KeyShortcutUIExtension);
 }
+
+export {
+    /** Deprecated use {@link shortcutHelpModule} instead */
+    shortcutHelpModule as glspShortcutHelpModule
+};

package/src/features/accessibility/keyboard-pointer/keyboard-pointer-module.ts

@@ -14,32 +14,35 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import {
+    BindingContext,
+    FeatureModule,
     TYPES,
-    bindAsService,
-    configureActionHandler,
+    TriggerEdgeCreationAction,
     TriggerNodeCreationAction,
-    FeatureModule,
-    BindingContext,
-    TriggerEdgeCreationAction
+    bindAsService,
+    configureActionHandler
 } from '@eclipse-glsp/sprotty';
-import { GlobalKeyListenerTool } from '../global-keylistener-tool';
-import { KeyboardPointer } from './keyboard-pointer';
-import { KeyboardGrid } from '../keyboard-grid/keyboard-grid';
-import { SetKeyboardPointerRenderPositionAction } from './actions';
+import { SetEdgeTargetSelectionAction } from '../edge-autocomplete/action';
 import { EdgeAutocompletePalette } from '../edge-autocomplete/edge-autocomplete-palette';
 import { EdgeAutocompletePaletteTool } from '../edge-autocomplete/edge-autocomplete-tool';
-import { SetEdgeTargetSelectionAction } from '../edge-autocomplete/action';
+import { GlobalKeyListenerTool } from '../global-keylistener-tool';
+import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
+import { KeyboardGrid } from '../keyboard-grid/keyboard-grid';
 import { GridSearchPalette } from '../keyboard-grid/keyboard-grid-search-palette';
 import { KeyboardNodeGrid } from '../keyboard-grid/keyboard-node-grid';
-import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction } from '../keyboard-grid/action';
+import { SetKeyboardPointerRenderPositionAction } from './actions';
+import { KeyboardPointer } from './keyboard-pointer';
 
 /**
  * Handles the pointer used via grid to position new elements.
  */
-export const keyboardControlModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureKeyboardControlTools(context);
-});
+export const keyboardControlModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureKeyboardControlTools(context);
+    },
+    { featureId: Symbol('keyboardControl') }
+);
 
 export function configureKeyboardControlTools(context: BindingContext): void {
     bindAsService(context, TYPES.IDefaultTool, GlobalKeyListenerTool);

package/src/features/accessibility/keyboard-tool-palette/keyboard-tool-palette-module.ts

@@ -29,10 +29,13 @@ import { EnableToolPaletteAction } from '../../tool-palette/tool-palette';
 import { FocusDomAction } from '../actions';
 import { KeyboardToolPalette } from './keyboard-tool-palette';
 
-export const keyboardToolPaletteModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureKeyboardToolPaletteTool(context);
-});
+export const keyboardToolPaletteModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureKeyboardToolPaletteTool(context);
+    },
+    { featureId: Symbol('keyboardToolPalette') }
+);
 
 export function configureKeyboardToolPaletteTool(context: BindingContext): void {
     bindAsService(context, TYPES.IUIExtension, KeyboardToolPalette);

package/src/features/accessibility/move-zoom/move-zoom-module.ts

@@ -21,10 +21,13 @@ import { ZoomElementAction, ZoomElementHandler, ZoomViewportAction, ZoomViewport
 /**
  * Handles move and zoom actions.
  */
-export const moveZoomModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureMoveZoom(context);
-});
+export const moveZoomModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureMoveZoom(context);
+    },
+    { featureId: Symbol('moveZoom') }
+);
 
 export function configureMoveZoom(context: BindingContext): void {
     context.bind(MoveViewportHandler).toSelf().inSingletonScope();

package/src/features/accessibility/resize-key-tool/resize-key-module.ts

@@ -21,10 +21,13 @@ import { ResizeKeyTool } from './resize-key-tool';
 /**
  * Handles resize actions.
  */
-export const resizeKeyModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureResizeTools(context);
-});
+export const resizeKeyModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureResizeTools(context);
+    },
+    { featureId: Symbol('resizeKey') }
+);
 
 export function configureResizeTools(context: BindingContext): void {
     context.bind(ResizeElementHandler).toSelf().inSingletonScope();

package/src/features/accessibility/search/search-palette-module.ts

@@ -18,10 +18,13 @@ import { bindAsService, BindingContext, FeatureModule, TYPES } from '@eclipse-gl
 import { SearchAutocompletePalette } from './search-palette';
 import { SearchAutocompletePaletteTool } from './search-tool';
 
-export const searchPaletteModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
-    const context = { bind, isBound, rebind };
-    configureSearchPaletteModule(context);
-});
+export const searchPaletteModule = new FeatureModule(
+    (bind, _unbind, isBound, rebind) => {
+        const context = { bind, isBound, rebind };
+        configureSearchPaletteModule(context);
+    },
+    { featureId: Symbol('searchPalette') }
+);
 
 export function configureSearchPaletteModule(context: Pick<BindingContext, 'bind'>): void {
     bindAsService(context, TYPES.IUIExtension, SearchAutocompletePalette);

package/src/features/accessibility/toast/toast-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule } from 'inversify';
-import { bindAsService, BindingContext, configureActionHandler, TYPES } from '@eclipse-glsp/sprotty';
+import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import '../../../../css/toast.css';
 import { HideToastAction, ShowToastMessageAction } from './toast-handler';
 import { Toast } from './toast-tool';
@@ -23,10 +22,13 @@ import { Toast } from './toast-tool';
  * Handles toast/user notification actions.
  */
 
-export const glspToastModule = new ContainerModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
-    configureToastTool(context);
-});
+export const toastModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
+        configureToastTool(context);
+    },
+    { featureId: Symbol('toast') }
+);
 
 export function configureToastTool(context: BindingContext): void {
     bindAsService(context, TYPES.IUIExtension, Toast);
@@ -34,3 +36,8 @@ export function configureToastTool(context: BindingContext): void {
     configureActionHandler(context, ShowToastMessageAction.KIND, Toast);
     configureActionHandler(context, HideToastAction.KIND, Toast);
 }
+
+export {
+    /** Deprecated use {@link toastModule} instead */
+    toastModule as glspToastModule
+};

package/src/features/accessibility/view-key-tools/deselect-key-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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,21 +14,21 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { inject, injectable } from 'inversify';
-import { toArray } from 'sprotty/lib/utils/iterable';
-import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import {
     Action,
-    KeyListener,
-    KeyTool,
     GModelElement,
     GRoutableElement,
+    KeyListener,
+    KeyTool,
     SelectAction,
     SwitchEditModeAction,
     isSelectable
 } from '@eclipse-glsp/sprotty';
+import { inject, injectable } from 'inversify';
+import { toArray } from 'sprotty/lib/utils/iterable';
+import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
 import { Tool } from '../../../base/tool-manager/tool';
-import { SResizeHandle } from '../../change-bounds/model';
+import { GResizeHandle } from '../../change-bounds/model';
 
 /**
  * Deselects the element if there is no interaction possible with element.
@@ -59,7 +59,7 @@ export class DeselectKeyTool implements Tool {
 export class DeselectKeyListener extends KeyListener {
     override keyDown(target: GModelElement, event: KeyboardEvent): Action[] {
         if (this.matchesDeselectKeystroke(event)) {
-            const isResizeHandleActive = toArray(target.root.index.all().filter(el => el instanceof SResizeHandle)).length > 0;
+            const isResizeHandleActive = toArray(target.root.index.all().filter(el => el instanceof GResizeHandle)).length > 0;
 
             if (isResizeHandleActive) {
                 return [];

package/src/features/accessibility/view-key-tools/view-key-tools-module.ts

@@ -15,15 +15,20 @@
  ********************************************************************************/
 
 import { bindAsService, BindingContext, configureActionHandler, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
+import { KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
 import { DeselectKeyTool } from './deselect-key-tool';
 import { MovementKeyTool } from './movement-key-tool';
 import { ZoomKeyTool } from './zoom-key-tool';
-import { KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
 
-export const viewKeyToolsModule = new FeatureModule((bind, _unbind, isBound, rebind) => {
-    const context = { bind, isBound, rebind };
-    configureViewKeyTools(context);
-});
+export const viewKeyToolsModule = new FeatureModule(
+    (bind, _unbind, isBound, rebind) => {
+        const context = { bind, isBound, rebind };
+        configureViewKeyTools(context);
+    },
+    {
+        featureId: Symbol('viewKeyTools')
+    }
+);
 
 export function configureViewKeyTools(context: Pick<BindingContext, 'bind' | 'isBound'>): void {
     bindAsService(context, TYPES.IDefaultTool, MovementKeyTool);

package/src/features/bounds/bounds-module.ts

@@ -35,24 +35,27 @@ import { LocalComputedBoundsCommand } from './local-bounds';
 import { SetBoundsFeedbackCommand } from './set-bounds-feedback-command';
 import { VBoxLayouterExt } from './vbox-layout';
 
-export const boundsModule = new FeatureModule((bind, _unbind, isBound, _rebind) => {
-    const context = { bind, isBound };
-    configureCommand(context, SetBoundsCommand);
-    configureCommand(context, RequestBoundsCommand);
-    bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
-    bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
+export const boundsModule = new FeatureModule(
+    (bind, _unbind, isBound, _rebind) => {
+        const context = { bind, isBound };
+        configureCommand(context, SetBoundsCommand);
+        configureCommand(context, RequestBoundsCommand);
+        bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
+        bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
 
-    configureCommand(context, LocalComputedBoundsCommand);
-    configureCommand(context, SetBoundsFeedbackCommand);
+        configureCommand(context, LocalComputedBoundsCommand);
+        configureCommand(context, SetBoundsFeedbackCommand);
 
-    bind(TYPES.Layouter).to(LayouterExt).inSingletonScope();
-    bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
+        bind(TYPES.Layouter).to(LayouterExt).inSingletonScope();
+        bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
 
-    configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
-    configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
-    configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
+        configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
+        configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
+        configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
 
-    // backwards compatibility
-    // eslint-disable-next-line deprecation/deprecation
-    bind(PositionSnapper).toSelf();
-});
+        // backwards compatibility
+        // eslint-disable-next-line deprecation/deprecation
+        bind(PositionSnapper).toSelf();
+    },
+    { featureId: Symbol('bounds') }
+);

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

@@ -109,14 +109,14 @@ export function isBoundsAwareMoveable(element: GModelElement): element is Bounds
     return isMoveable(element) && isBoundsAware(element);
 }
 
-export class SResizeHandle extends GChildElement implements Hoverable {
+export class GResizeHandle extends GChildElement implements Hoverable {
     static readonly TYPE = 'resize-handle';
 
     override readonly parent: ResizableModelElement;
 
     constructor(
         readonly location: ResizeHandleLocation,
-        override readonly type: string = SResizeHandle.TYPE,
+        override readonly type: string = GResizeHandle.TYPE,
         readonly hoverFeedback: boolean = false
     ) {
         super();
@@ -166,12 +166,12 @@ export class SResizeHandle extends GChildElement implements Hoverable {
         return this.isNeResize() || this.isSwResize();
     }
 
-    static getHandlePosition(handle: SResizeHandle): Point;
+    static getHandlePosition(handle: GResizeHandle): Point;
     static getHandlePosition(parent: ResizableModelElement, location: ResizeHandleLocation): Point;
     static getHandlePosition(bounds: Bounds, location: ResizeHandleLocation): Point;
-    static getHandlePosition(first: ResizableModelElement | SResizeHandle | Bounds, second?: ResizeHandleLocation): Point {
-        const bounds = SResizeHandle.is(first) ? first.parent.bounds : first instanceof GModelElement ? first.bounds : first;
-        const location = SResizeHandle.is(first) ? first.location : second!;
+    static getHandlePosition(first: ResizableModelElement | GResizeHandle | Bounds, second?: ResizeHandleLocation): Point {
+        const bounds = GResizeHandle.is(first) ? first.parent.bounds : first instanceof GModelElement ? first.bounds : first;
+        const location = GResizeHandle.is(first) ? first.location : second!;
         switch (location) {
             case ResizeHandleLocation.TopLeft:
                 return Bounds.topLeft(bounds);
@@ -192,7 +192,7 @@ export class SResizeHandle extends GChildElement implements Hoverable {
         }
     }
 
-    static getCursorCss(handle: SResizeHandle): string {
+    static getCursorCss(handle: GResizeHandle): string {
         switch (handle.location) {
             case ResizeHandleLocation.TopLeft:
                 return CursorCSS.RESIZE_NW;
@@ -213,17 +213,17 @@ export class SResizeHandle extends GChildElement implements Hoverable {
         }
     }
 
-    static is(handle: unknown): handle is SResizeHandle {
-        return typeof handle === 'object' && !!handle && 'type' in handle && handle.type === SResizeHandle.TYPE;
+    static is(handle: unknown): handle is GResizeHandle {
+        return typeof handle === 'object' && !!handle && 'type' in handle && handle.type === GResizeHandle.TYPE;
     }
 }
 
 export function addResizeHandles(element: ResizableModelElement, locations: ResizeHandleLocation[] = ResizeHandleLocation.CORNERS): void {
     for (const location of ResizeHandleLocation.ALL) {
-        const existing = element.children.find(child => child instanceof SResizeHandle && child.location === location);
+        const existing = element.children.find(child => child instanceof GResizeHandle && child.location === location);
         if (locations.includes(location) && !existing) {
             // add missing handle
-            element.add(new SResizeHandle(location));
+            element.add(new GResizeHandle(location));
         } else if (!locations.includes(location) && existing) {
             // remove existing handle
             element.remove(existing);
@@ -232,5 +232,10 @@ export function addResizeHandles(element: ResizableModelElement, locations: Resi
 }
 
 export function removeResizeHandles(element: GParentElement): void {
-    element.removeAll(child => child instanceof SResizeHandle);
+    element.removeAll(child => child instanceof GResizeHandle);
 }
+
+export {
+    /** @deprecated Use {@link GResizeHandle} instead */
+    GResizeHandle as SResizeHandle
+};

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

@@ -18,7 +18,7 @@ import { injectable } from 'inversify';
 import { ModifyCSSFeedbackAction } from '../../base/feedback/css-feedback';
 import { BoundsAwareModelElement } from '../../utils/gmodel-util';
 import { toAbsoluteBounds } from '../../utils/viewpoint-util';
-import { SResizeHandle } from './model';
+import { GResizeHandle } from './model';
 
 /**
  * A `MovementRestrictor` is an optional service that can be used by tools to validate
@@ -86,7 +86,7 @@ export function createMovementRestrictionFeedback(
 ): ModifyCSSFeedbackAction {
     const elements: GModelElement[] = [element];
     if (element instanceof GParentElement) {
-        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
+        element.children.filter(child => child instanceof GResizeHandle).forEach(e => elements.push(e));
     }
     return ModifyCSSFeedbackAction.create({ elements, add: movementRestrictor.cssClasses });
 }
@@ -103,7 +103,7 @@ export function removeMovementRestrictionFeedback(
 ): ModifyCSSFeedbackAction {
     const elements: GModelElement[] = [element];
     if (element instanceof GParentElement) {
-        element.children.filter(child => child instanceof SResizeHandle).forEach(e => elements.push(e));
+        element.children.filter(child => child instanceof GResizeHandle).forEach(e => elements.push(e));
     }
 
     return ModifyCSSFeedbackAction.create({ elements, remove: movementRestrictor.cssClasses });

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

@@ -19,9 +19,12 @@ import { GlspCommandPalette } from './command-palette';
 import { CommandPaletteTool } from './command-palette-tool';
 import { ServerCommandPaletteActionProvider } from './server-command-palette-provider';
 
-export const commandPaletteModule = new FeatureModule(bind => {
-    bindAsService(bind, TYPES.IUIExtension, GlspCommandPalette);
-    bind(TYPES.ICommandPaletteActionProviderRegistry).to(CommandPaletteActionProviderRegistry).inSingletonScope();
-    bindAsService(bind, TYPES.ICommandPaletteActionProvider, ServerCommandPaletteActionProvider);
-    bindAsService(bind, TYPES.IDefaultTool, CommandPaletteTool);
-});
+export const commandPaletteModule = new FeatureModule(
+    bind => {
+        bindAsService(bind, TYPES.IUIExtension, GlspCommandPalette);
+        bind(TYPES.ICommandPaletteActionProviderRegistry).to(CommandPaletteActionProviderRegistry).inSingletonScope();
+        bindAsService(bind, TYPES.ICommandPaletteActionProvider, ServerCommandPaletteActionProvider);
+        bindAsService(bind, TYPES.IDefaultTool, CommandPaletteTool);
+    },
+    { featureId: Symbol('commandPalette') }
+);

package/src/features/context-menu/context-menu-module.ts

@@ -17,17 +17,20 @@ import { ContextMenuProviderRegistry, FeatureModule, IContextMenuService, TYPES,
 import { GLSPContextMenuMouseListener } from './glsp-context-menu-mouse-listener';
 import { ServerContextMenuItemProvider } from './server-context-menu-provider';
 
-export const contextMenuModule = new FeatureModule(bind => {
-    bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(ctx => async () => {
-        if (ctx.container.isBound(TYPES.IContextMenuService)) {
-            return ctx.container.get<IContextMenuService>(TYPES.IContextMenuService);
-        }
-        console.warn("'TYPES.IContextMenuService' is not bound. Use no-op implementation instead");
-        // eslint-disable-next-line @typescript-eslint/no-empty-function
-        return { show: () => {} };
-    });
+export const contextMenuModule = new FeatureModule(
+    bind => {
+        bind(TYPES.IContextMenuServiceProvider).toProvider<IContextMenuService>(ctx => async () => {
+            if (ctx.container.isBound(TYPES.IContextMenuService)) {
+                return ctx.container.get<IContextMenuService>(TYPES.IContextMenuService);
+            }
+            console.warn("'TYPES.IContextMenuService' is not bound. Use no-op implementation instead");
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            return { show: () => {} };
+        });
 
-    bindAsService(bind, TYPES.MouseListener, GLSPContextMenuMouseListener);
-    bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
-    bindAsService(bind, TYPES.IContextMenuItemProvider, ServerContextMenuItemProvider);
-});
+        bindAsService(bind, TYPES.MouseListener, GLSPContextMenuMouseListener);
+        bind(TYPES.IContextMenuProviderRegistry).to(ContextMenuProviderRegistry);
+        bindAsService(bind, TYPES.IContextMenuItemProvider, ServerContextMenuItemProvider);
+    },
+    { featureId: Symbol('contextMenu') }
+);

package/src/features/copy-paste/copy-paste-modules.ts

@@ -17,10 +17,13 @@ import { bindAsService, FeatureModule, TYPES } from '@eclipse-glsp/sprotty';
 import { LocalClipboardService, ServerCopyPasteHandler } from './copy-paste-handler';
 import { CopyPasteStartup } from './copy-paste-standalone';
 
-export const copyPasteModule = new FeatureModule((bind, _unbind, isBound) => {
-    bind(TYPES.ICopyPasteHandler).to(ServerCopyPasteHandler);
-    bind(TYPES.IAsyncClipboardService).to(LocalClipboardService).inSingletonScope();
-});
+export const copyPasteModule = new FeatureModule(
+    (bind, _unbind, isBound) => {
+        bind(TYPES.ICopyPasteHandler).to(ServerCopyPasteHandler);
+        bind(TYPES.IAsyncClipboardService).to(LocalClipboardService).inSingletonScope();
+    },
+    { featureId: Symbol('copyPaste') }
+);
 
 /**
  * Feature module that is intended for the standalone deployment of GLSP (i.e. plain webapp)
@@ -31,5 +34,8 @@ export const standaloneCopyPasteModule = new FeatureModule(
     (bind, _unbind, isBound) => {
         bindAsService(bind, TYPES.IDiagramStartup, CopyPasteStartup);
     },
-    { requires: copyPasteModule }
+    {
+        featureId: Symbol('standaloneCopyPaste'),
+        requires: copyPasteModule
+    }
 );

package/src/features/debug/debug-module.ts

@@ -20,13 +20,16 @@ import { DebugBoundsDecorator } from './debug-bounds-decorator';
 import { DebugManager } from './debug-manager';
 import { EnableDebugModeAction, EnableDebugModeCommand } from './debug-model';
 
-export const debugModule = new FeatureModule((bind, unbind, isBound, rebind) => {
-    const context = { bind, unbind, isBound, rebind };
+export const debugModule = new FeatureModule(
+    (bind, unbind, isBound, rebind) => {
+        const context = { bind, unbind, isBound, rebind };
 
-    configureCommand(context, EnableDebugModeCommand);
+        configureCommand(context, EnableDebugModeCommand);
 
-    bind(DebugManager).toSelf().inSingletonScope();
-    configureActionHandler(context, EnableDebugModeAction.KIND, DebugManager);
+        bind(DebugManager).toSelf().inSingletonScope();
+        configureActionHandler(context, EnableDebugModeAction.KIND, DebugManager);
 
-    bindAsService(context, TYPES.IVNodePostprocessor, DebugBoundsDecorator);
-});
+        bindAsService(context, TYPES.IVNodePostprocessor, DebugBoundsDecorator);
+    },
+    { featureId: Symbol('debug') }
+);