MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

refactoring: take UMethod instead of PsiMethod for checking

Browse Source
This commit is contained in:
Konstantin Aleev
2018-07-09 17:42:15 +03:00
parent 1faa391327
commit d2e8cc872c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uast/uast-common/src/org/jetbrains/uast/qualifiedUtils.kt
+6 -5
View File
@@ -19,7 +19,6 @@
package org.jetbrains.uast
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod
import com.intellij.psi.util.PsiMethodUtil
import org.jetbrains.uast.visitor.UastVisitor
@@ -211,12 +210,14 @@ fun UElement.asRecursiveLogString(render: (UElement) -> String = { it.asLogStrin
* or companion object's containing class if the given method is main method annotated with [kotlin.jvm.JvmStatic] in companion object,
* otherwise *null*.
*/
fun findMainClass(mainMethod: PsiMethod): PsiClass? {
var mainClassCandidate = mainMethod.containingClass ?: return null
if (PsiMethodUtil.isMainMethod(mainMethod)) return mainClassCandidate
fun findMainClass(mainMethod: UMethod): PsiClass? {
val psiMethod = mainMethod.javaPsi
if ("main" != psiMethod.name) return null
var mainClassCandidate = psiMethod.containingClass ?: return null
if (PsiMethodUtil.isMainMethod(psiMethod)) return mainClassCandidate
// Check for @JvmStatic main method in companion object
mainClassCandidate = mainClassCandidate.containingClass ?: return null
val mainInClass = PsiMethodUtil.findMainInClass(mainClassCandidate)
return if (mainMethod.manager.areElementsEquivalent(mainMethod, mainInClass)) mainClassCandidate else null
return if (psiMethod.manager.areElementsEquivalent(psiMethod, mainInClass)) mainClassCandidate else null
}