@eclipse-glsp/client 1.1.0-next.4a5a0ee.195 → 1.1.0-next.4e10035.245

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

@@ -0,0 +1,181 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 { Action, CenterAction, SelectAction, SelectAllAction } from '@eclipse-glsp/protocol';
+import { injectable } from 'inversify';
+import { isEqual } from 'lodash';
+import { codiconCSSString, isNameable, LabeledAction, name, SEdge, SModelElement, SModelRoot, SNode } from 'sprotty';
+import { toArray } from 'sprotty/lib/utils/iterable';
+import { AutocompleteSuggestion, IAutocompleteSuggestionProvider } from '../../autocomplete-palette/autocomplete-suggestion-providers';
+import { BaseAutocompletePalette } from '../../autocomplete-palette/base-autocomplete-palette';
+
+import { applyCssClasses, deleteCssClasses } from '../../tool-feedback/css-feedback';
+
+const CSS_SEARCH_HIDDEN = 'search-hidden';
+const CSS_SEARCH_HIGHLIGHTED = 'search-highlighted';
+
+export class RevealNamedElementAutocompleteSuggestionProvider implements IAutocompleteSuggestionProvider {
+    async retrieveSuggestions(root: Readonly<SModelRoot>, text: string): Promise<AutocompleteSuggestion[]> {
+        const nameables = toArray(root.index.all().filter(element => isNameable(element)));
+        return nameables.map(nameable => ({
+            element: nameable,
+            action: new LabeledAction(
+                `[${nameable.type}] ${name(nameable) ?? '<no-name>'}`,
+                this.getActions(nameable),
+                codiconCSSString('eye')
+            )
+        }));
+    }
+
+    protected getActions(nameable: SModelElement): Action[] {
+        return [SelectAction.create({ selectedElementsIDs: [nameable.id] }), CenterAction.create([nameable.id], { retainZoom: true })];
+    }
+}
+
+export class RevealEdgeElementAutocompleteSuggestionProvider implements IAutocompleteSuggestionProvider {
+    async retrieveSuggestions(root: Readonly<SModelRoot>, text: string): Promise<AutocompleteSuggestion[]> {
+        const edges = toArray(root.index.all().filter(element => element instanceof SEdge)) as SEdge[];
+        return edges.map(edge => ({
+            element: edge,
+            action: new LabeledAction(
+                `[${edge.type}] ` + this.getEdgeLabel(root, edge),
+                this.getActions(edge),
+                codiconCSSString('arrow-both')
+            )
+        }));
+    }
+    protected getActions(edge: SEdge): Action[] {
+        return [SelectAction.create({ selectedElementsIDs: [edge.id] }), CenterAction.create([edge.sourceId, edge.targetId])];
+    }
+    protected getEdgeLabel(root: Readonly<SModelRoot>, edge: SEdge): string {
+        let sourceName = '';
+        let targetName = '';
+
+        const sourceNode = root.index.getById(edge.sourceId);
+        const targetNode = root.index.getById(edge.targetId);
+
+        if (sourceNode !== undefined) {
+            sourceName = name(sourceNode) ?? sourceNode.type;
+        }
+        if (targetNode !== undefined) {
+            targetName = name(targetNode) ?? targetNode.type;
+        }
+
+        return sourceName + ' -> ' + targetName;
+    }
+}
+@injectable()
+export class SearchAutocompletePalette extends BaseAutocompletePalette {
+    static readonly ID = 'search-autocomplete-palette';
+
+    protected cachedSuggestions: AutocompleteSuggestion[] = [];
+
+    id(): string {
+        return SearchAutocompletePalette.ID;
+    }
+
+    protected override initializeContents(containerElement: HTMLElement): void {
+        super.initializeContents(containerElement);
+
+        this.autocompleteWidget.inputField.placeholder = 'Search for elements';
+    }
+    protected getSuggestionProviders(root: Readonly<SModelRoot>, input: string): IAutocompleteSuggestionProvider[] {
+        return [new RevealNamedElementAutocompleteSuggestionProvider(), new RevealEdgeElementAutocompleteSuggestionProvider()];
+    }
+    protected async retrieveSuggestions(root: Readonly<SModelRoot>, input: string): Promise<LabeledAction[]> {
+        const providers = this.getSuggestionProviders(root, input);
+        const suggestions = (await Promise.all(providers.map(provider => provider.retrieveSuggestions(root, input)))).flat(1);
+
+        this.cachedSuggestions = suggestions;
+
+        return suggestions.map(s => s.action);
+    }
+
+    protected override async visibleSuggestionsChanged(root: Readonly<SModelRoot>, labeledActions: LabeledAction[]): Promise<void> {
+        await this.applyCSS(this.getHiddenElements(root, this.getSuggestionsFromLabeledActions(labeledActions)), CSS_SEARCH_HIDDEN);
+        await this.deleteCSS(
+            this.getSuggestionsFromLabeledActions(labeledActions).map(s => s.element),
+            CSS_SEARCH_HIDDEN
+        );
+    }
+
+    protected override async selectedSuggestionChanged(
+        root: Readonly<SModelRoot>,
+        labeledAction?: LabeledAction | undefined
+    ): Promise<void> {
+        await this.deleteAllCSS(root, CSS_SEARCH_HIGHLIGHTED);
+        if (labeledAction !== undefined) {
+            const suggestions = this.getSuggestionsFromLabeledActions([labeledAction]);
+
+            const actions: CenterAction[] = [];
+            suggestions.map(currElem => actions.push(CenterAction.create([currElem.element.id], { animate: true, retainZoom: true })));
+
+            this.actionDispatcher.dispatchAll(actions);
+            await this.applyCSS(
+                suggestions.map(s => s.element),
+                CSS_SEARCH_HIGHLIGHTED
+            );
+        }
+    }
+
+    public override show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+        this.actionDispatcher.dispatch(SelectAllAction.create(false));
+
+        super.show(root, ...contextElementIds);
+    }
+
+    public override hide(): void {
+        if (this.root !== undefined) {
+            this.deleteAllCSS(this.root, CSS_SEARCH_HIDDEN);
+            this.deleteAllCSS(this.root, CSS_SEARCH_HIGHLIGHTED);
+            this.autocompleteWidget.inputField.value = '';
+        }
+
+        super.hide();
+    }
+
+    protected applyCSS(elements: SModelElement[], cssClass: string): Promise<void> {
+        const actions = elements.map(element => applyCssClasses(element, cssClass));
+        return this.actionDispatcher.dispatchAll(actions);
+    }
+
+    protected deleteCSS(elements: SModelElement[], cssClass: string): Promise<void> {
+        const actions = elements.map(element => deleteCssClasses(element, cssClass));
+        return this.actionDispatcher.dispatchAll(actions);
+    }
+
+    protected deleteAllCSS(root: Readonly<SModelRoot>, cssClass: string): Promise<void> {
+        const actions = toArray(root.index.all().map(element => deleteCssClasses(element, cssClass)));
+        return this.actionDispatcher.dispatchAll(actions);
+    }
+
+    protected getSuggestionsFromLabeledActions(labeledActions: LabeledAction[]): AutocompleteSuggestion[] {
+        return this.cachedSuggestions.filter(c => labeledActions.find(s => isEqual(s, c.action)));
+    }
+
+    protected getHiddenSuggestionsFromLabeledActions(labeledActions: LabeledAction[]): AutocompleteSuggestion[] {
+        return this.cachedSuggestions.filter(c => !labeledActions.find(s => isEqual(s, c.action)));
+    }
+
+    protected getHiddenElements(root: Readonly<SModelRoot>, suggestions: AutocompleteSuggestion[]): SModelElement[] {
+        return toArray(
+            root.index
+                .all()
+                .filter(element => element instanceof SNode || element instanceof SEdge)
+                .filter(element => suggestions.find(suggestion => suggestion.element.id === element.id) === undefined)
+        );
+    }
+}

