From 862497d320ebf32046f5c46b3d9ff23a1a5ab957 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 28 Apr 2016 12:37:22 +0300
Subject: [PATCH] external system: add kotlin runtime jar to the classpath of
 the remote process

---
 .../service/RemoteExternalSystemCommunicationManager.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java
index 1fc0ac9d4fd6..e0e4b4139828 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/RemoteExternalSystemCommunicationManager.java
@@ -66,6 +66,7 @@ import com.intellij.util.SystemProperties;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
 import kotlin.Unit;
+import kotlin.reflect.KotlinReflectionInternalError;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -154,6 +155,7 @@ public class RemoteExternalSystemCommunicationManager implements ExternalSystemC
 
         // add Kotlin runtime
         ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(Unit.class), classPath);
+        ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(KotlinReflectionInternalError.class), classPath);
 
         // External system module jars
         ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(getClass()), classPath);