From 3b18a443405a907e98aa355586aaba5e5db1f643 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Wed, 29 Apr 2015 14:25:47 +0300
Subject: [PATCH] Allow to use Kotlin reflection in all modules with Kotlin

---
 .idea/libraries/kotlin_runtime.xml                       | 1 +
 idea-runner/runner.xml                                   | 9 +++++++++
 idea/src/META-INF/plugin.xml                             | 2 +-
 .../jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.idea/libraries/kotlin_runtime.xml b/.idea/libraries/kotlin_runtime.xml
index c1beaee97a9..217f24d439d 100644
--- a/.idea/libraries/kotlin_runtime.xml
+++ b/.idea/libraries/kotlin_runtime.xml
@@ -2,6 +2,7 @@
   <library name="kotlin-runtime">
     <CLASSES>
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-runtime.jar!/" />
+      <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/idea-runner/runner.xml b/idea-runner/runner.xml
index 171b40181b0..7e71933a07b 100644
--- a/idea-runner/runner.xml
+++ b/idea-runner/runner.xml
@@ -11,6 +11,7 @@
     </condition>
 
     <property name="bootstrap.runtime" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar"/>
+    <property name="bootstrap.reflect" location="${dependencies.dir}/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar"/>
 
     <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${dependencies.dir}/ant-contrib.jar"/>
 
@@ -45,8 +46,15 @@
             <isset property="bootstrap.or.local.build"/>
         </condition>
 
+        <condition property="reflect.to.copy"
+                   value="${bootstrap.reflect}"
+                   else="${basedir}/../dist/kotlinc/lib/kotlin-reflect.jar">
+            <isset property="bootstrap.or.local.build"/>
+        </condition>
+
         <!--suppress AntResolveInspection -->
         <copy file="${runtime.to.copy}" tofile="${artifact.output.path}/lib/kotlin-runtime.jar"/>
+        <copy file="${reflect.to.copy}" tofile="${artifact.output.path}/lib/kotlin-reflect.jar"/>
     </target>
 
     <target name="copy-runtime-for-jps-plugin" if="bootstrap.or.local.build">
@@ -55,6 +63,7 @@
         <!--suppress AntResolveInspection -->
         <jar update="true" destfile="${artifact.output.path}/kotlin-jps-plugin.jar">
             <zipgroupfileset file="${bootstrap.runtime}"/>
+            <zipgroupfileset file="${bootstrap.reflect}"/>
         </jar>
     </target>
 </project>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 4eb86c0279c..cd9abd0d912 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -223,7 +223,7 @@
 
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.JetFileFactory"/>
 
-    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-plugin.jar"/>
+    <compileServer.plugin classpath="jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-plugin.jar"/>
     <compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
 
diff --git a/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt b/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt
index 3763e86d5ec..12b8da13837 100644
--- a/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt
+++ b/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt
@@ -31,7 +31,7 @@ public class BareJpsPluginRegistrar : ApplicationComponent {
         }
         else {
             val compileServerPlugin = CompileServerPlugin()
-            compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-bare-plugin.jar")
+            compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar")
             compileServerPlugin.setPluginDescriptor(PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare")))
 
             Extensions.getRootArea()