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

Treat nested mock type aliases as inner (same as for mock classes).

Browse Source
This commit is contained in:
Dmitry Petrov
2016-11-17 11:34:41 +03:00
parent f4011ecb3d
commit 0205a122f4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NotFoundClasses.kt
+4 -1
View File
@@ -54,7 +54,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
private val typeAliases = storageManager.createMemoizedFunction<ClassRequest, TypeAliasDescriptor> { request -> private val typeAliases = storageManager.createMemoizedFunction<ClassRequest, TypeAliasDescriptor> { request ->
computeClassifier(request, { computeClassifier(request, {
owner, name, isInner, numberOfTypeParametersCount -> owner, name, isInner, numberOfTypeParametersCount ->
MockTypeAliasDescriptor(storageManager, owner, name, numberOfTypeParametersCount) MockTypeAliasDescriptor(storageManager, owner, name, isInner, numberOfTypeParametersCount)
}) })
} }
@@ -115,6 +115,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
storageManager: StorageManager, storageManager: StorageManager,
containingDeclaration: DeclarationDescriptor, containingDeclaration: DeclarationDescriptor,
name: Name, name: Name,
private val isInner: Boolean,
numberOfDeclaredTypeParameters: Int numberOfDeclaredTypeParameters: Int
) : AbstractTypeAliasDescriptor(containingDeclaration, Annotations.EMPTY, name, SourceElement.NO_SOURCE, Visibilities.PUBLIC) { ) : AbstractTypeAliasDescriptor(containingDeclaration, Annotations.EMPTY, name, SourceElement.NO_SOURCE, Visibilities.PUBLIC) {
init { init {
@@ -136,6 +137,8 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
override val classDescriptor: ClassDescriptor? override val classDescriptor: ClassDescriptor?
get() = expandedType.constructor.declarationDescriptor as? ClassDescriptor get() = expandedType.constructor.declarationDescriptor as? ClassDescriptor
override fun isInner(): Boolean = isInner
override fun substitute(substitutor: TypeSubstitutor) = this override fun substitute(substitutor: TypeSubstitutor) = this
override fun toString() = "MockTypeAliasDescriptor[$fqNameUnsafe]" override fun toString() = "MockTypeAliasDescriptor[$fqNameUnsafe]"