From 6fe800eea011f3c076438204a6716dc295ee6d37 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Fri, 17 Apr 2020 12:53:27 +0200
Subject: [PATCH] Convert KotlinNativeABICompatibilityChecker into a startup
 activity

Relates to #KT-38318
---
 idea/resources/META-INF/native-common.xml | 31 +++++++++++++++++++++
 idea/resources/META-INF/native.xml        | 33 +----------------------
 idea/resources/META-INF/native.xml.192    |  7 +++++
 idea/resources/META-INF/plugin.xml        |  2 ++
 idea/resources/META-INF/plugin.xml.191    |  2 ++
 idea/resources/META-INF/plugin.xml.192    |  2 ++
 idea/resources/META-INF/plugin.xml.201    |  2 ++
 idea/resources/META-INF/plugin.xml.as35   |  2 ++
 idea/resources/META-INF/plugin.xml.as36   |  2 ++
 idea/resources/META-INF/plugin.xml.as40   |  2 ++
 10 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100644 idea/resources/META-INF/native-common.xml
 create mode 100644 idea/resources/META-INF/native.xml.192

diff --git a/idea/resources/META-INF/native-common.xml b/idea/resources/META-INF/native-common.xml
new file mode 100644
index 00000000000..b28b66c048a
--- /dev/null
+++ b/idea/resources/META-INF/native-common.xml
@@ -0,0 +1,31 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+    <application-components>
+        <component>
+            <implementation-class>org.jetbrains.kotlin.idea.klib.KlibLoadingMetadataCache</implementation-class>
+        </component>
+    </application-components>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <psi.classFileDecompiler implementation="org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeMetadataDecompiler"/>
+
+        <fileType.fileViewProviderFactory filetype="KNM"
+                                          implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
+        <filetype.stubBuilder filetype="KNM" implementationClass="com.intellij.psi.impl.compiled.ClassFileStubBuilder"/>
+        <filetype.decompiler filetype="KNM" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
+        <fileTypeFactory implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeFileTypeFactory"/>
+        <fileBasedIndex implementation="org.jetbrains.kotlin.idea.vfilefinder.KlibMetaFileIndex"/>
+        <library.type implementation="org.jetbrains.kotlin.ide.konan.NativeLibraryType"/>
+        <lang.parserDefinition language="KND" implementationClass="org.jetbrains.kotlin.ide.konan.NativeDefinitionsParserDefinition"/>
+        <lang.syntaxHighlighterFactory language="KND" implementationClass="org.jetbrains.kotlin.ide.konan.NativeDefinitionsSyntaxHighlighterFactory"/>
+        <languageInjector implementation="org.jetbrains.kotlin.ide.konan.CLanguageInjector"/>
+        <runConfigurationProducer implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeRunConfigurationProducer"/>
+    </extensions>
+
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KlibMetaBinary"/>
+        <idePlatformKind implementation="org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind"/>
+        <idePlatformKindTooling implementation="org.jetbrains.kotlin.ide.konan.NativeIdePlatformKindTooling"/>
+        <idePlatformKindResolution implementation="org.jetbrains.kotlin.ide.konan.NativePlatformKindResolution"/>
+        <projectConfigurator implementation="org.jetbrains.kotlin.ide.konan.gradle.KotlinNativeGradleConfigurator"/>
+      </extensions>
+</idea-plugin>
diff --git a/idea/resources/META-INF/native.xml b/idea/resources/META-INF/native.xml
index 8ed78bec442..2242c8a48ac 100644
--- a/idea/resources/META-INF/native.xml
+++ b/idea/resources/META-INF/native.xml
@@ -1,36 +1,5 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-    <project-components>
-        <component>
-            <implementation-class>org.jetbrains.kotlin.ide.konan.KotlinNativeABICompatibilityChecker</implementation-class>
-        </component>
-    </project-components>
-    <application-components>
-        <component>
-            <implementation-class>org.jetbrains.kotlin.idea.klib.KlibLoadingMetadataCache</implementation-class>
-        </component>
-    </application-components>
-
     <extensions defaultExtensionNs="com.intellij">
