From 30db8cfc73767799d291fba2d282f07d620163f9 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 1 Mar 2012 20:33:00 +0400 Subject: [PATCH] IDEA-68415 (Grails Console Functionality) --- .../plugins/groovy/console/DefaultGroovyShellRunner.java | 7 +++++++ .../plugins/groovy/console/GroovyShellAction.java | 2 +- .../plugins/groovy/console/GroovyShellRunner.java | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java index 93215525a8c1..7b4fc5337659 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/DefaultGroovyShellRunner.java @@ -19,6 +19,7 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.JavaParameters; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ModuleRootManager; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PathsList; import org.jetbrains.annotations.NotNull; @@ -75,4 +76,10 @@ public class DefaultGroovyShellRunner extends GroovyShellRunner { String version = GroovyConfigUtils.getInstance().getSDKVersion(homePath); return version == AbstractConfigUtils.UNDEFINED_VERSION ? "" : " (" + (bundled ? "Bundled " : "") + "Groovy " + version + ")"; } + + @NotNull + @Override + public String transformUserInput(@NotNull String userInput) { + return StringUtil.replace(userInput, "\n", "###\\n"); + } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java index ddd6be2bf823..6f79bae946f3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java @@ -179,7 +179,7 @@ public class GroovyShellAction extends DumbAwareAction { ConsoleExecuteActionHandler handler = new ConsoleExecuteActionHandler(getProcessHandler(), false) { @Override public void processLine(String line) { - super.processLine(StringUtil.replace(line, "\n", "###\\n")); + super.processLine(shellRunner.transformUserInput(line)); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellRunner.java index 5f4ca5e2813c..1ef8d20013bf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellRunner.java @@ -48,6 +48,11 @@ public abstract class GroovyShellRunner { return null; } + @NotNull + public String transformUserInput(@NotNull String userInput) { + return userInput; + } + @Nullable public static GroovyShellRunner getAppropriateRunner(@NotNull Module module) { for (GroovyShellRunner runner : EP_NAME.getExtensions()) {