From ec431460b323a792ab758ead5bd1021205b7e5b2 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Wed, 19 Feb 2020 23:09:25 +0100 Subject: [PATCH] Do not lookup for kotlin tests in non kotlin files Fixed #EA-220086 --- .../src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt | 5 +++++ .../org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191 | 5 +++++ .../org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192 | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt index 86e2da9a9ee..7530c6410a1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt @@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1 import com.intellij.openapi.util.component2 import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod +import org.jetbrains.kotlin.idea.KotlinLanguage private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } @@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled internal fun getTestClassForJvm(location: Location<*>): PsiClass? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } } @@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191 index 86f76ce8d51..24523a6148d 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191 @@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1 import com.intellij.openapi.util.component2 import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod +import org.jetbrains.kotlin.idea.KotlinLanguage private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } @@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled internal fun getTestClassForJvm(location: Location<*>): PsiClass? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } } @@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192 index 86f76ce8d51..24523a6148d 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192 @@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1 import com.intellij.openapi.util.component2 import com.intellij.psi.PsiClass import com.intellij.psi.PsiMethod +import org.jetbrains.kotlin.idea.KotlinLanguage private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } @@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled internal fun getTestClassForJvm(location: Location<*>): PsiClass? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } } @@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { val leaf = location.psiElement ?: return null + if (leaf.language != KotlinLanguage.INSTANCE) return null + if (isJUnitEnabled) { KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } }