From b73760c3fc6bbe798962396c7910a9249741283a Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 3 Dec 2018 11:30:59 +0300
Subject: [PATCH] Get rid of redundant method
 KtUltraLightParameter::annotatedOrigin

---
 .../jetbrains/kotlin/asJava/classes/ultraLightMethod.kt  | 6 ------
 .../kotlin/asJava/elements/KtLightModifierList.kt        | 9 +++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
index d6ec16fe9d1..386a726d349 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
@@ -135,7 +135,6 @@ internal abstract class KtUltraLightParameter(
 
     override fun hashCode(): Int = kotlinOrigin.hashCode()
 
-    internal abstract fun annotatedOrigin(): KtAnnotated?
     abstract override fun isVarArgs(): Boolean
 }
 
@@ -167,8 +166,6 @@ internal class KtUltraLightParameterForSource(
         (kotlinOrigin as? KtVariableDeclaration)?.setName(name)
         return this
     }
-
-    override fun annotatedOrigin() = kotlinOrigin
 }
 
 internal class KtUltraLightParameterForSetterParameter(
@@ -185,7 +182,6 @@ internal class KtUltraLightParameterForSetterParameter(
     }
 
     override fun isVarArgs(): Boolean = false
-    override fun annotatedOrigin() = kotlinOrigin
 }
 
 internal class KtUltraLightReceiverParameter(
@@ -199,6 +195,4 @@ internal class KtUltraLightReceiverParameter(
     override val kotlinType: KotlinType? by lazyPub {
         computeContainingDescriptor()?.extensionReceiverParameter?.type
     }
-
-    override fun annotatedOrigin(): KtAnnotated? = kotlinOrigin
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt
index e093c0db7b6..124df015e11 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt
@@ -22,7 +22,10 @@ import com.intellij.psi.PsiModifierList
 import com.intellij.psi.PsiModifierListOwner
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.asJava.builder.LightMemberOriginForDeclaration
-import org.jetbrains.kotlin.asJava.classes.*
+import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
+import org.jetbrains.kotlin.asJava.classes.KtUltraLightElementWithNullabilityAnnotation
+import org.jetbrains.kotlin.asJava.classes.KtUltraLightNullabilityAnnotation
+import org.jetbrains.kotlin.asJava.classes.lazyPub
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
@@ -100,9 +103,7 @@ private fun lightAnnotationsForEntries(lightModifierList: KtLightModifierList<*>
 
     if (!isFromSources(lightModifierList)) return emptyList()
 
-    val annotatedKtDeclaration =
-        if (lightModifierListOwner is KtUltraLightParameter) lightModifierListOwner.annotatedOrigin()
-        else lightModifierListOwner.kotlinOrigin as? KtDeclaration
+    val annotatedKtDeclaration = lightModifierListOwner.kotlinOrigin as? KtDeclaration
 
     if (annotatedKtDeclaration == null || !annotatedKtDeclaration.isValid || !hasAnnotationsInSource(annotatedKtDeclaration)) {
         return emptyList()