@eclipse-glsp/client 0.9.0-next.fd1a8bb6 → 0.10.0-next.827bd0d.158

package/src/base/action-dispatcher.ts

@@ -13,34 +13,35 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isResponseAction, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
 import { inject } from 'inversify';
-import { Action, ActionDispatcher, isResponseAction, RequestAction, ResponseAction } from 'sprotty';
-
+import { ActionDispatcher } from 'sprotty';
 import { ModelInitializationConstraint } from './model-initialization-constraint';
 
 export class GLSPActionDispatcher extends ActionDispatcher {
     protected readonly timeouts: Map<string, NodeJS.Timeout> = new Map();
-
-    @inject(ModelInitializationConstraint) protected initiailizationConstraint: ModelInitializationConstraint;
-    protected onModelInitialized: Promise<void> = Promise.resolve();
+    protected initializedConstraint = false;
+    @inject(ModelInitializationConstraint) protected initializationConstraint: ModelInitializationConstraint;
 
     initialize(): Promise<void> {
         return super.initialize().then(() => this.startModelInitialization());
     }
 
     startModelInitialization(): void {
-        this.logger.log(this, 'Starting model initialization mode');
-        this.onModelInitialized = this.initiailizationConstraint.onInitialized();
-        this.onModelInitialized.then(() => this.logger.log(this, 'Model initialization completed'));
+        if (!this.initializedConstraint) {
+            this.logger.log(this, 'Starting model initialization mode');
+            this.initializationConstraint.onInitialized().then(() => this.logger.log(this, 'Model initialization completed'));
+            this.initializedConstraint = true;
+        }
     }
 
     onceModelInitialized(): Promise<void> {
-        return this.onModelInitialized;
+        return this.initializationConstraint.onInitialized();
     }
 
     dispatch(action: Action): Promise<void> {
         const result = super.dispatch(action);
-        this.initiailizationConstraint.notifyDispatched(action);
+        this.initializationConstraint.notifyDispatched(action);
         return result;
     }
 

package/src/base/actions/focus-change-action.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action } from 'sprotty';
+import { Action } from '@eclipse-glsp/protocol';
 
 export class FocusStateChangedAction implements Action {
     static KIND = 'focusStateChanged';

package/src/base/{args.ts → argumentable.ts}

@@ -13,12 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Args } from '@eclipse-glsp/protocol';
 import { SModelElement } from 'sprotty';
 
-export interface Args {
-    [key: string]: string | number | boolean;
-}
-
 export interface SArgumentable {
     args: Args;
 }

