From 7620d66019998e4cace2a0dd83845d74de730e26 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 6 Apr 2016 15:45:58 +0300 Subject: [PATCH] Minor, rename PackagePartSource -> BinarySource --- .../kotlin/load/java/descriptors/util.kt | 2 +- ...tBinaryClassAnnotationAndConstantLoader.kt | 4 ++-- .../load/kotlin/JvmPackagePartSource.kt | 4 ++-- .../builtins/BuiltInsPackageFragment.kt | 2 +- .../deserialization/ClassDeserializer.kt | 2 +- .../deserialization/MemberDeserializer.kt | 8 ++++---- .../deserialization/ProtoContainer.kt | 4 ++-- .../serialization/deserialization/context.kt | 10 +++++----- .../DeserializedCallableMemberDescriptor.kt | 19 +++++++++---------- .../DeserializedPackageMemberScope.kt | 4 ++-- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 2 +- .../src/kotlin/reflect/jvm/reflectLambda.kt | 2 +- .../KotlinBuiltInDeserializerForDecompiler.kt | 2 +- .../builtIns/KotlinBuiltInStubBuilder.kt | 2 +- ...tlinJavaScriptDeserializerForDecompiler.kt | 2 +- .../decompiler/stubBuilder/clsStubBuilding.kt | 2 +- .../js/KotlinJavascriptPackageFragment.kt | 2 +- 17 files changed, 36 insertions(+), 37 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt index 4123dae48a6..eafd71ce5e8 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/util.kt @@ -67,5 +67,5 @@ fun ClassDescriptor.getParentJavaStaticClassScope(): LazyJavaStaticClassScope? { } fun DeserializedCallableMemberDescriptor.getImplClassNameForDeserialized(): Name? { - return (packagePartSource as? JvmPackagePartSource)?.simpleName + return (containerSource as? JvmPackagePartSource)?.simpleName } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt index 9edefdb9491..4d4f918fb9e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt @@ -233,14 +233,14 @@ abstract class AbstractBinaryClassAnnotationAndConstantLoader { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt index fb671782843..fb4caa6c00c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.serialization.deserialization.descriptors.PackagePartSource +import org.jetbrains.kotlin.serialization.deserialization.descriptors.BinarySource -class JvmPackagePartSource(val className: JvmClassName, val facadeClassName: JvmClassName?) : PackagePartSource { +class JvmPackagePartSource(val className: JvmClassName, val facadeClassName: JvmClassName?) : BinarySource { constructor(kotlinClass: KotlinJvmBinaryClass) : this( JvmClassName.byClassId(kotlinClass.classId), kotlinClass.classHeader.multifileClassName?.let { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt index a2f712737f2..c728d098cbc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragment.kt @@ -52,7 +52,7 @@ class BuiltInsPackageFragment( override fun computeMemberScope() = DeserializedPackageMemberScope( - this, proto.`package`, nameResolver, packagePartSource = null, components = components, + this, proto.`package`, nameResolver, containerSource = null, components = components, classNames = { classDataFinder.allClassIds.filter { classId -> !classId.isNestedClass }.map { it.shortClassName } } ) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt index 45d2d2391cd..cddc5987382 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt @@ -56,7 +56,7 @@ class ClassDeserializer(private val components: DeserializationComponents) { if (!fragment.hasTopLevelClass(classId.shortClassName)) return null } - components.createContext(fragment, nameResolver, TypeTable(classProto.typeTable), packagePartSource = null) + components.createContext(fragment, nameResolver, TypeTable(classProto.typeTable), containerSource = null) } return DeserializedClassDescriptor(outerContext, classProto, nameResolver, sourceElement) diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index e0effb6a87b..82714a79842 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -47,7 +47,7 @@ class MemberDeserializer(private val c: DeserializationContext) { proto, c.nameResolver, c.typeTable, - c.packagePartSource + c.containerSource ) val local = c.childContext(property, proto.typeParameterList) @@ -147,7 +147,7 @@ class MemberDeserializer(private val c: DeserializationContext) { else Annotations.EMPTY val function = DeserializedSimpleFunctionDescriptor( c.containingDeclaration, /* original = */ null, annotations, c.nameResolver.getName(proto.name), - Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)), proto, c.nameResolver, c.typeTable, c.packagePartSource + Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)), proto, c.nameResolver, c.typeTable, c.containerSource ) val local = c.childContext(function, proto.typeParameterList) function.initialize( @@ -175,7 +175,7 @@ class MemberDeserializer(private val c: DeserializationContext) { val classDescriptor = c.containingDeclaration as ClassDescriptor val descriptor = DeserializedConstructorDescriptor( classDescriptor, null, getAnnotations(proto, proto.flags, AnnotatedCallableKind.FUNCTION), - isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver, c.typeTable, c.packagePartSource + isPrimary, CallableMemberDescriptor.Kind.DECLARATION, proto, c.nameResolver, c.typeTable, c.containerSource ) val local = c.childContext(descriptor, listOf()) descriptor.initialize( @@ -240,7 +240,7 @@ class MemberDeserializer(private val c: DeserializationContext) { } private fun DeclarationDescriptor.asProtoContainer(): ProtoContainer? = when (this) { - is PackageFragmentDescriptor -> ProtoContainer.Package(fqName, c.nameResolver, c.typeTable, c.packagePartSource) + is PackageFragmentDescriptor -> ProtoContainer.Package(fqName, c.nameResolver, c.typeTable, c.containerSource) is DeserializedClassDescriptor -> thisAsProtoContainer else -> null // TODO: support annotations on lambdas and their parameters } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt index 36b467c49b6..c71c1767421 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.descriptors.PackagePartSource +import org.jetbrains.kotlin.serialization.deserialization.descriptors.BinarySource sealed class ProtoContainer( val nameResolver: NameResolver, @@ -45,7 +45,7 @@ sealed class ProtoContainer( val fqName: FqName, nameResolver: NameResolver, typeTable: TypeTable, - val packagePartSource: PackagePartSource? + val source: BinarySource? ) : ProtoContainer(nameResolver, typeTable) { override fun debugFqName(): FqName = fqName } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt index 6d867dabc6b..958255b44a9 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.resolve.constants.ConstantValue import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.descriptors.PackagePartSource +import org.jetbrains.kotlin.serialization.deserialization.descriptors.BinarySource import org.jetbrains.kotlin.storage.StorageManager class DeserializationComponents( @@ -49,9 +49,9 @@ class DeserializationComponents( descriptor: PackageFragmentDescriptor, nameResolver: NameResolver, typeTable: TypeTable, - packagePartSource: PackagePartSource? + containerSource: BinarySource? ): DeserializationContext = - DeserializationContext(this, nameResolver, descriptor, typeTable, packagePartSource, + DeserializationContext(this, nameResolver, descriptor, typeTable, containerSource, parentTypeDeserializer = null, typeParameters = listOf()) } @@ -61,7 +61,7 @@ class DeserializationContext( val nameResolver: NameResolver, val containingDeclaration: DeclarationDescriptor, val typeTable: TypeTable, - val packagePartSource: PackagePartSource?, + val containerSource: BinarySource?, parentTypeDeserializer: TypeDeserializer?, typeParameters: List ) { @@ -78,7 +78,7 @@ class DeserializationContext( nameResolver: NameResolver = this.nameResolver, typeTable: TypeTable = this.typeTable ) = DeserializationContext( - components, nameResolver, descriptor, typeTable, this.packagePartSource, + components, nameResolver, descriptor, typeTable, this.containerSource, parentTypeDeserializer = this.typeDeserializer, typeParameters = typeParameterProtos ) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt index 1de4e9bbae1..8c8267762b9 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt @@ -35,12 +35,11 @@ interface DeserializedCallableMemberDescriptor : CallableMemberDescriptor { val typeTable: TypeTable - // Information about the origin of this top-level callable or null, if it's not top-level or there's no such information. - // On JVM, this is JvmPackagePartSource which contains the internal name of the package part class - val packagePartSource: PackagePartSource? + // Information about the origin of this callable's container (class or package part on JVM) or null if there's no such information. + val containerSource: BinarySource? } -interface PackagePartSource +interface BinarySource class DeserializedSimpleFunctionDescriptor( containingDeclaration: DeclarationDescriptor, @@ -51,7 +50,7 @@ class DeserializedSimpleFunctionDescriptor( override val proto: ProtoBuf.Function, override val nameResolver: NameResolver, override val typeTable: TypeTable, - override val packagePartSource: PackagePartSource? + override val containerSource: BinarySource? ) : DeserializedCallableMemberDescriptor, SimpleFunctionDescriptorImpl(containingDeclaration, original, annotations, name, kind, SourceElement.NO_SOURCE) { @@ -64,7 +63,7 @@ class DeserializedSimpleFunctionDescriptor( ): FunctionDescriptorImpl { return DeserializedSimpleFunctionDescriptor( newOwner, original as SimpleFunctionDescriptor?, annotations, newName ?: name, kind, - proto, nameResolver, typeTable, packagePartSource + proto, nameResolver, typeTable, containerSource ) } } @@ -83,7 +82,7 @@ class DeserializedPropertyDescriptor( override val proto: ProtoBuf.Property, override val nameResolver: NameResolver, override val typeTable: TypeTable, - override val packagePartSource: PackagePartSource? + override val containerSource: BinarySource? ) : DeserializedCallableMemberDescriptor, PropertyDescriptorImpl(containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE, isLateInit, isConst) { @@ -97,7 +96,7 @@ class DeserializedPropertyDescriptor( ): PropertyDescriptorImpl { return DeserializedPropertyDescriptor( newOwner, original, annotations, newModality, newVisibility, isVar, name, kind, isLateInit, isConst, - proto, nameResolver, typeTable, packagePartSource + proto, nameResolver, typeTable, containerSource ) } } @@ -111,7 +110,7 @@ class DeserializedConstructorDescriptor( override val proto: ProtoBuf.Constructor, override val nameResolver: NameResolver, override val typeTable: TypeTable, - override val packagePartSource: PackagePartSource? + override val containerSource: BinarySource? ) : DeserializedCallableMemberDescriptor, ConstructorDescriptorImpl(containingDeclaration, original, annotations, isPrimary, kind, SourceElement.NO_SOURCE) { @@ -124,7 +123,7 @@ class DeserializedConstructorDescriptor( ): DeserializedConstructorDescriptor { return DeserializedConstructorDescriptor( newOwner as ClassDescriptor, original as ConstructorDescriptor?, annotations, isPrimary, kind, - proto, nameResolver, typeTable, packagePartSource + proto, nameResolver, typeTable, containerSource ) } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt index 2b0cb794965..8a5d6f9cb02 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt @@ -36,11 +36,11 @@ open class DeserializedPackageMemberScope( packageDescriptor: PackageFragmentDescriptor, proto: ProtoBuf.Package, nameResolver: NameResolver, - packagePartSource: PackagePartSource?, + containerSource: BinarySource?, components: DeserializationComponents, classNames: () -> Collection ) : DeserializedMemberScope( - components.createContext(packageDescriptor, nameResolver, TypeTable(proto.typeTable), packagePartSource), + components.createContext(packageDescriptor, nameResolver, TypeTable(proto.typeTable), containerSource), proto.functionList, proto.propertyList ) { private val packageFqName = packageDescriptor.fqName diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt index a1b6cab2489..700af7f0444 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt @@ -125,7 +125,7 @@ internal sealed class JvmPropertySignature { return "$" + JvmAbi.sanitizeAsJavaIdentifier(moduleName) } if (descriptor.visibility == Visibilities.PRIVATE && containingDeclaration is PackageFragmentDescriptor) { - val packagePartSource = (descriptor as DeserializedPropertyDescriptor).packagePartSource + val packagePartSource = (descriptor as DeserializedPropertyDescriptor).containerSource if (packagePartSource is JvmPackagePartSource && packagePartSource.facadeClassName != null) { return "$" + packagePartSource.simpleName.asString() } diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt index 57bcb7ae672..78b3d7b259f 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/reflectLambda.kt @@ -46,7 +46,7 @@ fun Function.reflect(): KFunction? { val moduleData = javaClass.getOrCreateModule() val context = DeserializationContext( moduleData.deserialization, nameResolver, moduleData.module, - typeTable = TypeTable(proto.typeTable), packagePartSource = null, parentTypeDeserializer = null, typeParameters = listOf() + typeTable = TypeTable(proto.typeTable), containerSource = null, parentTypeDeserializer = null, typeParameters = listOf() ) val descriptor = MemberDeserializer(context).loadFunction(proto) @Suppress("UNCHECKED_CAST") diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt index 7f229ac470a..72d1a483911 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDeserializerForDecompiler.kt @@ -59,7 +59,7 @@ class KotlinBuiltInDeserializerForDecompiler( } val membersScope = DeserializedPackageMemberScope( - createDummyPackageFragment(facadeFqName), proto.`package`, nameResolver, packagePartSource = null, + createDummyPackageFragment(facadeFqName), proto.`package`, nameResolver, containerSource = null, components = deserializationComponents ) { emptyList() } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInStubBuilder.kt index 26bbe6c5e49..2b2eb74d618 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInStubBuilder.kt @@ -53,7 +53,7 @@ class KotlinBuiltInStubBuilder : ClsStubBuilder() { val fileStub = createFileStub(packageFqName) createCallableStubs( fileStub, context, - ProtoContainer.Package(packageFqName, context.nameResolver, context.typeTable, packagePartSource = null), + ProtoContainer.Package(packageFqName, context.nameResolver, context.typeTable, source = null), packageProto.functionList, packageProto.propertyList ) for (classProto in file.classesToDecompile) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptDeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptDeserializerForDecompiler.kt index 1b2a52cc338..891c6252380 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptDeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptDeserializerForDecompiler.kt @@ -81,7 +81,7 @@ class KotlinJavaScriptDeserializerForDecompiler( val content = file.contentsToByteArray(false) val packageProto = ProtoBuf.Package.parseFrom(content, JsSerializerProtocol.extensionRegistry) val membersScope = DeserializedPackageMemberScope( - createDummyPackageFragment(packageFqName), packageProto, nameResolver, packagePartSource = null, + createDummyPackageFragment(packageFqName), packageProto, nameResolver, containerSource = null, components = deserializationComponents ) { emptyList() } return membersScope.getContributedDescriptors().toList() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index 721f9baddf0..cb0595ba0e5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt @@ -55,7 +55,7 @@ fun createPackageFacadeStub( ): KotlinFileStubImpl { val fileStub = KotlinFileStubForIde.forFile(packageFqName, packageFqName.isRoot) setupFileStub(fileStub, packageFqName) - createCallableStubs(fileStub, c, ProtoContainer.Package(packageFqName, c.nameResolver, c.typeTable, packagePartSource = null), + createCallableStubs(fileStub, c, ProtoContainer.Package(packageFqName, c.nameResolver, c.typeTable, source = null), packageProto.functionList, packageProto.propertyList) return fileStub } 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 37a2b0041e6..2c59d4f2dc7 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 @@ -43,7 +43,7 @@ class KotlinJavascriptPackageFragment( loadResourceSure(KotlinJavascriptSerializedResourcePaths.getPackageFilePath(fqName)).use { packageStream -> val packageProto = ProtoBuf.Package.parseFrom(packageStream, JsSerializerProtocol.extensionRegistry) DeserializedPackageMemberScope( - this, packageProto, nameResolver, packagePartSource = null, components = components, + this, packageProto, nameResolver, containerSource = null, components = components, classNames = { loadClassNames() } ) }