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 60ee2bf9b00..01dea0e060c 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 @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.idea.run @@ -43,8 +32,10 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer): Boolean { + override fun setupConfigurationFromContext( + configuration: JUnitConfiguration, + context: ConfigurationContext, + sourceElement: Ref + ): Boolean { if (DumbService.getInstance(context.project).isDumb) return false val location = context.location ?: return false @@ -131,14 +124,14 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer(false) if (!ktClass.isJUnitTestClass()) { @@ -163,9 +156,9 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer().singleOrNull { it.isJUnitTestClass() } + ktFile.declarations.filterIsInstance().singleOrNull { it.isJUnitTestClass() } } }