azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not lookup for kotlin tests in non kotlin files

Browse Source 
Fixed #EA-220086
This commit is contained in:
Vladimir Dolzhenko
2020-02-19 23:09:25 +01:00
parent 2a27ca828c
commit ec431460b3
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt
+5
View File
@@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1
import com.intellij.openapi.util.component2 import com.intellij.openapi.util.component2
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import org.jetbrains.kotlin.idea.KotlinLanguage
private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") }
private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") }
@@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled
internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it }
} }
@@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it }
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.191
+5
View File
@@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1
import com.intellij.openapi.util.component2 import com.intellij.openapi.util.component2
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import org.jetbrains.kotlin.idea.KotlinLanguage
private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") }
private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") }
@@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled
internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it }
} }
@@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it }
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/jvmTestClassUtils.kt.192
+5
View File
@@ -15,6 +15,7 @@ import com.intellij.openapi.util.component1
import com.intellij.openapi.util.component2 import com.intellij.openapi.util.component2
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import org.jetbrains.kotlin.idea.KotlinLanguage
private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") } private val isJUnitEnabled by lazy { isPluginEnabled("JUnit") }
private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") } private val isTestNgEnabled by lazy { isPluginEnabled("TestNG-J") }
@@ -33,6 +34,8 @@ internal fun canRunJvmTests() = isJUnitEnabled || isTestNgEnabled
internal fun getTestClassForJvm(location: Location<*>): PsiClass? { internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestClass(leaf)?.let { return it }
} }
@@ -47,6 +50,8 @@ internal fun getTestClassForJvm(location: Location<*>): PsiClass? {
internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? { internal fun getTestMethodForJvm(location: Location<*>): PsiMethod? {
val leaf = location.psiElement ?: return null val leaf = location.psiElement ?: return null
if (leaf.language != KotlinLanguage.INSTANCE) return null
if (isJUnitEnabled) { if (isJUnitEnabled) {
KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it } KotlinJUnitRunConfigurationProducer.getTestMethod(leaf)?.let { return it }
} }