azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure JdkAndMockLibrary with JS stdlib if jsLib flag is set

Browse Source
This commit is contained in:
Nikolay Krasko
2017-11-24 23:12:26 +03:00
parent 1bc8ad7852
commit a45fa9a33f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java
+5 -1
View File
@@ -71,7 +71,7 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri
Library.ModifiableModel libraryModel = model.getModuleLibraryTable().getModifiableModel().createLibrary(LIBRARY_NAME).getModifiableModel(); Library.ModifiableModel libraryModel = model.getModuleLibraryTable().getModifiableModel().createLibrary(LIBRARY_NAME).getModifiableModel();
libraryModel.addRoot(jarUrl, OrderRootType.CLASSES); libraryModel.addRoot(jarUrl, OrderRootType.CLASSES);
if (withRuntime) { if (withRuntime && !isJsLibrary) {
libraryModel.addRoot(getJarUrl(PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()), OrderRootType.CLASSES); libraryModel.addRoot(getJarUrl(PathUtil.getKotlinPathsForDistDirectory().getStdlibPath()), OrderRootType.CLASSES);
} }
if (withSources) { if (withSources) {
@@ -79,6 +79,10 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri
} }
libraryModel.commit(); libraryModel.commit();
if (withRuntime && isJsLibrary) {
KotlinStdJSProjectDescriptor.INSTANCE.configureModule(module, model);
}
} }
@NotNull @NotNull