From 74989240e58469507b8fb44c0fed5186d4e7fd9f Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 26 Apr 2011 14:55:07 +0200
Subject: [PATCH] move ToolKeymapExtension registration to correct place
 (IDEA-65893)

---
 platform/platform-resources/src/META-INF/LangExtensions.xml | 2 ++
 resources/src/META-INF/IdeaPlugin.xml                       | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 266312e61dee..941421e03566 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -618,4 +618,6 @@
   <renameInputValidator implementation="com.intellij.refactoring.rename.RenameToIgnoredDirectoryFileInputValidator" order="last"/>
 
   <refactoring.elementListenerProvider implementation="com.intellij.execution.impl.RunConfigurationRefactoringElementListenerProvider"/>
+
+  <keymapExtension implementation="com.intellij.tools.ToolKeymapExtension"/>
 </extensions>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 11aae27673fb..41fefe7e7e5a 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -855,8 +855,6 @@
 
     <keymapExtension implementation="com.intellij.debugger.actions.DebuggerKeymapExtension"/>
 
-    <keymapExtension implementation="com.intellij.tools.ToolKeymapExtension"/>
-
     <vcsSelectionProvider implementation="com.intellij.vcsUtil.JavaVcsSelectionProvider"/>
 
     <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImplicitVariableElementInfoFactory"/>