From c0481ca5981f22be6095668cf251a41892803602 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Thu, 31 Mar 2016 15:27:04 +0300
Subject: [PATCH] Move injection to optional dependency

---
 idea/src/META-INF/injection.xml | 9 +++++++++
 idea/src/META-INF/plugin.xml    | 7 +------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 idea/src/META-INF/injection.xml

diff --git a/idea/src/META-INF/injection.xml b/idea/src/META-INF/injection.xml
new file mode 100644
index 00000000000..a313ac1337b
--- /dev/null
+++ b/idea/src/META-INF/injection.xml
@@ -0,0 +1,9 @@
+<idea-plugin>
+    <extensions defaultExtensionNs="com.intellij">
+        <languageInjector implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjector"/>
+    </extensions>
+
+    <extensions defaultExtensionNs="org.intellij.intelliLang">
+        <languageSupport implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjectionSupport"/>
+    </extensions>
+</idea-plugin>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index fd458449854..39e07135858 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -17,6 +17,7 @@
   <depends optional="true" config-file="android.xml">org.jetbrains.android</depends>
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
+  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
 
   <project-components>
     <component>
@@ -1433,12 +1434,6 @@
     <filetype.decompiler filetype="kotlin_builtins" implementationClass="com.intellij.psi.impl.compiled.ClassFileDecompiler"/>
 
     <pathMacroExpandableProtocol protocol="kotlin-js-meta"/>
-
-    <languageInjector implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjector" />
-  </extensions>
-
-  <extensions defaultExtensionNs="org.intellij.intelliLang">
-    <languageSupport implementation="org.jetbrains.kotlin.idea.injection.KotlinLanguageInjectionSupport"/>
   </extensions>
 
   <xi:include href="extensions/ide.xml" xpointer="xpointer(/idea-plugin/*)"/>