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

Typealias can't be a qualifier

Browse Source
This commit is contained in:
Dmitry Petrov
2016-06-16 15:09:38 +03:00
parent c8a5ccb1d0
commit 5dfbaede4f
4 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.kt
+1 -2
View File
@@ -397,7 +397,7 @@ class QualifiedExpressionResolver(val classifierUsageCheckers: Iterable<Classifi
val nextPackageOrClassDescriptor =
when (currentDescriptor) {
is TypeAliasDescriptor -> // TODO type aliases as qualifiers? (would break some assumptions in TypeResolver)
currentDescriptor.classDescriptor?.getContributedClassifier(qualifierPart)
null
is ClassDescriptor ->
currentDescriptor.getContributedClassifier(qualifierPart)
is PackageViewDescriptor -> {
@@ -622,7 +622,6 @@ class QualifiedExpressionResolver(val classifierUsageCheckers: Iterable<Classifi
is PackageViewDescriptor -> PackageQualifier(referenceExpression, descriptor)
is ClassDescriptor -> ClassQualifier(referenceExpression, descriptor)
is TypeParameterDescriptor -> TypeParameterQualifier(referenceExpression, descriptor)
is TypeAliasDescriptor -> ClassQualifier(referenceExpression, descriptor.classDescriptor ?: return null)
else -> return null
}