@eclipse-glsp/client 1.1.0-next.97e90c6.246 → 1.1.0-next.9f38884.282

package/README.md

@@ -9,6 +9,6 @@ This project is built with `yarn` and is available from npm via [@eclipse-glsp/c
 ## More information
 
 For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/).
-If you have questions, contact us on our [spectrum chat](https://spectrum.chat/glsp/) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
+If you have questions, please raise them in the [discussions](https://github.com/eclipse-glsp/glsp/discussions) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
 
 ![alt](https://www.eclipse.org/glsp/images/diagramanimated.gif)

package/css/decoration.css

@@ -14,13 +14,6 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-:root {
-    --glsp-error-foreground: red;
-    --glsp-warning-foreground: yellow;
-    --glsp-info-foreground: lightblue;
-    --glsp-issue-background: rgb(255 255 255 / 85%);
-}
-
 .sprotty-issue-background {
     fill: var(--glsp-issue-background);
     background-color: var(--glsp-issue-background);

package/css/glsp-sprotty.css

@@ -14,6 +14,13 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+:root {
+    --glsp-error-foreground: red;
+    --glsp-warning-foreground: yellow;
+    --glsp-info-foreground: lightblue;
+    --glsp-issue-background: rgb(255 255 255 / 85%);
+}
+
 .sprotty {
     padding: 0px;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -91,9 +98,6 @@
 .sprotty-edge.selected {
     stroke: #1d80d1;
     stroke-width: 1.5px;
-    stroke-dashoffset: 5;
-    stroke-dasharray: 5, 5;
-    stroke-linecap: round;
 }
 
 .sprotty-edge.mouseover:not(.selected) .arrow,
@@ -127,6 +131,10 @@
     cursor: crosshair;
 }
 
+.sprotty .edge-check-pending-mode {
+    cursor: wait;
+}
+
 .sprotty .move-mode {
     cursor: move;
 }
@@ -256,7 +264,7 @@
 }
 
 .search-hidden {
-    opacity: 0.2;
+    opacity: 0.4;
 }
 
 .search-highlighted .sprotty-node,

package/css/key-shortcut.css

@@ -0,0 +1,111 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+.keyboard-shortcuts-menu {
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #ededee;
+    margin-bottom: 20px;
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    bottom: 0;
+    right: 10px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    line-height: 1.5;
+    font-size: 16px;
+    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);
+}
+
+.keyboard-shortcuts-menu h3 {
+    font-size: 18px;
+    font-weight: bold;
+    margin: 0;
+    margin-bottom: 10px;
+    padding: 10px;
+}
+
+.keyboard-shortcuts-menu kbd {
+    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);
+    color: #333;
+    display: inline-block;
+    font-size: 0.85em;
+    font-weight: 600;
+    line-height: 1;
+    padding: 2px 4px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+    white-space: nowrap;
+}
+
+.keyboard-shortcuts-menu kbd:active {
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2) inset;
+}
+
+.keyboard-shortcuts-container {
+    display: flex;
+    flex-direction: column;
+    max-height: 100%;
+    padding: 10px;
+    padding-top: 3px;
+    overflow: auto;
+    right: 40px;
+    top: 25px;
+    text-align: left;
+    display: block;
+    z-index: 1000;
+    color: black;
+}
+
+.shortcut-entry-container {
+    display: flex;
+    justify-content: space-between;
+    margin-right: 10px;
+}
+
+#key-shortcut-close-btn {
+    position: absolute;
+    top: 14px;
+    right: 5px;
+    font-size: 16px;
+    font-weight: bold;
+    background: #cccccc;
+    border: none;
+    cursor: pointer;
+}
+
+.column-title {
+    text-align: left;
+}
+
+.menu-header {
+    padding: 0.4em;
+    text-align: left;
+    background: #cccccc;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.shortcut-table thead th {
+    border-bottom: 2px solid #000;
+}

package/css/keyboard-tool-palette.css

