Build: Move compiler.xml extensions to cli-common

compiler/build.gradle.kts

@@ -94,11 +94,6 @@ sourceSets {
     }
 }
 
-val jar: Jar by tasks
-jar.from("../idea/resources") {
-    include("META-INF/extensions/compiler.xml")
-}
-
 projectTest(parallel = true) {
     dependsOn(":dist")
     workingDir = rootDir

compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml

@@ -0,0 +1,57 @@
+<idea-plugin>
+    <id>org.jetbrains.kotlin</id>
+    <version>1.2</version>
+
+    <extensionPoints>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.diagnosticSuppressor"
+                        interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.expressionCodegenExtension"
+                        interface="org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.syntheticResolveExtension"
+                        interface="org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.jsSyntheticTranslateExtension"
+                        interface="org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.irGenerationExtension"
+                        interface="org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.simpleNameReferenceExtension"
+                        interface="org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.kotlinIndicesHelperExtension"
+                        interface="org.jetbrains.kotlin.idea.core.extension.KotlinIndicesHelperExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.classBuilderFactoryInterceptorExtension"
+                        interface="org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.packageFragmentProviderExtension"
+                        interface="org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.quickFixContributor"
+                        interface="org.jetbrains.kotlin.idea.quickfix.QuickFixContributor"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.storageComponentContainerContributor"
+                        interface="org.jetbrains.kotlin.extensions.StorageComponentContainerContributor"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptDefinitionContributor"
+                        interface="org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptTemplatesProvider"
+                        interface="org.jetbrains.kotlin.script.ScriptTemplatesProvider"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.extraImportsProviderExtension"
+                        interface="org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.facetConfigurationExtension"
+                        interface="org.jetbrains.kotlin.idea.facet.KotlinFacetConfigurationExtension"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.versionInfoProvider"
+                        interface="org.jetbrains.kotlin.idea.facet.KotlinVersionInfoProvider"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.completionInformationProvider"
+                        interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" />
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.moduleBuilder"
+                        interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
+                        interface="com.intellij.refactoring.rename.RenameHandler"/>
+    </extensionPoints>
+</idea-plugin>

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -560,7 +560,7 @@ class KotlinCoreEnvironment private constructor(
                 configuration.get(CLIConfigurationKeys.INTELLIJ_PLUGIN_ROOT)?.let(::File)
                     ?: PathUtil.getResourcePathForClass(this::class.java).takeIf { it.hasConfigFile(configFilePath) }
                     // hack for load extensions when compiler run directly from project directory (e.g. in tests)
-                    ?: File("idea/resources").takeIf { it.hasConfigFile(configFilePath) }
+                    ?: File("compiler/cli/cli-common/resources").takeIf { it.hasConfigFile(configFilePath) }
                     ?: throw IllegalStateException(
                         "Unable to find extension point configuration $configFilePath " +
                                 "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})"

compiler/tests-common/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     testCompile(project(":compiler:light-classes"))
     testCompile(project(":compiler:serialization"))
     testCompile(project(":kotlin-preloader"))
+    testCompile(project(":compiler:cli-common"))
     testCompile(project(":daemon-common"))
     testCompile(project(":daemon-common-new"))
     testCompile(project(":js:js.serializer"))