From 7c2112d0140fc1d86adfc183b0e643d07bc0741f Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Mon, 5 Oct 2020 14:25:46 +0200
Subject: [PATCH] Prepare for KT dynamic plugin: make EP dynamic

Relates to ^KT-38518
---
 .../META-INF/extensions/compiler.xml          | 39 +++++++++++--------
 .../extensions/ide-frontend-independent.xml   |  7 +++-
 idea/resources/META-INF/extensions/ide.xml    |  8 ++--
 idea/resources/META-INF/gradle.xml            |  6 ++-
 4 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
index 9beed2476e6..45c43a722f2 100644
--- a/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
+++ b/compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml
@@ -13,55 +13,60 @@
                         interface="org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptorExtension"
                         area="IDEA_PROJECT"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.diagnosticSuppressor"
-                        interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor"/>
+                        interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticSuppressor"
+                        dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.expressionCodegenExtension"
                         interface="org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.syntheticResolveExtension"
                         interface="org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.jsSyntheticTranslateExtension"
                         interface="org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.irGenerationExtension"
                         interface="org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.simpleNameReferenceExtension"
                         interface="org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.kotlinIndicesHelperExtension"
                         interface="org.jetbrains.kotlin.idea.core.extension.KotlinIndicesHelperExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.classBuilderFactoryInterceptorExtension"
                         interface="org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.packageFragmentProviderExtension"
                         interface="org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.quickFixContributor"
-                        interface="org.jetbrains.kotlin.idea.quickfix.QuickFixContributor"/>
+                        interface="org.jetbrains.kotlin.idea.quickfix.QuickFixContributor"
+                        dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.storageComponentContainerContributor"
                         interface="org.jetbrains.kotlin.extensions.StorageComponentContainerContributor"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptDefinitionContributor"
                         interface="org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <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"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
         <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"/>
+                        interface="org.jetbrains.kotlin.idea.facet.KotlinVersionInfoProvider"
+                        dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.completionInformationProvider"
-                        interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider" />
+                        interface="org.jetbrains.kotlin.idea.completion.CompletionInformationProvider"
+                        dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.moduleBuilder"
-                        interface="com.intellij.ide.util.projectWizard.ModuleBuilder"/>
+                        interface="com.intellij.ide.util.projectWizard.ModuleBuilder" dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.renameHandler"
-                        interface="com.intellij.refactoring.rename.RenameHandler"/>
+                        interface="com.intellij.refactoring.rename.RenameHandler"
+                        dynamic="true"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"
                         interface="org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar"/>
     </extensionPoints>
diff --git a/idea/resources/META-INF/extensions/ide-frontend-independent.xml b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
index 078ee5e4f83..e72078c6a8c 100644
--- a/idea/resources/META-INF/extensions/ide-frontend-independent.xml
+++ b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
@@ -4,8 +4,11 @@
                     interface="org.jetbrains.kotlin.idea.highlighter.BeforeResolveHighlightingExtension"/>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.binaryExtension" interface="org.jetbrains.kotlin.idea.util.KotlinBinaryExtension"/>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.buildSystemTypeDetector"
-                    interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"/>
-    <extensionPoint qualifiedName="org.jetbrains.kotlin.projectConfigurator" interface="org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator"/>
+                    interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"
+                    dynamic="true"/>
+    <extensionPoint qualifiedName="org.jetbrains.kotlin.projectConfigurator"
+                    interface="org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator"
+                    dynamic="true"/>
     <extensionPoint qualifiedName="org.jetbrains.kotlin.newFileHook"
                     interface="org.jetbrains.kotlin.idea.actions.NewKotlinFileHook"/>
   </extensionPoints>
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index 6242950216e..c8bf0deb8fe 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -9,7 +9,8 @@
                         area="IDEA_PROJECT"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.highlighterExtension"
-                        interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"/>
+                        interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"
+                        dynamic="true"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.ultraLightClassModifierExtension"
                         interface="org.jetbrains.kotlin.asJava.UltraLightClassModifierExtension"
@@ -35,14 +36,15 @@
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptDefinitionsProvider"
                         interface="kotlin.script.experimental.intellij.ScriptDefinitionsProvider"
-                        area="IDEA_PROJECT"/>
+                        area="IDEA_PROJECT" dynamic="true"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.syntheticScopeProviderExtension"
                         interface="org.jetbrains.kotlin.synthetic.SyntheticScopeProviderExtension"
                         area="IDEA_PROJECT"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.resolveScopeEnlarger"
-                        interface="org.jetbrains.kotlin.idea.caches.resolve.util.KotlinResolveScopeEnlarger"/>
+                        interface="org.jetbrains.kotlin.idea.caches.resolve.util.KotlinResolveScopeEnlarger"
+                        dynamic="true"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.j2kConverterExtension"
                         interface="org.jetbrains.kotlin.j2k.J2kConverterExtension"/>
diff --git a/idea/resources/META-INF/gradle.xml b/idea/resources/META-INF/gradle.xml
index d9cd19bf75f..d63de1bb92a 100644
--- a/idea/resources/META-INF/gradle.xml
+++ b/idea/resources/META-INF/gradle.xml
@@ -1,10 +1,12 @@
 <idea-plugin>
     <extensionPoints>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.gradleProjectImportHandler" area="IDEA_PROJECT"
-                        interface="org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler"/>
+                        interface="org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler"
+                        dynamic="true"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.gradleModelFacade"
-                        interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade"/>
+                        interface="org.jetbrains.kotlin.idea.inspections.gradle.KotlinGradleModelFacade"
+                        dynamic="true"/>
     </extensionPoints>
 
     <extensions defaultExtensionNs="org.jetbrains.kotlin">