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

Gradle method/class configurations: support only jvm modules

Browse Source 
Fixes a problem where invalid run configuration could be created
    for common module when 'Gradle Test Runner' option is selected
This commit is contained in:
Pavel V. Talanov
2018-09-13 17:00:49 +02:00
parent 619e2bc0db
commit cbe3c69457
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt
+10 -4
View File
@@ -29,6 +29,8 @@ import com.intellij.openapi.util.component2
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import org.jetbrains.kotlin.idea.project.platform
import org.jetbrains.kotlin.platform.impl.isJvm
import org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer import org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer
import org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer import org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer
import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleConstants
@@ -73,6 +75,7 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP
val contextLocation = context.location ?: return false val contextLocation = context.location ?: return false
val module = context.module ?: return false val module = context.module ?: return false
if (!module.platform.isJvm) return false
if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) { if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) {
return false return false
@@ -101,7 +104,8 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP
if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
val leaf = context.location?.psiElement ?: return false val leaf = context.location?.psiElement ?: return false
if (context.module == null) return false val module = context.module ?: return false
if (!module.platform.isJvm) return false
if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) { if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) {
return false return false
@@ -113,11 +117,11 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP
if (testClass == null || testClass.qualifiedName == null) return false if (testClass == null || testClass.qualifiedName == null) return false
val projectPath = resolveProjectPath(context.module) ?: return false val projectPath = resolveProjectPath(module) ?: return false
if (projectPath != configuration.settings.externalProjectPath) { if (projectPath != configuration.settings.externalProjectPath) {
return false return false
} }
if (!configuration.settings.taskNames.containsAll(getTasksToRun(context.module))) return false if (!configuration.settings.taskNames.containsAll(getTasksToRun(module))) return false
val scriptParameters = configuration.settings.scriptParameters + ' ' val scriptParameters = configuration.settings.scriptParameters + ' '
val i = scriptParameters.indexOf("--tests ") val i = scriptParameters.indexOf("--tests ")
@@ -137,7 +141,8 @@ class KotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfiguratio
if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false if (!IS_TEST_FRAMEWORK_PLUGIN_ENABLED) return false
val contextLocation = context.location ?: return false val contextLocation = context.location ?: return false
if (context.module == null) return false val module = context.module ?: return false
if (!module.platform.isJvm) return false
if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) { if (RunConfigurationProducer.getInstance(PatternConfigurationProducer::class.java).isMultipleElementsSelected(context)) {
return false return false
@@ -164,6 +169,7 @@ class KotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfiguratio
val contextLocation = context.location ?: return false val contextLocation = context.location ?: return false
val module = context.module ?: return false val module = context.module ?: return false
if (!module.platform.isJvm) return false
val psiMethod = getTestMethod(contextLocation.psiElement) ?: return false val psiMethod = getTestMethod(contextLocation.psiElement) ?: return false