1 files changed, 10 insertions, 8 deletions

diff --git a/language-web/src/main/js/editor/XtextWebSocketClient.ts b/language-web/src/main/js/editor/XtextWebSocketClient.ts
index 489ac03d..5b775500 100644
--- a/language-web/src/main/js/editor/XtextWebSocketClient.ts
+++ b/language-web/src/main/js/editor/XtextWebSocketClient.ts
@@ -1,7 +1,7 @@
 import { nanoid } from 'nanoid';
 
 import { getLogger } from '../logging';
-import { PendingRequest } from './PendingRequest';
+import { PendingTask } from '../utils/PendingTask';
 import { Timer } from '../utils/Timer';
 import {
   isErrorResponse,
@@ -23,6 +23,8 @@ const BACKGROUND_IDLE_TIMEOUT_MS = 5 * 60 * 1000;
 
 const PING_TIMEOUT_MS = 10 * 1000;
 
+const REQUEST_TIMEOUT_MS = 1000;
+
 const log = getLogger('XtextWebSocketClient');
 
 type ReconnectHandler = () => Promise<void>;
@@ -49,7 +51,7 @@ export class XtextWebSocketClient {
 
   connection!: WebSocket;
 
-  pendingRequests = new Map<string, PendingRequest>();
+  pendingRequests = new Map<string, PendingTask<unknown>>();
 
   onReconnect: ReconnectHandler;
 
@@ -223,14 +225,14 @@ export class XtextWebSocketClient {
       id: messageId,
       request,
     } as IXtextWebRequest);
-    const promise = new Promise((resolve, reject) => {
-      this.pendingRequests.set(messageId, new PendingRequest(resolve, reject, () => {
+    log.trace('Sending message', message);
+    return new Promise((resolve, reject) => {
+      const task = new PendingTask(resolve, reject, REQUEST_TIMEOUT_MS, () => {
         this.removePendingRequest(messageId);
-      }));
+      });
+      this.pendingRequests.set(messageId, task);
+      this.connection.send(message);
     });
-    log.trace('Sending message', message);
-    this.connection.send(message);
-    return promise;
   }
 
   private handleMessage(messageStr: unknown) {