diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt index 64b4c3c31d..b74130e9a0 100644 --- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt +++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt @@ -1,10 +1,9 @@ package org.utbot.intellij.plugin.util import com.intellij.psi.PsiClass +import com.intellij.psi.PsiMember import com.intellij.psi.PsiModifier -import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.SyntheticElement -import com.intellij.refactoring.classMembers.MemberInfoBase import com.intellij.refactoring.util.classMembers.MemberInfo import com.intellij.testIntegration.TestIntegrationUtils import org.jetbrains.kotlin.asJava.elements.KtLightMethod @@ -13,21 +12,21 @@ import org.jetbrains.kotlin.asJava.elements.isSetter import org.utbot.common.filterWhen import org.utbot.framework.UtSettings -private val MemberInfoBase.isAbstract: Boolean - get() = this.member.modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false +private val PsiMember.isAbstract: Boolean + get() = modifierList?.hasModifierProperty(PsiModifier.ABSTRACT)?: false -private val MemberInfo.isKotlinGetterOrSetter: Boolean +private val PsiMember.isKotlinGetterOrSetter: Boolean get() { if (this !is KtLightMethod) return false - return this.isGetter || this.isSetter + return isGetter || isSetter } private fun Iterable.filterTestableMethods(): List = this .filterWhen(UtSettings.skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement } - .filterNot { it.isAbstract } - .filterNot { it.isKotlinGetterOrSetter } + .filterNot { it.member.isAbstract } + .filterNot { it.member.isKotlinGetterOrSetter } private val PsiClass.isPrivateOrProtected: Boolean get() = this.modifierList?.let {