From 1b97511248e7d4794a7297734b72202f6914e6ae Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 1 Sep 2020 18:05:40 +0300
Subject: [PATCH] as42: Register classFileDecompiler through xml

It doesn't work otherwise. It's expected that extension point is registered
at the moment of ClassFileDecompilers instatiation or it fails.
---
 .../META-INF/extensions/compiler.xml.as42     | 71 +++++++++++++++++++
 ...KotlinCoreApplicationEnvironment.java.as42 |  2 -
 2 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml.as42

diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml.as42 b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml.as42
new file mode 100644
index 00000000000..86ede9124a3
--- /dev/null
+++ b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml.as42
@@ -0,0 +1,71 @@
+<idea-plugin>
+    <id>org.jetbrains.kotlin</id>
+    <version>1.2</version>
+
+    <extensionPoints>
+        <extensionPoint qualifiedName="com.intellij.psi.classFileDecompiler"
+                        interface="com.intellij.psi.compiled.ClassFileDecompilers$Decompiler"
+                        dynamic="true"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.analyzeCompleteHandlerExtension"
+                        interface="org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.extensions.internal.callResolutionInterceptorExtension"
+                        interface="org.jetbrains.kotlin.extensions.internal.CallResolutionInterceptorExtension"
+                        area="IDEA_PROJECT"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.extensions.internal.typeResolutionInterceptorExtension"
+                        interface="org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptorExtension"
+                        area="IDEA_PROJECT"/>
+        <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"/>
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"
+                        interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
+    </extensionPoints>
+</idea-plugin>
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.as42 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.as42
index 4394e43dfbf..a6174901ed9 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.as42
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreApplicationEnvironment.java.as42
@@ -14,7 +14,6 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.intellij.psi.FileContextProvider;
 import com.intellij.psi.augment.PsiAugmentProvider;
-import com.intellij.psi.compiled.ClassFileDecompilers;
 import com.intellij.psi.meta.MetaDataContributor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,7 +39,6 @@ public class KotlinCoreApplicationEnvironment extends JavaCoreApplicationEnviron
         registerApplicationExtensionPoint(JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider.class);
 
         registerApplicationExtensionPoint(ContainerProvider.EP_NAME, ContainerProvider.class);
-        registerApplicationExtensionPoint(ClassFileDecompilers.getInstance().EP_NAME, ClassFileDecompilers.Decompiler.class);
 
         registerApplicationExtensionPoint(MetaLanguage.EP_NAME, MetaLanguage.class);