Allow interrupting the kernel more than once (#11184)

For #10587, #10356

Author: DonJayamanne

news/2 Fixes/10356.md

@@ -0,0 +1 @@
+Cancelling the prompt to restart the kernel should not leave the toolbar buttons disabled.

news/2 Fixes/10587.md

@@ -0,0 +1 @@
+Allow interrupting the kernel more than once.

src/client/datascience/interactive-common/interactiveBase.ts

@@ -381,29 +381,40 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
         }
 
         if (this._notebook && !this.restartingKernel) {
-            if (await this.shouldAskForRestart()) {
-                // Ask the user if they want us to restart or not.
-                const message = localize.DataScience.restartKernelMessage();
-                const yes = localize.DataScience.restartKernelMessageYes();
-                const dontAskAgain = localize.DataScience.restartKernelMessageDontAskAgain();
-                const no = localize.DataScience.restartKernelMessageNo();
-
-                const v = await this.applicationShell.showInformationMessage(message, yes, dontAskAgain, no);
-                if (v === dontAskAgain) {
-                    await this.disableAskForRestart();
-                    await this.restartKernelInternal();
-                } else if (v === yes) {
+            this.restartingKernel = true;
+            this.startProgress();
+
+            try {
+                if (await this.shouldAskForRestart()) {
+                    // Ask the user if they want us to restart or not.
+                    const message = localize.DataScience.restartKernelMessage();
+                    const yes = localize.DataScience.restartKernelMessageYes();
+                    const dontAskAgain = localize.DataScience.restartKernelMessageDontAskAgain();
+                    const no = localize.DataScience.restartKernelMessageNo();
+
+                    const v = await this.applicationShell.showInformationMessage(message, yes, dontAskAgain, no);
+                    if (v === dontAskAgain) {
+                        await this.disableAskForRestart();
+                        await this.restartKernelInternal();
+                    } else if (v === yes) {
+                        await this.restartKernelInternal();
+                    }
+                } else {
                     await this.restartKernelInternal();
                 }
-            } else {
-                await this.restartKernelInternal();
+            } finally {
+                this.restartingKernel = false;
+                this.stopProgress();
             }
         }
     }
 
     @captureTelemetry(Telemetry.Interrupt)
     public async interruptKernel(): Promise<void> {
         if (this._notebook && !this.restartingKernel) {
+            this.restartingKernel = true;
+            this.startProgress();
+
             const status = this.statusProvider.set(
                 localize.DataScience.interruptKernelStatus(),
                 true,
@@ -412,10 +423,10 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
                 this
             );
 
-            const settings = this.configuration.getSettings(await this.getOwningResource());
-            const interruptTimeout = settings.datascience.jupyterInterruptTimeout;
-
             try {
+                const settings = this.configuration.getSettings(await this.getOwningResource());
+                const interruptTimeout = settings.datascience.jupyterInterruptTimeout;
+
                 const result = await this._notebook.interruptKernel(interruptTimeout);
                 status.dispose();
 
@@ -436,6 +447,9 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
                 status.dispose();
                 traceError(err);
                 this.applicationShell.showErrorMessage(err);
+            } finally {
+                this.restartingKernel = false;
+                this.stopProgress();
             }
         }
     }

src/datascience-ui/interactive-common/redux/reducers/kernel.ts

@@ -24,21 +24,13 @@ export namespace Kernel {
     export function restartKernel(arg: CommonReducerArg): IMainState {
         postActionToExtension(arg, InteractiveWindowMessages.RestartKernel);
 
-        // Set busy until kernel is restarted
-        return {
-            ...arg.prevState,
-            busy: true
-        };
+        return arg.prevState;
     }
 
     export function interruptKernel(arg: CommonReducerArg): IMainState {
         postActionToExtension(arg, InteractiveWindowMessages.Interrupt);
 
-        // Set busy until kernel is finished interrupting
-        return {
-            ...arg.prevState,
-            busy: true
-        };
+        return arg.prevState;
     }
 
     export function updateStatus(