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

Do not perform type alias expansion for error types.

Browse Source
This commit is contained in:
Dmitry Petrov
2016-06-08 16:13:03 +03:00
parent b2e5cfebee
commit ccbade663b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
+3 -1
View File
@@ -113,13 +113,15 @@ class TypeAliasExpander(
): TypeProjection { ): TypeProjection {
val type = originalProjection.type val type = originalProjection.type
if (!type.requiresTypeAliasExpansion()) { if (type.isError || !type.requiresTypeAliasExpansion()) {
return originalProjection return originalProjection
} }
val typeConstructor = type.constructor val typeConstructor = type.constructor
val typeDescriptor = typeConstructor.declarationDescriptor val typeDescriptor = typeConstructor.declarationDescriptor
assert(typeConstructor.parameters.size == type.arguments.size) { "Unexpected malformed type: $type" }
when (typeDescriptor) { when (typeDescriptor) {
is TypeParameterDescriptor -> { is TypeParameterDescriptor -> {
return originalProjection return originalProjection