From 229a0e90b0791efa0638f21ead5528c6401bf597 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 28 Feb 2014 09:29:37 +0100
Subject: [PATCH] CR-IC-4571 EditorExtensions.xml is overkill

---
 .../platform-resources/src/META-INF/EditorExtensions.xml     | 5 -----
 .../platform-resources/src/META-INF/PlatformExtensions.xml   | 2 ++
 .../platform-resources/src/META-INF/PlatformLangPlugin.xml   | 1 -
 platform/platform-resources/src/META-INF/PlatformPlugin.xml  | 1 -
 resources/src/idea/RichPlatformPlugin.xml                    | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 platform/platform-resources/src/META-INF/EditorExtensions.xml

diff --git a/platform/platform-resources/src/META-INF/EditorExtensions.xml b/platform/platform-resources/src/META-INF/EditorExtensions.xml
deleted file mode 100644
index f2e50a2fde46..000000000000
--- a/platform/platform-resources/src/META-INF/EditorExtensions.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <projectService serviceImplementation="com.intellij.openapi.editor.LazyRangeMarkerFactory"/>
-  </extensions>
-</idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index 854e1ce08535..b6189cf69a47 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -190,6 +190,8 @@
     <projectService serviceInterface="com.intellij.openapi.vcs.VcsFileListenerContextHelper"
                     serviceImplementation="com.intellij.openapi.vcs.VcsFileListenerContextHelper"/>
 
+    <projectService serviceImplementation="com.intellij.openapi.editor.LazyRangeMarkerFactory"/>
+
     <!-- General -->
     <applicationConfigurable instance="com.intellij.ide.GeneralSettingsConfigurable"/>
 
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 54a54fc51865..943f3f568d68 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -21,7 +21,6 @@
     <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
-    <xi:include href="/META-INF/EditorExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
 
     <applicationService serviceInterface="com.intellij.ide.RecentProjectsManagerBase"
                         serviceImplementation="com.intellij.ide.RecentDirectoryProjectsManagerEx"/>
diff --git a/platform/platform-resources/src/META-INF/PlatformPlugin.xml b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
index 72d1efc98464..8cca39a37a4f 100644
--- a/platform/platform-resources/src/META-INF/PlatformPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformPlugin.xml
@@ -17,7 +17,6 @@
   <extensions defaultExtensionNs="com.intellij">
     <xi:include href="/META-INF/PlatformExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
-    <xi:include href="/META-INF/EditorExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
 
     <applicationService serviceInterface="com.intellij.ide.RecentProjectsManagerBase"
                         serviceImplementation="com.intellij.ide.RecentDirectoryProjectsManager"/>
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index cd22c2f41ea3..e6ab127a6b67 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -108,7 +108,6 @@
     <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/LangExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
     <xi:include href="/META-INF/ExternalSystemExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
-    <xi:include href="/META-INF/EditorExtensions.xml" xpointer="xpointer(/idea-plugin/extensions/*)"/>
 
     <projectViewPane implementation="com.intellij.ide.projectView.impl.ProjectViewPane"/>