fixup! readline: fix pre-aborted signal question handling

nodejs · Mar 26, 2021 · f10ef73 · f10ef73
1 parent a39a0e7
commit f10ef73
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/readline.js b/lib/readline.js
@@ -59,6 +59,7 @@ const {
   StringPrototypeStartsWith,
   StringPrototypeTrim,
   Promise,
+  PromiseReject,
   Symbol,
   SymbolAsyncIterator,
   SafeStringIterator,
@@ -400,11 +401,11 @@ Interface.prototype.question = function(query, options, cb) {
 Interface.prototype.question[promisify.custom] = function(query, options) {
   options = typeof options === 'object' && options !== null ? options : {};
 
-  return new Promise((resolve, reject) => {
-    if (options.signal?.aborted) {
-      throw new AbortError();
-    }
+  if (options.signal && options.signal.aborted) {
+    return PromiseReject(new AbortError());
+  }
 
+  return new Promise((resolve, reject) => {
     this.question(query, options, resolve);
     if (options.signal) {
       options.signal.addEventListener('abort', () => {