Skip to content

Fix bug in filtering Kotlin getters/setters in plugin #1026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 28, 2022
Merged

Fix bug in filtering Kotlin getters/setters in plugin #1026

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/util/PsiClassHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,21 +12,21 @@ import org.jetbrains.kotlin.asJava.elements.isSetter
import org.utbot.common.filterWhen
import org.utbot.framework.UtSettings

private val MemberInfoBase<out PsiModifierListOwner>.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<MemberInfo>.filterTestableMethods(): List<MemberInfo> = 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 {
Expand Down