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

JS: support new names for built-in metadata files starting with dot

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-04-22 21:51:25 +03:00
committed by Alexander Udalov
parent 20cd360b07
commit 7e69c414d4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+11 -5
View File
@@ -41,7 +41,7 @@ import java.util.zip.GZIPOutputStream
import kotlin.platform.platformStatic import kotlin.platform.platformStatic
public object KotlinJavascriptSerializationUtil { public object KotlinJavascriptSerializationUtil {
private val PACKAGE_FILE_SUFFIX = "/.kotlin_package" private val PACKAGE_FILE_EXT = ".kotlin_package"
platformStatic platformStatic
public fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, metadata: ByteArray, storageManager: StorageManager): PackageFragmentProvider? { public fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, metadata: ByteArray, storageManager: StorageManager): PackageFragmentProvider? {
@@ -117,19 +117,25 @@ public object KotlinJavascriptSerializationUtil {
val fragments = module.getPackageFragmentProvider().getPackageFragments(fqName) val fragments = module.getPackageFragmentProvider().getPackageFragments(fqName)
val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments") val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments")
packageProto.writeTo(packageStream) packageProto.writeTo(packageStream)
// TODO: don't use fallback paths here writeFun(BuiltInsSerializationUtil.getPackageFilePath(fqName), packageStream)
writeFun(BuiltInsSerializationUtil.FallbackPaths.getPackageFilePath(fqName), packageStream)
val nameStream = ByteArrayOutputStream() val nameStream = ByteArrayOutputStream()
val strings = serializer.getStringTable() val strings = serializer.getStringTable()
SerializationUtil.serializeStringTable(nameStream, strings.serializeSimpleNames(), strings.serializeQualifiedNames()) SerializationUtil.serializeStringTable(nameStream, strings.serializeSimpleNames(), strings.serializeQualifiedNames())
writeFun(BuiltInsSerializationUtil.FallbackPaths.getStringTableFilePath(fqName), nameStream) writeFun(BuiltInsSerializationUtil.getStringTableFilePath(fqName), nameStream)
} }
fun getFileName(classDescriptor: ClassDescriptor): String { fun getFileName(classDescriptor: ClassDescriptor): String {
return BuiltInsSerializationUtil.getClassMetadataPath(classDescriptor.classId) return BuiltInsSerializationUtil.getClassMetadataPath(classDescriptor.classId)
} }
private fun getPackageName(filePath: String): String {
val lastIndexOfSep = filePath.lastIndexOf('/')
assert(lastIndexOfSep >= 0, "expected / in $filePath")
return filePath.substring(0, lastIndexOfSep).replace('/', '.')
}
private fun getPackages(contentMap: Map<String, ByteArray>): List<String> = private fun getPackages(contentMap: Map<String, ByteArray>): List<String> =
contentMap.keySet().filter { it.endsWith(PACKAGE_FILE_SUFFIX) } map { it.substring(0, it.length() - PACKAGE_FILE_SUFFIX.length()).replace('/', '.') } contentMap.keySet().filter { it.endsWith(PACKAGE_FILE_EXT) }.map { getPackageName(it) }
} }