diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 81c7897d27a7..55a28d3f5037 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -1401,14 +1401,18 @@ group.MarkFileAs.text=Mark File As
action.MarkAsPlainTextAction.text=Mark as Plain Text
action.MarkAsOriginalTypeAction.text=Mark as
-action.Console.Execute.text=Execute Current Statement
-action.Console.Execute.description=Execute current statement in console
+action.Console.Open.text=Open Console
+action.Console.Open.description=Open console for selected entity
+action.Console.Execute.text=Execute Current Statement in One-Line Console
+action.Console.Execute.description=Execute current statement in one-line console
+action.Console.Execute.Multiline.text=Execute Current Statement in Multiline Console
+action.Console.Execute.Multiline.description=Execute current statement in multiline console
action.Console.SplitLine.text=Split Line
-action.Console.History.Previous.text=Previous history entry
-action.Console.History.Previous.description=Previous console history entry
-action.Console.History.Next.text=Next history entry
-action.Console.History.Next.description=Next console history entry
-action.Console.History.Browse.text=Browse History
+action.Console.History.Previous.text=Previous Entry in Console History
+action.Console.History.Previous.description=Previous entry in console history
+action.Console.History.Next.text=Next Entry in Console History
+action.Console.History.Next.description=Next entry in console history
+action.Console.History.Browse.text=Browse Console History
action.Console.History.Browse.description=Browse console history
action.RevealIn.description=Highlights the file in platform's file manager
action.GoToLinkTarget.text=Go to Link Target
diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index a24a3ef5ee43..615a2f9ed0f9 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -1000,33 +1000,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index 25f77d894c38..00a6864cd210 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -454,12 +454,6 @@
-
-
-
-
-
-
diff --git a/platform/platform-resources/src/idea/Keymap_ReSharper.xml b/platform/platform-resources/src/idea/Keymap_ReSharper.xml
index 1654be1bbb51..86885b8442d8 100755
--- a/platform/platform-resources/src/idea/Keymap_ReSharper.xml
+++ b/platform/platform-resources/src/idea/Keymap_ReSharper.xml
@@ -7,7 +7,6 @@
-
diff --git a/platform/platform-resources/src/idea/Keymap_ReSharper_OSX.xml b/platform/platform-resources/src/idea/Keymap_ReSharper_OSX.xml
index f13ad3e2741a..af4a0a686326 100755
--- a/platform/platform-resources/src/idea/Keymap_ReSharper_OSX.xml
+++ b/platform/platform-resources/src/idea/Keymap_ReSharper_OSX.xml
@@ -14,10 +14,6 @@
-
-
-
-
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index c8987b10987d..06d8fa9beaff 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -594,7 +594,9 @@
+
+
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index f542f80d62d8..1e6f8bd6ee15 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -32,6 +32,7 @@ import gnu.trove.THashMap;
import gnu.trove.THashSet;
import junit.framework.TestCase;
import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -51,10 +52,8 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
for (Keymap keymap : KeymapManagerEx.getInstanceEx().getAllKeymaps()) {
String failure = checkDuplicatesInKeymap(keymap, knownDuplicates);
- if (failure != null) {
- if (failMessage.length() > 0) failMessage.append("\n");
- failMessage.append(failure);
- }
+ if (failMessage.length() > 0) failMessage.append("\n");
+ failMessage.append(failure);
}
if (failMessage.length() > 0) {
TestCase.fail(failMessage +
@@ -90,7 +89,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "control DELETE", "EditorDeleteToWordEnd", "RemoveFromFavorites"},
{ "control DIVIDE", "CommentByLineComment", "Images.Editor.ActualSize"},
{ "control DOWN", "EditorScrollDown", "EditorLookupDown"},
- { "control ENTER", "EditorSplitLine", "ViewSource", "Console.Jdbc.Execute", "Console.Jpa.Execute", "Groovy.Shell.Execute"},
+ { "control ENTER", "EditorSplitLine", "ViewSource", "Console.Execute.Multiline"},
{ "control EQUALS", "ExpandAll", "ExpandRegion"},
{ "control F5", "Refresh", "Rerun"},
{ "control D", "CompareDirs", "EditorDuplicate", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
@@ -119,7 +118,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "shift control D", "Uml.ShowDiff", "TagDocumentationNavigation"},
{ "shift control DOWN", "ResizeToolWindowDown", "MoveStatementDown"},
{ "shift control ENTER", "EditorChooseLookupItemCompleteStatement", "EditorCompleteStatement", "Console.Jpa.GenerateSql"},
- { "shift control F10", "Jdbc.OpenConsole", "Jdbc.RunSqlScript", "Jpa.OpenConsole", "RunClass", "RunTargetAction"},
+ { "shift control F10", "Console.Open", "RunClass", "RunTargetAction"},
{ "shift control F8", "ViewBreakpoints", "EditBreakpoint"},
{ "shift control G", "ClassTemplateNavigation", "GoToClass"},
{ "shift control LEFT", "EditorPreviousWordWithSelection", "ResizeToolWindowLeft", },
@@ -128,13 +127,13 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "shift control UP", "ResizeToolWindowUp", "MoveStatementUp"},
{ "shift control alt DOWN", "VcsShowNextChangeMarker", "HtmlTableCellNavigateDown"},
{ "shift control alt UP", "VcsShowPrevChangeMarker", "HtmlTableCellNavigateUp"},
- { "shift control alt DELETE", "Console.Jdbc.Terminate", "Console.Jpa.Terminate"},
{ "shift control K", "hg4idea.push", "Git.Push"},
{ "shift control U", "ShelveChanges.UnshelveWithDialog", "EditorToggleCase"},
{ "control E", "RecentFiles", "Vcs.ShowMessageHistory"},
{ "control alt Z", "Vcs.RollbackChangedLines", "ChangesView.Revert"},
});
put("Mac OS X 10.5+", new String[][] {
+ { "F5", "CopyElement", "Console.TableResult.Reload", "UML.ApplyCurrentLayout"},
{ "BACK_SPACE", "$Delete", "EditorBackSpace", "Images.Thumbnails.UpFolder"},
{ "shift BACK_SPACE", "EditorBackSpace", "UsageView.Include"},
{ "meta BACK_SPACE", "EditorDeleteLine", "$Delete"},
@@ -324,7 +323,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
{ "meta BACK_SPACE", "EditorDeleteToWordStart", "$Delete"},
{ "F2", "Console.TableResult.EditValue", "QuickJavaDoc"},
{ "F3", "GotoDeclaration", "EditSource"},
- { "F5", "StepInto", "UML.ApplyCurrentLayout"},
+ { "F5", "StepInto", "Console.TableResult.Reload", "UML.ApplyCurrentLayout"},
{ "control PERIOD", "EditorChooseLookupItemDot", "HippieCompletion"},
{ "meta 1", "FileChooser.GotoHome", "ShowIntentionActions", "DuplicatesForm.SendToLeft"},
{ "meta 3", "FileChooser.GotoModule", "GotoAction"},
@@ -375,6 +374,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
}
}
+ @NotNull
@SuppressWarnings({"HardCodedStringLiteral"})
private static String checkDuplicatesInKeymap(Keymap keymap, Map>> allKnownDuplicates) {
Set shortcuts = new LinkedHashSet();
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 8beabdc57073..98e4d8642741 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -1561,7 +1561,8 @@
-