Get rid of redundant method KtUltraLightParameter::annotatedOrigin
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
+5
-4
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user