repl: fix Ctrl+C on top level await

PR-URL: #38656 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

Author: aduh95

lib/repl.js

@@ -74,8 +74,6 @@ const{
  ObjectKeys,
  ObjectSetPrototypeOf,
  Promise,
- PromisePrototypeFinally,
- PromisePrototypeThen,
  PromiseRace,
  ReflectApply,
  RegExp,
@@ -566,21 +564,24 @@ function REPLServer(prompt,
 promise=PromiseRace([promise,interrupt]);
 }
 
-PromisePrototypeFinally(PromisePrototypeThen(promise,(result)=>{
-finishExecution(null,result);
-},(err)=>{
-if(err&&process.domain){
-debug('not recoverable, send to domain');
-process.domain.emit('error',err);
-process.domain.exit();
-return;
+(async()=>{
+try{
+constresult=awaitpromise;
+finishExecution(null,result);
+}catch(err){
+if(err&&process.domain){
+debug('not recoverable, send to domain');
+process.domain.emit('error',err);
+process.domain.exit();
+return;
+}
+finishExecution(err);
+}finally{
+// Remove prioritized SIGINT listener if it was not called.
+prioritizedSigintQueue.delete(sigintListener);
+unpause();
 }
-finishExecution(err);
-}),()=>{
-// Remove prioritized SIGINT listener if it was not called.
-prioritizedSigintQueue.delete(sigintListener);
-unpause();
-});
+})();
 }
 }
 
@@ -768,7 +769,9 @@ function REPLServer(prompt,
 constprioritizedSigintQueue=newSafeSet();
 self.on('SIGINT',functiononSigInt(){
 if(prioritizedSigintQueue.size>0){
-ArrayPrototypeForEach(prioritizedSigintQueue,(task)=>task());
+for(consttaskofprioritizedSigintQueue){
+task();
+}
 return;
 }
 

test/parallel/test-repl-top-level-await.js

@@ -164,18 +164,12 @@ async function ordinaryTests(){
 }
 
 asyncfunctionctrlCTest(){
-putIn.run([
-`const timeout = (msecs) => new Promise((resolve) =>{
- setTimeout(resolve, msecs).unref();
- });`,
-]);
-
 console.log('Testing Ctrl+C');
 assert.deepStrictEqual(awaitrunAndWait([
-'await timeout(100000)',
+'await new Promise(() =>{})',
 {ctrl: true,name: 'c'},
 ]),[
-'await timeout(100000)\r',
+'await new Promise(() =>{})\r',
 'Uncaught:',
 '[Error [ERR_SCRIPT_EXECUTION_INTERRUPTED]: '+
 'Script execution was interrupted by `SIGINT`]{',
@@ -190,4 +184,4 @@ async function main(){
 awaitctrlCTest();
 }
 
-main();
+main().then(common.mustCall());