From 493005012d7af7ae55c02e5488264f7ba71fc093 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 28 Apr 2016 12:32:45 +0300 Subject: [PATCH] external system: add kotlin runtime jar to the classpath of the remote process --- .../service/RemoteExternalSystemCommunicationManager.java | 4 ++++ 1 file changed, 4 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 2b9a4e344244..1fc0ac9d4fd6 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 @@ -65,6 +65,7 @@ import com.intellij.util.PathUtil; import com.intellij.util.SystemProperties; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.ContainerUtilRt; +import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -151,6 +152,9 @@ public class RemoteExternalSystemCommunicationManager implements ExternalSystemC ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(EmptyModuleType.class), classPath); ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(LanguageLevel.class), classPath); + // add Kotlin runtime + ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(Unit.class), classPath); + // External system module jars ContainerUtil.addIfNotNull(PathUtil.getJarPathForClass(getClass()), classPath); // external-system-rt.jar