From ce8532cda5277e5bd8cdef4f8e5eecfa7e4f083e Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Tue, 15 Nov 2016 18:47:03 +0300
Subject: [PATCH] Reopening Debugger Console causes IllegalArgumentException
 (PY-21457)

Add console folding to debug console once
---
 .../com/jetbrains/python/console/PythonConsoleView.java  | 9 ++++++++-
 .../python/console/PythonDebugLanguageConsoleView.java   | 7 +++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java
index 2cafcee76f66..a3df1ceac153 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java
@@ -150,11 +150,18 @@ public class PythonConsoleView extends LanguageConsoleImpl implements Observable
     }
   }
 
+  public boolean isConsoleEnabledFirstTime() {
+    return myFirstRun && myExecuteActionHandler != null;
+  }
+
+  public void setFirstRun(boolean firstRun) {
+    myFirstRun = firstRun;
+  }
+
   public void showStartMessageForFirstExecution(String startCommand) {
     if (myFirstRun && myExecuteActionHandler != null) {
       setPrompt("");
       executeStatement(startCommand + "\n", ProcessOutputTypes.SYSTEM);
-      myFirstRun = false;
     }
   }
 
diff --git a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
index 04129d41ce12..177ce1fc9bdc 100644
--- a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
@@ -73,8 +73,11 @@ public class PythonDebugLanguageConsoleView extends DuplexConsoleView<ConsoleVie
 
     if (!primary && !isPrimaryConsoleEnabled()) {
       PythonConsoleView console = getPydevConsoleView();
-      console.addConsoleFolding(true);
-      console.showStartMessageForFirstExecution(DEBUG_CONSOLE_START_COMMAND);
+      if (console.isConsoleEnabledFirstTime()) {
+        console.addConsoleFolding(true);
+        console.showStartMessageForFirstExecution(DEBUG_CONSOLE_START_COMMAND);
+        console.setFirstRun(false);
+      }
 
       IdeFocusManager.findInstance().requestFocus(console.getConsoleEditor().getContentComponent(), true);
     }