Skip to content

Commit 0205a12

Browse files
committed
Treat nested mock type aliases as inner (same as for mock classes).
1 parent f4011ec commit 0205a12

File tree

1 file changed

+4
-1
lines changed
  • core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization

1 file changed

+4
-1
lines changed

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NotFoundClasses.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
5454
private val typeAliases = storageManager.createMemoizedFunction<ClassRequest, TypeAliasDescriptor> { request ->
5555
computeClassifier(request, {
5656
owner, name, isInner, numberOfTypeParametersCount ->
57-
MockTypeAliasDescriptor(storageManager, owner, name, numberOfTypeParametersCount)
57+
MockTypeAliasDescriptor(storageManager, owner, name, isInner, numberOfTypeParametersCount)
5858
})
5959
}
6060

@@ -115,6 +115,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
115115
storageManager: StorageManager,
116116
containingDeclaration: DeclarationDescriptor,
117117
name: Name,
118+
private val isInner: Boolean,
118119
numberOfDeclaredTypeParameters: Int
119120
) : AbstractTypeAliasDescriptor(containingDeclaration, Annotations.EMPTY, name, SourceElement.NO_SOURCE, Visibilities.PUBLIC) {
120121
init {
@@ -136,6 +137,8 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
136137
override val classDescriptor: ClassDescriptor?
137138
get() = expandedType.constructor.declarationDescriptor as? ClassDescriptor
138139

140+
override fun isInner(): Boolean = isInner
141+
139142
override fun substitute(substitutor: TypeSubstitutor) = this
140143

141144
override fun toString() = "MockTypeAliasDescriptor[$fqNameUnsafe]"

0 commit comments

Comments
 (0)