1
1
package org.utbot.intellij.plugin.util
2
2
3
3
import com.intellij.psi.PsiClass
4
+ import com.intellij.psi.PsiMember
4
5
import com.intellij.psi.PsiModifier
5
- import com.intellij.psi.PsiModifierListOwner
6
6
import com.intellij.psi.SyntheticElement
7
- import com.intellij.refactoring.classMembers.MemberInfoBase
8
7
import com.intellij.refactoring.util.classMembers.MemberInfo
9
8
import com.intellij.testIntegration.TestIntegrationUtils
10
9
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
@@ -13,21 +12,21 @@ import org.jetbrains.kotlin.asJava.elements.isSetter
13
12
import org.utbot.common.filterWhen
14
13
import org.utbot.framework.UtSettings
15
14
16
- private val MemberInfoBase < out PsiModifierListOwner > .isAbstract: Boolean
17
- get() = this .member. modifierList?.hasModifierProperty(PsiModifier .ABSTRACT )? : false
15
+ private val PsiMember .isAbstract: Boolean
16
+ get() = modifierList?.hasModifierProperty(PsiModifier .ABSTRACT )? : false
18
17
19
18
20
- private val MemberInfo .isKotlinGetterOrSetter: Boolean
19
+ private val PsiMember .isKotlinGetterOrSetter: Boolean
21
20
get() {
22
21
if (this !is KtLightMethod )
23
22
return false
24
- return this . isGetter || this . isSetter
23
+ return isGetter || isSetter
25
24
}
26
25
27
26
private fun Iterable<MemberInfo>.filterTestableMethods (): List <MemberInfo > = this
28
27
.filterWhen(UtSettings .skipTestGenerationForSyntheticMethods) { it.member !is SyntheticElement }
29
- .filterNot { it.isAbstract }
30
- .filterNot { it.isKotlinGetterOrSetter }
28
+ .filterNot { it.member. isAbstract }
29
+ .filterNot { it.member. isKotlinGetterOrSetter }
31
30
32
31
private val PsiClass .isPrivateOrProtected: Boolean
33
32
get() = this .modifierList?.let {
0 commit comments