From 8f8cbfcfa5b701f29d4859c07ff4b97b65d09c6c Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Thu, 8 Feb 2018 18:51:12 +0100
Subject: [PATCH] KtAnnotationEntry#name is stubbed and is nullable

---
 .../kotlin/psi/KtAnnotationEntry.java         | 25 +++++++++++++++++++
 .../org/jetbrains/kotlin/psi/KtPsiUtil.java   | 17 +------------
 .../kotlin/psi/stubs/StubInterfaces.kt        |  2 +-
 .../KtAnnotationEntryElementType.java         |  4 +--
 .../impl/KotlinAnnotationEntryStubImpl.kt     |  4 +--
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java
index adece1135d1..fff03721fa1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtAnnotationEntry.java
@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.KtNodeTypes;
 import org.jetbrains.kotlin.lexer.KtTokens;
+import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub;
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
 
@@ -121,4 +122,28 @@ public class KtAnnotationEntry extends KtElementImplStub<KotlinAnnotationEntrySt
 
         return target;
     }
+
+    @Nullable
+    public Name getShortName() {
+        KotlinAnnotationEntryStub stub = getStub();
+        if (stub != null) {
+            String shortName = stub.getShortName();
+            if (shortName != null) {
+                return Name.identifier(shortName);
+            }
+            return null;
+        }
+
+        KtTypeReference typeReference = getTypeReference();
+        assert typeReference != null : "Annotation entry hasn't typeReference " + getText();
+        KtTypeElement typeElement = typeReference.getTypeElement();
+        if (typeElement instanceof KtUserType) {
+            KtUserType userType = (KtUserType) typeElement;
+            String shortName = userType.getReferencedName();
+            if (shortName != null) {
+                return Name.identifier(shortName);
+            }
+        }
+        return null;
+    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
index 057a608be3e..9ea196488ce 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java
@@ -174,27 +174,12 @@ public class KtPsiUtil {
         }
     }
 
-    @Nullable
-    public static Name getShortName(@NotNull KtAnnotationEntry annotation) {
-        KtTypeReference typeReference = annotation.getTypeReference();
-        assert typeReference != null : "Annotation entry hasn't typeReference " + annotation.getText();
-        KtTypeElement typeElement = typeReference.getTypeElement();
-        if (typeElement instanceof KtUserType) {
-            KtUserType userType = (KtUserType) typeElement;
-            String shortName = userType.getReferencedName();
-            if (shortName != null) {
-                return Name.identifier(shortName);
-            }
-        }
-        return null;
-    }
-
     public static boolean isDeprecated(@NotNull KtModifierListOwner owner) {
         KtModifierList modifierList = owner.getModifierList();
         if (modifierList != null) {
             List<KtAnnotationEntry> annotationEntries = modifierList.getAnnotationEntries();
             for (KtAnnotationEntry annotation : annotationEntries) {
-                Name shortName = getShortName(annotation);
+                Name shortName = annotation.getShortName();
                 if (KotlinBuiltIns.FQ_NAMES.deprecated.shortName().equals(shortName)) {
                     return true;
                 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
index 3b9d9bfa8ee..7a247022d47 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
@@ -57,7 +57,7 @@ interface KotlinObjectStub : KotlinClassOrObjectStub<KtObjectDeclaration> {
 }
 
 interface KotlinAnnotationEntryStub : StubElement<KtAnnotationEntry> {
-    fun getShortName(): String
+    fun getShortName(): String?
     fun hasValueArguments(): Boolean
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationEntryElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationEntryElementType.java
index ce05f8264a3..6330eb1a019 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationEntryElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtAnnotationEntryElementType.java
@@ -40,8 +40,8 @@ public class KtAnnotationEntryElementType extends KtStubElementType<KotlinAnnota
 
     @Override
     public KotlinAnnotationEntryStub createStub(@NotNull KtAnnotationEntry psi, StubElement parentStub) {
-        Name shortName = KtPsiUtil.getShortName(psi);
-        String resultName = shortName != null ? shortName.asString() : psi.getText();
+        Name shortName = psi.getShortName();
+        String resultName = shortName != null ? shortName.asString() : null;
         KtValueArgumentList valueArgumentList = psi.getValueArgumentList();
         boolean hasValueArguments = valueArgumentList != null && !valueArgumentList.getArguments().isEmpty();
         return new KotlinAnnotationEntryStubImpl(parentStub, StringRef.fromString(resultName), hasValueArguments);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt
index 8cd6e04b11a..9874ff35d11 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinAnnotationEntryStubImpl.kt
@@ -25,11 +25,11 @@ import com.intellij.psi.PsiElement
 
 class KotlinAnnotationEntryStubImpl(
     parent: StubElement<out PsiElement>?,
-    private val shortName: StringRef,
+    private val shortName: StringRef?,
     private val hasValueArguments: Boolean
 ) : KotlinStubBaseImpl<KtAnnotationEntry>(parent, KtStubElementTypes.ANNOTATION_ENTRY), KotlinAnnotationEntryStub {
 
-    override fun getShortName() = shortName.string
+    override fun getShortName() = shortName?.string
 
     override fun hasValueArguments() = hasValueArguments
 }