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

Minor, rename val EXTENSION_REGISTRY -> extensionRegistry

Browse Source
This commit is contained in:
Alexander Udalov
2015-07-02 18:32:28 +03:00
parent 110d6fa7f1
commit c8439ae6fc
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
+1 -1
View File
@@ -33,7 +33,7 @@ public class KotlinJavascriptPackageFragment(
protected override fun loadClassNames(packageProto: ProtoBuf.Package): Collection<Name> {
val classesStream = loadResourceSure(KotlinJavascriptSerializedResourcePaths.getClassesInPackageFilePath(fqName))
val classesProto = JsProtoBuf.Classes.parseFrom(classesStream, serializedResourcePaths.EXTENSION_REGISTRY)
val classesProto = JsProtoBuf.Classes.parseFrom(classesStream, serializedResourcePaths.extensionRegistry)
return classesProto.getClassNameList()?.map { id -> nameResolver.getName(id) } ?: listOf()
}
}
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt
+2 -2
View File
@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.serialization.SerializedResourcePaths
public object KotlinJavascriptSerializedResourcePaths : SerializedResourcePaths() {
public override val EXTENSION_REGISTRY: ExtensionRegistryLite = ExtensionRegistryLite.newInstance()
public override val extensionRegistry: ExtensionRegistryLite = ExtensionRegistryLite.newInstance()
init {
JsProtoBuf.registerAllExtensions(EXTENSION_REGISTRY)
JsProtoBuf.registerAllExtensions(extensionRegistry)
}
private val CLASSES_FILE_EXTENSION = "kotlin_classes"
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt
+2 -2
View File
@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import java.io.ByteArrayInputStream
public fun ByteArray.toPackageData(nameResolver: NameResolver): PackageData {
val registry = KotlinJavascriptSerializedResourcePaths.EXTENSION_REGISTRY
val registry = KotlinJavascriptSerializedResourcePaths.extensionRegistry
val packageProto = ProtoBuf.Package.parseFrom(ByteArrayInputStream(this), registry)
return PackageData(nameResolver, packageProto)
}
public fun ByteArray.toClassData(nameResolver: NameResolver): ClassData {
val registry = KotlinJavascriptSerializedResourcePaths.EXTENSION_REGISTRY
val registry = KotlinJavascriptSerializedResourcePaths.extensionRegistry
val classProto = ProtoBuf.Class.parseFrom(ByteArrayInputStream(this), registry)
return ClassData(nameResolver, classProto)
}