nodejs
diff --git a/Collapse file
‎lib/readline.js‎
Copy file name to clipboardExpand all lines: lib/readline.js
+2-1Lines changed: 2 additions & 1 deletion b/Collapse file
‎lib/readline.js‎
Copy file name to clipboardExpand all lines: lib/readline.js
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/Collapse file
‎test/parallel/test-readline-interface.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-readline-interface.js
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎test/parallel/test-readline-interface.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-readline-interface.js
+24Lines changed: 24 additions & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-readline-promises-interface.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-readline-promises-interface.js
+11Lines changed: 11 additions & 0 deletions b/Collapse file
‎test/parallel/test-readline-promises-interface.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-readline-promises-interface.js
+11Lines changed: 11 additions & 0 deletions
@@ -148,9 +148,10 @@ Interface.prototype.question = function(query, options, cb) {
     const cleanup = () => {
       options.signal.removeEventListener(onAbort);
     };
+    const originalCb = cb;
     cb = typeof cb === 'function' ? (answer) => {
       cleanup();
-      return cb(answer);
+      return originalCb(answer);
     } : cleanup;
   }
 
 
@@ -1006,6 +1006,17 @@ for (let i = 0; i < 12; i++) {
     rli.close();
   }
 
+  // Calling the question callback with abort signal
+  {
+    const [rli] = getInterface({ terminal });
+    const { signal } = new AbortController();
+    rli.question('foo?', { signal }, common.mustCall((answer) => {
+      assert.strictEqual(answer, 'bar');
+    }));
+    rli.write('bar\n');
+    rli.close();
+  }
+
   // Calling the question multiple times
   {
     const [rli] = getInterface({ terminal });
@@ -1030,6 +1041,19 @@ for (let i = 0; i < 12; i++) {
     rli.close();
   }
 
+  // Calling the promisified question with abort signal
+  {
+    const [rli] = getInterface({ terminal });
+    const question = util.promisify(rli.question).bind(rli);
+    const { signal } = new AbortController();
+    question('foo?', { signal })
+    .then(common.mustCall((answer) => {
+      assert.strictEqual(answer, 'bar');
+    }));
+    rli.write('bar\n');
+    rli.close();
+  }
+
   // Aborting a question
   {
     const ac = new AbortController();
 
@@ -909,6 +909,17 @@ for (let i = 0; i < 12; i++) {
     rli.close();
   }
 
+  // Calling the question callback with abort signal
+  {
+    const [rli] = getInterface({ terminal });
+    const { signal } = new AbortController();
+    rli.question('foo?', { signal }).then(common.mustCall((answer) => {
+      assert.strictEqual(answer, 'bar');
+    }));
+    rli.write('bar\n');
+    rli.close();
+  }
+
   // Aborting a question
   {
     const ac = new AbortController();