package/src/features/accessibility/search/search-tool.ts

@@ -0,0 +1,60 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 { Action } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
+import { KeyListener, KeyTool, SetUIExtensionVisibilityAction, SModelElement, Tool } from 'sprotty';
+import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+import { SearchAutocompletePalette } from './search-palette';
+
+@injectable()
+export class SearchAutocompletePaletteTool implements Tool {
+    static readonly ID = 'glsp.search-autocomplete-palette-tool';
+
+    protected readonly keyListener = new SearchAutocompletePaletteKeyListener();
+
+    @inject(KeyTool) protected keyTool: KeyTool;
+
+    get id(): string {
+        return SearchAutocompletePaletteTool.ID;
+    }
+
+    enable(): void {
+        this.keyTool.register(this.keyListener);
+    }
+
+    disable(): void {
+        this.keyTool.deregister(this.keyListener);
+    }
+}
+
+export class SearchAutocompletePaletteKeyListener extends KeyListener {
+    override keyDown(element: SModelElement, event: KeyboardEvent): Action[] {
+        if (this.matchesSearchActivateKeystroke(event)) {
+            return [
+                SetUIExtensionVisibilityAction.create({
+                    extensionId: SearchAutocompletePalette.ID,
+                    visible: true
+                })
+            ];
+        }
+        return [];
+    }
+
+    protected matchesSearchActivateKeystroke(event: KeyboardEvent): boolean {
+        return matchesKeystroke(event, 'KeyF', 'ctrl');
+    }
+}

