From cdd238d75e72b9ffe3b484242caa87be2cccd58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Sun, 28 Feb 2021 13:53:06 +0100
Subject: [PATCH] do not timeout on faulty async handlers, continue with false
 to give default handlers chance to run

---
 src/common/InputHandler.ts      | 9 +++++++--
 src/common/input/WriteBuffer.ts | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/InputHandler.ts b/src/common/InputHandler.ts
index 228df3a3..7ab2a186 100644
--- a/src/common/InputHandler.ts
+++ b/src/common/InputHandler.ts
@@ -484,8 +484,13 @@ export class InputHandler extends Disposable implements IInputHandler {
   private _logSlowResolvingAsync(p: Promise<boolean>): void {
     // log a limited warning about an async taking too long
     if ((this._logService as any)._logLevel <= LogLevel.WARN) {
-      Promise.race([p, new Promise((res, rej) => setTimeout(rej, SLOW_ASYNC_LIMIT))])
-        .catch(() => console.warn(`async parser handler taking longer than ${SLOW_ASYNC_LIMIT} ms`));
+      Promise.race([p, new Promise((res, rej) => setTimeout(() => rej('#SLOW_TIMEOUT'), SLOW_ASYNC_LIMIT))])
+        .catch(err => {
+          if (err !== '#SLOW_TIMEOUT') {
+            throw err;
+          }
+          console.warn(`async parser handler taking longer than ${SLOW_ASYNC_LIMIT} ms`);
+        });
     }
   }
 
diff --git a/src/common/input/WriteBuffer.ts b/src/common/input/WriteBuffer.ts
index a2c70004..d22de912 100644
--- a/src/common/input/WriteBuffer.ts
+++ b/src/common/input/WriteBuffer.ts
@@ -167,7 +167,7 @@ export class WriteBuffer {
         // (executed on the same queue, thus properly aligned before continuation happens)
         result.catch(err => {
           qmt(() => {throw err;});
-          return Promise.resolve(true);
+          return Promise.resolve(false);
         }).then(continuation);
         return;
       }