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

[PLUGIN API] Make referenceClass resolve type aliases too

Browse Source 
- fix KT-40193
This commit is contained in:
Roman Artemev
2020-07-21 12:09:40 +03:00
committed by romanart
parent a0154b9851
commit d7a0dbfae8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/extensions/IrPluginContextImpl.kt
+7 -1
View File
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.backend.common.ir.BuiltinSymbolsBase
import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.ir.declarations.IrConstructor import org.jetbrains.kotlin.ir.declarations.IrConstructor
import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns
@@ -77,7 +78,12 @@ open class IrPluginContextImpl(
override fun referenceClass(fqName: FqName): IrClassSymbol? { override fun referenceClass(fqName: FqName): IrClassSymbol? {
assert(!fqName.isRoot) assert(!fqName.isRoot)
return resolveSymbol(fqName.parent()) { scope -> return resolveSymbol(fqName.parent()) { scope ->
val classDescriptor = scope.getContributedClassifier(fqName.shortName(), NoLookupLocation.FROM_BACKEND) as? ClassDescriptor? val classifierDescriptor = scope.getContributedClassifier(fqName.shortName(), NoLookupLocation.FROM_BACKEND)
val classDescriptor = when (classifierDescriptor) {
is ClassDescriptor -> classifierDescriptor
is TypeAliasDescriptor -> classifierDescriptor.classDescriptor
else -> error("Unexpected classifier $classifierDescriptor")
}
classDescriptor?.let { classDescriptor?.let {
st.referenceClass(it) st.referenceClass(it)
} }