package/src/features/autocomplete-palette/autocomplete-suggestion-providers.ts

@@ -0,0 +1,37 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 { LabeledAction, SModelElement, SModelRoot } from 'sprotty';
+
+/**
+ * Interface for a provider that provides suggestions that can be used to fill the autocomplete
+ */
+export interface IAutocompleteSuggestionProvider {
+    /**
+     * Returns the suggestions based on the provided parameters.
+     * @param root: The root model
+     * @param text: The text input provided by the user.
+     */
+    retrieveSuggestions(root: Readonly<SModelRoot>, text: string): Promise<AutocompleteSuggestion[]>;
+}
+
+/**
+ * Interface for autocomplete suggestions.
+ */
+export interface AutocompleteSuggestion {
+    element: SModelElement;
+    action: LabeledAction;
+}

package/src/features/autocomplete-palette/base-autocomplete-palette.ts

@@ -0,0 +1,88 @@
+/********************************************************************************
+ * Copyright (c) 2023 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
+ * 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 { Action } from '@eclipse-glsp/protocol';
+import { inject } from 'inversify';
+import { AbstractUIExtension, LabeledAction, SModelRoot, TYPES } from 'sprotty';
+import '../../../css/autocomplete-palette.css';
+import { GLSPActionDispatcher } from '../../base/action-dispatcher';
+import { AutoCompleteWidget, CloseReason, toActionArray } from '../../base/auto-complete/auto-complete-widget';
+
+export abstract class BaseAutocompletePalette extends AbstractUIExtension {
+    protected readonly autoSuggestionSettings = {
+        noSuggestionsMessage: 'No suggestions available',
+        suggestionsClass: 'command-palette-suggestions',
+        debounceWaitMs: 50,
+        showOnFocus: true
+    };
+
+    protected root?: Readonly<SModelRoot>;
+    protected autocompleteWidget: AutoCompleteWidget;
+
+    @inject(TYPES.IActionDispatcher)
+    protected actionDispatcher: GLSPActionDispatcher;
+
+    containerClass(): string {
+        return 'autocomplete-palette';
+    }
+
+    override show(root: Readonly<SModelRoot>, ...contextElementIds: string[]): void {
+        super.show(root, ...contextElementIds);
+        this.root = root;
+        this.autocompleteWidget.open(root);
+    }
+
+    override hide(): void {
+        this.autocompleteWidget.dispose();
+        this.root = undefined;
+        super.hide();
+    }
+
+    protected initializeContents(containerElement: HTMLElement): void {
+        containerElement.classList.add('command-palette');
+
+        this.autocompleteWidget = new AutoCompleteWidget(
+            this.autoSuggestionSettings,
+            { provideSuggestions: input => this.retrieveSuggestions(this.root!, input) },
+            { executeFromSuggestion: input => this.executeSuggestion(input) },
+            reason => this.autocompleteHide(reason),
+            this.logger,
+            {
+                visibleSuggestionsChanged: suggestions => this.visibleSuggestionsChanged(this.root!, suggestions),
+                selectedSuggestionChanged: suggestion => this.selectedSuggestionChanged(this.root!, suggestion)
+            }
+        );
+        this.autocompleteWidget.initialize(containerElement);
+    }
+
+    protected abstract retrieveSuggestions(root: Readonly<SModelRoot>, input: string): Promise<LabeledAction[]>;
+
+    protected async visibleSuggestionsChanged(root: Readonly<SModelRoot>, labeledActions: LabeledAction[]): Promise<void> {
+        return;
+    }
+
+    protected async selectedSuggestionChanged(root: Readonly<SModelRoot>, labeledAction?: LabeledAction): Promise<void> {
+        return;
+    }
+
+    protected autocompleteHide(reason: CloseReason): void {
+        this.hide();
+    }
+
+    protected executeSuggestion(input: LabeledAction | Action[] | Action): void {
+        this.actionDispatcher.dispatchAll(toActionArray(input));
+    }
+}

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

@@ -0,0 +1,49 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 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 { bindAsService } from '@eclipse-glsp/protocol';
+import { ContainerModule } from 'inversify';
+import {
+    configureCommand,
+    configureLayout,
+    HBoxLayouter,
+    HiddenBoundsUpdater,
+    Layouter,
+    LayoutRegistry,
+    RequestBoundsCommand,
+    SetBoundsCommand,
+    VBoxLayouter
+} from 'sprotty';
+import { TYPES } from '../../base/types';
+import { FreeFormLayouter } from './freeform-layout';
+import { GLSPHiddenBoundsUpdater } from './glsp-hidden-bounds-updater';
+import { HBoxLayouterExt } from './hbox-layout';
+import { VBoxLayouterExt } from './vbox-layout';
+
+const glspBoundsModule = new ContainerModule((bind, _unbind, isBound, _rebind) => {
+    const context = { bind, isBound };
+    configureCommand(context, SetBoundsCommand);
+    configureCommand(context, RequestBoundsCommand);
+    bind(HiddenBoundsUpdater).toSelf().inSingletonScope();
+    bindAsService(context, TYPES.HiddenVNodePostprocessor, GLSPHiddenBoundsUpdater);
+    bind(TYPES.Layouter).to(Layouter).inSingletonScope();
+    bind(TYPES.LayoutRegistry).to(LayoutRegistry).inSingletonScope();
+
+    configureLayout(context, VBoxLayouter.KIND, VBoxLayouterExt);
+    configureLayout(context, HBoxLayouter.KIND, HBoxLayouterExt);
+    configureLayout(context, FreeFormLayouter.KIND, FreeFormLayouter);
+});
+
+export default glspBoundsModule;

package/src/features/{layout/tests → bounds}/freeform-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 STMicroelectronics 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
@@ -17,7 +17,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement } from 'sprotty';
-import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { gModel, layout, sComp, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('FreeFormLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/freeform-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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
@@ -20,7 +20,7 @@ import { AbstractLayout } from 'sprotty/lib/features/bounds/abstract-layout';
 import { AbstractLayoutOptions } from 'sprotty/lib/features/bounds/layout-options';
 
 /**
- * Layouts children of a container with explit X/Y positions
+ * Layouts children of a container with explicit X/Y positions
  */
 @injectable()
 export class FreeFormLayouter extends AbstractLayout<AbstractLayoutOptions> {

package/src/features/bounds/glsp-hidden-bounds-updater.ts

@@ -0,0 +1,85 @@
+/********************************************************************************
+ * Copyright (c) 2022-2023 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 { Action, ComputedBoundsAction, Deferred, ElementAndRoutingPoints, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
+import { inject, injectable, optional } from 'inversify';
+import { VNode } from 'snabbdom';
+import { EdgeRouterRegistry, HiddenBoundsUpdater, IActionDispatcher, SModelElement, SRoutableElement } from 'sprotty';
+import { calcElementAndRoute, isRoutable } from '../../utils/smodel-util';
+
+/**
+ * Grabs the bounds from hidden SVG DOM elements, applies layouts, collects routes and fires {@link ComputedBoundsAction}s.
+ *
+ * The actions will contain the bound, alignment, and routing points of elements.
+ */
+@injectable()
+export class GLSPHiddenBoundsUpdater extends HiddenBoundsUpdater {
+    @inject(EdgeRouterRegistry) @optional() protected readonly edgeRouterRegistry?: EdgeRouterRegistry;
+
+    protected element2route: ElementAndRoutingPoints[] = [];
+    protected edges: SRoutableElement[] = [];
+    protected nodes: VNode[] = [];
+
+    override decorate(vnode: VNode, element: SModelElement): VNode {
+        super.decorate(vnode, element);
+        if (isRoutable(element)) {
+            this.element2route.push(calcElementAndRoute(element, this.edgeRouterRegistry));
+        }
+        return vnode;
+    }
+
+    override postUpdate(cause?: Action): void {
+        const actions = this.captureActions(() => super.postUpdate(cause));
+        actions
+            .filter(action => ComputedBoundsAction.is(action))
+            .forEach(action => this.actionDispatcher.dispatch(this.enhanceAction(action as ComputedBoundsAction)));
+        this.element2route = [];
+    }
+
+    protected captureActions(call: () => void): Action[] {
+        const capturingActionDispatcher = new CapturingActionDispatcher();
+        const actualActionDispatcher = this.actionDispatcher;
+        this.actionDispatcher = capturingActionDispatcher;
+        try {
+            call();
+            return capturingActionDispatcher.actions;
+        } finally {
+            this.actionDispatcher = actualActionDispatcher;
+        }
+    }
+
+    protected enhanceAction(action: ComputedBoundsAction): ComputedBoundsAction {
+        action.routes = this.element2route.length === 0 ? undefined : this.element2route;
+        return action;
+    }
+}
+
+class CapturingActionDispatcher implements IActionDispatcher {
+    readonly actions: Action[] = [];
+
+    async dispatch(action: Action): Promise<void> {
+        this.actions.push(action);
+    }
+
+    async dispatchAll(actions: Action[]): Promise<void> {
+        this.actions.push(...actions);
+    }
+
+    async request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res> {
+        // ignore, not needed for our purposes
+        return new Deferred<Res>().promise;
+    }
+}

package/src/features/{layout/tests → bounds}/hbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, STMicroelectronics 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
@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('HBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/hbox-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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

package/src/features/{layout/tests/layouter-test-util.ts → bounds/layouter-test-util.spec.ts}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 STMicroelectronics and others.
+ * Copyright (c) 2022-2023 STMicroelectronics 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
@@ -15,8 +15,8 @@
  ********************************************************************************/
 
 import { Dimension, Point } from '@eclipse-glsp/protocol';
+import { Container } from 'inversify';
 import 'mocha';
-import 'reflect-metadata';
 import {
     BoundsData,
     ConsoleLogger,
@@ -30,9 +30,9 @@ import {
     SParentElement,
     TYPES
 } from 'sprotty';
-import { createClientContainer } from '../../../base/container-modules';
-import { GLSPGraph } from '../../../lib/model';
-import { StatefulLayouterExt } from '../layouter';
+import { initializeDiagramContainer } from '../../base/container-modules';
+import { GLSPGraph } from '../../lib/model';
+import { StatefulLayouterExt } from './layouter';
 
 export function gModel(): GLSPGraph {
     return new GLSPGraph();
@@ -117,6 +117,6 @@ export function layout(
 export function setupLayoutRegistry(): LayoutRegistry {
     // Generic Test setup
     // create client container that registers all default modules including the layoutModule
-    const layoutContainer = createClientContainer();
+    const layoutContainer = initializeDiagramContainer(new Container());
     return layoutContainer.get<LayoutRegistry>(TYPES.LayoutRegistry);
 }

package/src/features/{layout → bounds}/layouter.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 EclipseSource and others.
+ * Copyright (c) 2022-2023 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

package/src/features/{layout/tests → bounds}/vbox-layout.spec.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2022 TypeFox, STMicroelectronics and others.
+ * Copyright (c) 2022-2023 TypeFox, STMicroelectronics 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
@@ -19,7 +19,7 @@ import { expect } from 'chai';
 import 'mocha';
 import 'reflect-metadata';
 import { BoundsData, ConsoleLogger, SModelElement, SNode } from 'sprotty';
-import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util';
+import { layout, setupLayoutRegistry, sLabel, sNode } from './layouter-test-util.spec';
 
 describe('VBoxLayouter', () => {
     const layoutRegistry = setupLayoutRegistry();

package/src/features/{layout → bounds}/vbox-layout.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2022 EclipseSource and others.
+ * Copyright (c) 2021-2023 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

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2019-2023 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,7 +25,7 @@ export class CommandPaletteTool implements Tool {
 
     @postConstruct()
     protected postConstruct(): void {
-        this.commandPaletteKeyListener = this.createCommandPaleteKeyListener();
+        this.commandPaletteKeyListener = this.createCommandPaletteKeyListener();
     }
 
     get id(): string {
@@ -40,7 +40,7 @@ export class CommandPaletteTool implements Tool {
         this.keyTool.deregister(this.commandPaletteKeyListener);
     }
 
-    protected createCommandPaleteKeyListener(): KeyListener {
+    protected createCommandPaletteKeyListener(): KeyListener {
         return new CommandPaletteKeyListener();
     }
 }