From 985934a40aa8227d0485e83d18fe9ad2c7aec6a9 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 20 Sep 2018 19:29:15 +0200 Subject: [PATCH] Prefer kotlin JUnit config to any pattern based config Specifically that means that Kotlin JUnit configurations will be created for JUnit classes and methods instead of AS pattern configurations --- .../kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt index 7057f43ffb2..27a42437f26 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt @@ -11,6 +11,7 @@ import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.execution.actions.RunConfigurationProducer import com.intellij.execution.configurations.ModuleBasedConfiguration import com.intellij.execution.junit.* +import com.intellij.execution.testframework.AbstractPatternBasedConfigurationProducer import com.intellij.openapi.module.Module import com.intellij.openapi.project.DumbService import com.intellij.openapi.roots.ModuleRootManager @@ -29,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer(JUnitConfigurationType.getInstance()) { override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { - return other.isProducedBy(JUnitConfigurationProducer::class.java) || other.isProducedBy(PatternConfigurationProducer::class.java) + return other.isProducedBy(JUnitConfigurationProducer::class.java) || other.isProducedBy(AbstractPatternBasedConfigurationProducer::class.java) } override fun isConfigurationFromContext(