From b0d0c70fac44bd52bc848a86e5898f94ac828cfd Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Wed, 21 Jun 2017 20:12:35 +0300
Subject: [PATCH] Jupyter Notebook: clear finish execution action before run
 cell

---
 .../plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java      | 2 +-
 .../plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java      | 1 +
 .../jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java
index be3e10546fb0..efa09e379cfa 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunAllCellsAction.java
@@ -35,7 +35,7 @@ public class IpnbRunAllCellsAction extends IpnbRunCellBaseAction {
       final int nextIndex = i + 1;
       if (nextIndex < cells.size()) {
         final IpnbEditablePanel nextCell = cells.get(nextIndex);
-        cell.setupOnFinish(() -> nextCell.runCell(nextIndex != cells.size() - 1));
+        cell.onFinishExecutionAction(() -> nextCell.runCell(nextIndex != cells.size() - 1));
       }
     }
     final IpnbEditablePanel firstPanel = cells.get(0);
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java
index 18a04873edad..0adeb5c8ef10 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/actions/IpnbRunCellBaseAction.java
@@ -15,6 +15,7 @@ public abstract class IpnbRunCellBaseAction extends AnAction {
   public static void runCell(@NotNull final IpnbFilePanel ipnbFilePanel, boolean selectNext) {
     final IpnbEditablePanel cell = ipnbFilePanel.getSelectedCellPanel();
     if (cell == null) return;
+    cell.onFinishExecutionAction(null);
     cell.runCell(selectNext);
   }
 }
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java
index bcfb16e08dbe..9d664c1686e1 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java
@@ -135,7 +135,7 @@ public abstract class IpnbEditablePanel<T extends JComponent, K extends IpnbEdit
 
   protected String getRawCellText() { return ""; }
 
-  public void setupOnFinish(Runnable onFinish) {
+  public void onFinishExecutionAction(Runnable onFinish) {
     myOnFinish = onFinish;
   }