@eclipse-glsp/client 2.3.0-next.322 → 2.3.0-next.363

package/css/change-bounds.css

@@ -0,0 +1,40 @@
+.sprotty-resize-handle[data-kind='top-left'] {
+    cursor: nw-resize;
+}
+
+.sprotty-resize-handle[data-kind='top'] {
+    cursor: n-resize;
+}
+
+.sprotty-resize-handle[data-kind='top-right'] {
+    cursor: ne-resize;
+}
+
+.sprotty-resize-handle[data-kind='right'] {
+    cursor: e-resize;
+}
+
+.sprotty-resize-handle[data-kind='bottom-right'] {
+    cursor: se-resize;
+}
+
+.sprotty-resize-handle[data-kind='bottom'] {
+    cursor: s-resize;
+}
+
+.sprotty-resize-handle[data-kind='bottom-left'] {
+    cursor: sw-resize;
+}
+
+.sprotty-resize-handle[data-kind='left'] {
+    cursor: w-resize;
+}
+
+.sprotty-resize-handle.resize-not-allowed {
+    fill: var(--glsp-error-foreground);
+}
+
+.sprotty g .resize-not-allowed > .sprotty-node {
+    stroke: var(--glsp-error-foreground);
+    stroke-width: 1.5px;
+}

package/css/command-palette.css

@@ -16,7 +16,9 @@
 
 .command-palette {
     transition: opacity 0.3s linear;
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .command-palette-suggestions {
@@ -25,7 +27,9 @@
     overflow: auto;
     box-sizing: border-box;
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .command-palette-suggestions .icon {

package/{lib/base/focus/index.d.ts → css/debug.css}

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2024 Axon Ivy AG 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,6 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './focus-state-change-action';
-export * from './focus-tracker';
-//# sourceMappingURL=index.d.ts.map
+
+.debug-bounds:has(> .debug-bounds-decoration) {
+    fill-opacity: 0.5;
+}
+
+.debug-bounds-decoration {
+    fill: none;
+    stroke: black;
+    stroke-width: 1px;
+}

package/css/ghost-element.css

@@ -25,3 +25,10 @@
     height: 0;
     visibility: hidden;
 }
+
+.sprotty-node.insert-indicator:not(.selected) {
+    pointer-events: none;
+    fill: none;
+    stroke: black; /* same color as default color for edges */
+    stroke-width: 1.5px;
+}

package/css/glsp-sprotty.css

@@ -148,6 +148,38 @@
     cursor: nwse-resize;
 }
 
+.sprotty .resize-nw-mode {
+    cursor: nw-resize;
+}
+
+.sprotty .resize-w-mode {
+    cursor: n-resize;
+}
+
+.sprotty .resize-ne-mode {
+    cursor: ne-resize;
+}
+
+.sprotty .resize-e-mode {
+    cursor: e-resize;
+}
+
+.sprotty .resize-se-mode {
+    cursor: se-resize;
+}
+
+.sprotty .resize-s-mode {
+    cursor: s-resize;
+}
+
+.sprotty .resize-sw-mode {
+    cursor: sw-resize;
+}
+
+.sprotty .resize-w-mode {
+    cursor: w-resize;
+}
+
 .sprotty .element-deletion-mode {
     cursor: pointer;
 }
@@ -191,6 +223,7 @@
 
 .sprotty g .movement-not-allowed > .sprotty-node {
     stroke: var(--glsp-error-foreground) !important;
+    stroke-width: 1.5px;
 }
 
 .sprotty-resize-handle.movement-not-allowed {
@@ -230,6 +263,10 @@
     opacity: 1;
 }
 
+.sprotty.sprotty-hidden .sprotty-projection-bar {
+    visibility: hidden;
+}
+
 .sprotty-projection-bar.vertical.bordered-projection-bar {
     position: absolute;
     top: 0;
@@ -275,15 +312,6 @@
     border-width: 2px;
 }
 
-.mouse-enter .projection-scroll-bar {
-    opacity: 0.3;
-}
-
-.mouse-leave .projection-scroll-bar {
-    opacity: 0;
-    pointer-events: none;
-}
-
 .bordered-projection-bar {
     border-left: 1px solid rgba(212, 212, 212, 0.2);
     border-top: 1px solid rgba(212, 212, 212, 0.2);
@@ -304,3 +332,8 @@
     stroke: rgb(218, 89, 15) !important;
     stroke: #130bf7 !important;
 }
+
+.ui-extension.hidden {
+    display: none;
+    opacity: 0;
+}

package/css/grid.css

@@ -0,0 +1,27 @@
+/********************************************************************************
+ * Copyright (c) 2024 Axon Ivy AG 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
+ ********************************************************************************/
+
+.grid-background .sprotty-graph,
+.grid-background.sprotty-graph {
+    --grid-stroke-width: calc(1px * var(--grid-background-zoom));
+    --grid-stroke-width-half: calc(var(--grid-stroke-width) / 2);
+    --grid-color: rgba(0, 0, 0, 0.1);
+    background-image: linear-gradient(to right, var(--grid-color) var(--grid-stroke-width), transparent var(--grid-stroke-width)),
+        linear-gradient(to bottom, var(--grid-color) var(--grid-stroke-width), transparent var(--grid-stroke-width));
+    background-size: var(--grid-background-width) var(--grid-background-height);
+    background-position: calc(var(--grid-background-x) - var(--grid-stroke-width-half))
+        calc(var(--grid-background-y) - var(--grid-stroke-width-half));
+}

package/css/helper-lines.css

@@ -16,8 +16,8 @@
 
 .helper-line {
     pointer-events: none;
-    stroke: red;
-    stroke-width: 1px;
+    stroke: #1d80d1;
+    stroke-width: 1;
     opacity: 1;
 }
 
@@ -28,6 +28,6 @@
     stroke-linejoin: miter;
     stroke-linecap: round;
     stroke: darkblue;
-    stroke-width: 1px;
+    stroke-width: 0.5;
     stroke-dasharray: 2;
 }

