azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of redundant method KtUltraLightParameter::annotatedOrigin

Browse Source
This commit is contained in:
Denis Zharkov
2018-12-03 11:30:59 +03:00
parent bbaa4c225d
commit b73760c3fc
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightMethod.kt
-6
View File
@@ -135,7 +135,6 @@ internal abstract class KtUltraLightParameter(
override fun hashCode(): Int = kotlinOrigin.hashCode() override fun hashCode(): Int = kotlinOrigin.hashCode()
internal abstract fun annotatedOrigin(): KtAnnotated?
abstract override fun isVarArgs(): Boolean abstract override fun isVarArgs(): Boolean
} }
@@ -167,8 +166,6 @@ internal class KtUltraLightParameterForSource(
(kotlinOrigin as? KtVariableDeclaration)?.setName(name) (kotlinOrigin as? KtVariableDeclaration)?.setName(name)
return this return this
} }
override fun annotatedOrigin() = kotlinOrigin
} }
internal class KtUltraLightParameterForSetterParameter( internal class KtUltraLightParameterForSetterParameter(
@@ -185,7 +182,6 @@ internal class KtUltraLightParameterForSetterParameter(
} }
override fun isVarArgs(): Boolean = false override fun isVarArgs(): Boolean = false
override fun annotatedOrigin() = kotlinOrigin
} }
internal class KtUltraLightReceiverParameter( internal class KtUltraLightReceiverParameter(
@@ -199,6 +195,4 @@ internal class KtUltraLightReceiverParameter(
override val kotlinType: KotlinType? by lazyPub { override val kotlinType: KotlinType? by lazyPub {
computeContainingDescriptor()?.extensionReceiverParameter?.type computeContainingDescriptor()?.extensionReceiverParameter?.type
} }
override fun annotatedOrigin(): KtAnnotated? = kotlinOrigin
} }
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightModifierList.kt
+5 -4
View File
@@ -22,7 +22,10 @@ import com.intellij.psi.PsiModifierList
import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiModifierListOwner
import org.jetbrains.kotlin.asJava.LightClassGenerationSupport import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
import org.jetbrains.kotlin.asJava.builder.LightMemberOriginForDeclaration 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.ClassDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
@@ -100,9 +103,7 @@ private fun lightAnnotationsForEntries(lightModifierList: KtLightModifierList<*>
if (!isFromSources(lightModifierList)) return emptyList() if (!isFromSources(lightModifierList)) return emptyList()
val annotatedKtDeclaration = val annotatedKtDeclaration = lightModifierListOwner.kotlinOrigin as? KtDeclaration
if (lightModifierListOwner is KtUltraLightParameter) lightModifierListOwner.annotatedOrigin()
else lightModifierListOwner.kotlinOrigin as? KtDeclaration
if (annotatedKtDeclaration == null || !annotatedKtDeclaration.isValid || !hasAnnotationsInSource(annotatedKtDeclaration)) { if (annotatedKtDeclaration == null || !annotatedKtDeclaration.isValid || !hasAnnotationsInSource(annotatedKtDeclaration)) {
return emptyList() return emptyList()