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

Patch resolveToDescriptorIfAny() for parameter case

Browse Source 
Now property descriptor is returned for primary constructor val / var,
otherwise parameter descriptor is returned.
This commit is contained in:
Mikhail Glukhikh
2017-09-12 13:02:03 +03:00
parent 04b8f1db6e
commit 0f9d31c9d1
1 changed files with 8 additions and 6 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
+8 -6
View File
@@ -24,10 +24,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.BindingTraceContext
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
@@ -41,8 +38,13 @@ fun KtDeclaration.resolveToDescriptor(bodyResolveMode: BodyResolveMode = BodyRes
getResolutionFacade().resolveToDescriptor(this, bodyResolveMode) getResolutionFacade().resolveToDescriptor(this, bodyResolveMode)
//TODO: BodyResolveMode.PARTIAL is not quite safe! //TODO: BodyResolveMode.PARTIAL is not quite safe!
fun KtDeclaration.resolveToDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL): DeclarationDescriptor? = fun KtDeclaration.resolveToDescriptorIfAny(bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL): DeclarationDescriptor? {
analyze(bodyResolveMode).get(BindingContext.DECLARATION_TO_DESCRIPTOR, this) val context = analyze(bodyResolveMode)
if (this is KtParameter && this.hasValOrVar()) {
return context.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, this)
}
return context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, this)
}
fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescriptor> { fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescriptor> {
val facade = getResolutionFacade() val facade = getResolutionFacade()