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

Kotlin Uast, Minor: support PsiElementBacked in KotlinUType

Browse Source
This commit is contained in:
Yan Zhulanow
2016-03-22 21:02:06 +03:00
parent 1ac6c0f2e9
commit da5e6c4092
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/KotlinUastLanguagePlugin.kt
+1 -1
View File
@@ -181,7 +181,7 @@ internal object KotlinConverter : UastConverter {
if (typeReference == null) return UastErrorType if (typeReference == null) return UastErrorType
val bindingContext = typeReference.analyze(BodyResolveMode.PARTIAL) val bindingContext = typeReference.analyze(BodyResolveMode.PARTIAL)
val type = bindingContext[BindingContext.TYPE, typeReference] ?: return UastErrorType 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? { internal fun asSimpleReference(element: PsiElement?, parent: UElement): USimpleReferenceExpression? {
plugins/uast-kotlin/src/org/jetbrains/kotlin/uast/declarations/KotlinUType.kt
+5 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.uast package org.jetbrains.kotlin.uast
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.name.FqNameUnsafe 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.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.uast.* import org.jetbrains.uast.*
import org.jetbrains.uast.psi.PsiElementBacked
class KotlinUType( class KotlinUType(
val type: KotlinType, val type: KotlinType,
val project: Project, val project: Project,
override val parent: UElement? override val parent: UElement?,
) : KotlinAbstractUElement(), UType { override val psi: PsiElement? = null
) : KotlinAbstractUElement(), UType, PsiElementBacked {
override val name: String override val name: String
get() = type.toString() get() = type.toString()