From d70b88900407faebccbb25d53061af7bc65ffce4 Mon Sep 17 00:00:00 2001 From: n-p-s <6024770+n-p-s@users.noreply.github.com> Date: Fri, 7 May 2021 13:53:08 +0200 Subject: [PATCH] Update declarations to be searchable by their JvmName annotation Relates to #KT-23653 --- .../org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt | 2 +- .../src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt index 6144b3f850d..b6dff65e07e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt @@ -98,7 +98,7 @@ object JvmFileClassUtil { it.calleeExpression?.constructorReferenceExpression?.getReferencedName() == shortName } - private fun getLiteralStringFromAnnotation(annotation: KtAnnotationEntry): String? { + fun getLiteralStringFromAnnotation(annotation: KtAnnotationEntry): String? { val argumentExpression = annotation.valueArguments.firstOrNull()?.getArgumentExpression() ?: return null val stringTemplate = argumentExpression as? KtStringTemplateExpression ?: return null val singleEntry = stringTemplate.entries.singleOrNull() as? KtLiteralStringTemplateEntry ?: return null diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java index 8f80e5e3d27..76f6e2b74f3 100644 --- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java +++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java @@ -17,6 +17,8 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; +import com.intellij.navigation.ItemPresentation; +import com.intellij.navigation.ItemPresentationProviders; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -152,4 +154,9 @@ public class KtAnnotationEntry extends KtElementImplStub