Fix some issues found by review

volivan239 · volivan239 · commit 92d3f5dae6b1 · 2022-10-24T00:34:25.000+03:00
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt b/utbot-core/src/main/kotlin/org/utbot/common/KClassUtil.kt
@@ -3,13 +3,8 @@ package org.utbot.common
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 
-val Class<*>.nameOfPackage: String get() = `package`?.name?:""
-
 fun Method.invokeCatching(obj: Any?, args: List<Any?>) = try {
     Result.success(invoke(obj, *args.toTypedArray()))
 } catch (e: InvocationTargetException) {
     Result.failure<Nothing>(e.targetException)
-}
-
-val Class<*>.allNestedClasses: List<Class<*>>
-    get() = listOf(this) + this.declaredClasses.flatMap { it.allNestedClasses.toList() }
+}
diff --git a/utbot-core/src/main/kotlin/org/utbot/common/ReflectionUtil.kt b/utbot-core/src/main/kotlin/org/utbot/common/ReflectionUtil.kt
@@ -111,4 +111,10 @@ val Class<*>.isFinal
     get() = Modifier.isFinal(modifiers)
 
 val Class<*>.isProtected
-    get() = Modifier.isProtected(modifiers)
+    get() = Modifier.isProtected(modifiers)
+
+val Class<*>.nameOfPackage: String
+    get() = `package`?.name?:""
+
+val Class<*>.allNestedClasses: List<Class<*>>
+    get() = listOf(this) + this.declaredClasses.flatMap { it.allNestedClasses }
diff --git a/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt b/utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/util/IdUtil.kt
@@ -441,6 +441,9 @@ val MethodId.method: Method
                 ?: error("Can't find method $signature in ${declaringClass.name}")
     }
 
+/**
+ * See [KCallable.extensionReceiverParameter] for more details
+ */
 val MethodId.extensionReceiverParameterIndex: Int?
     get() = this.method.kotlinFunction?.extensionReceiverParameter?.index
 
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgAbstractRenderer.kt
@@ -131,10 +131,13 @@ internal abstract class CgAbstractRenderer(
         }
     }
 
-    protected abstract val ClassId.shouldBeOmittedWhenUsedAsCaller: Boolean
+    /**
+     * Returns true if one can call methods of this class without specifying a caller (for example if ClassId represents this instance)
+     */
+    protected abstract val ClassId.methodsAreAccessibleAsTopLevel: Boolean
 
     private val MethodId.accessibleByName: Boolean
