diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt index 09500e28ea7..bf0c4eb2cf0 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestClassGradleConfigurationProducer.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.run import com.intellij.execution.Location import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext -import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.junit.InheritorChooser import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil @@ -44,11 +43,11 @@ abstract class AbstractKotlinMultiplatformTestClassGradleConfigurationProducer : } override fun isPreferredConfiguration(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { - return other.isJpsJunitConfiguration() || super.isPreferredConfiguration(self, other) + return other.isJpsJunitConfiguration() } override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { - return other.isJpsJunitConfiguration() || super.shouldReplace(self, other) + return other.isJpsJunitConfiguration() } override fun onFirstRun(fromContext: ConfigurationFromContext, context: ConfigurationContext, performRunnable: Runnable) { @@ -97,10 +96,6 @@ abstract class AbstractKotlinMultiplatformTestClassGradleConfigurationProducer : abstract class AbstractKotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationProducer(), KotlinGradleConfigurationProducer { - override fun getConfigurationFactory(): ConfigurationFactory { - return KotlinGradleExternalTaskConfigurationType.instance.factory - } - override fun isConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean { if (!context.check()) { return false diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt index b4374702bf0..10eb101448d 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/AbstractKotlinTestMethodGradleConfigurationProducer.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.idea.run import com.intellij.execution.Location import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext -import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.junit.InheritorChooser import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil @@ -44,11 +43,11 @@ abstract class AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer } override fun isPreferredConfiguration(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { - return other.isJpsJunitConfiguration() || super.isPreferredConfiguration(self, other) + return other.isJpsJunitConfiguration() } override fun shouldReplace(self: ConfigurationFromContext, other: ConfigurationFromContext): Boolean { - return other.isJpsJunitConfiguration() || super.shouldReplace(self, other) + return other.isJpsJunitConfiguration() } override fun onFirstRun(fromContext: ConfigurationFromContext, context: ConfigurationContext, performRunnable: Runnable) { @@ -100,10 +99,6 @@ abstract class AbstractKotlinMultiplatformTestMethodGradleConfigurationProducer abstract class AbstractKotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfigurationProducer(), KotlinGradleConfigurationProducer { - override fun getConfigurationFactory(): ConfigurationFactory { - return KotlinGradleExternalTaskConfigurationType.instance.factory - } - override fun isConfigurationFromContext(configuration: ExternalSystemRunConfiguration, context: ConfigurationContext): Boolean { if (!context.check()) { return false diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleExternalTaskConfigurationType.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleExternalTaskConfigurationType.kt deleted file mode 100644 index fa5e033fb37..00000000000 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleExternalTaskConfigurationType.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * 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 - -import com.intellij.execution.configurations.ConfigurationFactory -import com.intellij.execution.configurations.ConfigurationTypeUtil -import com.intellij.openapi.externalSystem.model.ProjectSystemId -import com.intellij.openapi.externalSystem.service.execution.AbstractExternalSystemTaskConfigurationType -import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration -import com.intellij.openapi.project.Project -import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration -import org.jetbrains.plugins.gradle.util.GradleConstants - -class KotlinGradleExternalTaskConfigurationType : AbstractExternalSystemTaskConfigurationType(GradleConstants.SYSTEM_ID) { - companion object { - val instance: KotlinGradleExternalTaskConfigurationType - get() = ConfigurationTypeUtil.findConfigurationType(KotlinGradleExternalTaskConfigurationType::class.java) - } - - override fun getId() = "Kotlin" + externalSystemId.readableName + "RunConfiguration" - - @Suppress("SpellCheckingInspection") - override fun getHelpTopic() = "reference.dialogs.rundebug.GradleRunConfiguration" - - override fun getDisplayName() = "Kotlin Gradle" - override fun getConfigurationTypeDescription() = "Kotlin Gradle build" - - override fun doCreateConfiguration( - externalSystemId: ProjectSystemId, - project: Project, - factory: ConfigurationFactory, - name: String - ): ExternalSystemRunConfiguration { - return KotlinGradleRunConfiguration(project, factory, name) - } -} - -class KotlinGradleRunConfiguration(project: Project?, factory: ConfigurationFactory?, name: String?) : - GradleRunConfiguration(project, factory, name) \ No newline at end of file diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt index e29cfc1b4d0..3b999e4d722 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleTestRunConfigurationAndHighlightingTest.kt @@ -16,8 +16,8 @@ import com.intellij.openapi.vfs.VfsUtil import com.intellij.psi.PsiFile import org.jetbrains.kotlin.gradle.GradleDaemonAnalyzerTestCase import org.jetbrains.kotlin.gradle.checkFiles -import org.jetbrains.kotlin.idea.run.KotlinGradleRunConfiguration import org.jetbrains.kotlin.test.TagsTestDataUtil +import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration import org.junit.Test import java.io.File @@ -64,7 +64,7 @@ class GradleTestRunConfigurationAndHighlightingTest : GradleImportingTestCase() if ("Run Test" !in lineMarkerInfo.lineMarkerTooltip.orEmpty()) return null val kotlinConfigsFromContext = lineMarkerInfo.extractConfigurationsFromContext() - .filter { it.configuration is KotlinGradleRunConfiguration } + .filter { it.configuration is GradleRunConfiguration } if (kotlinConfigsFromContext.isEmpty()) return "settings=\"Nothing here\"" @@ -100,7 +100,7 @@ class GradleTestRunConfigurationAndHighlightingTest : GradleImportingTestCase() } private fun ConfigurationFromContext.renderDescription(tagsToRender: List): String { - val configuration = configuration as KotlinGradleRunConfiguration + val configuration = configuration as GradleRunConfiguration val location = PsiLocation(sourceElement) val context = ConfigurationContext.createEmptyContextForLocation(location) diff --git a/idea/resources/META-INF/gradle.xml b/idea/resources/META-INF/gradle.xml index 8b2e213c801..a295f8317f2 100644 --- a/idea/resources/META-INF/gradle.xml +++ b/idea/resources/META-INF/gradle.xml @@ -24,7 +24,6 @@ -