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

Uast: KotlinUEnumConstant.returnType now is evaluated from containing сlass

Browse Source 
to make it not load additional clsDelegates
This commit is contained in:
Nicolay Mitropolsky
2018-06-04 20:32:27 +03:00
committed by xiexed
parent 0fb879dfc2
commit 045cc253ab
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt
+2 -1
View File
@@ -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()
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUVariable.kt.173
+2 -2
View File
@@ -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()