package/css/key-shortcut.css

@@ -30,7 +30,9 @@
     z-index: 9999;
     width: 400px;
     max-height: 512px;
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .keyboard-shortcuts-menu h3 {
@@ -45,7 +47,9 @@
     background-color: #e4e1e1;
     border: 1px solid #ccc;
     border-radius: 3px;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(255, 255, 255, 0.5);
+    box-shadow:
+        0 1px 0 rgba(0, 0, 0, 0.2),
+        inset 0 0 0 1px rgba(255, 255, 255, 0.5);
     color: #333;
     display: inline-block;
     font-size: 0.85em;

package/css/keyboard-tool-palette.css

@@ -14,13 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-.accessibility-tool-palette.tool-palette {
-    top: 48px;
-    width: 240px;
-}
-
 .accessibility-tool-palette .header-tools i {
-    margin-right: 0.5em;
     position: relative;
 }
 
@@ -39,7 +33,9 @@
     color: black;
     text-align: center;
 
-    font: bold 0.8rem Arial, sans-serif;
+    font:
+        bold 0.8rem Arial,
+        sans-serif;
     line-height: 0.5rem;
 }
 

package/css/keyboard.css

@@ -46,5 +46,7 @@
     color: black;
     text-align: center;
 
-    font: bold 1.3rem Arial, sans-serif;
+    font:
+        bold 1.3rem Arial,
+        sans-serif;
 }

package/css/tool-palette.css

@@ -17,10 +17,10 @@
 /* Css for main container */
 .tool-palette {
     position: absolute;
-    right: 40px;
-    top: 25px;
+    right: 45px;
+    top: 35px;
     text-align: center;
-    width: 225px;
+    width: fit-content;
     display: block;
     z-index: 1000;
     border-style: solid;
@@ -38,6 +38,11 @@
     /* Firefox */
     -ms-user-select: none;
     /* Internet Explorer/Edge */
+
+    box-shadow:
+        4px 0 4px 0 rgba(0, 0, 0, 0.2),
+        0 4px 4px 0 rgba(0, 0, 0, 0.19);
+    font-size: 14px;
 }
 
 /* Css for header compartment */
@@ -45,31 +50,29 @@
 .palette-header {
     padding: 0.4em;
     text-align: left;
-    background: #cccccc;
+    background: rgb(151, 160, 165);
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    border-bottom: 0;
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: space-between;
-    flex-wrap: wrap;
+    gap: 6px;
 }
 
 .header-icon {
-    display: flex;
+    display: none;
     align-items: center;
 }
 
