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

KT-3008: multiple minor fixes after code review

Browse Source
This commit is contained in:
Alexey Andreev
2016-06-21 14:26:52 +03:00
parent 713a7efcdf
commit 97605a97da
20 changed files with 190 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+2 -4
View File
@@ -58,10 +58,8 @@ object KotlinJavascriptSerializationUtil {
@JvmStatic fun readModule(metadata: ByteArray, storageManager: StorageManager,
kotlinModule: ModuleDescriptor): JsModuleDescriptor<PackageFragmentProvider?> {
val prototype = metadata.toContentMap()
val packageFragmentProvider = createPackageFragmentProvider(kotlinModule, prototype.contentMap, storageManager)
return JsModuleDescriptor(kotlinModule.name.asString(), prototype.kind, prototype.imported, packageFragmentProvider)
val jsModule = metadata.readAsContentMap(kotlinModule.name.asString())
return jsModule.copy(createPackageFragmentProvider(kotlinModule, jsModule.data, storageManager))
}
@JvmStatic private fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, contentMap: Map<String, ByteArray>,