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

Load module annotations in IDE

Browse Source 
#KT-22759 Fixed
This commit is contained in:
Alexander Udalov
2018-01-25 17:53:57 +01:00
parent 890374a42a
commit 21e2a3c0b4
13 changed files with 193 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
+4 -4
View File
@@ -126,12 +126,12 @@ object MockLibraryUtil {
}
@JvmStatic
fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean): File {
fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List<String> = emptyList()): File {
val contentDir = KotlinTestUtils.tmpDir("testLibrary-" + jarName)
val outDir = File(contentDir, "out")
val outputFile = File(outDir, jarName + ".js")
compileKotlin2JS(sourcesPath, outputFile)
compileKotlin2JS(sourcesPath, outputFile, extraOptions)
return createJarFile(contentDir, outDir, jarName, sourcesPath.takeIf { addSources })
}
@@ -189,8 +189,8 @@ object MockLibraryUtil {
runJvmCompiler(args)
}
private fun compileKotlin2JS(sourcesPath: String, outputFile: File) {
runJsCompiler(listOf("-meta-info", "-output", outputFile.absolutePath, sourcesPath))
private fun compileKotlin2JS(sourcesPath: String, outputFile: File, extraOptions: List<String>) {
runJsCompiler(listOf("-meta-info", "-output", outputFile.absolutePath, sourcesPath, *extraOptions.toTypedArray()))
}
fun compileKotlinModule(buildFilePath: String) {