@@ -0,0 +1,66 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+.accessibility-tool-palette.tool-palette {
+    top: 48px;
+    width: 240px;
+}
+
+.accessibility-tool-palette .header-tools i {
+    margin-right: 0.5em;
+    position: relative;
+}
+
+.accessibility-tool-palette .tool-button .key-shortcut,
+.accessibility-tool-palette .header-tools .key-shortcut {
+    display: none;
+    position: absolute;
+
+    border-radius: 50%;
+    width: 0.5rem;
+    height: 0.5rem;
+    padding: 0.5rem;
+
+    background: #fff;
+    border: 2px solid #666;
+    color: black;
+    text-align: center;
+
+    font: bold 0.8rem Arial, sans-serif;
+    line-height: 0.5rem;
+}
+
+.accessibility-tool-palette .tool-button .key-shortcut {
+    left: -2rem;
+}
+
+.accessibility-tool-palette .header-tools .key-shortcut {
+    top: -2.5rem;
+    right: -0.3rem;
+}
+
+.accessibility-show-shortcuts:focus-within .header-tools .key-shortcut,
+.accessibility-show-shortcuts:focus-within .tool-button .key-shortcut {
+    display: block;
+}
+
+.accessibility-tool-palette.collapsible-palette {
+    overflow: visible;
+}
+
+.accessibility-tool-palette.collapsible-palette + .minimize-palette-button {
+    top: 50px;
+}

package/css/keyboard.css

@@ -0,0 +1,50 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+.grid-container {
+    display: grid;
+    position: absolute;
+    top: 0.5rem;
+    bottom: 0.5rem;
+    left: 0.5rem;
+    right: 0.5rem;
+    grid-template-columns: auto auto auto;
+}
+
+.grid-container:focus {
+    opacity: 1 !important;
+}
+
+.grid-item {
+    border: 1px solid rgba(0, 0, 0, 0.6);
+    padding: 1rem;
+    /* Fix overlapping borders */
+    margin: 0 -1px -1px 0;
+}
+
+.grid-item-number {
+    border-radius: 50%;
+    width: 1.5rem;
+    height: 1.5rem;
+    padding: 0.5rem;
+
+    background: #fff;
+    border: 2px solid #666;
+    color: black;
+    text-align: center;
+
+    font: bold 1.3rem Arial, sans-serif;
+}

package/css/navigation.css

@@ -0,0 +1,26 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+
+:root {
+    --glsp-navigation-highlight: rgba(136, 68, 68, 0.2);
+}
+.navigable-element {
+    stroke: var(--glsp-navigation-highlight) !important;
+}
+.navigable-element .sprotty-edge.arrow {
+    fill: var(--glsp-navigation-highlight) !important;
+    stroke: var(--glsp-navigation-highlight) !important;
+}

package/css/status-overlay.css

