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

Uast: secondary constructors delegation support (KT-21409)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-11-24 16:54:43 +03:00
committed by xiexed
parent 3bfa5c4706
commit 1ce21583ad
3 changed files with 50 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
+20 -18
View File
@@ -20,7 +20,6 @@ import com.intellij.psi.*
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForScript
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.toLightMethods
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.utils.SmartList
@@ -73,12 +72,10 @@ open class KotlinUClass private constructor(
override fun getInitializers(): Array<UClassInitializer> = super.getInitializers()
override fun getMethods(): Array<UMethod> {
val primaryConstructor = ktClass?.primaryConstructor?.toLightMethods()?.firstOrNull()
fun createUMethod(psiMethod: PsiMethod): UMethod {
return if (psiMethod is KtLightMethod &&
psiMethod.isConstructor &&
(primaryConstructor == null || psiMethod == primaryConstructor)) {
psiMethod.isConstructor) {
KotlinPrimaryConstructorUMethod(ktClass, psiMethod, this)
} else {
getLanguagePlugin().convert(psiMethod, this)
@@ -111,22 +108,27 @@ class KotlinPrimaryConstructorUMethod(
override val uastParent: UElement?
): KotlinUMethod(psi, uastParent) {
override val uastBody: UExpression? by lz {
val superTypeCallEntry = ktClass?.superTypeListEntries?.firstIsInstanceOrNull<KtSuperTypeCallEntry>()
val initializers = ktClass?.getAnonymousInitializers()?.takeIf { it.isNotEmpty() }
if (superTypeCallEntry != null || initializers != null)
KotlinUBlockExpression.KotlinLazyUBlockExpression(this) { uastParent ->
SmartList<UExpression>().apply {
superTypeCallEntry?.let {
add(KotlinUFunctionCallExpression(it, uastParent))
}
val languagePlugin = uastParent.getLanguagePlugin()
initializers?.forEach {
addIfNotNull(languagePlugin.convertOpt(it.body, uastParent))
}
val delegationCall: KtCallElement? = psi.kotlinOrigin.let {
when (it) {
is KtPrimaryConstructor, is KtObjectDeclaration ->
ktClass?.superTypeListEntries?.firstIsInstanceOrNull<KtSuperTypeCallEntry>()
is KtSecondaryConstructor -> it.getDelegationCall()
else -> null
}
}
val initializers = ktClass?.getAnonymousInitializers().orEmpty()
if (delegationCall == null && initializers.isEmpty()) return@lz null
KotlinUBlockExpression.KotlinLazyUBlockExpression(this) { uastParent ->
SmartList<UExpression>().apply {
delegationCall?.let {
add(KotlinUFunctionCallExpression(it, uastParent))
}
val languagePlugin = uastParent.getLanguagePlugin()
initializers.forEach {
addIfNotNull(languagePlugin.convertOpt(it.body, uastParent))
}
}
else
null
}
}
}
plugins/uast-kotlin/testData/SuperCalls.log.txt
Vendored
+19
View File
@@ -23,6 +23,15 @@ UFile (package = )
UAnnotationMethod (name = A)
UParameter (name = i)
UAnnotation (fqName = null)
UBlockExpression
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (this))
USimpleNameReferenceExpression (identifier = <init>)
UQualifiedReferenceExpression
USimpleNameReferenceExpression (identifier = i)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (toString))
USimpleNameReferenceExpression (identifier = toString)
UClass (name = B)
UAnnotationMethod (name = B)
UParameter (name = param)
@@ -46,9 +55,19 @@ UFile (package = )
UAnnotationMethod (name = C)
UParameter (name = p)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (super))
USimpleNameReferenceExpression (identifier = <init>)
USimpleNameReferenceExpression (identifier = p)
UAnnotationMethod (name = C)
UParameter (name = i)
UAnnotation (fqName = null)
UBlockExpression
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (super))
USimpleNameReferenceExpression (identifier = <init>)
USimpleNameReferenceExpression (identifier = i)
UClass (name = O)
UField (name = INSTANCE)
UAnnotation (fqName = null)
plugins/uast-kotlin/testData/SuperCalls.render.txt
Vendored
+11 -5
View File
@@ -1,6 +1,6 @@
public final class SuperCallsKt {
private static final var anon: A = anonymous object : A ("textForAnon"){
fun bar(){}
private static final var anon: A = anonymous object : A("textForAnon") {
fun bar() {}
}
public static final fun getAnon() : A = UastEmptyExpression
}
@@ -11,7 +11,9 @@ public class A {
}
public final fun getStr() : java.lang.String = UastEmptyExpression
public fun A(str: java.lang.String) = UastEmptyExpression
public fun A(i: int) = UastEmptyExpression
public fun A(i: int) {
<init>(i.toString())
}
}
public final class B : A {
@@ -24,8 +26,12 @@ public final class C : A {
public fun foo(a: long) : void {
super.foo(a)
}
public fun C(p: java.lang.String) = UastEmptyExpression
public fun C(i: int) = UastEmptyExpression
public fun C(p: java.lang.String) {
<init>(p)
}
public fun C(i: int) {
<init>(i)
}
}
public final class O : A {