-.header-icon i {
-    margin-right: 0.2em;
-}
-
 .header-tools {
     display: flex;
     align-items: center;
+    gap: 3px;
 }
 
 .header-tools i {
-    border: 1px solid #cccccc;
+    border: 1px solid transparent;
     padding: 0.15em;
     margin-right: 0.15em;
 }
@@ -88,7 +91,6 @@
 .palette-body {
     background: rgba(100, 100, 100, 0.2);
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .tool-group {
@@ -97,13 +99,13 @@
 }
 
 .group-header {
-    background: #cccccc;
+    background: rgb(187, 193, 196);
     display: flex;
     align-items: center;
 }
 
 .group-header:hover {
-    background: #aaaaaa;
+    background: rgb(187, 193, 196);
 }
 
 .group-header i {
@@ -111,7 +113,7 @@
 }
 
 .tool-button {
-    background: #ededee;
+    background: rgb(252, 253, 253);
     padding: 0.4em;
     display: flex;
     align-items: center;
@@ -122,11 +124,11 @@
 }
 
 .tool-button:hover {
-    background: #dfdfdf;
+    background: rgb(220, 223, 224);
 }
 
 .tool-button.clicked {
-    background: #bddaef;
+    background: rgb(163, 201, 219);
 }
 
 .tool-button.collapsed {
@@ -143,13 +145,19 @@
     right: 20px;
     top: 35px;
     z-index: 1000;
+    color: rgb(58, 63, 65);
+}
+
+.minimize-palette-button .codicon::before {
+    font-size: 20px;
 }
 
 .search-input {
-    background: #dfdfdf;
+    box-sizing: border-box;
+    background: rgb(252, 253, 253);
     color: black;
-    border: #bddaef;
-    padding-left: 3px;
+    border: 1px solid rgb(187, 193, 196);
+    padding: 4px;
     width: 100%;
-    margin: 3px;
+    margin: 3px 0;
 }

package/lib/base/action-dispatcher.d.ts

@@ -14,14 +14,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Action, ActionDispatcher, RequestAction, ResponseAction } from '@eclipse-glsp/sprotty';
+import { Action, ActionDispatcher, GModelRoot, RequestAction, ResponseAction } from '@eclipse-glsp/sprotty';
+import { IGModelRootListener } from './editor-context-service';
 import { ModelInitializationConstraint } from './model/model-initialization-constraint';
