diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/BinaryOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/BinaryOperatorReferenceSearcher.kt index a9f4cc15c36..b52736c8df2 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/BinaryOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/BinaryOperatorReferenceSearcher.kt @@ -35,7 +35,7 @@ class BinaryOperatorReferenceSearcher( optimizer: SearchRequestCollector ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, wordsToSearch = operationTokens.map { it.value }) { - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val binaryExpression = expression.parent as? KtBinaryExpression ?: return if (binaryExpression.operationToken !in operationTokens) return if (expression != binaryExpression.left) return diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ContainsOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ContainsOperatorReferenceSearcher.kt index 677dc19f545..0ed546e0159 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ContainsOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ContainsOperatorReferenceSearcher.kt @@ -38,7 +38,7 @@ class ContainsOperatorReferenceSearcher( private val OPERATION_TOKENS = setOf(KtTokens.IN_KEYWORD, KtTokens.NOT_IN) - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val parent = expression.parent when (parent) { is KtBinaryExpression -> { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/DestructuringDeclarationReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/DestructuringDeclarationReferenceSearcher.kt index ce56462e080..66aff3a1e90 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/DestructuringDeclarationReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/DestructuringDeclarationReferenceSearcher.kt @@ -53,7 +53,7 @@ class DestructuringDeclarationReferenceSearcher( override fun isReferenceToCheck(ref: PsiReference) = ref is KtDestructuringDeclarationReference - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val parent = expression.parent val destructuringDeclaration = when (parent) { is KtDestructuringDeclaration -> parent diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index cf8e769014d..d4c1917148a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -69,8 +69,8 @@ class ExpressionsOfTypeProcessor( private val typeToSearch: FuzzyType, private val searchScope: SearchScope, private val project: Project, - private val suspiciousExpressionHandler: (KtExpression) -> Unit, - private val suspiciousScopeHandler: (SearchScope) -> Unit + private val possibleMatchHandler: (KtExpression) -> Unit, + private val possibleMatchesInScopeHandler: (SearchScope) -> Unit ) { @TestOnly enum class Mode { @@ -132,7 +132,7 @@ class ExpressionsOfTypeProcessor( // for class from library always use plain search because we cannot search usages in compiled code (we could though) if (!runReadAction { psiClass.isValid && ProjectRootsUtil.isInProjectSource (psiClass) }) { - suspiciousScopeHandler(searchScope) + possibleMatchesInScopeHandler(searchScope) return } @@ -146,7 +146,7 @@ class ExpressionsOfTypeProcessor( .filter { it.isValid } .toTypedArray() if (scopeElements.isNotEmpty()) { - suspiciousScopeHandler(LocalSearchScope(scopeElements)) + possibleMatchesInScopeHandler(LocalSearchScope(scopeElements)) } } } @@ -179,7 +179,7 @@ class ExpressionsOfTypeProcessor( private fun downShiftToPlainSearch() { tasks.clear() scopesToUsePlainSearch.clear() - suspiciousScopeHandler(searchScope) + possibleMatchesInScopeHandler(searchScope) } private fun addClassToProcess(classToSearch: PsiClass) { @@ -531,7 +531,7 @@ class ExpressionsOfTypeProcessor( inScope = inScope && element in searchScope } if (inScope) { - suspiciousExpressionHandler(element) + possibleMatchHandler(element) } val parent = element.parent diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/IndexingOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/IndexingOperatorReferenceSearcher.kt index 47dfd6fa33f..c3a5850147b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/IndexingOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/IndexingOperatorReferenceSearcher.kt @@ -36,7 +36,7 @@ class IndexingOperatorReferenceSearcher( private val isSet: Boolean ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, wordsToSearch = listOf("[")) { - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val accessExpression = expression.parent as? KtArrayAccessExpression ?: return if (expression != accessExpression.arrayExpression) return if (!checkAccessExpression(accessExpression)) return diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/InvokeOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/InvokeOperatorReferenceSearcher.kt index 3ad0f72a42d..3b7d326028a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/InvokeOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/InvokeOperatorReferenceSearcher.kt @@ -33,7 +33,7 @@ class InvokeOperatorReferenceSearcher( optimizer: SearchRequestCollector ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, wordsToSearch = emptyList()) { - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val callExpression = expression.parent as? KtCallExpression ?: return processReferenceElement(callExpression) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/OperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/OperatorReferenceSearcher.kt index 5143e34e8ca..407faeefa75 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/OperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/OperatorReferenceSearcher.kt @@ -57,7 +57,7 @@ abstract class OperatorReferenceSearcher( ) { private val project = targetDeclaration.project - protected abstract fun processSuspiciousExpression(expression: KtExpression) + protected abstract fun processPossibleReceiverExpression(expression: KtExpression) protected abstract fun extractReference(element: PsiElement): PsiReference? @@ -203,8 +203,8 @@ abstract class OperatorReferenceSearcher( receiverType, searchScope, project, - suspiciousExpressionHandler = { expression -> processSuspiciousExpression(expression) }, - suspiciousScopeHandler = { searchScope -> doPlainSearch(searchScope) } + possibleMatchHandler = { expression -> processPossibleReceiverExpression(expression) }, + possibleMatchesInScopeHandler = { searchScope -> doPlainSearch(searchScope) } ).run() } finally { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/UnaryOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/UnaryOperatorReferenceSearcher.kt index 77c547d07e4..2277aee4c48 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/UnaryOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/UnaryOperatorReferenceSearcher.kt @@ -36,7 +36,7 @@ class UnaryOperatorReferenceSearcher( optimizer: SearchRequestCollector ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, wordsToSearch = listOf(operationToken.value)) { - override fun processSuspiciousExpression(expression: KtExpression) { + override fun processPossibleReceiverExpression(expression: KtExpression) { val unaryExpression = expression.parent as? KtUnaryExpression ?: return if (unaryExpression.operationToken != operationToken) return processReferenceElement(unaryExpression)