From 3f5ed3f67c9c9bd031d1047fd357d1b045ead5ac Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 19 Feb 2014 19:07:46 +0100
Subject: [PATCH] IDEA-120952

---
 .../execution/console/ConsoleExecuteAction.java | 17 ++++++++++++++++-
 .../AbstractConsoleRunnerWithHistory.java       | 17 ++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
index 80b10c116a0b..6bb17cfd6476 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
@@ -44,6 +44,21 @@ public class ConsoleExecuteAction extends DumbAwareAction {
     this(console, executeActionHandler, CONSOLE_EXECUTE_ACTION_ID, Conditions.<LanguageConsoleImpl>alwaysTrue());
   }
 
+  /**
+   * Only internal usage, to keep backward compatibility
+   * to remove in IDEA 14
+   */
+  public static ConsoleExecuteAction createAction(final LanguageConsoleImpl languageConsole,
+                                                             @Nullable Condition<LanguageConsoleImpl> enabledCondition,
+                                                             final BaseConsoleExecuteActionHandler consoleExecuteActionHandler) {
+    return new ConsoleExecuteAction(languageConsole, new ConsoleExecuteActionHandler(consoleExecuteActionHandler.myPreserveMarkup) {
+      @Override
+      void doExecute(@NotNull String text, @NotNull LanguageConsoleImpl console, @Nullable LanguageConsoleView consoleView) {
+        consoleExecuteActionHandler.doExecute(text, languageConsole, null);
+      }
+    }, enabledCondition);
+  }
+
   ConsoleExecuteAction(@NotNull LanguageConsoleImpl console, final @NotNull ConsoleExecuteActionHandler executeActionHandler, @Nullable Condition<LanguageConsoleImpl> enabledCondition) {
     this(console, null, executeActionHandler, CONSOLE_EXECUTE_ACTION_ID, enabledCondition);
   }
@@ -97,7 +112,7 @@ public class ConsoleExecuteAction extends DumbAwareAction {
     private final ConsoleHistoryModel myConsoleHistoryModel;
 
     private boolean myAddToHistory = true;
-    private final boolean myPreserveMarkup;
+    final boolean myPreserveMarkup;
 
     public ConsoleExecuteActionHandler(boolean preserveMarkup) {
       myConsoleHistoryModel = new ConsoleHistoryModel();
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
index 0a62ed853d0e..7da454eedc2c 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
@@ -241,13 +241,24 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
     return myConsoleView.getConsole();
   }
 
-  public static AnAction createConsoleExecAction(final LanguageConsoleView console,
-                                                 final ProcessHandler processHandler,
-                                                 final ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+  public static AnAction createConsoleExecAction(@NotNull LanguageConsoleView console,
+                                                 @NotNull ProcessHandler processHandler,
+                                                 @NotNull ConsoleExecuteActionHandler consoleExecuteActionHandler) {
     return new ConsoleExecuteAction(console, consoleExecuteActionHandler, consoleExecuteActionHandler.getEmptyExecuteAction(),
                                     new LanguageConsoleBuilder.ProcessBackedExecutionEnabledCondition(processHandler));
   }
 
+  @SuppressWarnings("UnusedDeclaration")
+  @Deprecated
+  /**
+   * @deprecated to remove in IDEA 14
+   */
+  public static AnAction createConsoleExecAction(LanguageConsoleImpl languageConsole,
+                                                 ProcessHandler processHandler,
+                                                 ConsoleExecuteActionHandler consoleExecuteActionHandler) {
+    return ConsoleExecuteAction.createAction(languageConsole, new LanguageConsoleBuilder.ProcessBackedExecutionEnabledCondition(processHandler), consoleExecuteActionHandler);
+  }
+
   @NotNull
   protected abstract ConsoleExecuteActionHandler createConsoleExecuteActionHandler();