@@ -0,0 +1,75 @@
+/********************************************************************************
+ * Copyright (c) 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
+ ********************************************************************************/
+
+.sprotty-status {
+    position: absolute;
+    top: 5px;
+    left: 10px;
+    display: flex;
+    align-items: center;
+}
+
+.sprotty-status .fatal {
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-status .error {
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-status .warning {
+    color: var(--glsp-warning-foreground);
+}
+
+.sprotty-status .info {
+    color: var(--glsp-info-foreground);
+}
+
+.sprotty-error {
+    fill: var(--glsp-issue-background);
+    color: var(--glsp-error-foreground);
+}
+
+.sprotty-warning {
+    fill: var(--glsp-issue-background);
+    color: var(--glsp-warning-foreground);
+}
+
+.sprotty-info {
+    fill: var(--glsp-issue-background);
+    color: var();
+}
+
+.sprotty-infoRow .codicon {
+    margin-right: 8px;
+}
+.sprotty-status .ok {
+    visibility: hidden;
+}
+
+.sprotty-status-message {
+    visibility: hidden;
+    padding-left: 10px;
+}
+
+.sprotty-status-message.fatal {
+    visibility: visible;
+    padding-left: 10px;
+}
+
+.sprotty-status:hover .sprotty-status-message {
+    visibility: visible;
+}

package/css/toast.css

@@ -0,0 +1,45 @@
+/********************************************************************************
+ * 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
+ ********************************************************************************/
+.toast {
+    position: absolute;
+    bottom: 1rem;
+    width: 100%;
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    grid-column-gap: 1rem;
+    margin: 0 1rem;
+}
+
+.toast-column-left {
+    grid-column: 1 / span 1;
+}
+
+.toast-column-center {
+    grid-column: 2 / span 1;
+}
+
+.toast-column-right {
+    grid-column: 3 / span 1;
+}
+
+.toast-container {
+    display: inline-block;
+    min-width: 256px;
+    max-width: 516px;
+    background-color: #ccc;
+    color: #000;
+    padding: 0.5rem;
+}

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

@@ -1,22 +1,6 @@
 /// <reference types="node" />
-/********************************************************************************
- * Copyright (c) 2019-2022 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, RequestAction, ResponseAction } from '@eclipse-glsp/protocol';
-import { ActionDispatcher } from 'sprotty';
-import { ModelInitializationConstraint } from './model-initialization-constraint';
+import { Action, ActionDispatcher, RequestAction, ResponseAction } from '../glsp-sprotty/index';
+import { ModelInitializationConstraint } from './model/model-initialization-constraint';
 export declare class GLSPActionDispatcher extends ActionDispatcher {
     protected readonly timeouts: Map<string, NodeJS.Timeout>;
     protected initializedConstraint: boolean;
@@ -24,6 +8,13 @@ export declare class GLSPActionDispatcher extends ActionDispatcher {
     initialize(): Promise<void>;
     startModelInitialization(): void;
     onceModelInitialized(): Promise<void>;
+    hasHandler(action: Action): boolean;
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the model initialization is completed.
+     *
+     * @param actions The actions that should be dispatched after the model initialization
+     */
+    dispatchOnceModelInitialized(...actions: Action[]): void;
     dispatch(action: Action): Promise<void>;
     protected handleAction(action: Action): Promise<void>;
     request<Res extends ResponseAction>(action: RequestAction<Res>): Promise<Res>;
@@ -37,6 +28,6 @@ export declare class GLSPActionDispatcher extends ActionDispatcher {
      * If `rejectOnTimeout` is set to false (default) the returned promise will be resolved with
      * no value, otherwise it will be rejected.
      */
-    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res>;
+    requestUntil<Res extends ResponseAction>(action: RequestAction<Res>, timeoutMs?: number, rejectOnTimeout?: boolean): Promise<Res | undefined>;
 }
 //# sourceMappingURL=action-dispatcher.d.ts.map

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,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAElF,qBAAa,oBAAqB,SAAQ,gBAAgB;IACtD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAa;IACrE,SAAS,CAAC,qBAAqB,UAAS;IACD,SAAS,CAAC,wBAAwB,EAAE,6BAA6B,CAAC;IAEhG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,wBAAwB,IAAI,IAAI;IAQhC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAM7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBrD,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,EAAE,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,SAAS,SAAO,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;CA2BhI"}
+{"version":3,"file":"action-dispatcher.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.ts"],"names":[],"mappings":";AAgBA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACxF,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;IAmBrD,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

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLSPActionDispatcher = void 0;
 /********************************************************************************
- * Copyright (c) 2019-2022 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,11 +25,10 @@ exports.GLSPActionDispatcher = void 0;
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-const protocol_1 = require("@eclipse-glsp/protocol");
 const inversify_1 = require("inversify");
-const sprotty_1 = require("sprotty");
-const model_initialization_constraint_1 = require("./model-initialization-constraint");
-class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
+const _glsp_sprotty_1 = require("../glsp-sprotty/index");
+const model_initialization_constraint_1 = require("./model/model-initialization-constraint");
+let GLSPActionDispatcher = exports.GLSPActionDispatcher = class GLSPActionDispatcher extends _glsp_sprotty_1.ActionDispatcher {
     constructor() {
         super(...arguments);
         this.timeouts = new Map();
@@ -41,31 +40,42 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
     startModelInitialization() {
         if (!this.initializedConstraint) {
             this.logger.log(this, 'Starting model initialization mode');
-            this.initializationConstraint.onInitialized().then(() => this.logger.log(this, 'Model initialization completed'));
+            this.initializationConstraint.onInitialized(() => this.logger.log(this, 'Model initialization completed'));
             this.initializedConstraint = true;
         }
     }
     onceModelInitialized() {
         return this.initializationConstraint.onInitialized();
     }
-    dispatch(action) {
-        const result = super.dispatch(action);
+    hasHandler(action) {
+        return this.actionHandlerRegistry.get(action.kind).length > 0;
+    }
+    /**
+     * Processes all given actions, by dispatching them to the corresponding handlers, after the model initialization is completed.
+     *
+     * @param actions The actions that should be dispatched after the model initialization
+     */
+    dispatchOnceModelInitialized(...actions) {
+        this.initializationConstraint.onInitialized(() => this.dispatchAll(actions));
+    }
+    async dispatch(action) {
+        const result = await super.dispatch(action);
         this.initializationConstraint.notifyDispatched(action);
         return result;
     }
     handleAction(action) {
-        if (protocol_1.ResponseAction.hasValidResponseId(action)) {
+        if (_glsp_sprotty_1.ResponseAction.hasValidResponseId(action)) {
             // clear timeout
             const timeout = this.timeouts.get(action.responseId);
             if (timeout !== undefined) {
                 clearTimeout(timeout);
                 this.timeouts.delete(action.responseId);
             }
-            // we might have reached a timeout, so we simply drop the response
+            // Check if we have a pending request for the response.
+            // If not the  we clear the responseId => action will be dispatched normally
             const deferred = this.requests.get(action.responseId);
             if (deferred === undefined) {
-                this.logger.log(this, 'No matching request for response', action);
-                return Promise.resolve();
+                action.responseId = '';
             }
         }
         return super.handleAction(action);
@@ -73,7 +83,7 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
     request(action) {
         if (!action.requestId && action.requestId === '') {
             // No request id has been specified. So we use a generated one.
-            action.requestId = protocol_1.RequestAction.generateRequestId();
+            action.requestId = _glsp_sprotty_1.RequestAction.generateRequestId();
         }
         return super.request(action);
     }
@@ -90,7 +100,7 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
     requestUntil(action, timeoutMs = 2000, rejectOnTimeout = false) {
         if (!action.requestId && action.requestId === '') {
             // No request id has been specified. So we use a generated one.
-            action.requestId = protocol_1.RequestAction.generateRequestId();
+            action.requestId = _glsp_sprotty_1.RequestAction.generateRequestId();
         }
         const requestId = action.requestId;
         const timeout = setTimeout(() => {
@@ -112,10 +122,12 @@ class GLSPActionDispatcher extends sprotty_1.ActionDispatcher {
         this.timeouts.set(requestId, timeout);
         return super.request(action);
     }
-}
+};
 __decorate([
     (0, inversify_1.inject)(model_initialization_constraint_1.ModelInitializationConstraint),
     __metadata("design:type", model_initialization_constraint_1.ModelInitializationConstraint)
 ], GLSPActionDispatcher.prototype, "initializationConstraint", void 0);
-exports.GLSPActionDispatcher = GLSPActionDispatcher;
+exports.GLSPActionDispatcher = GLSPActionDispatcher = __decorate([
+    (0, inversify_1.injectable)()
+], GLSPActionDispatcher);
 //# sourceMappingURL=action-dispatcher.js.map

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-dispatcher.spec.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=action-dispatcher.spec.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"action-dispatcher.spec.d.ts","sourceRoot":"","sources":["../../src/base/action-dispatcher.spec.ts"],"names":[],"mappings":""}