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

In tests use stdlib sources from jar rather than from original locations

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-04-06 22:13:43 +03:00
parent 7ccbd36304
commit 136e6b64f2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java
+2 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtil;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
import java.io.File; import java.io.File;
@@ -36,9 +37,7 @@ public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeL
Library library = model.getModuleLibraryTable().getLibraryByName(Companion.getLIBRARY_NAME()); Library library = model.getModuleLibraryTable().getLibraryByName(Companion.getLIBRARY_NAME());
assert library != null; assert library != null;
Library.ModifiableModel modifiableModel = library.getModifiableModel(); Library.ModifiableModel modifiableModel = library.getModifiableModel();
modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES); modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(ForTestCompileRuntime.runtimeSourcesJarForTests()), OrderRootType.SOURCES);
modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("core/builtins/src")), OrderRootType.SOURCES);
modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("core/builtins/native")), OrderRootType.SOURCES);
modifiableModel.commit(); modifiableModel.commit();
} }
} }