From c8439ae6fc139b3d93d535c3aad3a93c9efa2bab Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 2 Jul 2015 18:32:28 +0300 Subject: [PATCH] Minor, rename val EXTENSION_REGISTRY -> extensionRegistry --- .../kotlin/builtins/BuiltInsSerializedResourcePaths.kt | 6 +++--- .../kotlin/serialization/SerializedResourcePaths.kt | 5 ++--- .../deserialization/DeserializedPackageFragment.kt | 2 +- .../deserialization/ResourceLoadingClassDataFinder.kt | 2 +- .../serialization/js/KotlinJavascriptPackageFragment.kt | 2 +- .../js/KotlinJavascriptSerializedResourcePaths.kt | 4 ++-- .../org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt index 8665aadb694..5531c86eb65 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializedResourcePaths.kt @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.serialization.SerializedResourcePaths import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf public object BuiltInsSerializedResourcePaths : SerializedResourcePaths() { - public override val EXTENSION_REGISTRY: ExtensionRegistryLite + public override val extensionRegistry: ExtensionRegistryLite init { - EXTENSION_REGISTRY = ExtensionRegistryLite.newInstance() - BuiltInsProtoBuf.registerAllExtensions(EXTENSION_REGISTRY) + extensionRegistry = ExtensionRegistryLite.newInstance() + BuiltInsProtoBuf.registerAllExtensions(extensionRegistry) } private val CLASS_METADATA_FILE_EXTENSION = "kotlin_class" diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt index af3851d61ba..63c4f0d3c4c 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializedResourcePaths.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName public abstract class SerializedResourcePaths { - public abstract val EXTENSION_REGISTRY: ExtensionRegistryLite + public abstract val extensionRegistry: ExtensionRegistryLite public abstract fun getClassMetadataPath(classId: ClassId): String @@ -39,5 +39,4 @@ public abstract class SerializedResourcePaths { } public val fallbackPaths: FallbackPaths = FallbackPaths - -} \ No newline at end of file +} diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt index 2f404139dd2..765947f6dfa 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragment.kt @@ -51,7 +51,7 @@ public abstract class DeserializedPackageFragment( internal val deserializedMemberScope by storageManager.createLazyValue { val packageStream = loadResourceSure(serializedResourcePaths.getPackageFilePath(fqName)) - val packageProto = ProtoBuf.Package.parseFrom(packageStream, serializedResourcePaths.EXTENSION_REGISTRY) + val packageProto = ProtoBuf.Package.parseFrom(packageStream, serializedResourcePaths.extensionRegistry) DeserializedPackageMemberScope(this, packageProto, nameResolver, components, classNames = { loadClassNames(packageProto) }) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ResourceLoadingClassDataFinder.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ResourceLoadingClassDataFinder.kt index 03b86ee84d5..a7ba2d90484 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ResourceLoadingClassDataFinder.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ResourceLoadingClassDataFinder.kt @@ -36,7 +36,7 @@ public open class ResourceLoadingClassDataFinder( return ClassData( packageFragment.nameResolver, - ProtoBuf.Class.parseFrom(stream, serializedResourcePaths.EXTENSION_REGISTRY) + ProtoBuf.Class.parseFrom(stream, serializedResourcePaths.extensionRegistry) ) } } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt index 8c619cd1772..2d81434b26d 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt @@ -33,7 +33,7 @@ public class KotlinJavascriptPackageFragment( protected override fun loadClassNames(packageProto: ProtoBuf.Package): Collection { 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() } } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt index 85d56722589..c9f26583143 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializedResourcePaths.kt @@ -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" diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt index d083e035be9..18b978f5c6f 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/jsProtoBufUtil.kt @@ -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) }