-export declare class GLSPActionDispatcher extends ActionDispatcher {
+export declare class GLSPActionDispatcher extends ActionDispatcher implements IGModelRootListener {
     protected readonly timeouts: Map<string, NodeJS.Timeout>;
     protected initializedConstraint: boolean;
     protected initializationConstraint: ModelInitializationConstraint;
+    protected postUpdateQueue: Action[];
     initialize(): Promise<void>;
-    startModelInitialization(): void;
+    protected doInitialize(): Promise<void>;
+    protected startModelInitialization(): void;
     onceModelInitialized(): Promise<void>;
     hasHandler(action: Action): boolean;
     /**
@@ -30,6 +33,15 @@ export declare class GLSPActionDispatcher extends ActionDispatcher {
      * @param actions The actions that should be dispatched after the model initialization
      */
     dispatchOnceModelInitialized(...actions: Action[]): void;
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the next model update.
+     * The given actions are queued until the next model update cycle has been completed i.e.
+     * the `EditorContextService.onModelRootChanged` event is triggered.
+     *
+     * @param actions The actions that should be dispatched after the next model update
+     */
+    dispatchAfterNextUpdate(...actions: Action[]): void;
+    modelRootChanged(_root: Readonly<GModelRoot>): void;
     dispatch(action: Action): Promise<void>;
     protected handleAction(action: Action): Promise<void>;
     request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res>;

package/lib/base/action-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGhG,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAEzD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,wBAAwB,IAAI,IAAI;IAQhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIzC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,SAAO,EAChB,eAAe,UAAQ,GACxB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CA2B9B"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAc,UAAU,EAAE,aAAa,EAAE,cAAc,EAAkB,MAAM,uBAAuB,CAAC;AAGxI,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AAExF,qBACa,oBAAqB,SAAQ,gBAAiB,YAAW,mBAAmB;IACrF,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IAGxC,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAElE,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,CAAM;IAEhC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;cAOpB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAY7C,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAQ1C,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC;;;;OAIG;IACH,4BAA4B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAIxD;;;;;;OAMG;IACH,uBAAuB,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAInD,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI;IAUpC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD,OAAO,CAAC,GAAG,SAAS,cAAc,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAQtF;;;;;;;;;OASG;IACH,YAAY,CAAC,GAAG,SAAS,cAAc,EACnC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAC1B,SAAS,SAAO,EAChB,eAAe,UAAQ,GACxB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CA2B9B"}

package/lib/base/action-dispatcher.js

@@ -27,6 +27,7 @@ exports.GLSPActionDispatcher = void 0;
  ********************************************************************************/
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
+const action_handler_registry_1 = require("./action-handler-registry");
 const glsp_model_source_1 = require("./model/glsp-model-source");
 const model_initialization_constraint_1 = require("./model/model-initialization-constraint");
 let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
@@ -34,9 +35,24 @@ let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDi
         super(...arguments);
         this.timeouts = new Map();
         this.initializedConstraint = false;
+        this.postUpdateQueue = [];
     }
     initialize() {
-        return super.initialize().then(() => this.startModelInitialization());
+        if (!this.initialized) {
+            this.initialized = this.doInitialize();
+        }
+        return this.initialized;
+    }
+    async doInitialize() {
+        const registry = await this.actionHandlerRegistryProvider();
+        this.actionHandlerRegistry = registry;
+        if (registry instanceof action_handler_registry_1.GLSPActionHandlerRegistry) {
+            registry.initialize();
+        }
+        this.handleAction(sprotty_1.SetModelAction.create(sprotty_1.EMPTY_ROOT)).catch(() => {
+            /* Logged in handleAction method */
+        });
+        this.startModelInitialization();
     }
     startModelInitialization() {
         if (!this.initializedConstraint) {
@@ -59,6 +75,24 @@ let GLSPActionDispatcher = class GLSPActionDispatcher extends sprotty_1.ActionDi
     dispatchOnceModelInitialized(...actions) {
         this.initializationConstraint.onInitialized(() => this.dispatchAll(actions));
     }
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the next model update.
+     * The given actions are queued until the next model update cycle has been completed i.e.
+     * the `EditorContextService.onModelRootChanged` event is triggered.
+     *
+     * @param actions The actions that should be dispatched after the next model update
+     */
+    dispatchAfterNextUpdate(...actions) {
+        this.postUpdateQueue.push(...actions);
+    }
+    modelRootChanged(_root) {
+        if (this.postUpdateQueue.length === 0) {
+            return;
+        }
+        const toDispatch = [...this.postUpdateQueue];
+        this.postUpdateQueue = [];
+        this.dispatchAll(toDispatch);
+    }
     async dispatch(action) {
         const result = await super.dispatch(action);
         this.initializationConstraint.notifyDispatched(action);

package/lib/base/action-dispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"action-dispatcher.js","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":"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"}

package/lib/base/action-handler-registry.d.ts

@@ -13,22 +13,17 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ActionHandlerRegistration, ActionHandlerRegistry, IActionHandler, IActionHandlerInitializer } from '@eclipse-glsp/sprotty';
-import { IContributionProvider } from '../utils/contribution-provider';
+import { ActionHandlerRegistration, ActionHandlerRegistry, IActionHandlerInitializer, LazyInjector } from '@eclipse-glsp/sprotty';
 export declare class GLSPActionHandlerRegistry extends ActionHandlerRegistry {
-    protected readonly registrations: IContributionProvider<ActionHandlerRegistration>;
-    protected readonly initializers: IContributionProvider<IActionHandlerInitializer>;
+    protected lazyInjector: LazyInjector;
     protected initialized: boolean;
-    constructor();
-    protected init(): void;
-    register(key: string, instance: IActionHandler): void;
-    get(key: string): IActionHandler[];
-    initializeActionHandler(initializer: IActionHandlerInitializer): void;
+    constructor(registrations?: ActionHandlerRegistration[], initializers?: IActionHandlerInitializer[]);
     /**
      * Retrieve a set of all action kinds for which (at least) one
      * handler is registered
      * @returns the set of handled action kinds
      */
     getHandledActionKinds(): string[];
+    initialize(): void;
 }
 //# sourceMappingURL=action-handler-registry.d.ts.map

package/lib/base/action-handler-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-handler-registry.d.ts","sourceRoot":"","sources":["../../src/base/action-handler-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,cAAc,EAAE,yBAAyB,EAAS,MAAM,uBAAuB,CAAC;AAE3I,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,qBACa,yBAA0B,SAAQ,qBAAqB;IAGhE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;IAInF,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;IAElF,SAAS,CAAC,WAAW,UAAS;;IAM9B,SAAS,CAAC,IAAI,IAAI,IAAI;IAQb,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI;IAKrD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE;IAKlC,uBAAuB,CAAC,WAAW,EAAE,yBAAyB,GAAG,IAAI;IAK9E;;;;OAIG;IACH,qBAAqB,IAAI,MAAM,EAAE;CAIpC"}
+{"version":3,"file":"action-handler-registry.d.ts","sourceRoot":"","sources":["../../src/base/action-handler-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,YAAY,EAAS,MAAM,uBAAuB,CAAC;AAGzI,qBACa,yBAA0B,SAAQ,qBAAqB;IAEhE,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC;IAErC,SAAS,CAAC,WAAW,UAAS;gBAEN,aAAa,GAAE,yBAAyB,EAAO,EAAc,YAAY,GAAE,yBAAyB,EAAO;IAGnI;;;;OAIG;IACH,qBAAqB,IAAI,MAAM,EAAE;IAIjC,UAAU,IAAI,IAAI;CAYrB"}

package/lib/base/action-handler-registry.js

@@ -23,57 +23,47 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPActionHandlerRegistry = void 0;
 const sprotty_1 = require("@eclipse-glsp/sprotty");
 const inversify_1 = require("inversify");
 let GLSPActionHandlerRegistry = class GLSPActionHandlerRegistry extends sprotty_1.ActionHandlerRegistry {
-    constructor() {
-        super([], []);
+    constructor(registrations = [], initializers = []) {
+        super(registrations, initializers);
         this.initialized = false;
     }
-    init() {
-        if (!this.initialized) {
-            this.initialized = true;
-            this.registrations.getContributions().forEach(registration => this.register(registration.actionKind, registration.factory()));
-            this.initializers.getContributions().forEach(initializer => this.initializeActionHandler(initializer));
-        }
-    }
-    register(key, instance) {
-        this.init();
-        super.register(key, instance);
-    }
-    get(key) {
-        this.init();
-        return super.get(key);
-    }
-    initializeActionHandler(initializer) {
-        this.init();
-        super.initializeActionHandler(initializer);
-    }
     /**
      * Retrieve a set of all action kinds for which (at least) one
      * handler is registered
      * @returns the set of handled action kinds
      */
     getHandledActionKinds() {
-        this.init();
         return Array.from(this.elements.keys());
     }
+    initialize() {
+        if (this.initialized) {
+            return;
+        }
+        this.lazyInjector
+            .getAll(sprotty_1.TYPES.ActionHandlerRegistration)
+            .forEach(registration => this.register(registration.actionKind, registration.factory()));
+        this.lazyInjector
+            .getAll(sprotty_1.TYPES.IActionHandlerInitializer)
+            .forEach(initializer => this.initializeActionHandler(initializer));
+    }
 };
 exports.GLSPActionHandlerRegistry = GLSPActionHandlerRegistry;
 __decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IContributionProvider),
-    (0, inversify_1.named)(sprotty_1.TYPES.ActionHandlerRegistration),
-    __metadata("design:type", Object)
-], GLSPActionHandlerRegistry.prototype, "registrations", void 0);
-__decorate([
-    (0, inversify_1.inject)(sprotty_1.TYPES.IContributionProvider),
-    (0, inversify_1.named)(sprotty_1.TYPES.IActionHandlerInitializer),
+    (0, inversify_1.inject)(sprotty_1.LazyInjector),
     __metadata("design:type", Object)
-], GLSPActionHandlerRegistry.prototype, "initializers", void 0);
+], GLSPActionHandlerRegistry.prototype, "lazyInjector", void 0);
 exports.GLSPActionHandlerRegistry = GLSPActionHandlerRegistry = __decorate([
     (0, inversify_1.injectable)(),
-    __metadata("design:paramtypes", [])
+    __param(0, (0, inversify_1.optional)()),
+    __param(1, (0, inversify_1.optional)()),
+    __metadata("design:paramtypes", [Array, Array])
 ], GLSPActionHandlerRegistry);
 //# sourceMappingURL=action-handler-registry.js.map