-        get() = (context.shouldOptimizeImports && this in context.importedStaticMethods) || classId == context.generatedClass || classId.shouldBeOmittedWhenUsedAsCaller
+        get() = (context.shouldOptimizeImports && this in context.importedStaticMethods) || classId.methodsAreAccessibleAsTopLevel
 
     override fun visit(element: CgElement) {
         val error =
@@ -656,7 +659,7 @@ internal abstract class CgAbstractRenderer(
     }
 
     override fun visit(element: CgStaticFieldAccess) {
-        if (!element.declaringClass.shouldBeOmittedWhenUsedAsCaller) {
+        if (!element.declaringClass.methodsAreAccessibleAsTopLevel) {
             print(element.declaringClass.asString())
             print(".")
         }
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgJavaRenderer.kt
@@ -60,8 +60,8 @@ internal class CgJavaRenderer(context: CgRendererContext, printer: CgPrinter = C
 
     override val langPackage: String = "java.lang"
 
-    override val ClassId.shouldBeOmittedWhenUsedAsCaller: Boolean
-        get() = false
+    override val ClassId.methodsAreAccessibleAsTopLevel: Boolean
+        get() = this == context.generatedClass
 
     override fun visit(element: AbstractCgClass<*>) {
         for (annotation in element.annotations) {
diff --git a/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt b/utbot-framework/src/main/kotlin/org/utbot/framework/codegen/model/visitor/CgKotlinRenderer.kt
@@ -73,8 +73,8 @@ internal class CgKotlinRenderer(context: CgRendererContext, printer: CgPrinter =
 
     override val langPackage: String = "kotlin"
 
-    override val ClassId.shouldBeOmittedWhenUsedAsCaller: Boolean
-        get() = isKotlinFile
+    override val ClassId.methodsAreAccessibleAsTopLevel: Boolean
+        get() = isKotlinFile || (this == context.generatedClass)
 
     override fun visit(element: AbstractCgClass<*>) {
         for (annotation in element.annotations) {
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/actions/GenerateTestsAction.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/actions/GenerateTestsAction.kt
@@ -66,8 +66,7 @@ class GenerateTestsAction : AnAction(), UpdateInBackground {
 
             val psiElementHandler = PsiElementHandler.makePsiElementHandler(file)
 
-            // When in Kotlin file, we should propose top-level functions for testing
-            if (psiElementHandler.isCreateTestActionAvailable(element) || file is KtFile) {
+            if (psiElementHandler.isCreateTestActionAvailable(element)) {
                 val srcClass = psiElementHandler.containingClass(element) ?: return null
                 val srcSourceRoot = srcClass.getSourceRoot() ?: return null
                 val srcMembers = srcClass.extractFirstLevelMembers(false)
@@ -221,7 +220,7 @@ class GenerateTestsAction : AnAction(), UpdateInBackground {
     }
 
     private fun getAllClasses(directory: PsiDirectory): Set<PsiClass> {
-        val allClasses = directory.files.flatMap { getClassesFromFile(it) }.toMutableSet()
+        val allClasses = directory.files.flatMap { PsiElementHandler.makePsiElementHandler(it).getClassesFromFile(it) }.toMutableSet()
         for (subDir in directory.subdirectories) allClasses += getAllClasses(subDir)
         return allClasses
     }
@@ -234,16 +233,10 @@ class GenerateTestsAction : AnAction(), UpdateInBackground {
         if (!dirsArePackages) {
             return emptySet()
         }
-        val allClasses = psiFiles.flatMap { getClassesFromFile(it) }.toMutableSet()
+        val allClasses = psiFiles.flatMap { PsiElementHandler.makePsiElementHandler(it).getClassesFromFile(it) }.toMutableSet()
         allClasses.addAll(psiFiles.mapNotNull { (it as? KtFile)?.findFacadeClass() })
         for (psiDir in psiDirectories) allClasses += getAllClasses(psiDir)
 
         return allClasses
     }
-
-    private fun getClassesFromFile(psiFile: PsiFile): List<PsiClass> {
-        val psiElementHandler = PsiElementHandler.makePsiElementHandler(psiFile)
-        return PsiTreeUtil.getChildrenOfTypeAsList(psiFile, psiElementHandler.classClass)
-                .map { psiElementHandler.toPsi(it, PsiClass::class.java) }
-    }
 }
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/KotlinPsiElementHandler.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/KotlinPsiElementHandler.kt
@@ -2,6 +2,7 @@ package org.utbot.intellij.plugin.ui.utils
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
 import com.intellij.psi.util.findParentOfType
 import org.jetbrains.kotlin.asJava.findFacadeClass
 import org.jetbrains.kotlin.idea.testIntegration.KotlinCreateTestIntention
@@ -11,7 +12,6 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
-import org.jetbrains.kotlin.toKtPsiSourceElement
 import org.jetbrains.uast.toUElement
 
 class KotlinPsiElementHandler(
@@ -27,8 +27,16 @@ class KotlinPsiElementHandler(
         return element.toUElement()?.javaPsi as? T ?: error("Could not cast $element to $clazz")
     }
 
-    override fun isCreateTestActionAvailable(element: PsiElement): Boolean =
-        getTarget(element)?.let { KotlinCreateTestIntention().applicabilityRange(it) != null } ?: false
+    override fun getClassesFromFile(psiFile: PsiFile): List<PsiClass> {
+        return listOfNotNull((psiFile as? KtFile)?.findFacadeClass()) + super.getClassesFromFile(psiFile)
+    }
+
+    override fun isCreateTestActionAvailable(element: PsiElement): Boolean {
+        getTarget(element)?.let {
+            return KotlinCreateTestIntention().applicabilityRange(it) != null
+        }
+        return (element.containingFile as? KtFile)?.findFacadeClass() != null
+    }
 
     private fun getTarget(element: PsiElement?): KtNamedDeclaration? =
         element?.parentsWithSelf
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/PsiElementHandler.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/utils/PsiElementHandler.kt
@@ -3,6 +3,7 @@ package org.utbot.intellij.plugin.ui.utils
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
+import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.psi.KtFile
 
 /**
@@ -36,6 +37,14 @@ interface PsiElementHandler {
      */
     fun <T> toPsi(element: PsiElement, clazz: Class<T>): T
 
+    /**
+     * Returns all classes that are declared in the [psiFile]
+     */
+    fun getClassesFromFile(psiFile: PsiFile): List<PsiClass> {
+        return PsiTreeUtil.getChildrenOfTypeAsList(psiFile, classClass)
+            .map { toPsi(it, PsiClass::class.java) }
+    }
+
     /**
      * Get java class of the Class in the corresponding syntax tree (PsiClass, KtClass, e.t.c).
      */

Original file line number	Diff line number	Diff line change
`@@ -441,6 +441,9 @@ val MethodId.method: Method`
`441`	`441`	`?: error("Can't find method $signature in ${declaringClass.name}")`
`442`	`442`	`}`
`443`	`443`
	`444`	`+/**`
	`445`	`+ * See [KCallable.extensionReceiverParameter] for more details`
	`446`	`+ */`
`444`	`447`	`val MethodId.extensionReceiverParameterIndex: Int?`
`445`	`448`	`get() = this.method.kotlinFunction?.extensionReceiverParameter?.index`
`446`	`449`
Original file line number	Diff line number	Diff line change
`@@ -131,10 +131,13 @@ internal abstract class CgAbstractRenderer(`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- protected abstract val ClassId.shouldBeOmittedWhenUsedAsCaller: Boolean`
	`134`	`+ /**`
	`135`	`+ * Returns true if one can call methods of this class without specifying a caller (for example if ClassId represents this instance)`
	`136`	`+ */`
	`137`	`+ protected abstract val ClassId.methodsAreAccessibleAsTopLevel: Boolean`
`135`	`138`
`136`	`139`	`private val MethodId.accessibleByName: Boolean`
`137`		`- get() = (context.shouldOptimizeImports && this in context.importedStaticMethods) \|\| classId == context.generatedClass \|\| classId.shouldBeOmittedWhenUsedAsCaller`
	`140`	`+ get() = (context.shouldOptimizeImports && this in context.importedStaticMethods) \|\| classId.methodsAreAccessibleAsTopLevel`
`138`	`141`
`139`	`142`	`override fun visit(element: CgElement) {`
`140`	`143`	`val error =`
`@@ -656,7 +659,7 @@ internal abstract class CgAbstractRenderer(`
`656`	`659`	`}`
`657`	`660`
`658`	`661`	`override fun visit(element: CgStaticFieldAccess) {`
`659`		`- if (!element.declaringClass.shouldBeOmittedWhenUsedAsCaller) {`
	`662`	`+ if (!element.declaringClass.methodsAreAccessibleAsTopLevel) {`
`660`	`663`	`print(element.declaringClass.asString())`
`661`	`664`	`print(".")`
`662`	`665`	`}`