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

Introduce resolveToParameterDescriptorIfAny(), drop reified version

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-02-20 17:43:06 +03:00
parent 7a1b3cd224
commit f6513cd17e
7 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+9 -12
View File
@@ -57,23 +57,20 @@ fun KtDeclaration.unsafeResolveToDescriptor(bodyResolveMode: BodyResolveMode = B
* and then takes the relevant descriptor from binding context.
* The exact set of declarations to resolve depends on bodyResolveMode
*/
inline fun <reified D : DeclarationDescriptor> KtDeclaration.resolveToDescriptorIfAny(
bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL,
klass: Class<D> = D::class.java
): D? {
fun KtDeclaration.resolveToDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL): DeclarationDescriptor? {
//TODO: BodyResolveMode.PARTIAL is not quite safe!
val context = analyze(bodyResolveMode)
if (this is KtParameter && this.hasValOrVar() && klass != ValueParameterDescriptor::class.java) {
return context.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, this) as? D
return if (this is KtParameter && hasValOrVar()) {
context.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, this)
} else {
context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, this)
}
return context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, this) as? D
}
fun KtDeclaration.resolveToDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL) =
resolveToDescriptorIfAny<DeclarationDescriptor>(bodyResolveMode)
fun KtParameter.resolveToDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL) =
resolveToDescriptorIfAny<ValueParameterDescriptor>(bodyResolveMode)
fun KtParameter.resolveToParameterDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL): ValueParameterDescriptor? {
val context = analyze(bodyResolveMode)
return context.get(BindingContext.VALUE_PARAMETER, this) as? ValueParameterDescriptor
}
fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescriptor> {
val facade = getResolutionFacade()