-        <psi.classFileDecompiler implementation="org.jetbrains.kotlin.ide.konan.decompiler.KotlinNativeMetadataDecompiler"/>
-
-        <fileType.fileViewProviderFactory filetype="KNM"
-                                          implementationClass="com.intellij.psi.ClassFileViewProviderFactory"/>
-        <filetype.stubBuilder filetype="KNM" implementationClass="com.intellij.psi.impl.compiled.ClassFileStubBuilder"/>
-        <filetype.decompiler filetype="KNM" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
-        <fileTypeFactory implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeFileTypeFactory"/>
-        <fileBasedIndex implementation="org.jetbrains.kotlin.idea.vfilefinder.KlibMetaFileIndex"/>
-        <library.type implementation="org.jetbrains.kotlin.ide.konan.NativeLibraryType"/>
-        <lang.parserDefinition language="KND" implementationClass="org.jetbrains.kotlin.ide.konan.NativeDefinitionsParserDefinition"/>
-        <lang.syntaxHighlighterFactory language="KND" implementationClass="org.jetbrains.kotlin.ide.konan.NativeDefinitionsSyntaxHighlighterFactory"/>
-        <languageInjector implementation="org.jetbrains.kotlin.ide.konan.CLanguageInjector"/>
-        <runConfigurationProducer implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeRunConfigurationProducer"/>
+        <postStartupActivity implementation="org.jetbrains.kotlin.ide.konan.KotlinNativeABICompatibilityChecker"/>
     </extensions>
-
-    <extensions defaultExtensionNs="org.jetbrains.kotlin">
-        <binaryExtension implementation="org.jetbrains.kotlin.idea.util.KlibMetaBinary"/>
-        <idePlatformKind implementation="org.jetbrains.kotlin.platform.impl.NativeIdePlatformKind"/>
-        <idePlatformKindTooling implementation="org.jetbrains.kotlin.ide.konan.NativeIdePlatformKindTooling"/>
-        <idePlatformKindResolution implementation="org.jetbrains.kotlin.ide.konan.NativePlatformKindResolution"/>
-        <projectConfigurator implementation="org.jetbrains.kotlin.ide.konan.gradle.KotlinNativeGradleConfigurator"/>
-      </extensions>
 </idea-plugin>
diff --git a/idea/resources/META-INF/native.xml.192 b/idea/resources/META-INF/native.xml.192
new file mode 100644
index 00000000000..60fe74140b3
--- /dev/null
+++ b/idea/resources/META-INF/native.xml.192
@@ -0,0 +1,7 @@
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+    <project-components>
+        <component>
+            <implementation-class>org.jetbrains.kotlin.ide.konan.KotlinNativeABICompatibilityChecker</implementation-class>
+        </component>
+    </project-components>
+</idea-plugin>
diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources/META-INF/plugin.xml
index 81781a23d34..e2e2615c292 100644
--- a/idea/resources/META-INF/plugin.xml
+++ b/idea/resources/META-INF/plugin.xml
@@ -48,7 +48,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191
index d06c9be159d..271f1801886 100644
--- a/idea/resources/META-INF/plugin.xml.191
+++ b/idea/resources/META-INF/plugin.xml.191
@@ -47,7 +47,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.192 b/idea/resources/META-INF/plugin.xml.192
index d3dae3286f2..26ac2ebd8ae 100644
--- a/idea/resources/META-INF/plugin.xml.192
+++ b/idea/resources/META-INF/plugin.xml.192
@@ -47,7 +47,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources/META-INF/plugin.xml.201
index 992143deb11..a6f8fdb02df 100644
--- a/idea/resources/META-INF/plugin.xml.201
+++ b/idea/resources/META-INF/plugin.xml.201
@@ -48,7 +48,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.as35 b/idea/resources/META-INF/plugin.xml.as35
index 816fc4f071e..e0cf902c639 100644
--- a/idea/resources/META-INF/plugin.xml.as35
+++ b/idea/resources/META-INF/plugin.xml.as35
@@ -48,7 +48,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.as36 b/idea/resources/META-INF/plugin.xml.as36
index f607fdad523..8002dae9d90 100644
--- a/idea/resources/META-INF/plugin.xml.as36
+++ b/idea/resources/META-INF/plugin.xml.as36
@@ -48,7 +48,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>
diff --git a/idea/resources/META-INF/plugin.xml.as40 b/idea/resources/META-INF/plugin.xml.as40
index a2167a10b80..a046fbfd3e6 100644
--- a/idea/resources/META-INF/plugin.xml.as40
+++ b/idea/resources/META-INF/plugin.xml.as40
@@ -47,7 +47,9 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio.
   <xi:include href="jvm.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <!-- CIDR-PLUGIN-EXCLUDE-END -->
 
+  <xi:include href="native-common.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="native.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
   <xi:include href="tipsAndTricks.xml" xpointer="xpointer(/idea-plugin/*)"/>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>