From ad730cedf6a55ab7e50651e403570d4d132ff3af Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 13 Nov 2017 17:14:17 +0100
Subject: [PATCH] Rename idea/src/META-INF/extensions/{common.xml ->
 compiler.xml}

To emphasize that this file declares extensions to be registered in the
compiler, not only in the IDE
---
 build.xml                                                       | 2 +-
 compiler/build.gradle.kts                                       | 2 +-
 .../jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt  | 2 +-
 idea/src/META-INF/extensions/{common.xml => compiler.xml}       | 0
 idea/src/META-INF/extensions/ide.xml                            | 2 +-
 idea/src/META-INF/plugin.xml                                    | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename idea/src/META-INF/extensions/{common.xml => compiler.xml} (100%)

diff --git a/build.xml b/build.xml
index 68c5171c396..853f59d8497 100644
--- a/build.xml
+++ b/build.xml
@@ -379,7 +379,7 @@
                 <fileset dir="${basedir}/resources" includes="kotlinManifest.properties"/>
 
                 <fileset dir="idea/src">
-                    <include name="META-INF/extensions/common.xml"/>
+                    <include name="META-INF/extensions/compiler.xml"/>
                 </fileset>
 
                 <zipgroupfileset dir="${basedir}/lib" includes="*.jar"/>
diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
index 91c587a649c..743186f5e78 100644
--- a/compiler/build.gradle.kts
+++ b/compiler/build.gradle.kts
@@ -77,7 +77,7 @@ val jar: Jar by tasks
 jar.apply {
     from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
     from("../idea/src").apply {
-        include("META-INF/extensions/common.xml")
+        include("META-INF/extensions/compiler.xml")
     }
 }
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index db11b81d097..289205ff19f 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -474,7 +474,7 @@ class KotlinCoreEnvironment private constructor(
                 override fun createJrtFileSystem(): VirtualFileSystem? = CoreJrtFileSystem()
             }
 
-            registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/common.xml")
+            registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/compiler.xml")
 
             registerApplicationServicesForCLI(applicationEnvironment)
             registerApplicationServices(applicationEnvironment)
diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/compiler.xml
similarity index 100%
rename from idea/src/META-INF/extensions/common.xml
rename to idea/src/META-INF/extensions/compiler.xml
diff --git a/idea/src/META-INF/extensions/ide.xml b/idea/src/META-INF/extensions/ide.xml
index 77e0e1a22a6..5c12e3b42a4 100644
--- a/idea/src/META-INF/extensions/ide.xml
+++ b/idea/src/META-INF/extensions/ide.xml
@@ -22,7 +22,7 @@
         <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator"/>
         <projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator"/>
 
-        <!-- diagnosticSuppressor decelerated in common.xml -->
+        <!-- diagnosticSuppressor declared in compiler.xml -->
         <diagnosticSuppressor implementation="org.jetbrains.kotlin.idea.debugger.DiagnosticSuppressorForDebugger"/>
 
         <scriptDefinitionContributor
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 800545e1da7..f6d5c4fa20c 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -2721,7 +2721,7 @@
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <extensionPoints>
-    <xi:include href="extensions/common.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
+    <xi:include href="extensions/compiler.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
   </extensionPoints>
 
   <extensions defaultExtensionNs="org.jetbrains.kotlin">