From 08d062dcf9272fbec52b74ae4ee32f0554b7cde8 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Thu, 6 Jan 2022 14:06:45 -0800 Subject: [PATCH] Remove unused/deprecated ReadWriteAccess util The usage in KtFirCallResolver for resolving compound accessor calls is fully rewritten recently, and this util is no longer used. This is partial revert of cd4a08cb185cc4bb58c50b579506d28e42054f6e --- .../kotlin/idea/references/referenceUtils.kt | 43 ++----------------- 1 file changed, 3 insertions(+), 40 deletions(-) diff --git a/compiler/psi/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt b/compiler/psi/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt index c33c2797a38..8aacfc0ced1 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt +++ b/compiler/psi/src/org/jetbrains/kotlin/idea/references/referenceUtils.kt @@ -6,12 +6,9 @@ package org.jetbrains.kotlin.idea.references import org.jetbrains.kotlin.kdoc.psi.impl.KDocName -import org.jetbrains.kotlin.lexer.KtTokens -import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS -import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelectorOrThis -import org.jetbrains.kotlin.resolve.references.ReferenceAccess -import org.jetbrains.kotlin.utils.addToStdlib.constant +import org.jetbrains.kotlin.psi.KtElement +import org.jetbrains.kotlin.psi.KtReferenceExpression +import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull @@ -30,37 +27,3 @@ val KtElement.mainReference: KtReference? is KDocName -> mainReference else -> references.firstIsInstanceOrNull() } - -@Deprecated( - "Not for the IDE usage", - replaceWith = ReplaceWith("readWriteAccessWithFullExpression", "org.jetbrains.kotlin.idea.references") -) -fun KtExpression.readWriteAccessWithFullExpressionWithPossibleResolve( - readWriteAccessWithFullExpressionByResolve: (KtBinaryExpression) -> Pair?, -): Pair { - var expression = getQualifiedExpressionForSelectorOrThis() - loop@ while (true) { - when (val parent = expression.parent) { - is KtParenthesizedExpression, is KtAnnotatedExpression, is KtLabeledExpression -> expression = parent as KtExpression - else -> break@loop - } - } - - val assignment = expression.getAssignmentByLHS() - if (assignment != null) { - return when (assignment.operationToken) { - KtTokens.EQ -> ReferenceAccess.WRITE to assignment - - else -> { - readWriteAccessWithFullExpressionByResolve(assignment) - ?: (ReferenceAccess.READ_WRITE to assignment) - } - } - } - - val unaryExpression = expression.parent as? KtUnaryExpression - return if (unaryExpression != null && unaryExpression.operationToken in constant { setOf(KtTokens.PLUSPLUS, KtTokens.MINUSMINUS) }) - ReferenceAccess.READ_WRITE to unaryExpression - else - ReferenceAccess.READ to expression -}