From 0de06e551bb5e0c7beed2318827a76cf7a24f65b Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 18 Jan 2024 11:53:04 +0100 Subject: [PATCH] [kotlin] find usages: fix expect/actual referencing KTIJ-24383 GitOrigin-RevId: 51e429f82295387dc60edf5e75d85b1e1e5733f0 --- .../multiModuleFindUsages/findImplFromHeader/directives.txt | 2 +- .../idea/searching/usages/KotlinK2SearchUsagesSupport.kt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImplFromHeader/directives.txt b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImplFromHeader/directives.txt index 87feae1a7547..583800b57667 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImplFromHeader/directives.txt +++ b/plugins/kotlin/idea/tests/testData/multiModuleFindUsages/findImplFromHeader/directives.txt @@ -1 +1 @@ -// IGNORE_K2 \ No newline at end of file +// FIR_COMPARISON \ No newline at end of file diff --git a/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/usages/KotlinK2SearchUsagesSupport.kt b/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/usages/KotlinK2SearchUsagesSupport.kt index 320379f87404..e3ea0e6e9a4b 100644 --- a/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/usages/KotlinK2SearchUsagesSupport.kt +++ b/plugins/kotlin/kotlin.searching/src/org/jetbrains/kotlin/idea/searching/usages/KotlinK2SearchUsagesSupport.kt @@ -107,6 +107,11 @@ internal class KotlinK2SearchUsagesSupport : KotlinSearchUsagesSupport { } override fun isCallableOverrideUsage(reference: PsiReference, declaration: KtNamedDeclaration): Boolean { + if (declaration.isExpectDeclaration() && + reference.unwrappedTargets.any { target -> target is KtDeclaration && expectedDeclarationIfAny(target) == declaration }) { + return true + } + fun KtDeclaration.isTopLevelCallable() = when (this) { is KtNamedFunction -> isTopLevel is KtProperty -> isTopLevel