From 2e58b57db9a4067b04263fb7bcba7c53e56f1cb7 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 14 Jun 2021 14:10:52 -0700 Subject: [PATCH] UAST: remove redundant override: expression list's evaluate() The super function in `KotlinEvaluatableUElement` is almost same, except for handling of `UnsignedErrorValueTypeConstant`. Such handling was added later, so I assume the addition to this override was missed. In any cases, this override is unnecessary. --- .../expressions/KotlinUExpressionList.kt | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt index 1748119d49c..a59f8d3875a 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUExpressionList.kt @@ -17,9 +17,6 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.psi.KtExpression -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.uast.UElement import org.jetbrains.uast.UExpression import org.jetbrains.uast.UExpressionList @@ -27,23 +24,17 @@ import org.jetbrains.uast.UastSpecialExpressionKind import org.jetbrains.uast.kotlin.kinds.KotlinSpecialExpressionKinds open class KotlinUExpressionList( - override val sourcePsi: PsiElement?, - override val kind: UastSpecialExpressionKind, // original element - givenParent: UElement? + override val sourcePsi: PsiElement?, + override val kind: UastSpecialExpressionKind, // original element + givenParent: UElement? ) : KotlinAbstractUExpression(givenParent), UExpressionList, KotlinUElementWithType, KotlinEvaluatableUElement { override lateinit var expressions: List internal set - override fun evaluate(): Any? { - val ktElement = sourcePsi as? KtExpression ?: return null - val compileTimeConst = ktElement.analyze()[BindingContext.COMPILE_TIME_VALUE, ktElement] - return compileTimeConst?.getValue(TypeUtils.NO_EXPECTED_TYPE) - } - companion object { fun createClassBody(psi: PsiElement?, uastParent: UElement?): KotlinUExpressionList = - KotlinUExpressionList(psi, KotlinSpecialExpressionKinds.CLASS_BODY, uastParent).apply { - expressions = emptyList() - } + KotlinUExpressionList(psi, KotlinSpecialExpressionKinds.CLASS_BODY, uastParent).apply { + expressions = emptyList() + } } }