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

referenceUtil: cleanup code

Browse Source
This commit is contained in:
Dmitry Gridin
2019-10-11 20:28:45 +07:00
parent 20784d50ff
commit 348d2376b1
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+13 -20
View File
@@ -52,12 +52,9 @@ import java.util.*
// For property accessor return enclosing property // For property accessor return enclosing property
val PsiReference.unwrappedTargets: Set<PsiElement> val PsiReference.unwrappedTargets: Set<PsiElement>
get() { get() {
fun PsiElement.adjust(): PsiElement? { fun PsiElement.adjust(): PsiElement? = when (val target = unwrapped?.originalElement) {
val target = unwrapped?.originalElement is KtPropertyAccessor -> target.getNonStrictParentOfType<KtProperty>()
return when { else -> target
target is KtPropertyAccessor -> target.getNonStrictParentOfType<KtProperty>()
else -> target
}
} }
return when (this) { return when (this) {
@@ -107,8 +104,7 @@ fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
} }
if (element is KtLabelReferenceExpression) { if (element is KtLabelReferenceExpression) {
val labelParent = (element.parent as? KtContainerNode)?.parent when ((element.parent as? KtContainerNode)?.parent) {
when (labelParent) {
is KtReturnExpression -> unwrappedTargets.forEach { is KtReturnExpression -> unwrappedTargets.forEach {
if (it !is KtFunctionLiteral && !(it is KtNamedFunction && it.name.isNullOrEmpty())) return@forEach if (it !is KtFunctionLiteral && !(it is KtNamedFunction && it.name.isNullOrEmpty())) return@forEach
it as KtFunction it as KtFunction
@@ -136,7 +132,7 @@ fun PsiReference.matchesTarget(candidateTarget: PsiElement): Boolean {
if (this is KtReference) { if (this is KtReference) {
return targets.any { return targets.any {
it.isConstructorOf(unwrappedCandidate) it.isConstructorOf(unwrappedCandidate)
|| it is KtObjectDeclaration && it.isCompanion() && it.getNonStrictParentOfType<KtClass>() == unwrappedCandidate || it is KtObjectDeclaration && it.isCompanion() && it.getNonStrictParentOfType<KtClass>() == unwrappedCandidate
} }
} }
// TODO: Workaround for Kotlin constructor search in Java code. To be removed after refactoring of the search API // TODO: Workaround for Kotlin constructor search in Java code. To be removed after refactoring of the search API
@@ -205,12 +201,10 @@ val KDocName.mainReference: KDocReference
get() = references.firstIsInstance() get() = references.firstIsInstance()
val KtElement.mainReference: KtReference? val KtElement.mainReference: KtReference?
get() { get() = when (this) {
return when { is KtReferenceExpression -> mainReference
this is KtReferenceExpression -> mainReference is KDocName -> mainReference
this is KDocName -> mainReference else -> references.firstIsInstanceOrNull<KtReference>()
else -> references.firstIsInstanceOrNull<KtReference>()
}
} }
fun KtElement.resolveMainReferenceToDescriptors(): Collection<DeclarationDescriptor> { fun KtElement.resolveMainReferenceToDescriptors(): Collection<DeclarationDescriptor> {
@@ -229,8 +223,7 @@ fun KtExpression.readWriteAccess(useResolveForReadWrite: Boolean) = readWriteAcc
fun KtExpression.readWriteAccessWithFullExpression(useResolveForReadWrite: Boolean): Pair<ReferenceAccess, KtExpression> { fun KtExpression.readWriteAccessWithFullExpression(useResolveForReadWrite: Boolean): Pair<ReferenceAccess, KtExpression> {
var expression = getQualifiedExpressionForSelectorOrThis() var expression = getQualifiedExpressionForSelectorOrThis()
loop@ while (true) { loop@ while (true) {
val parent = expression.parent when (val parent = expression.parent) {
when (parent) {
is KtParenthesizedExpression, is KtAnnotatedExpression, is KtLabeledExpression -> expression = parent as KtExpression is KtParenthesizedExpression, is KtAnnotatedExpression, is KtLabeledExpression -> expression = parent as KtExpression
else -> break@loop else -> break@loop
} }
@@ -288,8 +281,8 @@ fun KtElement.canBeResolvedViaImport(target: DeclarationDescriptor, bindingConte
fun KtFunction.getCalleeByLambdaArgument(): KtSimpleNameExpression? { fun KtFunction.getCalleeByLambdaArgument(): KtSimpleNameExpression? {
val argument = getParentOfTypeAndBranch<KtValueArgument> { getArgumentExpression() } ?: return null val argument = getParentOfTypeAndBranch<KtValueArgument> { getArgumentExpression() } ?: return null
val callExpression = when (argument) { val callExpression = when (argument) {
is KtLambdaArgument -> argument.parent as? KtCallExpression is KtLambdaArgument -> argument.parent as? KtCallExpression
else -> (argument.parent as? KtValueArgumentList)?.parent as? KtCallExpression else -> (argument.parent as? KtValueArgumentList)?.parent as? KtCallExpression
} ?: return null } ?: return null
return callExpression.calleeExpression as? KtSimpleNameExpression return callExpression.calleeExpression as? KtSimpleNameExpression
} }