package/src/base/auto-complete/auto-complete-actions.ts

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { LabeledAction } from 'sprotty/lib';
+import { LabeledAction } from '@eclipse-glsp/protocol';
 
 export interface SetAutoCompleteValueAction extends LabeledAction {
     readonly text: string;

package/src/base/auto-complete/auto-complete-widget.ts

@@ -13,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isAction, isLabeledAction, LabeledAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { AutocompleteResult, AutocompleteSettings } from 'autocompleter';
-import { Action, ILogger, isAction, isLabeledAction, LabeledAction, SModelRoot } from 'sprotty/lib';
+import { codiconCSSClasses, ILogger, SModelRoot } from 'sprotty';
 import { toArray } from 'sprotty/lib/utils/iterable';
 import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
-
-import { ValidationStatus } from '../actions/edit-validation-actions';
 import { isSetAutoCompleteValueAction } from './auto-complete-actions';
 import { IValidationDecorator } from './validation-decorator';
 
@@ -53,7 +52,7 @@ export interface TextSubmitHandler {
 const configureAutocomplete: (settings: AutocompleteSettings<LabeledAction>) => AutocompleteResult = require('autocompleter');
 
 export class AutoCompleteWidget {
-    loadingIndicatorClasses = ['loading', 'fa', 'fa-spinner', 'fa-pulse', 'fa-3x', 'fa-fw'];
+    loadingIndicatorClasses = codiconCSSClasses('loading', false, true, ['loading']);
 
     protected containerElement: HTMLElement;
     protected inputElement: HTMLInputElement;

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

@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ValidationStatus } from '../actions/edit-validation-actions';
+import { codiconCSSString } from 'sprotty/lib/utils/codicon';
+import { ValidationStatus } from '@eclipse-glsp/protocol';
 
 export interface IValidationDecorator {
     decorateValidationResult(status: ValidationStatus): void;
@@ -38,9 +39,9 @@ export namespace IValidationDecorator {
 
 export class ValidationDecorator implements IValidationDecorator {
     warningClasses = ['warning'];
-    warningIconClasses = ['fa', 'fa-question-circle'];
+    warningIconClasses = codiconCSSString('warning');
     errorClasses = ['error'];
-    errorIconClasses = ['fa', 'fa-exclamation-circle'];
+    errorIconClasses = codiconCSSString('error');
 
     isValidated = false;
     hasValidationError = false;
@@ -67,7 +68,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.errorClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.errorClasses);
-        div.innerHTML = `<span class="${this.errorIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.errorIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -75,7 +76,7 @@ export class ValidationDecorator implements IValidationDecorator {
         this.switchCssClasses(this.containerElement, this.warningClasses);
         const div = this.createDecorationDiv();
         this.switchCssClasses(div, this.warningClasses);
-        div.innerHTML = `<span class="${this.warningIconClasses.join(' ')}"></span> ${message}`;
+        div.innerHTML = `<span class="${this.warningIconClasses}"></span> ${message}`;
         this.adjustPosition();
     }
 
@@ -96,7 +97,7 @@ export class ValidationDecorator implements IValidationDecorator {
     }
 
     protected decorationContainerWidth(): number {
-        return this.containerElement.clientWidth - 22;
+        return this.containerElement.clientWidth - 5;
     }
 
     protected adjustPosition(): void {

package/src/base/command-stack.ts

@@ -13,11 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { RedoOperation, UndoOperation } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { CommandStack, IActionDispatcher, SModelRoot, TYPES } from 'sprotty';
 
-import { RedoOperation, UndoOperation } from '../features/undo-redo/model';
-
 @injectable()
 export class GLSPCommandStack extends CommandStack {
     @inject(TYPES.IActionDispatcherProvider) protected actionDispatcher: () => Promise<IActionDispatcher>;

package/src/base/container-modules.ts

@@ -0,0 +1,112 @@
+/********************************************************************************
+ * Copyright (c) 2021 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { Container, ContainerModule } from 'inversify';
+import {
+    boundsModule,
+    buttonModule,
+    defaultModule,
+    edgeIntersectionModule,
+    edgeLayoutModule,
+    expandModule,
+    exportModule,
+    fadeModule,
+    labelEditUiModule,
+    modelSourceModule,
+    openModule,
+    routingModule,
+    zorderModule
+} from 'sprotty';
+import glspCommandPaletteModule from '../features/command-palette/di.config';
+import glspContextMenuModule from '../features/context-menu/di.config';
+import { glspServerCopyPasteModule } from '../features/copy-paste/di.config';
+import glspDecorationModule from '../features/decoration/di.config';
+import glspEditLabelModule from '../features/edit-label/di.config';
+import modelHintsModule from '../features/hints/di.config';
+import glspHoverModule from '../features/hover/di.config';
+import layoutCommandsModule from '../features/layout/di.config';
+import modelSourceWatcherModule from '../features/model-source-watcher/di.config';
+import glspMouseToolModule from '../features/mouse-tool/di.config';
+import { navigationModule } from '../features/navigation/di.config';
+import glspSelectModule from '../features/select/di.config';
+import toolFeedbackModule from '../features/tool-feedback/di.config';
+import toolPaletteModule from '../features/tool-palette/di.config';
+import toolsModule from '../features/tools/di.config';
+import { markerNavigatorModule, validationModule } from '../features/validation/di.config';
+import glspViewportModule from '../features/viewport/di.config';
+import defaultGLSPModule from './di.config';
+
+export const DEFAULT_MODULES = [
+    defaultModule,
+    defaultGLSPModule,
+    boundsModule,
+    buttonModule,
+    edgeIntersectionModule,
+    edgeLayoutModule,
+    expandModule,
+    exportModule,
+    fadeModule,
+    glspCommandPaletteModule,
+    glspContextMenuModule,
+    glspDecorationModule,
+    glspEditLabelModule,
+    glspHoverModule,
+    glspMouseToolModule,
+    glspSelectModule,
+    glspServerCopyPasteModule,
+    glspViewportModule,
+    labelEditUiModule,
+    layoutCommandsModule,
+    markerNavigatorModule,
+    modelHintsModule,
+    modelSourceModule,
+    modelSourceWatcherModule,
+    navigationModule,
+    openModule,
+    toolPaletteModule,
+    routingModule,
+    toolFeedbackModule,
+    toolsModule,
+    validationModule,
+    zorderModule
+];
+
+/**
+ * Creates a GLSP Client container with the GLSP default modules and the specified custom `modules`.
+ *
+ * You can still customize the default modules in two ways.
+ *
+ * First, you can unload default modules and load them again with your custom code.
+ *
+ * ```typescript
+ * const container = createClientContainer(myModule1, myModule2);
+ * container.unload(modelSourceWatcherModule);
+ * container.load(myModelSourceWatcherModule);
+ * ```
+ *
+ * Second, you can unbind or rebind implementations that are originally bound in one of the default modules.
+ *
+ * ```typescript
+ * rebind(NavigationTargetResolver).to(MyNavigationTargetResolver);
+ * ```
+ * @param modules Custom modules to be loaded in addition to the default modules.
+ * @returns The created container.
+ */
+export function createClientContainer(...modules: ContainerModule[]): Container {
+    const container = new Container();
+    container.load(...DEFAULT_MODULES, ...modules);
+    return container;
+}

package/src/base/di.config.ts

@@ -13,17 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import '../../css/glsp-sprotty.css';
-
-import { InitializeResult } from '@eclipse-glsp/protocol';
+import { InitializeResult, SetEditModeAction } from '@eclipse-glsp/protocol';
+import '@vscode/codicons/dist/codicon.css';
 import { Container, ContainerModule } from 'inversify';
 import { ActionHandlerRegistry, configureActionHandler, configureCommand, ModelSource, SetModelCommand, TYPES } from 'sprotty';
-
+import '../../css/glsp-sprotty.css';
 import { GLSPActionDispatcher } from './action-dispatcher';
-import { SetEditModeAction } from './actions/edit-mode-action';
 import { FocusStateChangedAction } from './actions/focus-change-action';
 import { GLSPCommandStack } from './command-stack';
-import { EditorContextService } from './editor-context';
+import { EditorContextService } from './editor-context-service';
 import { FocusTracker } from './focus-tracker';
 import { DefaultModelInitializationConstraint, ModelInitializationConstraint } from './model-initialization-constraint';
 import { GLSPModelRegistry } from './model/model-registry';
@@ -75,7 +73,8 @@ const defaultGLSPModule = new ContainerModule((bind, _unbind, isBound, rebind) =
 export default defaultGLSPModule;
 
 /**
- * Utility function to configure the {@link ModelSource}, i.e. the `DiagramServer`, as action handler for all server actions for the given diagramType.
+ * Utility function to configure the {@link ModelSource}, i.e. the `DiagramServer`, as action handler for all server actions for the given
+ * diagramType.
  * @param result A promise that resolves after all server actions have been registered.
  * @param diagramType The diagram type.
  * @param container The di container.

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

@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, MouseListener, SModelElement } from 'sprotty';
+import { Action } from '@eclipse-glsp/protocol';
+import { MouseListener, SModelElement } from 'sprotty';
 
 /**
  * A mouse listener that is aware of prior mouse dragging.

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

@@ -13,38 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Args, distinctAdd, EditMode, EditorContext, isSetEditModeAction, remove } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional } from 'inversify';
-import { Action, IActionHandler, ModelSource, MousePositionTracker, Point, SModelElement, SModelRoot, TYPES } from 'sprotty';
-
+import { IActionHandler, ModelSource, MousePositionTracker, SModelElement, SModelRoot, TYPES } from 'sprotty';
 import { SelectionService } from '../features/select/selection-service';
-import { distinctAdd, remove } from '../utils/array-utils';
-import { EditMode, isSetEditModeAction } from './actions/edit-mode-action';
-import { Args } from './args';
 import { isSourceUriAware } from './source-uri-aware';
 import { GLSP_TYPES } from './types';
 
-/**
- * The `EditorContext` may be used to represent the current state of the editor for particular actions.
- * It encompasses the last recorded mouse position, the list of selected elements, and may contain
- * custom arguments to encode additional state information.
- */
-export interface EditorContext {
-    /**
-     * The list of selected element identifiers.
-     */
-    readonly selectedElementIds: string[];
-
-    /**
-     * The last recorded mouse position.
-     */
-    readonly lastMousePosition?: Point;
-
-    /**
-     * Custom arguments.
-     */
-    readonly args?: Args;
-}
-
 export interface EditModeListener {
     editModeChanged(newValue: string, oldvalue: string): void;
 }

package/src/base/focus-tracker.ts

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Action, IActionHandler, ICommand, TYPES, ViewerOptions } from 'sprotty';
-
+import { IActionHandler, ICommand, TYPES, ViewerOptions } from 'sprotty';
 import { isFocusStateChangedAction } from './actions/focus-change-action';
 
 @injectable()

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

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isSetModelAction, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import {
-    Action,
     ActionHandlerRegistry,
     Command,
     CommandActionHandler,
@@ -23,13 +23,10 @@ import {
     CommandReturn,
     IActionHandler,
     ILogger,
-    SetModelAction,
-    SetModelCommand,
     SModelRoot,
-    TYPES
+    TYPES,
+    UpdateModelCommand
 } from 'sprotty';
-import { UpdateModelAction, UpdateModelCommand } from 'sprotty/lib/features/update/update-model';
-
 import { IFeedbackActionDispatcher } from '../../features/tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../../features/tool-feedback/model';
 import { GLSP_TYPES } from '../types';
@@ -45,17 +42,13 @@ export class SetModelActionHandler implements IActionHandler {
     }
 }
 
-export function isSetModelAction(action: Action): action is SetModelAction {
-    return action !== undefined && action.kind === SetModelCommand.KIND && (action as SetModelAction).newRoot !== undefined;
-}
-
 export interface SModelRootListener {
     modelRootChanged(root: Readonly<SModelRoot>): void;
 }
 
 /**
- * A special`UpdateModelCommand` that retrieves all registered `actions` from the `IFeedbackActionDispatcher` (if present) and applies their feedback
- * to the `newRoot` before performing the update
+ * A special`UpdateModelCommand` that retrieves all registered `actions` from the `IFeedbackActionDispatcher` (if present) and applies their
+ * feedback to the `newRoot` before performing the update
  */
 @injectable()
 export class FeedbackAwareUpdateModelCommand extends UpdateModelCommand {

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,8 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, UpdateModelAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { Action, InitializeCanvasBoundsAction, UpdateModelAction } from 'sprotty';
+import { InitializeCanvasBoundsAction } from 'sprotty';
 import { Deferred } from 'sprotty/lib/utils/async';
 
 /**

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,12 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { distinctAdd, EditMode } from '@eclipse-glsp/protocol';
 import { inject, injectable, multiInject, optional, postConstruct } from 'inversify';
 import { Tool, ToolManager } from 'sprotty';
-
-import { distinctAdd } from '../../utils/array-utils';
-import { EditMode } from '../actions/edit-mode-action';
-import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context';
+import { EditModeListener, EditorContextService, EditorContextServiceProvider } from '../editor-context-service';
 import { GLSP_TYPES } from '../types';
 
 export interface IGLSPToolManager extends ToolManager {

package/src/base/types.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,5 +33,7 @@ export const GLSP_TYPES = {
     IGLSPToolManager: Symbol.for('IGLSPToolManager'),
     ITool: Symbol.for('ITool'),
     IDefaultTool: Symbol.for('IDefaultTool'),
-    IEditModeListener: Symbol.for('IEditModeListener')
+    IEditModeListener: Symbol.for('IEditModeListener'),
+    LayoutRegistration: Symbol.for('LayoutRegistration'),
+    IMarqueeBehavior: Symbol.for('IMarqueeBehavior')
 };

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

@@ -29,7 +29,7 @@ import {
 
 export const resizeFeature = Symbol('resizeFeature');
 
-export interface Resizable extends BoundsAware, Selectable { }
+export interface Resizable extends BoundsAware, Selectable {}
 
 export function isResizable(element: SModelElement): element is SParentElement & Resizable {
     return isBoundsAware(element) && isSelectable(element) && element instanceof SParentElement && element.hasFeature(resizeFeature);
@@ -61,6 +61,14 @@ export class SResizeHandle extends SChildElement implements Hoverable {
     hasFeature(feature: symbol): boolean {
         return feature === hoverFeedbackFeature;
     }
+
+    isNwSeResize(): boolean {
+        return this.location === ResizeHandleLocation.TopLeft || this.location === ResizeHandleLocation.BottomRight;
+    }
+
+    isNeSwResize(): boolean {
+        return this.location === ResizeHandleLocation.TopRight || this.location === ResizeHandleLocation.BottomLeft;
+    }
 }
 
 export function addResizeHandles(element: SParentElement): void {

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

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { BoundsAware, Point, SModelElement, SNode, SParentElement } from 'sprotty';
-
+import { BoundsAware, SModelElement, SNode, SParentElement } from 'sprotty';
 import { toAbsoluteBounds } from '../../utils/viewpoint-util';
 import { ModifyCSSFeedbackAction } from '../tool-feedback/css-feedback';
 import { isBoundsAwareMoveable, SResizeHandle } from './model';

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,8 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Point } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
-import { ISnapper, Point, SModelElement } from 'sprotty';
+import { ISnapper, SModelElement } from 'sprotty';
 
 @injectable()
 export class GridSnapper implements ISnapper {

package/src/features/command-palette/server-command-palette-provider.ts

@@ -13,12 +13,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, isSetContextActionsAction, LabeledAction, Point, RequestContextActions } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import { Action, ICommandPaletteActionProvider, LabeledAction, Point, SModelElement, TYPES } from 'sprotty';
-
+import { ICommandPaletteActionProvider, 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 { EditorContextService } from '../../base/editor-context-service';
 
 export namespace ServerCommandPalette {
     export const CONTEXT_ID = 'command-palette';

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,11 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+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';
-import { DeleteElementOperation } from '../../base/operations/operation';
+import { EditorContextService, EditorContextServiceProvider } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
 
 @injectable()

package/src/features/context-menu/di.config.ts

@@ -15,7 +15,6 @@
  ********************************************************************************/
 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';