From 06e4621633038fdce44aab36cf7efdf22efca267 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 15 Feb 2012 18:43:03 +0100
Subject: [PATCH] ctrl+enter should execute in groovy shell, not just enter

---
 .../runners/AbstractConsoleRunnerWithHistory.java      |  3 +--
 .../execution/runners/ConsoleExecuteActionHandler.java |  4 ++++
 plugins/groovy/src/META-INF/plugin.xml                 |  4 ++++
 .../plugins/groovy/console/GroovyShellAction.java      | 10 +++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

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 f016f4c63258..e4265db6af83 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
@@ -255,7 +255,6 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
 
   public static class ConsoleExecuteAction extends DumbAwareAction {
     public static final String ACTIONS_EXECUTE_ICON = "/actions/execute.png";
-    public static final String CONSOLE_EXECUTE = "Console.Execute";
 
     private final LanguageConsoleImpl myLanguageConsole;
     private final ProcessHandler myProcessHandler;
@@ -270,7 +269,7 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
       myLanguageConsole = languageConsole;
       myProcessHandler = processHandler;
       myConsoleExecuteActionHandler = consoleExecuteActionHandler;
-      EmptyAction.setupAction(this, CONSOLE_EXECUTE, null);
+      EmptyAction.setupAction(this, consoleExecuteActionHandler.getEmptyExecuteAction(), null);
     }
 
     public void actionPerformed(final AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java b/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
index ed28b353e442..c9a5f387be7d 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/ConsoleExecuteActionHandler.java
@@ -90,4 +90,8 @@ public class ConsoleExecuteActionHandler {
 
   public void finishExecution() {
   }
+
+  public String getEmptyExecuteAction() {
+    return "Console.Execute";
+  }
 }
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index c9aba2f5ff5c..5fc4443413fd 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -1014,6 +1014,10 @@
   </extensions>
 
   <actions>
+    <action id="Groovy.Shell.Execute" class="com.intellij.openapi.actionSystem.EmptyAction" text="Execute Groovy Code" description="Execute Groovy code in console">
+      <keyboard-shortcut first-keystroke="control ENTER" keymap="$default"/>
+    </action>
+
     <action id="Groovy.NewClass" class="org.jetbrains.plugins.groovy.actions.NewGroovyClassAction"
             text="Groovy Class" description="Create new Groovy class">
       <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewGroup1"/>
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 4df327fe2caa..645116bbbbcf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellAction.java
@@ -31,7 +31,10 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.projectRoots.*;
+import com.intellij.openapi.projectRoots.JavaSdkType;
+import com.intellij.openapi.projectRoots.JdkUtil;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.SdkType;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ui.configuration.ModulesAlphaComparator;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -186,6 +189,11 @@ public class GroovyShellAction extends DumbAwareAction {
             public void processLine(String line) {
               super.processLine(StringUtil.replace(line, "\n", "###\\n"));
             }
+
+            @Override
+            public String getEmptyExecuteAction() {
+              return "Groovy.Shell.Execute";
+            }
           };
           new ConsoleHistoryController("Groovy Shell", null, getLanguageConsole(), handler.getConsoleHistoryModel()).install();
           return handler;