Fix exception on star import from typealias
#KT-30983 Fixed
This commit is contained in:
@@ -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?
|
||||
|
||||
Reference in New Issue
Block a user