From 0f4f933835cc260afc8d87561bf25235a1326848 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Sat, 10 Sep 2022 15:33:17 +0200 Subject: [PATCH] [lc] decompiled: fix navigation to primary constructor ^KT-53934 ^KTIJ-22755 --- .../KotlinDeclarationInCompiledFileSearcherFE10Impl.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/analysis/decompiled/light-classes-for-decompiled-fe10/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/fe10/KotlinDeclarationInCompiledFileSearcherFE10Impl.kt b/analysis/decompiled/light-classes-for-decompiled-fe10/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/fe10/KotlinDeclarationInCompiledFileSearcherFE10Impl.kt index 803497e8f7a..e9e7b6f9022 100644 --- a/analysis/decompiled/light-classes-for-decompiled-fe10/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/fe10/KotlinDeclarationInCompiledFileSearcherFE10Impl.kt +++ b/analysis/decompiled/light-classes-for-decompiled-fe10/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/fe10/KotlinDeclarationInCompiledFileSearcherFE10Impl.kt @@ -29,7 +29,12 @@ class KotlinDeclarationInCompiledFileSearcherFE10Impl : KotlinDeclarationInCompi findByStub(file, relativeClassName, member, memberName)?.let { return it } } - return file.getDeclaration(BySignatureIndexer, key) + val declaration = file.getDeclaration(BySignatureIndexer, key) ?: return null + return if (member is PsiMethod && member.isConstructor && declaration is KtClassOrObject) { + declaration.primaryConstructor ?: declaration + } else { + declaration + } } }