From f48a8d206a0c8dd315b1932b35a601627bb079fe Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 7 Apr 2015 16:11:54 +0300 Subject: [PATCH] JdkAndMockLibraryProjectDescriptor: support for Kotlin/Javascript library --- .../idea/test/JdkAndMockLibraryProjectDescriptor.java | 8 +++++++- 1 file changed, 7 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 91f6365913b..c472d7517bc 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 @@ -31,15 +31,21 @@ public class JdkAndMockLibraryProjectDescriptor extends JetLightProjectDescripto private final String sourcesPath; private final boolean withSources; + private final boolean isJsLibrary; public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources) { + this(sourcesPath, withSources, false); + } + + public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources, boolean isJsLibrary) { this.sourcesPath = sourcesPath; this.withSources = withSources; + this.isJsLibrary = isJsLibrary; } @Override public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { - File libraryJar = MockLibraryUtil.compileLibraryToJar(sourcesPath, LIBRARY_NAME, withSources); + File libraryJar = MockLibraryUtil.compileLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, isJsLibrary); String jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.getAbsolutePath()) + "!/"; Library.ModifiableModel libraryModel = model.getModuleLibraryTable().getModifiableModel().createLibrary(LIBRARY_NAME).getModifiableModel();