fix(cli-repl): render prompt correctly on interrupt MONGOSH-882 (#999)

Author: rose-m

packages/cli-repl/src/cli-repl.spec.ts

@@ -963,7 +963,7 @@ describe('CliRepl', () => {
     });
 
     context('with a user-provided prompt', () => {
-      it('allows prompts that interact with shell API methods', async() => {
+      beforeEach(async() => {
         await cliRepl.start(await testServer.connectionString(), {});
 
         input.write('use clirepltest\n');
@@ -973,10 +973,23 @@ describe('CliRepl', () => {
         await waitEval(cliRepl.bus);
 
         output = '';
+      });
+
+      it('allows prompts that interact with shell API methods', async() => {
         input.write('1 + 2\n');
         await waitEval(cliRepl.bus);
         expect(output).to.include('on clirepltest> ');
       });
+
+      it('renders the prompt correctly on interrupt', async() => {
+        input.write('while(true) { sleep(500); }\n');
+        process.kill(process.pid, 'SIGINT');
+
+        await waitBus(cliRepl.bus, 'mongosh:interrupt-complete');
+
+        expect(output).to.contain('Stopping execution');
+        expect(output).to.contain('on clirepltest> ');
+      });
     });
 
     context('pressing CTRL-C', () => {

packages/cli-repl/src/mongosh-repl.ts

@@ -404,6 +404,7 @@ class MongoshNodeRepl implements EvaluationListener {
     }
 
     const { repl, shellEvaluator } = this.runtimeState();
+    let interrupted = false;
 
     try {
       const shellResult = await shellEvaluator.customEval(originalEval, input, context, filename);
@@ -424,6 +425,7 @@ class MongoshNodeRepl implements EvaluationListener {
           .filter(([key]) => !key.startsWith('_')));
     } catch (err) {
       if (this.runtimeState().internalState.interrupted.isSet()) {
+        interrupted = true;
         this.bus.emit('mongosh:eval-interrupted');
         // The shell is interrupted by CTRL-C - so we ignore any errors
         // that happened during evaluation.
@@ -442,7 +444,8 @@ class MongoshNodeRepl implements EvaluationListener {
       }
       throw err;
     } finally {
-      if (!this.insideAutoCompleteOrGetPrompt) {
+      if (!this.insideAutoCompleteOrGetPrompt && !interrupted) {
+        // In case of an interrupt, onAsyncSigint will print the prompt when completed
         repl.setPrompt(await this.getShellPrompt());
       }
 
@@ -512,6 +515,10 @@ class MongoshNodeRepl implements EvaluationListener {
       }));
     }
     this.bus.emit('mongosh:interrupt-complete'); // For testing purposes.
+
+    const { repl } = this.runtimeState();
+    repl.setPrompt(await this.getShellPrompt());
+
     return true;
   }