From a45fa9a33feb3b0e51be569c6a1eb65e26188e41 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 24 Nov 2017 23:12:26 +0300
Subject: [PATCH] Configure JdkAndMockLibrary with JS stdlib if jsLib flag is
 set

---
 .../idea/test/JdkAndMockLibraryProjectDescriptor.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java
index 94a7d4bed9f..aadc32f5adf 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java
@@ -71,7 +71,7 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri
 
         Library.ModifiableModel libraryModel = model.getModuleLibraryTable().getModifiableModel().createLibrary(LIBRARY_NAME).getModifiableModel();
         libraryModel.addRoot(jarUrl, OrderRootType.CLASSES);
-        if (withRuntime) {
+        if (withRuntime && !isJsLibrary) {
             libraryModel.addRoot(getJarUrl(PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()), OrderRootType.CLASSES);
         }
         if (withSources) {
@@ -79,6 +79,10 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri
         }
 
         libraryModel.commit();
+
+        if (withRuntime && isJsLibrary) {
+            KotlinStdJSProjectDescriptor.INSTANCE.configureModule(module, model);
+        }
     }
 
     @NotNull