From 5f20ebdb4357eefe993c155b7541b249ef801699 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 3 Nov 2010 15:52:39 +0300
Subject: [PATCH] inline shortcut for Collapse action (RUBY-7044)

---
 platform/platform-resources/src/idea/Keymap_Default.xml | 4 ++++
 platform/platform-resources/src/idea/LangActions.xml    | 2 +-
 resources/src/idea/JBuilderKeymap.xml                   | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index 9d563ab98940..1e86171aa14e 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -375,6 +375,10 @@
     <keyboard-shortcut first-keystroke="control SUBTRACT"/>
     <keyboard-shortcut first-keystroke="control MINUS"/>
   </action>
+  <action id="CollapseRegion">
+    <keyboard-shortcut first-keystroke="control SUBTRACT"/>
+    <keyboard-shortcut first-keystroke="control MINUS"/>
+  </action>
   <action id="PreviousOccurence">
     <keyboard-shortcut first-keystroke="control alt UP"/>
   </action>
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 4a9408ba4c1a..326a7e36df01 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -158,7 +158,7 @@
 
     <group id="FoldingGroup" class="com.intellij.codeInsight.folding.impl.actions.FoldingActionGroup" popup="true">
       <action id="ExpandRegion" class="com.intellij.codeInsight.folding.impl.actions.ExpandRegionAction"/>
-      <action id="CollapseRegion" class="com.intellij.codeInsight.folding.impl.actions.CollapseRegionAction" use-shortcut-of="CollapseAll"/>
+      <action id="CollapseRegion" class="com.intellij.codeInsight.folding.impl.actions.CollapseRegionAction"/>
       <separator/>
       <action id="ExpandAllRegions" class="com.intellij.codeInsight.folding.impl.actions.ExpandAllRegionsAction"/>
       <action id="CollapseAllRegions" class="com.intellij.codeInsight.folding.impl.actions.CollapseAllRegionsAction"/>
diff --git a/resources/src/idea/JBuilderKeymap.xml b/resources/src/idea/JBuilderKeymap.xml
index 03762edca0a6..8475d1527c7a 100644
--- a/resources/src/idea/JBuilderKeymap.xml
+++ b/resources/src/idea/JBuilderKeymap.xml
@@ -28,6 +28,9 @@
     <action id="CollapseAll">
       <keyboard-shortcut first-keystroke="control SUBTRACT"/>
     </action>
+    <action id="CollapseRegion">
+      <keyboard-shortcut first-keystroke="control SUBTRACT"/>
+    </action>
     <action id="CollapseBlock"/>
     <action id="CopyElement"/>
     <action id="CopyPaths"/>