From ec99585eb9844794028a1462a34c48258b07d876 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 15 Jul 2021 18:50:12 +0300
Subject: [PATCH] Remove explicit registration of classFileDecompiler EP and
 core.xml

---
 .../resources/META-INF/extensions/core.xml    | 12 ------
 .../cli/jvm/compiler/KotlinCoreEnvironment.kt |  5 ---
 .../test/JUnit3RunnerWithInnersForJPS.java    |  1 -
 prepare/compiler-embeddable/build.gradle.kts  | 40 -------------------
 4 files changed, 58 deletions(-)
 delete mode 100644 compiler/cli/cli-common/resources/META-INF/extensions/core.xml

diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/core.xml b/compiler/cli/cli-common/resources/META-INF/extensions/core.xml
deleted file mode 100644
index bc2b356021d..00000000000
--- a/compiler/cli/cli-common/resources/META-INF/extensions/core.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<idea-plugin>
-    <id>org.jetbrains.kotlin</id>
-    <version>1.2</version>
-
-    <!-- Don't add more extension points here! Logic in KotlinCoreEnvironment assumes that there is only one EP.  -->
-    <!-- And this file should be removed once 202 is no longer supported -->
-    <extensionPoints>
-        <extensionPoint qualifiedName="com.intellij.psi.classFileDecompiler"
-                        interface="com.intellij.psi.compiled.ClassFileDecompilers$Decompiler"
-                        dynamic="true"/>
-    </extensionPoints>
-</idea-plugin>
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 7b839b52d3a..9c32047869e 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
@@ -538,11 +538,6 @@ class KotlinCoreEnvironment private constructor(
             val applicationEnvironment = KotlinCoreApplicationEnvironment.create(parentDisposable, unitTestMode)
 
             registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/compiler.xml")
-            // FIX ME WHEN BUNCH 202 REMOVED: this code is required to support compiler bundled to both 202 and 203.
-            // Please, remove "com.intellij.psi.classFileDecompiler" EP registration once 202 is no longer supported by the compiler
-            if (!ApplicationManager.getApplication().extensionArea.hasExtensionPoint("com.intellij.psi.classFileDecompiler")) {
-                registerApplicationExtensionPointsAndExtensionsFrom(configuration, "extensions/core.xml")
-            }
 
             registerApplicationServicesForCLI(applicationEnvironment)
             registerApplicationServices(applicationEnvironment)
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
index af956918e57..1c4fe64c090 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java
@@ -88,7 +88,6 @@ public class JUnit3RunnerWithInnersForJPS extends Runner implements Filterable,
      */
     private static void ensureCompilerExtensionFilesExists() {
         copyCompilerResourceFile("compiler.xml");
-        copyCompilerResourceFile("core.xml");
     }
 
     private static void copyCompilerResourceFile(String fileName) {
diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts
index 70285aab0c4..d573eaf6bc7 100644
--- a/prepare/compiler-embeddable/build.gradle.kts
+++ b/prepare/compiler-embeddable/build.gradle.kts
@@ -48,51 +48,11 @@ compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") {
     archiveClassifier.set("dummy")
 })
 
-class CoreXmlShadingTransformer : Transformer {
-    companion object {
-        private const val XML_NAME = "META-INF/extensions/core.xml"
-    }
-
-    @kotlin.jvm.Transient
-    private var content: StringBuilder? = StringBuilder()
-
-    private fun ensureStringBuilderExist() {
-        if (content == null) {
-            content = StringBuilder()
-        }
-    }
-
-    override fun canTransformResource(element: FileTreeElement): Boolean {
-        return (element.name == XML_NAME)
-    }
-
-    override fun transform(context: TransformerContext) {
-        ensureStringBuilderExist()
-        val text = context.`is`.bufferedReader().lines()
-            .map { it.replace("com.intellij.psi", "org.jetbrains.kotlin.com.intellij.psi") }
-            .collect(Collectors.joining("\n"))
-        content!!.appendln(text)
-        context.`is`.close()
-    }
-
-    override fun hasTransformedResource(): Boolean {
-        return content?.isNotEmpty() ?: false
-    }
-
-    override fun modifyOutputStream(outputStream: ZipOutputStream, preserveFileTimestamps: Boolean) {
-        if (content == null) return
-        val entry = ZipEntry(XML_NAME)
-        outputStream.putNextEntry(entry)
-        outputStream.write(content.toString().toByteArray())
-    }
-}
 
 val runtimeJar = runtimeJar(embeddableCompiler()) {
     exclude("com/sun/jna/**")
     exclude("org/jetbrains/annotations/**")
     mergeServiceFiles()
-
-    transform(CoreXmlShadingTransformer::class.java)
 }
 
 sourcesJar()