From b09fc7c1461e975da6aaa74a5fc10ab5e451814c Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 13 Jul 2016 15:48:21 +0200 Subject: [PATCH] Kotlin JUnit run configuration producer needs to take precedence over IDEA's PatternConfigurationProducer #KT-13084 Fixed --- .../kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt index bae401439b3..aae8d6c75f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt @@ -39,7 +39,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) + return other.isProducedBy(JUnitConfigurationProducer::class.java) || other.isProducedBy(PatternConfigurationProducer::class.java) } override fun isConfigurationFromContext(configuration: JUnitConfiguration,