From 5e99101dcb6858922b88ebebb0d69dfb6e538c58 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 16 Sep 2014 10:12:38 +0200 Subject: [PATCH] IDEA-COMMUNITY-CR-599 --- .../intellij/execution/console/ConsoleExecuteAction.java | 8 ++++---- .../execution/console/LanguageConsoleBuilder.java | 2 +- .../intellij/execution/console/UseConsoleInputAction.java | 2 +- 3 files changed, 6 insertions(+), 6 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 f5bec9ac6be4..fe260df74038 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java +++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java @@ -140,7 +140,7 @@ public class ConsoleExecuteAction extends DumbAwareAction { private boolean myAddToHistory = true; final boolean myPreserveMarkup; - boolean useProcessStdIn; + boolean myUseProcessStdIn; public ConsoleExecuteActionHandler(boolean preserveMarkup) { myCommandHistoryModel = new ConsoleHistoryModel(); @@ -163,14 +163,14 @@ public class ConsoleExecuteAction extends DumbAwareAction { } protected void runExecuteAction(@NotNull LanguageConsoleImpl console, @Nullable LanguageConsoleView consoleView) { - if (!useProcessStdIn) { + if (!myUseProcessStdIn) { beforeExecution(console); } - String text = console.prepareExecuteAction(myAddToHistory && !useProcessStdIn, myPreserveMarkup, true); + String text = console.prepareExecuteAction(myAddToHistory && !myUseProcessStdIn, myPreserveMarkup, true); ((UndoManagerImpl)UndoManager.getInstance(console.getProject())).invalidateActionsFor(DocumentReferenceManager.getInstance().create(console.getCurrentEditor().getDocument())); - if (useProcessStdIn) { + if (myUseProcessStdIn) { assert consoleView != null; consoleView.print(text, ConsoleViewContentType.USER_INPUT); consoleView.print("\n", ConsoleViewContentType.USER_INPUT); diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java index 12db013acdd8..a763d934b30e 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java @@ -175,7 +175,7 @@ public final class LanguageConsoleBuilder { if (processInputStateKey != null) { assert executeActionHandler != null; if (PropertiesComponent.getInstance().getBoolean(processInputStateKey, false)) { - executeActionHandler.useProcessStdIn = true; + executeActionHandler.myUseProcessStdIn = true; DaemonCodeAnalyzer daemonCodeAnalyzer = DaemonCodeAnalyzer.getInstance(consoleView.getProject()); daemonCodeAnalyzer.setHighlightingEnabled(consoleView.getConsole().getFile(), false); } diff --git a/platform/lang-impl/src/com/intellij/execution/console/UseConsoleInputAction.java b/platform/lang-impl/src/com/intellij/execution/console/UseConsoleInputAction.java index 5b450e3bd154..5dc58ac1875c 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/UseConsoleInputAction.java +++ b/platform/lang-impl/src/com/intellij/execution/console/UseConsoleInputAction.java @@ -51,6 +51,6 @@ final class UseConsoleInputAction extends ToggleAction implements DumbAware { List actions = ActionUtil.getActions(consoleView.getConsole().getConsoleEditor().getComponent()); ConsoleExecuteAction action = ContainerUtil.findInstance(actions, ConsoleExecuteAction.class); - action.myExecuteActionHandler.useProcessStdIn = !state; + action.myExecuteActionHandler.myUseProcessStdIn = !state; } } \ No newline at end of file