From 4636b7d9b93c0f8732e18ff55bc9f81050173673 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 23 Sep 2014 20:29:32 +0400
Subject: [PATCH] IDEA-129885 Ctrl+up/down should scroll in Database Console

---
 platform/platform-resources/src/idea/Keymap_Default.xml       | 4 ++--
 platform/platform-resources/src/idea/Keymap_Mac.xml           | 2 --
 .../testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java  | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index 2c1c6abe70fa..c8320a11ac0f 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -998,8 +998,8 @@
   <action id="Console.TableResult.Reload"><keyboard-shortcut first-keystroke="control R"/></action>
   <action id="Console.TableResult.EditValue"><keyboard-shortcut first-keystroke="F2"/><keyboard-shortcut first-keystroke="alt ENTER"/></action>
 
-  <action id="Console.History.Next"><keyboard-shortcut first-keystroke="control UP"/></action>
-  <action id="Console.History.Previous"><keyboard-shortcut first-keystroke="control DOWN"/></action>
+  <action id="Console.History.Next" />
+  <action id="Console.History.Previous" />
   <action id="Console.History.Browse"><keyboard-shortcut first-keystroke="control alt E"/></action>
 
   <action id="Console.Jdbc.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index 70fb2093619f..2ad9c7f7e2c6 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -453,8 +453,6 @@
       <keyboard-shortcut first-keystroke="alt HOME"/>
     </action>
 
-    <action id="Console.History.Next" /> <!-- Disables meta up -->
-    <action id="Console.History.Previous" /> <!-- Disables meta down -->
     <action id="Console.TableResult.Reload" />
 
 
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
index fa173458ea42..da59c1fb5460 100644
--- a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
+++ b/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
@@ -89,7 +89,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "control ADD",              "ExpandAll", "ExpandRegion"},
     { "control DELETE",           "EditorDeleteToWordEnd", "RemoveFromFavorites"},
     { "control DIVIDE",           "CommentByLineComment", "Images.Editor.ActualSize"},
-    { "control DOWN",             "EditorScrollDown", "Console.History.Previous", "EditorLookupDown"},
+    { "control DOWN",             "EditorScrollDown", "EditorLookupDown"},
     { "control ENTER",            "EditorSplitLine", "ViewSource", "Console.Jdbc.Execute", "Console.Jpa.Execute", "Groovy.Shell.Execute"},
     { "control EQUALS",           "ExpandAll", "ExpandRegion"},
     { "control F5",               "Refresh", "Rerun"},
@@ -100,7 +100,7 @@ public abstract class KeymapsTestCase extends PlatformTestCase {
     { "control R",                "Replace", "Console.TableResult.Reload", "org.jetbrains.plugins.ruby.rails.console.ReloadSources"},
     { "control SLASH",            "CommentByLineComment", "Images.Editor.ActualSize"},
     { "control U",                "GotoSuperMethod", "CommanderSwapPanels"},
-    { "control UP",               "EditorScrollUp", "Console.History.Next", "EditorLookupUp"},
+    { "control UP",               "EditorScrollUp", "EditorLookupUp"},
     { "control alt A",            "ChangesView.AddUnversioned", "Diagram.DeselectAll"},
     { "control alt E",            "PerforceDirect.Edit", "Console.History.Browse"},
     { "control alt DOWN",         "NextOccurence", "Console.TableResult.NextPage"},