From a4f8c6734c2e0f6c18dc0e78cdb01b6821e75553 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 25 May 2020 12:25:47 +0300
Subject: [PATCH] FIR IDE: Introduce ide-frontend-independent.xml extensions

---
 .../META-INF/extensions/ide-frontend-independent.xml     | 9 +++++++++
 idea/resources/META-INF/extensions/ide.xml               | 9 ++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 idea/resources/META-INF/extensions/ide-frontend-independent.xml

diff --git a/idea/resources/META-INF/extensions/ide-frontend-independent.xml b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
new file mode 100644
index 00000000000..ca08c1de0a7
--- /dev/null
+++ b/idea/resources/META-INF/extensions/ide-frontend-independent.xml
@@ -0,0 +1,9 @@
+<idea-plugin>
+  <extensionPoints>
+    <extensionPoint qualifiedName="org.jetbrains.kotlin.beforeResolveHighlightingVisitor"
+                    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"/>
+  </extensionPoints>
+</idea-plugin>
\ No newline at end of file
diff --git a/idea/resources/META-INF/extensions/ide.xml b/idea/resources/META-INF/extensions/ide.xml
index 13a4a06ad0f..24ed62a86eb 100644
--- a/idea/resources/META-INF/extensions/ide.xml
+++ b/idea/resources/META-INF/extensions/ide.xml
@@ -1,4 +1,6 @@
-<idea-plugin>
+<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="ide-frontend-independent.xml" xpointer="xpointer(/idea-plugin/*)"/>
+
     <extensionPoints>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.updater" beanClass="com.intellij.openapi.fileTypes.FileTypeExtensionPoint"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.projectConfigurator" interface="org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator"/>
@@ -18,8 +20,7 @@
             <with attribute="implementationClass" implements="org.jetbrains.kotlin.idea.scratch.ScratchFileLanguageProvider"/>
         </extensionPoint>
 
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.binaryExtension"
-                        interface="org.jetbrains.kotlin.idea.util.KotlinBinaryExtension"/>
+
         <extensionPoint qualifiedName="org.jetbrains.kotlin.facetValidatorCreator"
                         interface="org.jetbrains.kotlin.idea.facet.KotlinFacetValidatorCreator"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.clearBuildState"
@@ -28,8 +29,6 @@
                         interface="org.jetbrains.kotlin.idea.actions.NewKotlinFileHook"/>
         <extensionPoint qualifiedName="org.jetbrains.kotlin.completionExtension"
                         interface="org.jetbrains.kotlin.idea.completion.KotlinCompletionExtension"/>
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.buildSystemTypeDetector"
-                        interface="org.jetbrains.kotlin.idea.configuration.BuildSystemTypeDetector"/>
 
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.scriptAdditionalIdeaDependenciesProvider"