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

Introduce & use resolveToDescriptorIfAny<DescriptorType>

Browse Source 
This allows to omit casts after resolveToDescriptorIfAny() call,
get different descriptors for different receivers (in future),
distinguish parameter / property situation for primary constructor
This commit is contained in:
Mikhail Glukhikh
2018-02-14 17:40:36 +03:00
parent 8c97f8cbb5
commit 7a1b3cd224
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+5 -2
View File
@@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.OverridingUtil
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
val KtDeclaration.descriptor: DeclarationDescriptor?
get() = this.resolveToDescriptorIfAny(BodyResolveMode.FULL)
get() = if (this is KtParameter) this.descriptor else this.resolveToDescriptorIfAny(BodyResolveMode.FULL)
val KtDeclaration.constructor: ConstructorDescriptor?
get() {
@@ -59,8 +59,11 @@ val KtDeclaration.constructor: ConstructorDescriptor?
}
}
val KtParameter.descriptor: ValueParameterDescriptor?
get() = this.resolveToDescriptorIfAny<ValueParameterDescriptor>(BodyResolveMode.FULL)
val KtParameter.propertyDescriptor: PropertyDescriptor?
get() = this.analyze().get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, this)
get() = this.resolveToDescriptorIfAny<PropertyDescriptor>(BodyResolveMode.FULL)
fun PsiReference.checkUsageVsOriginalDescriptor(
targetDescriptor: DeclarationDescriptor,