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

FIR UAST: unify UMethod creation

Browse Source
This commit is contained in:
Jinseong Jeon
2021-06-18 23:14:07 -07:00
committed by Ilya Kirillov
parent 5ec5b7f041
commit 638b0beadb
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/declarations/FirKotlinUMethod.kt
+4 -10
View File
@@ -29,9 +29,9 @@ class FirKotlinUMethod(
psi: KtLightMethod, psi: KtLightMethod,
givenParent: UElement? givenParent: UElement?
): UMethod { ): UMethod {
return when (psi) { return when (val kotlinOrigin = psi.kotlinOrigin) {
is KtConstructor<*> -> is KtConstructor<*> ->
FirKotlinConstructorUMethod(psi.containingClassOrObject, psi, givenParent) FirKotlinConstructorUMethod(kotlinOrigin.containingClassOrObject, psi, givenParent)
// TODO: FirKotlinUAnnotationMethod // TODO: FirKotlinUAnnotationMethod
else -> else ->
FirKotlinUMethod(psi, givenParent) FirKotlinUMethod(psi, givenParent)
@@ -48,14 +48,8 @@ class FirKotlinUMethod(
is KtFunction -> is KtFunction ->
LightClassUtil.getLightClassMethod(sourcePsi) LightClassUtil.getLightClassMethod(sourcePsi)
else -> null else -> null
} ?: return null } as? KtLightMethod ?: return null
return when (sourcePsi) { return create(javaPsi, givenParent)
is KtConstructor<*> ->
FirKotlinConstructorUMethod(sourcePsi.containingClassOrObject, javaPsi, sourcePsi, givenParent)
// TODO: FirKotlinUAnnotationMethod
else ->
FirKotlinUMethod(javaPsi, sourcePsi, givenParent)
}
} }
} }
} }