@eclipse-glsp/client 0.9.0-next.f6bfed94 → 0.10.0-next.06ee84f.156

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,15 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-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';

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,12 +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';
@@ -44,10 +42,6 @@ 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;
 }

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

@@ -69,7 +69,6 @@ export class SResizeHandle extends SChildElement implements Hoverable {
     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/server-context-menu-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, IContextMenuItemProvider, isSelected, LabeledAction, Point, SModelElement, TYPES } from 'sprotty';
-
+import { IContextMenuItemProvider, isSelected, 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 ServerContextMenu {
     export const CONTEXT_ID = 'context-menu';

package/src/features/copy-paste/copy-paste-context-menu.ts

@@ -13,20 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, GLSPServerStatusAction, Point, ServerMessageAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
-import {
-    Action,
-    IActionDispatcher,
-    IActionHandler,
-    IContextMenuItemProvider,
-    isSelected,
-    MenuItem,
-    Point,
-    SModelRoot,
-    TYPES
-} from 'sprotty/lib';
-
-import { GLSPServerStatusAction, ServerMessageAction } from '../../model-source/glsp-server-status';
+import { IActionDispatcher, IActionHandler, IContextMenuItemProvider, isSelected, MenuItem, SModelRoot, TYPES } from 'sprotty';
 
 export class InvokeCopyAction implements Action {
     static readonly KIND = 'invoke-copy';

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

@@ -13,14 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { ClipboardData, CutOperation, PasteOperation, RequestClipboardDataAction, SetClipboardDataAction } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import { TYPES, ViewerOptions } from 'sprotty';
 import { v4 as uuid } from 'uuid';
-
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { EditorContextService } from '../../base/editor-context';
+import { EditorContextService } from '../../base/editor-context-service';
 import { GLSP_TYPES } from '../../base/types';
-import { ClipboardData, CutOperation, PasteOperation, RequestClipboardDataAction } from './copy-paste-actions';
 
 export interface ICopyPasteHandler {
     handleCopy(event: ClipboardEvent): void;
@@ -105,7 +104,7 @@ export class ServerCopyPasteHandler implements ICopyPasteHandler {
             const clipboardId = uuid();
             event.clipboardData.setData(CLIPBOARD_DATA_FORMAT, toClipboardId(clipboardId));
             this.actionDispatcher
-                .request(RequestClipboardDataAction.create(this.editorContext.get()))
+                .request<SetClipboardDataAction>(RequestClipboardDataAction.create(this.editorContext.get()))
                 .then(action => this.clipboadService.put(action.clipboardData, clipboardId));
             event.preventDefault();
         } else {

package/src/features/copy-paste/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
@@ -14,8 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { ContainerModule } from 'inversify';
-import { configureActionHandler } from 'sprotty/lib';
-
+import { configureActionHandler } from 'sprotty';
 import { GLSP_TYPES } from '../../base/types';
 import {
     CopyPasteContextMenuItemProvider,

package/src/features/decoration/decoration-placer.ts

@@ -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 { Decoration, DecorationPlacer, isSizeable, ORIGIN_POINT, Point, SChildElement, SModelElement, SRoutableElement } from 'sprotty';
+import { Decoration, DecorationPlacer, isSizeable, ORIGIN_POINT, SChildElement, SModelElement, SRoutableElement } from 'sprotty';
 
 @injectable()
 export class GlspDecorationPlacer extends DecorationPlacer {

package/src/features/edit-label/edit-label-validator.ts

@@ -13,6 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { isSetEditValidationResultAction, RequestEditValidationAction, ValidationStatus } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
     Action,
@@ -26,7 +27,6 @@ import {
 } from 'sprotty';
 
 import { GLSPActionDispatcher } from '../../base/action-dispatcher';
-import { isSetEditValidationResultAction, RequestEditValidationAction, ValidationStatus } from '../../base/actions/edit-validation-actions';
 
 export namespace LabelEditValidation {
     export const CONTEXT_ID = 'label-edit';

package/src/features/hints/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,11 +13,10 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { SetTypeHintsAction } from '@eclipse-glsp/protocol';
 import { ContainerModule } from 'inversify';
 import { configureActionHandler, configureCommand } from 'sprotty';
-
 import { GLSP_TYPES } from '../../base/types';
-import { SetTypeHintsAction } from './request-type-hints-action';
 import { ApplyTypeHintsCommand, TypeHintProvider } from './type-hints';
 
 const modelHintsModule = new ContainerModule((bind, _unbind, isBound) => {

package/src/features/hints/model.ts

@@ -13,7 +13,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { SModelElement, SModelElementSchema, SModelExtension } from 'sprotty';
+import { SModelElementSchema } from '@eclipse-glsp/protocol';
+import { SModelElement, SModelExtension } from 'sprotty';
 
 export const containerFeature = Symbol('containable');
 

package/src/features/hints/type-hints.ts

@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, EdgeTypeHint, isSetTypeHintsAction, ShapeTypeHint, TypeHint } from '@eclipse-glsp/protocol';
 import { inject, injectable } from 'inversify';
 import {
-    Action,
     CommandExecutionContext,
     CommandReturn,
     Connectable,
@@ -28,12 +28,10 @@ import {
     moveFeature,
     SEdge,
     SModelElement,
-    SModelElementSchema,
     SModelRoot,
     SShapeElement,
     TYPES
 } from 'sprotty';
-
 import { GLSP_TYPES } from '../../base/types';
 import { getElementTypeId, hasCompatibleType } from '../../utils/smodel-util';
 import { resizeFeature } from '../change-bounds/model';
@@ -41,67 +39,6 @@ import { reconnectFeature } from '../reconnect/model';
 import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 import { FeedbackCommand } from '../tool-feedback/model';
 import { Containable, containerFeature, reparentFeature } from './model';
-import { isSetTypeHintsAction } from './request-type-hints-action';
-
-export abstract class TypeHint {
-    /**
-    The id of the element.
-    */
-    readonly elementTypeId: string;
-
-    /**
-     * Specifies whether the element can be relocated.
-     */
-    readonly repositionable: boolean;
-
-    /**
-     * Specifices wheter the element can be deleted
-     */
-    readonly deletable: boolean;
-}
-
-export class ShapeTypeHint extends TypeHint {
-    /**
-     * Specifies whether the element can be resized.
-     */
-    readonly resizable: boolean;
-
-    /**
-     * Specifies whether the element can be moved to another parent
-     */
-    readonly reparentable: boolean;
-
-    /**
-     * The types of elements that can be contained by this element (if any)
-     */
-    readonly containableElementTypeIds?: string[];
-}
-
-export class EdgeTypeHint extends TypeHint {
-    /**
-     * Specifies whether the routing of this element can be changed.
-     */
-    readonly routable: boolean;
-
-    /**
-     * Allowed source element types for this edge type
-     */
-    readonly sourceElementTypeIds: string[];
-
-    /**
-     * Allowed targe element types for this edge type
-     */
-    readonly targetElementTypeIds: string[];
-
-    isAllowedSource(input: SModelElement | SModelElementSchema | string): boolean {
-        const type = getElementTypeId(input);
-        return this.sourceElementTypeIds.includes(type);
-    }
-    isAllowedTarget(input: SModelElement | SModelElementSchema | string): boolean {
-        const type = getElementTypeId(input);
-        return this.targetElementTypeIds.includes(type);
-    }
-}
 
 @injectable()
 export class ApplyTypeHintsAction implements Action {

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

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 EclipseSource and others.
+ * Copyright (c) 2020-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -30,7 +30,6 @@ import {
     TYPES
 } from 'sprotty';
 import { PopupPositionUpdater } from 'sprotty/lib/features/hover/popup-position-updater';
-
 import { FocusStateChangedAction } from '../../base/actions/focus-change-action';
 import { GlspHoverMouseListener } from './hover';
 

package/src/features/hover/hover.ts

@@ -13,22 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import { Action, Bounds, RequestPopupModelAction, SetPopupModelAction } from '@eclipse-glsp/protocol';
 import { injectable } from 'inversify';
 import {
-    Action,
-    Bounds,
     EMPTY_ROOT,
     HoverMouseListener,
     PreRenderedElementSchema,
-    RequestPopupModelAction,
-    SetPopupModelAction,
     SIssueMarker,
     SIssueSeverity,
     SModelElement,
     SModelElementSchema,
     SModelRootSchema
 } from 'sprotty';
-
 import { GIssueMarker } from '../validation/issue-marker';
 
 @injectable()