Handle cell execution cancellation because the notebook is being disp…

…osed Fixes jupyterlab#7554
jasongrout · Nov 22, 2019 · c8ca46c · c8ca46c
1 parent b91f38f
commit c8ca46c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/apputils/src/clientsession.tsx b/packages/apputils/src/clientsession.tsx
@@ -765,7 +765,7 @@ export class ClientSession implements IClientSession {
     // If we have already, and now we aren't busy, dispose
     // of the busy disposable.
     if (this._setBusy) {
-      if (this.session.kernel && this.session.kernel.status === 'busy') {
+      if (status === 'busy') {
         if (!this._busyDisposable) {
           this._busyDisposable = this._setBusy();
         }

diff --git a/packages/cells/src/widget.ts b/packages/cells/src/widget.ts
@@ -1108,8 +1108,9 @@ export namespace CodeCell {
       }
       return msg;
     } catch (e) {
-      // If this is still the current execution, clear the prompt.
-      if (e.message === 'Canceled' && cell.outputArea.future === future) {
+      // If we started executing, and the cell is still indicating this
+      // execution, clear the prompt.
+      if (future && !cell.isDisposed && cell.outputArea.future === future) {
         cell.setPrompt('');
       }
       throw e;

diff --git a/packages/notebook/src/actions.tsx b/packages/notebook/src/actions.tsx
@@ -1555,11 +1555,10 @@ namespace Private {
               }
             })
             .catch(reason => {
-              if (reason.message !== 'Canceled') {
-                throw reason;
+              if (cell.isDisposed || reason.message.startsWith('Canceled')) {
+                return false;
               }
-
-              return false;
+              throw reason;
             })
             .then(ran => {
               if (ran) {