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

Minor. compilation after rebase.

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-06-08 19:39:29 +03:00
parent 541b9954f5
commit 6bce4f6d6a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeAliasExpander.kt
+5 -5
View File
@@ -36,10 +36,10 @@ class TypeAliasExpander(
annotations: Annotations, annotations: Annotations,
recursionDepth: Int, recursionDepth: Int,
withAbbreviatedType: Boolean withAbbreviatedType: Boolean
): KotlinType { ): SimpleType {
val originalProjection = TypeProjectionImpl(Variance.INVARIANT, typeAliasExpansion.descriptor.underlyingType) val originalProjection = TypeProjectionImpl(Variance.INVARIANT, typeAliasExpansion.descriptor.underlyingType)
val expandedProjection = expandTypeProjection(originalProjection, typeAliasExpansion, null, recursionDepth) val expandedProjection = expandTypeProjection(originalProjection, typeAliasExpansion, null, recursionDepth)
val expandedType = expandedProjection.type val expandedType = expandedProjection.type.asSimpleType()
if (expandedType.isError) return expandedType if (expandedType.isError) return expandedType
@@ -54,7 +54,7 @@ class TypeAliasExpander(
originalProjection.type.isMarkedNullable, originalProjection.type.isMarkedNullable,
MemberScope.Empty) MemberScope.Empty)
expandedType.withAbbreviatedType(abbreviatedType) expandedType.withAbbreviation(abbreviatedType)
} }
else { else {
expandedType expandedType
@@ -111,7 +111,7 @@ class TypeAliasExpander(
typeAliasExpansion: TypeAliasExpansion, typeAliasExpansion: TypeAliasExpansion,
recursionDepth: Int recursionDepth: Int
): TypeProjection { ): TypeProjection {
val type = originalProjection.type val type = originalProjection.type.asSimpleType()
if (type.isError || !type.requiresTypeAliasExpansion()) { if (type.isError || !type.requiresTypeAliasExpansion()) {
return originalProjection return originalProjection
@@ -141,7 +141,7 @@ class TypeAliasExpander(
val expandedType = expandRecursively(nestedExpansion, type.annotations, recursionDepth + 1, false) val expandedType = expandRecursively(nestedExpansion, type.annotations, recursionDepth + 1, false)
// 'dynamic' type can't be abbreviated - will be reported separately // 'dynamic' type can't be abbreviated - will be reported separately
val typeWithAbbreviation = if (expandedType.isDynamic()) expandedType else expandedType.withAbbreviatedType(type) val typeWithAbbreviation = if (expandedType.isDynamic()) expandedType else expandedType.withAbbreviation(type)
return TypeProjectionImpl(originalProjection.projectionKind, typeWithAbbreviation) return TypeProjectionImpl(originalProjection.projectionKind, typeWithAbbreviation)
} }