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

[ULC] Fix delegate field type resolve

Browse Source 
Fixed #KT-46519
This commit is contained in:
Igor Yakovlev
2021-05-14 18:36:31 +02:00
committed by TeamCityServer
parent a02cecec20
commit b0df70dbfe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt
+2 -3
View File
@@ -114,9 +114,8 @@ internal open class KtUltraLightFieldImpl protected constructor(
private val kotlinType: KotlinType? private val kotlinType: KotlinType?
get() = when { get() = when {
declaration is KtProperty && declaration.hasDelegate() -> declaration is KtProperty && declaration.hasDelegate() ->
(variableDescriptor as? PropertyDescriptor)?.let { declaration.delegateExpression?.let {
val context = LightClassGenerationSupport.getInstance(project).analyze(declaration) LightClassGenerationSupport.getInstance(project).analyze(it).getType(it)
PropertyCodegen.getDelegateTypeForProperty(it, context)
} }
declaration is KtObjectDeclaration -> declaration is KtObjectDeclaration ->
(declaration.resolve() as? ClassDescriptor)?.defaultType (declaration.resolve() as? ClassDescriptor)?.defaultType