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

Add debugName to ModuleMapping

Browse Source
This commit is contained in:
Alexander Udalov
2016-09-29 18:01:08 +03:00
parent 74ad6b1410
commit 97f2051a03
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
+1 -1
View File
@@ -36,7 +36,7 @@ private fun List<PackageParts>.addCompiledParts(state: GenerationState): List<Pa
val incrementalCache = state.incrementalCacheForThisTarget ?: return this
val moduleMappingData = incrementalCache.getModuleMappingData() ?: return this
val mapping = ModuleMapping.create(moduleMappingData)
val mapping = ModuleMapping.create(moduleMappingData, "<incremental>")
incrementalCache.getObsoletePackageParts().forEach {
val i = it.lastIndexOf('/')
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmPackagePartProvider.kt
+4 -5
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.cli.jvm.compiler
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.SmartList
import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -61,13 +60,13 @@ class JvmPackagePartProvider(val env: KotlinCoreEnvironment) : PackagePartProvid
loadedModules.addAll(relevantRoots.mapNotNull {
it.findChild("META-INF")
}.flatMap {
it.children.filter<VirtualFile> { it.name.endsWith(ModuleMapping.MAPPING_FILE_EXT) }
}.map {
it.children.filter { it.name.endsWith(ModuleMapping.MAPPING_FILE_EXT) }
}.map { file ->
try {
ModuleMapping.create(it.contentsToByteArray())
ModuleMapping.create(file.contentsToByteArray(), file.toString())
}
catch (e: EOFException) {
throw RuntimeException("Error on reading package parts for '$packageFqName' package in '$it', roots: $notLoadedRoots", e)
throw RuntimeException("Error on reading package parts for '$packageFqName' package in '$file', roots: $notLoadedRoots", e)
}
})
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+1 -1
View File
@@ -90,7 +90,7 @@ class IncrementalPackageFragmentProvider(
MemberScope.Empty
}
else {
val moduleMapping = incrementalCache.getModuleMappingData()?.let { ModuleMapping.create(it) }
val moduleMapping = incrementalCache.getModuleMappingData()?.let { ModuleMapping.create(it, "<incremental>") }
val actualPackagePartFiles =
moduleMapping?.findPackageParts(fqName.asString())?.let {
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackagePartProvider.kt
+5 -1
View File
@@ -28,7 +28,11 @@ internal class IncrementalPackagePartProvider private constructor(
incrementalCaches: List<IncrementalCache>,
storageManager: StorageManager
) : PackagePartProvider {
private val moduleMappings = storageManager.createLazyValue { incrementalCaches.map { ModuleMapping.create(it.getModuleMappingData()) } }
private val moduleMappings = storageManager.createLazyValue {
incrementalCaches.map { cache ->
ModuleMapping.create(cache.getModuleMappingData(), "<incremental>")
}
}
override fun findPackageParts(packageFqName: String): List<String> {
return (moduleMappings().mapNotNull { it.findPackageParts(packageFqName) }.flatMap { it.parts } +