Fix exception on star import from typealias

#KT-30983 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2019-05-22 19:07:22 +03:00
parent b84b890250
commit bbec3bf001
13 changed files with 148 additions and 1 deletions
@@ -231,7 +231,7 @@ class QualifiedExpressionResolver {
val packageOrClassDescriptor = resolveToPackageOrClass(
path, moduleDescriptor, trace, packageFragmentForCheck,
scopeForFirstPart = null, position = QualifierPosition.IMPORT
) ?: return null
).classDescriptorFromTypeAlias() ?: return null
if (packageOrClassDescriptor is ClassDescriptor && packageOrClassDescriptor.kind.isSingleton && lastPart.expression != null) {
trace.report(
@@ -249,6 +249,10 @@ class QualifiedExpressionResolver {
}
}
private fun DeclarationDescriptor?.classDescriptorFromTypeAlias(): DeclarationDescriptor? {
return if (this is TypeAliasDescriptor) classDescriptor else this
}
private fun computePackageFragmentToCheck(
containingFile: KtFile,
packageFragmentForVisibilityCheck: PackageFragmentDescriptor?