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

Uast: KotlinPrimaryConstructorUMethod renamed to KotlinConstructorUMethod (KT-21409)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2017-11-24 19:10:17 +03:00
committed by xiexed
parent 1ce21583ad
commit 77be33d433
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinAbstractUElement.kt
+1 -1
View File
@@ -103,7 +103,7 @@ fun doConvertParent(element: UElement, parent: PsiElement?): UElement? {
val containingClass = parent.containingClassOrObject val containingClass = parent.containingClassOrObject
if (containingClass != null) { if (containingClass != null) {
val containingUClass = KotlinUastLanguagePlugin().convertElementWithParent(containingClass, null) as? KotlinUClass val containingUClass = KotlinUastLanguagePlugin().convertElementWithParent(containingClass, null) as? KotlinUClass
containingUClass?.methods?.filterIsInstance<KotlinPrimaryConstructorUMethod>()?.firstOrNull()?.let { containingUClass?.methods?.filterIsInstance<KotlinConstructorUMethod>()?.firstOrNull { it.isPrimary }?.let {
return it.uastBody return it.uastBody
} }
} }
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUClass.kt
+6 -2
View File
@@ -76,7 +76,7 @@ open class KotlinUClass private constructor(
fun createUMethod(psiMethod: PsiMethod): UMethod { fun createUMethod(psiMethod: PsiMethod): UMethod {
return if (psiMethod is KtLightMethod && return if (psiMethod is KtLightMethod &&
psiMethod.isConstructor) { psiMethod.isConstructor) {
KotlinPrimaryConstructorUMethod(ktClass, psiMethod, this) KotlinConstructorUMethod(ktClass, psiMethod, this)
} else { } else {
getLanguagePlugin().convert(psiMethod, this) getLanguagePlugin().convert(psiMethod, this)
} }
@@ -102,11 +102,15 @@ open class KotlinUClass private constructor(
} }
} }
class KotlinPrimaryConstructorUMethod( class KotlinConstructorUMethod(
private val ktClass: KtClassOrObject?, private val ktClass: KtClassOrObject?,
override val psi: KtLightMethod, override val psi: KtLightMethod,
override val uastParent: UElement? override val uastParent: UElement?
): KotlinUMethod(psi, uastParent) { ): KotlinUMethod(psi, uastParent) {
val isPrimary: Boolean
get() = psi.kotlinOrigin is KtPrimaryConstructor
override val uastBody: UExpression? by lz { override val uastBody: UExpression? by lz {
val delegationCall: KtCallElement? = psi.kotlinOrigin.let { val delegationCall: KtCallElement? = psi.kotlinOrigin.let {
when (it) { when (it) {