From 045cc253ab80cf6c28af44d67169b5f192fdfb56 Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Mon, 4 Jun 2018 20:32:27 +0300 Subject: [PATCH] =?UTF-8?q?Uast:=20`KotlinUEnumConstant.returnType`=20now?= =?UTF-8?q?=20is=20evaluated=20from=20containing=20=D1=81lass?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to make it not load additional clsDelegates --- .../org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt | 3 ++- .../jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt index b2842d351db..a3131087db0 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt @@ -18,6 +18,7 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.* import com.intellij.psi.search.GlobalSearchScope +import com.intellij.psi.util.PsiTypesUtil import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.Nullable import org.jetbrains.kotlin.asJava.classes.KtLightClass @@ -436,7 +437,7 @@ class KotlinUEnumConstant( } override val returnType: PsiType? - get() = psi.type + get() = uastParent?.getAsJavaPsiElement(PsiClass::class.java)?.let { PsiTypesUtil.getClassType(it) } override fun resolve() = psi.resolveMethod() diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173 b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173 index c4d76e429c6..cecd4033cae 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173 +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173 @@ -18,6 +18,7 @@ package org.jetbrains.uast.kotlin import com.intellij.psi.* import com.intellij.psi.search.GlobalSearchScope +import com.intellij.psi.util.PsiTypesUtil import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.Nullable import org.jetbrains.kotlin.asJava.classes.KtLightClass @@ -33,7 +34,6 @@ import org.jetbrains.kotlin.utils.SmartList import org.jetbrains.uast.* import org.jetbrains.uast.internal.acceptList import org.jetbrains.uast.kotlin.declarations.UastLightIdentifier -import org.jetbrains.uast.kotlin.internal.KotlinUElementWithComments import org.jetbrains.uast.kotlin.psi.UastKotlinPsiParameter import org.jetbrains.uast.kotlin.psi.UastKotlinPsiVariable import org.jetbrains.uast.visitor.UastVisitor @@ -418,7 +418,7 @@ class KotlinUEnumConstant( } override val returnType: PsiType? - get() = psi.type + get() = uastParent?.getAsJavaPsiElement(PsiClass::class.java)?.let { PsiTypesUtil.getClassType(it) } override fun resolve() = psi.resolveMethod()