diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt index e44fb4a2a0f..4bbdb86ecb4 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt @@ -181,7 +181,7 @@ internal object KotlinConverter : UastConverter { if (typeReference == null) return UastErrorType val bindingContext = typeReference.analyze(BodyResolveMode.PARTIAL) val type = bindingContext[BindingContext.TYPE, typeReference] ?: return UastErrorType - return convert(type, typeReference.project, parent) + return KotlinUType(type, typeReference.project, parent, typeReference.typeElement) } internal fun asSimpleReference(element: PsiElement?, parent: UElement): USimpleReferenceExpression? { diff --git a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUType.kt b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUType.kt index 22f5d541df0..0bf301590d4 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUType.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUType.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.uast import com.intellij.openapi.project.Project +import com.intellij.psi.PsiElement import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.name.FqNameUnsafe @@ -24,12 +25,14 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.uast.* +import org.jetbrains.uast.psi.PsiElementBacked class KotlinUType( val type: KotlinType, val project: Project, - override val parent: UElement? -) : KotlinAbstractUElement(), UType { + override val parent: UElement?, + override val psi: PsiElement? = null +) : KotlinAbstractUElement(), UType, PsiElementBacked { override val name: String get() = type.toString()